Merge pull request #996 from richardg867/master

ALi M6117 SoC implementation
This commit is contained in:
Miran Grča
2020-09-11 01:56:54 +02:00
committed by GitHub
9 changed files with 549 additions and 121 deletions

View File

@@ -84,6 +84,9 @@ ifeq ($(DEV_BUILD), y)
ifndef M1489
M1489 := y
endif
ifndef M6117
M6117 := y
endif
ifndef VGAWONDER
VGAWONDER := y
endif
@@ -163,6 +166,9 @@ else
ifndef M1489
M1489 := n
endif
ifndef M6117
M6117 := n
endif
ifndef VGAWONDER
VGAWONDER := n
endif
@@ -568,6 +574,11 @@ OPTS += -DUSE_M1489
DEVBROBJ += ali1489.o
endif
ifeq ($(M6117), y)
OPTS += -DUSE_M6117
DEVBROBJ += ali6117.o
endif
ifeq ($(596B), y)
OPTS += -DUSE_596B
endif
@@ -601,7 +612,7 @@ endif
# Final versions of the toolchain flags.
CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
$(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
$(AFLAGS) -mstackrealign -Wall \
-fno-strict-aliasing
# Add freetyp2 references through pkgconfig