Skip to content
Snippets Groups Projects
Commit 5c9b3d1a authored by John Hodge's avatar John Hodge
Browse files

Build - Renamed $(CONFIG) to $(PLATFORM)

parent 3de85568
Branches
Tags
No related merge requests found
...@@ -9,5 +9,8 @@ STRIP = arm-elf-strip ...@@ -9,5 +9,8 @@ STRIP = arm-elf-strip
ASSUFFIX = S ASSUFFIX = S
CONFIG=realview_pb # Default Configuration
ifeq ($(PLATFORM),)
PLATFORM=realview_pb
endif
ifeq ($(CONFIG),default) ifeq ($(PLATFORM),default)
$(error Please select a configuration) $(error Please select a platform)
endif endif
# Core ARMv7 modules
MODULES += armv7/GIC MODULES += armv7/GIC
MODULES += Filesystems/InitRD MODULES += Filesystems/InitRD
...@@ -21,25 +21,25 @@ ifeq ($(AS_SUFFIX),) ...@@ -21,25 +21,25 @@ ifeq ($(AS_SUFFIX),)
AS_SUFFIX = S AS_SUFFIX = S
endif endif
ASFLAGS += -D ARCHDIR_IS_$(ARCHDIR)=1 -DCONFIG_is_$(CONFIG)=1 ASFLAGS += -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
CPPFLAGS += -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\" CPPFLAGS += -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\"
CPPFLAGS += -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DARCHDIR_IS_$(ARCHDIR)=1 -DCONFIG_is_$(CONFIG)=1 CPPFLAGS += -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
CPPFLAGS += -DKERNEL_VERSION=$(KERNEL_VERSION) CPPFLAGS += -D KERNEL_VERSION=$(KERNEL_VERSION)
CFLAGS += -Wall -fno-stack-protector -Wstrict-prototypes -g CFLAGS += -Wall -fno-stack-protector -Wstrict-prototypes -g
CFLAGS += -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized CFLAGS += -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
CFLAGS += -O3 CFLAGS += -O3
LDFLAGS += -T arch/$(ARCHDIR)/link.ld -g LDFLAGS += -T arch/$(ARCHDIR)/link.ld -g
ifeq ($(CONFIG),default) ifeq ($(PLATFORM),default)
OBJDIR := obj-$(ARCH)/ OBJDIR := obj-$(ARCH)/
#OBJSUFFIX := .$(ARCH) #OBJSUFFIX := .$(ARCH)
BIN := ../Acess2.$(ARCH).bin BIN := ../Acess2.$(ARCH).bin
GZBIN := ../Acess2.$(ARCH).gz GZBIN := ../Acess2.$(ARCH).gz
else else
OBJDIR := obj-$(ARCH)-$(CONFIG)/ OBJDIR := obj-$(ARCH)-$(PLATFORM)/
#OBJSUFFIX := .$(ARCH)-$(CONFIG) #OBJSUFFIX := .$(ARCH)-$(PLATFORM)
BIN := ../Acess2.$(ARCH)-$(CONFIG).bin BIN := ../Acess2.$(ARCH)-$(PLATFORM).bin
GZBIN := ../Acess2.$(ARCH)-$(CONFIG).gz GZBIN := ../Acess2.$(ARCH)-$(PLATFORM).gz
endif endif
ifeq ($(DEBUG_BUILD),yes) ifeq ($(DEBUG_BUILD),yes)
......
...@@ -7,8 +7,7 @@ CPPFLAGS = ...@@ -7,8 +7,7 @@ CPPFLAGS =
CFLAGS = CFLAGS =
ASFLAGS = ASFLAGS =
ASFLAGS += -DCONFIG_is_$(CONFIG)=1 CPPFLAGS += -DMMU_PRESENT=1
CPPFLAGS += -DMMU_PRESENT=$(MMU_PRESENT)
LDFLAGS += `$(CC) --print-libgcc-file-name` LDFLAGS += `$(CC) --print-libgcc-file-name`
A_OBJ = start.ao main.o lib.o lib.ao time.o pci.o debug.o A_OBJ = start.ao main.o lib.o lib.ao time.o pci.o debug.o
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
//#define PCI_PADDR 0x60000000 // Realview (Non-PB) //#define PCI_PADDR 0x60000000 // Realview (Non-PB)
#if CONFIG_is_realview_pb #if PLATFORM_is_realview_pb
# define UART0_PADDR 0x10009000 // Realview # define UART0_PADDR 0x10009000 // Realview
# define GICI_PADDR 0x1e000000 # define GICI_PADDR 0x1e000000
# define GICD_PADDR 0x1e001000 # define GICD_PADDR 0x1e001000
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#endif #endif
#if CONFIG_is_trimslice // Tegra2 #if PLATFORM_is_trimslice // Tegra2
# define UART0_PADDR 0x70006000 # define UART0_PADDR 0x70006000
# define GICD_PADDR 0x50041000 # define GICD_PADDR 0x50041000
# define GICI_PADDR 0x60004000 // TODO: Is this actually a GIC-I? # define GICI_PADDR 0x60004000 // TODO: Is this actually a GIC-I?
......
...@@ -11,9 +11,9 @@ ASFLAGS = -f elf ...@@ -11,9 +11,9 @@ ASFLAGS = -f elf
USE_MP=0 USE_MP=0
ifeq ($(CONFIG),default) ifeq ($(PLATFORM),default)
USE_MP=0 USE_MP=0
else ifeq ($(CONFIG),smp) else ifeq ($(PLATFORM),smp)
USE_MP=1 USE_MP=1
endif endif
......
...@@ -40,8 +40,8 @@ ifneq ($(ARCH),host) ...@@ -40,8 +40,8 @@ ifneq ($(ARCH),host)
endif endif
endif endif
ifeq ($(CONFIG),) ifeq ($(PLATFORM),)
CONFIG := default PLATFORM := default
endif endif
# Makefile.user.cfg is not part of the Acess git repo, # Makefile.user.cfg is not part of the Acess git repo,
...@@ -55,7 +55,7 @@ MODULES += Filesystems/Ext2 ...@@ -55,7 +55,7 @@ MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS MODULES += Filesystems/NTFS
include $(ACESSDIR)/BuildConf/$(ARCH)/$(CONFIG).mk include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
MODULES += IPStack # So the other modules are loaded before it MODULES += IPStack # So the other modules are loaded before it
#DYNMODS := USB/Core #DYNMODS := USB/Core
......
...@@ -5,7 +5,7 @@ QEMU=qemu-system-arm ...@@ -5,7 +5,7 @@ QEMU=qemu-system-arm
USE_GDB= USE_GDB=
_SYSTEM=realview-pb-a8 _SYSTEM=realview-pb-a8
_KERNEL=Acess2.armv7.bin _KERNEL=Acess2.armv7-realview_pb.bin
QEMU_PARAMS="" QEMU_PARAMS=""
_NETTYPE="user" _NETTYPE="user"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment