lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[make] rename DEFINES to GLOBAL_DEFINES

Browse Source 
To fix your module makefiles:
-Change DEFINES to GLOBAL_DEFINES
This commit is contained in:
Travis Geiselbrecht
2013-06-07 21:57:58 -07:00
parent e002c58b59
commit d5cf22f40d
19 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/rules.mk
View File

@@ -8,13 +8,13 @@ ENABLE_THUMB?=true
# default to the regular arm subarch # default to the regular arm subarch
SUBARCH := arm SUBARCH := arm
DEFINES += \ GLOBAL_DEFINES += \
ARM_CPU_$(ARM_CPU)=1 ARM_CPU_$(ARM_CPU)=1
# do set some options based on the cpu core # do set some options based on the cpu core
HANDLED_CORE := false HANDLED_CORE := false
ifeq ($(ARM_CPU),cortex-m3) ifeq ($(ARM_CPU),cortex-m3)
DEFINES += \ GLOBAL_DEFINES += \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7=1 \
ARM_ISA_ARMv7M=1 \ ARM_ISA_ARMv7M=1 \
@@ -27,7 +27,7 @@ ONLY_THUMB := true
SUBARCH := arm-m SUBARCH := arm-m
endif endif
ifeq ($(ARM_CPU),cortex-m4) ifeq ($(ARM_CPU),cortex-m4)
DEFINES += \ GLOBAL_DEFINES += \
ARM_CPU_CORTEX_M4=1 \ ARM_CPU_CORTEX_M4=1 \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7=1 \
@@ -41,7 +41,7 @@ ONLY_THUMB := true
SUBARCH := arm-m SUBARCH := arm-m
endif endif
ifeq ($(ARM_CPU),cortex-m4f) ifeq ($(ARM_CPU),cortex-m4f)
DEFINES += \ GLOBAL_DEFINES += \
ARM_CPU_CORTEX_M4=1 \ ARM_CPU_CORTEX_M4=1 \
ARM_CPU_CORTEX_M4F=1 \ ARM_CPU_CORTEX_M4F=1 \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
@@ -58,7 +58,7 @@ ONLY_THUMB := true
SUBARCH := arm-m SUBARCH := arm-m
endif endif
ifeq ($(ARM_CPU),cortex-a8) ifeq ($(ARM_CPU),cortex-a8)
DEFINES += \ GLOBAL_DEFINES += \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_WITH_MMU=1 \ ARM_WITH_MMU=1 \
ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7=1 \
@@ -74,7 +74,7 @@ HANDLED_CORE := true
#CFLAGS += -mfpu=neon -mfloat-abi=softfp #CFLAGS += -mfpu=neon -mfloat-abi=softfp
endif endif
ifeq ($(ARM_CPU),arm1136j-s) ifeq ($(ARM_CPU),arm1136j-s)
DEFINES += \ GLOBAL_DEFINES += \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_WITH_MMU=1 \ ARM_WITH_MMU=1 \
ARM_ISA_ARMv6=1 \ ARM_ISA_ARMv6=1 \
@@ -85,7 +85,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
HANDLED_CORE := true HANDLED_CORE := true
endif endif
ifeq ($(ARM_CPU),arm1176jzf-s) ifeq ($(ARM_CPU),arm1176jzf-s)
DEFINES += \ GLOBAL_DEFINES += \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_WITH_MMU=1 \ ARM_WITH_MMU=1 \
ARM_ISA_ARMv6=1 \ ARM_ISA_ARMv6=1 \
@@ -97,7 +97,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
HANDLED_CORE := true HANDLED_CORE := true
endif endif
ifeq ($(ARM_CPU),arm926ej-s) ifeq ($(ARM_CPU),arm926ej-s)
DEFINES += \ GLOBAL_DEFINES += \
ARM_WITH_CP15=1 \ ARM_WITH_CP15=1 \
ARM_WITH_MMU=1 \ ARM_WITH_MMU=1 \
ARM_ISA_ARMv5E=1 \ ARM_ISA_ARMv5E=1 \
@@ -109,7 +109,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
HANDLED_CORE := true HANDLED_CORE := true
endif endif
ifeq ($(ARM_CPU),arm7tdmi) ifeq ($(ARM_CPU),arm7tdmi)
DEFINES += \ GLOBAL_DEFINES += \
ARM_ISA_ARMv4=1 \ ARM_ISA_ARMv4=1 \
ARM_WITH_THUMB=1 \ ARM_WITH_THUMB=1 \
ARM_CPU_ARM7=1 ARM_CPU_ARM7=1
@@ -148,7 +148,7 @@ MODULE_SRCS += \
MODULE_ARM_OVERRIDE_SRCS := \ MODULE_ARM_OVERRIDE_SRCS := \
$(LOCAL_DIR)/arm/arch.c $(LOCAL_DIR)/arm/arch.c
DEFINES += \ GLOBAL_DEFINES += \
ARCH_DEFAULT_STACK_SIZE=4096 ARCH_DEFAULT_STACK_SIZE=4096
endif endif
ifeq ($(SUBARCH),arm-m) ifeq ($(SUBARCH),arm-m)
@@ -163,7 +163,7 @@ MODULE_SRCS += \
GLOBAL_INCLUDES += \ GLOBAL_INCLUDES += \
$(LOCAL_DIR)/arm-m/CMSIS/Include $(LOCAL_DIR)/arm-m/CMSIS/Include
DEFINES += \ GLOBAL_DEFINES += \
ARCH_DEFAULT_STACK_SIZE=1024 ARCH_DEFAULT_STACK_SIZE=1024
endif endif

34
engine.mk
View File

@@ -71,8 +71,8 @@ LINKER_SCRIPT :=
# anything you add here will be deleted in make clean # anything you add here will be deleted in make clean
GENERATED := $(CONFIGHEADER) GENERATED := $(CONFIGHEADER)
# anything added to DEFINES will be put into $(BUILDDIR)/config.h # anything added to GLOBAL_DEFINES will be put into $(BUILDDIR)/config.h
DEFINES := LK=1 GLOBAL_DEFINES := LK=1
# Anything added to SRCDEPS will become a dependency of every source file in the system. # Anything added to SRCDEPS will become a dependency of every source file in the system.
# Useful for header files that may be included by one or more source files. # Useful for header files that may be included by one or more source files.
@@ -129,7 +129,7 @@ include make/recurse.mk
all:: $(EXTRA_BUILDDEPS) all:: $(EXTRA_BUILDDEPS)
# add some automatic configuration defines # add some automatic configuration defines
DEFINES += \ GLOBAL_DEFINES += \
PROJECT_$(PROJECT)=1 \ PROJECT_$(PROJECT)=1 \
PROJECT=\"$(PROJECT)\" \ PROJECT=\"$(PROJECT)\" \
TARGET_$(TARGET)=1 \ TARGET_$(TARGET)=1 \
@@ -142,7 +142,7 @@ DEFINES += \
# debug build? # debug build?
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
DEFINES += \ GLOBAL_DEFINES += \
DEBUG=$(DEBUG) DEBUG=$(DEBUG)
endif endif
@@ -157,6 +157,14 @@ DEPS := $(ALLOBJS:%o=%d)
# prefix all of the paths in GLOBAL_INCLUDES with -I # prefix all of the paths in GLOBAL_INCLUDES with -I
GLOBAL_INCLUDES := $(addprefix -I,$(GLOBAL_INCLUDES)) GLOBAL_INCLUDES := $(addprefix -I,$(GLOBAL_INCLUDES))
# test for some old variables
ifneq ($(INCLUDES),)
$(error INCLUDES variable set, please move to GLOBAL_INCLUDES)
endif
ifneq ($(DEFINES),)
$(error DEFINES variable set, please move to GLOBAL_DEFINES)
endif
# default to no ccache # default to no ccache
CCACHE ?= CCACHE ?=
CC := $(CCACHE) $(TOOLCHAIN_PREFIX)gcc CC := $(CCACHE) $(TOOLCHAIN_PREFIX)gcc
@@ -168,13 +176,13 @@ SIZE := $(TOOLCHAIN_PREFIX)size
NM := $(TOOLCHAIN_PREFIX)nm NM := $(TOOLCHAIN_PREFIX)nm
# put all of the global build flags in config.h to force a rebuild if any change # put all of the global build flags in config.h to force a rebuild if any change
DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\" GLOBAL_DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\"
DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\" GLOBAL_DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\"
DEFINES += GLOBAL_OPTFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_OPTFLAGS))\" GLOBAL_DEFINES += GLOBAL_OPTFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_OPTFLAGS))\"
DEFINES += GLOBAL_CFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CFLAGS))\" GLOBAL_DEFINES += GLOBAL_CFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CFLAGS))\"
DEFINES += GLOBAL_CPPFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CPPFLAGS))\" GLOBAL_DEFINES += GLOBAL_CPPFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CPPFLAGS))\"
DEFINES += GLOBAL_ASMFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_ASMFLAGS))\" GLOBAL_DEFINES += GLOBAL_ASMFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_ASMFLAGS))\"
DEFINES += GLOBAL_LDFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_LDFLAGS))\" GLOBAL_DEFINES += GLOBAL_LDFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_LDFLAGS))\"
# comment out or override if you want to see the full output of each command # comment out or override if you want to see the full output of each command
NOECHO ?= @ NOECHO ?= @
@@ -205,11 +213,11 @@ clean: $(EXTRA_CLEANDEPS)
install: all install: all
scp $(OUTBIN) 192.168.0.4:/tftproot scp $(OUTBIN) 192.168.0.4:/tftproot
# generate a config.h file with all of the DEFINES laid out in #define format # generate a config.h file with all of the GLOBAL_DEFINES laid out in #define format
configheader: configheader:
$(CONFIGHEADER): configheader $(CONFIGHEADER): configheader
$(call MAKECONFIGHEADER,$@,DEFINES) $(call MAKECONFIGHEADER,$@,GLOBAL_DEFINES)
# Empty rule for the .d files. The above rules will build .d files as a side # Empty rule for the .d files. The above rules will build .d files as a side
# effect. Only works on gcc 3.x and above, however. # effect. Only works on gcc 3.x and above, however.

2
platform/am335x/rules.mk
View File

@@ -33,7 +33,7 @@ MEMSIZE ?= 0x10000000
LINKER_SCRIPT += \ LINKER_SCRIPT += \
$(BUILDDIR)/system-onesegment.ld $(BUILDDIR)/system-onesegment.ld
DEFINES += \ GLOBAL_DEFINES += \
MEMBASE=$(MEMBASE) \ MEMBASE=$(MEMBASE) \
SDRAM_BASE=$(MEMBASE) \ SDRAM_BASE=$(MEMBASE) \
SDRAM_SIZE=$(MEMSIZE) \ SDRAM_SIZE=$(MEMSIZE) \

4
platform/armemu/rules.mk
View File

@@ -23,7 +23,7 @@ MODULE_SRCS += \
# $(LOCAL_DIR)/console.c \ # $(LOCAL_DIR)/console.c \
$(LOCAL_DIR)/net.c \ $(LOCAL_DIR)/net.c \
DEFINES += \ GLOBAL_DEFINES += \
WITH_DEV_DISPLAY=1 WITH_DEV_DISPLAY=1
MODULE_DEPS += \ MODULE_DEPS += \
@@ -32,7 +32,7 @@ MODULE_DEPS += \
MEMBASE := 0x0 MEMBASE := 0x0
MEMSIZE := 0x400000 # 4MB MEMSIZE := 0x400000 # 4MB
DEFINES += \ GLOBAL_DEFINES += \
MEMBASE=$(MEMBASE) \ MEMBASE=$(MEMBASE) \
MEMSIZE=$(MEMSIZE) MEMSIZE=$(MEMSIZE)

4
platform/omap3/rules.mk
View File

@@ -9,7 +9,7 @@ CPU := generic
DEVS += usb DEVS += usb
# provides a few devices # provides a few devices
DEFINES += \ GLOBAL_DEFINES += \
WITH_DEV_USBC=1 \ WITH_DEV_USBC=1 \
WITH_DEV_UART=1 WITH_DEV_UART=1
@@ -31,7 +31,7 @@ MODULE_SRCS += \
MEMBASE := 0x80000000 MEMBASE := 0x80000000
DEFINES += MEMBASE=$(MEMBASE) \ GLOBAL_DEFINES += MEMBASE=$(MEMBASE) \
WITH_CPU_EARLY_INIT=1 WITH_CPU_EARLY_INIT=1
LINKER_SCRIPT += \ LINKER_SCRIPT += \

2
platform/realview-pb/rules.mk
View File

@@ -17,7 +17,7 @@ MODULE_SRCS += \
MEMBASE := 0x0 MEMBASE := 0x0
MEMSIZE := 0x10000000 # 256MB MEMSIZE := 0x10000000 # 256MB
DEFINES += \ GLOBAL_DEFINES += \
MEMBASE=$(MEMBASE) \ MEMBASE=$(MEMBASE) \
MEMSIZE=$(MEMSIZE) MEMSIZE=$(MEMSIZE)

2
platform/sam3/rules.mk
View File

@@ -10,7 +10,7 @@ ARCH := arm
ARM_CPU := cortex-m3 ARM_CPU := cortex-m3
ifeq ($(SAM_CHIP),sam3x8h) ifeq ($(SAM_CHIP),sam3x8h)
DEFINES += \ GLOBAL_DEFINES += \
__SAM3X8H__=1 \ __SAM3X8H__=1 \
SAM3XA=1 SAM3XA=1
MEMSIZE ?= 98304 MEMSIZE ?= 98304

12
platform/stm32f1xx/rules.mk
View File

@@ -11,32 +11,32 @@ ARCH := arm
ARM_CPU := cortex-m3 ARM_CPU := cortex-m3
ifeq ($(STM32_CHIP),stm32f107) ifeq ($(STM32_CHIP),stm32f107)
DEFINES += \ GLOBAL_DEFINES += \
STM32F10X_CL=1 STM32F10X_CL=1
MEMSIZE ?= 65536 MEMSIZE ?= 65536
endif endif
ifeq ($(STM32_CHIP),stm32f103_xl) ifeq ($(STM32_CHIP),stm32f103_xl)
DEFINES += \ GLOBAL_DEFINES += \
STM32F10X_XL=1 STM32F10X_XL=1
MEMSIZE ?= 65536 MEMSIZE ?= 65536
endif endif
ifeq ($(STM32_CHIP),stm32f103_hd) ifeq ($(STM32_CHIP),stm32f103_hd)
DEFINES += \ GLOBAL_DEFINES += \
STM32F10X_HD=1 STM32F10X_HD=1
MEMSIZE ?= 65536 MEMSIZE ?= 65536
endif endif
ifeq ($(STM32_CHIP),stm32f103_md) ifeq ($(STM32_CHIP),stm32f103_md)
DEFINES += \ GLOBAL_DEFINES += \
STM32F10X_MD=1 STM32F10X_MD=1
MEMSIZE ?= 20480 MEMSIZE ?= 20480
endif endif
ifeq ($(STM32_CHIP),stm32f103_ld) ifeq ($(STM32_CHIP),stm32f103_ld)
DEFINES += \ GLOBAL_DEFINES += \
STM32F10X_LD=1 STM32F10X_LD=1
MEMSIZE ?= 20480 MEMSIZE ?= 20480
endif endif
DEFINES += \ GLOBAL_DEFINES += \
MEMSIZE=$(MEMSIZE) MEMSIZE=$(MEMSIZE)
GLOBAL_INCLUDES += \ GLOBAL_INCLUDES += \

6
platform/stm32f2xx/rules.mk
View File

@@ -13,13 +13,13 @@ ARCH := arm
ARM_CPU := cortex-m3 ARM_CPU := cortex-m3
ifeq ($(STM32_CHIP),stm32f207) ifeq ($(STM32_CHIP),stm32f207)
DEFINES += \ GLOBAL_DEFINES += \
STM32F207=1 \ STM32F207=1 \
STM32F2XX=1 STM32F2XX=1
FOUND_CHIP := true FOUND_CHIP := true
endif endif
ifeq ($(STM32_CHIP),stm32f407) ifeq ($(STM32_CHIP),stm32f407)
DEFINES += \ GLOBAL_DEFINES += \
STM32F407=1 \ STM32F407=1 \
STM32F4XX=1 STM32F4XX=1
FOUND_CHIP := true FOUND_CHIP := true
@@ -30,7 +30,7 @@ ifeq ($(FOUND_CHIP),)
$(error unknown STM32F2xx chip $(STM32_CHIP)) $(error unknown STM32F2xx chip $(STM32_CHIP))
endif endif
DEFINES += \ GLOBAL_DEFINES += \
MEMSIZE=$(MEMSIZE) MEMSIZE=$(MEMSIZE)
GLOBAL_INCLUDES += \ GLOBAL_INCLUDES += \

2
project/armemu-test.mk
View File

@@ -18,7 +18,7 @@ MODULES += \
app/tests \ app/tests \
app/shell app/shell
DEFINES += \ GLOBAL_DEFINES += \
WITH_KERNEL_EVLOG=1 WITH_KERNEL_EVLOG=1
# extra rules to copy the armemu.conf file to the build dir # extra rules to copy the armemu.conf file to the build dir

2
target/beagle/rules.mk
View File

@@ -10,6 +10,6 @@ MODULES += \
MEMSIZE := 0x08000000 # 128MB MEMSIZE := 0x08000000 # 128MB
DEFINES += \ GLOBAL_DEFINES += \
SDRAM_SIZE=$(MEMSIZE) SDRAM_SIZE=$(MEMSIZE)

2
target/beaglebone/rules.mk
View File

@@ -11,7 +11,7 @@ MODULES += \
MEMSIZE := 0x10000000 # 256MB MEMSIZE := 0x10000000 # 256MB
DEFINES += \ GLOBAL_DEFINES += \
#include make/module.mk #include make/module.mk

2
target/osk5912/rules.mk
View File

@@ -12,7 +12,7 @@ MODULE_SRCS += \
MEMSIZE := 0x02000000 # 32MB MEMSIZE := 0x02000000 # 32MB
DEFINES += \ GLOBAL_DEFINES += \
SDRAM_SIZE=$(MEMSIZE) \ SDRAM_SIZE=$(MEMSIZE) \
SMC91C96_BASE_ADDR=0x04800300 \ SMC91C96_BASE_ADDR=0x04800300 \
SMC91C96_IRQ=0 SMC91C96_IRQ=0

2
target/realview-pb/rules.mk
View File

@@ -9,7 +9,7 @@ PLATFORM := realview-pb
MODULES += \ MODULES += \
DEFINES += \ GLOBAL_DEFINES += \
#include make/module.mk #include make/module.mk

2
target/stellaris-launchpad/rules.mk
View File

@@ -5,7 +5,7 @@ MODULE := $(LOCAL_DIR)
STELLARIS_CHIP := LM4F120H5QR STELLARIS_CHIP := LM4F120H5QR
PLATFORM := stellaris PLATFORM := stellaris
DEFINES += \ GLOBAL_DEFINES += \
TARGET_HAS_DEBUG_LED=1 TARGET_HAS_DEBUG_LED=1
GLOBAL_INCLUDES += $(LOCAL_DIR)/include GLOBAL_INCLUDES += $(LOCAL_DIR)/include

2
target/stm32-h103/rules.mk
View File

@@ -6,7 +6,7 @@ STM32_CHIP := stm32f103_md
PLATFORM := stm32f1xx PLATFORM := stm32f1xx
DEFINES += \ GLOBAL_DEFINES += \
ENABLE_UART1=1 \ ENABLE_UART1=1 \
TARGET_HAS_DEBUG_LED=1 TARGET_HAS_DEBUG_LED=1

2
target/stm32-p107/rules.mk
View File

@@ -6,7 +6,7 @@ STM32_CHIP := stm32f107
PLATFORM := stm32f1xx PLATFORM := stm32f1xx
DEFINES += \ GLOBAL_DEFINES += \
ENABLE_UART3=1 \ ENABLE_UART3=1 \
TARGET_HAS_DEBUG_LED=1 TARGET_HAS_DEBUG_LED=1

2
target/stm32-p407/rules.mk
View File

@@ -6,7 +6,7 @@ STM32_CHIP := stm32f407
PLATFORM := stm32f2xx PLATFORM := stm32f2xx
DEFINES += \ GLOBAL_DEFINES += \
ENABLE_UART3=1 \ ENABLE_UART3=1 \
TARGET_HAS_DEBUG_LED=1 TARGET_HAS_DEBUG_LED=1

2
target/stm3220g/rules.mk
View File

@@ -6,7 +6,7 @@ STM32_CHIP := stm32f207
PLATFORM := stm32f2xx PLATFORM := stm32f2xx
DEFINES += \ GLOBAL_DEFINES += \
ENABLE_UART3=1 \ ENABLE_UART3=1 \
TARGET_HAS_DEBUG_LED=1 TARGET_HAS_DEBUG_LED=1