X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=70570c86d843f7a6f9ba79aba1e3ba22bf9b4a93;hb=d1b2ff57c789c5d4bb1d9429582d5cbe6569e82b;hp=21a813dda505fb6ba1f1565da86fedf5d23741be;hpb=90c7a46940410bbe94138d70307e35c6dfa39336;p=tpg%2Facess2.git diff --git a/Makefile.cfg b/Makefile.cfg index 21a813dd..70570c86 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -20,11 +20,12 @@ STRIP := strip MKDIR := mkdir -p RMDIR := rm -rf lCP := cp +ASSUFFIX = asm # Load Architecture settings ifeq ($(ARCH),) - ARCH := i386 + ARCH := x86 endif include $(ACESSDIR)/Makefile.$(ARCH).cfg ifeq ($(ARCHDIR),) @@ -46,7 +47,8 @@ MODULES += Filesystems/FAT MODULES += Filesystems/NTFS ifeq ($(ARCHDIR),x86) -MODULES += Storage/ATA Storage/FDD +MODULES += Storage/ATA +MODULES += Storage/FDDv2 MODULES += Network/NE2000 Network/RTL8139 MODULES += Display/VESA MODULES += Display/BochsGA @@ -57,7 +59,8 @@ MODULES += USB/Core endif ifeq ($(ARCHDIR),x86_64) -MODULES += Storage/ATA Storage/FDD +MODULES += Storage/ATA +MODULES += Storage/FDDv2 MODULES += Network/NE2000 Network/RTL8139 MODULES += Display/BochsGA MODULES += Interfaces/UDI @@ -68,6 +71,9 @@ endif ifeq ($(ARCHDIR),armv7) MODULES += Input/PS2KbMouse +MODULES += armv7/GIC +MODULES += Filesystems/InitRD +MODULES += Display/PL110 endif MODULES += IPStack # So the other modules are loaded before it