[make] rename DEFINES to GLOBAL_DEFINES

To fix your module makefiles:
-Change DEFINES to GLOBAL_DEFINES

19 files changed, 58 insertions, 50 deletions

diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk
index 78f93a1f..d6865b3d 100644
--- a/arch/arm/rules.mk
+++ b/arch/arm/rules.mk
@@ -8,13 +8,13 @@ ENABLE_THUMB?=true
 # default to the regular arm subarch
 SUBARCH := arm
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_CPU_$(ARM_CPU)=1
 
 # do set some options based on the cpu core
 HANDLED_CORE := false
 ifeq ($(ARM_CPU),cortex-m3)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_WITH_CP15=1 \
 	ARM_ISA_ARMv7=1 \
 	ARM_ISA_ARMv7M=1 \
@@ -27,7 +27,7 @@ ONLY_THUMB := true
 SUBARCH := arm-m
 endif
 ifeq ($(ARM_CPU),cortex-m4)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_CPU_CORTEX_M4=1 \
 	ARM_WITH_CP15=1 \
 	ARM_ISA_ARMv7=1 \
@@ -41,7 +41,7 @@ ONLY_THUMB := true
 SUBARCH := arm-m
 endif
 ifeq ($(ARM_CPU),cortex-m4f)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_CPU_CORTEX_M4=1 \
 	ARM_CPU_CORTEX_M4F=1 \
 	ARM_WITH_CP15=1 \
@@ -58,7 +58,7 @@ ONLY_THUMB := true
 SUBARCH := arm-m
 endif
 ifeq ($(ARM_CPU),cortex-a8)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_WITH_CP15=1 \
 	ARM_WITH_MMU=1 \
 	ARM_ISA_ARMv7=1 \
@@ -74,7 +74,7 @@ HANDLED_CORE := true
 #CFLAGS += -mfpu=neon -mfloat-abi=softfp
 endif
 ifeq ($(ARM_CPU),arm1136j-s)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_WITH_CP15=1 \
 	ARM_WITH_MMU=1 \
 	ARM_ISA_ARMv6=1 \
@@ -85,7 +85,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm1176jzf-s)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_WITH_CP15=1 \
 	ARM_WITH_MMU=1 \
 	ARM_ISA_ARMv6=1 \
@@ -97,7 +97,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm926ej-s)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_WITH_CP15=1 \
 	ARM_WITH_MMU=1 \
 	ARM_ISA_ARMv5E=1 \
@@ -109,7 +109,7 @@ GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm7tdmi)
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARM_ISA_ARMv4=1 \
 	ARM_WITH_THUMB=1 \
 	ARM_CPU_ARM7=1
@@ -148,7 +148,7 @@ MODULE_SRCS += \
 MODULE_ARM_OVERRIDE_SRCS := \
 	$(LOCAL_DIR)/arm/arch.c
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARCH_DEFAULT_STACK_SIZE=4096
 endif
 ifeq ($(SUBARCH),arm-m)
@@ -163,7 +163,7 @@ MODULE_SRCS += \
 GLOBAL_INCLUDES += \
 	$(LOCAL_DIR)/arm-m/CMSIS/Include
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ARCH_DEFAULT_STACK_SIZE=1024
 endif
 
diff --git a/engine.mk b/engine.mk
index 1fd00963..ce07ce21 100644
--- a/engine.mk
+++ b/engine.mk
@@ -71,8 +71,8 @@ LINKER_SCRIPT :=
 # anything you add here will be deleted in make clean
 GENERATED := $(CONFIGHEADER)
 
-# anything added to DEFINES will be put into $(BUILDDIR)/config.h
-DEFINES := LK=1
+# anything added to GLOBAL_DEFINES will be put into $(BUILDDIR)/config.h
+GLOBAL_DEFINES := LK=1
 
 # 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.
@@ -129,7 +129,7 @@ include make/recurse.mk
 all:: $(EXTRA_BUILDDEPS)
 
 # add some automatic configuration defines
-DEFINES += \
+GLOBAL_DEFINES += \
 	PROJECT_$(PROJECT)=1 \
 	PROJECT=\"$(PROJECT)\" \
 	TARGET_$(TARGET)=1 \
@@ -142,7 +142,7 @@ DEFINES += \
 
 # debug build?
 ifneq ($(DEBUG),)
-DEFINES += \
+GLOBAL_DEFINES += \
 	DEBUG=$(DEBUG)
 endif
 
@@ -157,6 +157,14 @@ DEPS := $(ALLOBJS:%o=%d)
 # prefix all of the paths in GLOBAL_INCLUDES with -I
 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
 CCACHE ?=
 CC := $(CCACHE) $(TOOLCHAIN_PREFIX)gcc
@@ -168,13 +176,13 @@ SIZE := $(TOOLCHAIN_PREFIX)size
 NM := $(TOOLCHAIN_PREFIX)nm
 
 # put all of the global build flags in config.h to force a rebuild if any change
-DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\"
-DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\"
-DEFINES += GLOBAL_OPTFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_OPTFLAGS))\"
-DEFINES += GLOBAL_CFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CFLAGS))\"
-DEFINES += GLOBAL_CPPFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CPPFLAGS))\"
-DEFINES += GLOBAL_ASMFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_ASMFLAGS))\"
-DEFINES += GLOBAL_LDFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_LDFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\"
+GLOBAL_DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_OPTFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_OPTFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_CFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_CPPFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CPPFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_ASMFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_ASMFLAGS))\"
+GLOBAL_DEFINES += GLOBAL_LDFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_LDFLAGS))\"
 
 # comment out or override if you want to see the full output of each command
 NOECHO ?= @
@@ -205,11 +213,11 @@ clean: $(EXTRA_CLEANDEPS)
 install: all
 	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
-	$(call MAKECONFIGHEADER,$@,DEFINES)
+	$(call MAKECONFIGHEADER,$@,GLOBAL_DEFINES)
 
 # 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.
diff --git a/platform/am335x/rules.mk b/platform/am335x/rules.mk
index 1c2e22f9..1571bb72 100644
--- a/platform/am335x/rules.mk
+++ b/platform/am335x/rules.mk
@@ -33,7 +33,7 @@ MEMSIZE ?= 0x10000000
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-onesegment.ld
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	MEMBASE=$(MEMBASE) \
 	SDRAM_BASE=$(MEMBASE) \
 	SDRAM_SIZE=$(MEMSIZE) \
diff --git a/platform/armemu/rules.mk b/platform/armemu/rules.mk
index d3648d7e..ce2c969f 100644
--- a/platform/armemu/rules.mk
+++ b/platform/armemu/rules.mk
@@ -23,7 +23,7 @@ MODULE_SRCS += \
 #	$(LOCAL_DIR)/console.c \
 	$(LOCAL_DIR)/net.c \
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	WITH_DEV_DISPLAY=1
 
 MODULE_DEPS += \
@@ -32,7 +32,7 @@ MODULE_DEPS += \
 MEMBASE := 0x0
 MEMSIZE := 0x400000	# 4MB
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	MEMBASE=$(MEMBASE) \
 	MEMSIZE=$(MEMSIZE)
 
diff --git a/platform/omap3/rules.mk b/platform/omap3/rules.mk
index 40fe4116..a482e77e 100644
--- a/platform/omap3/rules.mk
+++ b/platform/omap3/rules.mk
@@ -9,7 +9,7 @@ CPU := generic
 DEVS += usb
 
 # provides a few devices
-DEFINES += \
+GLOBAL_DEFINES += \
 	WITH_DEV_USBC=1 \
 	WITH_DEV_UART=1
 
@@ -31,7 +31,7 @@ MODULE_SRCS += \
 
 MEMBASE := 0x80000000
 
-DEFINES += MEMBASE=$(MEMBASE) \
+GLOBAL_DEFINES += MEMBASE=$(MEMBASE) \
 	WITH_CPU_EARLY_INIT=1
 
 LINKER_SCRIPT += \
diff --git a/platform/realview-pb/rules.mk b/platform/realview-pb/rules.mk
index d70f67bf..c39f846a 100644
--- a/platform/realview-pb/rules.mk
+++ b/platform/realview-pb/rules.mk
@@ -17,7 +17,7 @@ MODULE_SRCS += \
 MEMBASE := 0x0
 MEMSIZE := 0x10000000	# 256MB
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	MEMBASE=$(MEMBASE) \
 	MEMSIZE=$(MEMSIZE)
 
diff --git a/platform/sam3/rules.mk b/platform/sam3/rules.mk
index 112c6414..5aa0fa9e 100644
--- a/platform/sam3/rules.mk
+++ b/platform/sam3/rules.mk
@@ -10,7 +10,7 @@ ARCH := arm
 ARM_CPU := cortex-m3
 
 ifeq ($(SAM_CHIP),sam3x8h)
-DEFINES += \
+GLOBAL_DEFINES += \
 	__SAM3X8H__=1 \
 	SAM3XA=1
 MEMSIZE ?= 98304 
diff --git a/platform/stm32f1xx/rules.mk b/platform/stm32f1xx/rules.mk
index e4feb3cb..c92d695c 100644
--- a/platform/stm32f1xx/rules.mk
+++ b/platform/stm32f1xx/rules.mk
@@ -11,32 +11,32 @@ ARCH := arm
 ARM_CPU := cortex-m3
 
 ifeq ($(STM32_CHIP),stm32f107)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F10X_CL=1	
 MEMSIZE ?= 65536
 endif
 ifeq ($(STM32_CHIP),stm32f103_xl)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F10X_XL=1
 MEMSIZE ?= 65536
 endif
 ifeq ($(STM32_CHIP),stm32f103_hd)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F10X_HD=1
 MEMSIZE ?= 65536
 endif
 ifeq ($(STM32_CHIP),stm32f103_md)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F10X_MD=1
 MEMSIZE ?= 20480
 endif
 ifeq ($(STM32_CHIP),stm32f103_ld)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F10X_LD=1
 MEMSIZE ?= 20480
 endif
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	MEMSIZE=$(MEMSIZE)
 
 GLOBAL_INCLUDES += \
diff --git a/platform/stm32f2xx/rules.mk b/platform/stm32f2xx/rules.mk
index dddda249..c5846ce3 100644
--- a/platform/stm32f2xx/rules.mk
+++ b/platform/stm32f2xx/rules.mk
@@ -13,13 +13,13 @@ ARCH := arm
 ARM_CPU := cortex-m3
 
 ifeq ($(STM32_CHIP),stm32f207)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F207=1	\
 	STM32F2XX=1
 FOUND_CHIP := true
 endif
 ifeq ($(STM32_CHIP),stm32f407)
-DEFINES += \
+GLOBAL_DEFINES += \
 	STM32F407=1	\
 	STM32F4XX=1
 FOUND_CHIP := true
@@ -30,7 +30,7 @@ ifeq ($(FOUND_CHIP),)
 $(error unknown STM32F2xx chip $(STM32_CHIP))
 endif
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	MEMSIZE=$(MEMSIZE)
 
 GLOBAL_INCLUDES += \
diff --git a/project/armemu-test.mk b/project/armemu-test.mk
index 8291a71a..cb23048c 100644
--- a/project/armemu-test.mk
+++ b/project/armemu-test.mk
@@ -18,7 +18,7 @@ MODULES += \
 	app/tests \
 	app/shell
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	WITH_KERNEL_EVLOG=1
 
 # extra rules to copy the armemu.conf file to the build dir
diff --git a/target/beagle/rules.mk b/target/beagle/rules.mk
index 69bc4514..e89f0f85 100644
--- a/target/beagle/rules.mk
+++ b/target/beagle/rules.mk
@@ -10,6 +10,6 @@ MODULES += \
 
 MEMSIZE := 0x08000000	# 128MB
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	SDRAM_SIZE=$(MEMSIZE)
 
diff --git a/target/beaglebone/rules.mk b/target/beaglebone/rules.mk
index 2c855544..ea0ac1f4 100644
--- a/target/beaglebone/rules.mk
+++ b/target/beaglebone/rules.mk
@@ -11,7 +11,7 @@ MODULES += \
 
 MEMSIZE := 0x10000000	# 256MB
 
-DEFINES += \
+GLOBAL_DEFINES += \
 
 #include make/module.mk
 
diff --git a/target/osk5912/rules.mk b/target/osk5912/rules.mk
index 40651bff..79f6d8c2 100644
--- a/target/osk5912/rules.mk
+++ b/target/osk5912/rules.mk
@@ -12,7 +12,7 @@ MODULE_SRCS += \
 
 MEMSIZE := 0x02000000	# 32MB
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	SDRAM_SIZE=$(MEMSIZE) \
 	SMC91C96_BASE_ADDR=0x04800300 \
 	SMC91C96_IRQ=0
diff --git a/target/realview-pb/rules.mk b/target/realview-pb/rules.mk
index f5f66c8f..291023ed 100644
--- a/target/realview-pb/rules.mk
+++ b/target/realview-pb/rules.mk
@@ -9,7 +9,7 @@ PLATFORM := realview-pb
 
 MODULES += \
 
-DEFINES += \
+GLOBAL_DEFINES += \
 
 #include make/module.mk
 
diff --git a/target/stellaris-launchpad/rules.mk b/target/stellaris-launchpad/rules.mk
index 67f96400..2dacb023 100644
--- a/target/stellaris-launchpad/rules.mk
+++ b/target/stellaris-launchpad/rules.mk
@@ -5,7 +5,7 @@ MODULE := $(LOCAL_DIR)
 STELLARIS_CHIP := LM4F120H5QR
 PLATFORM := stellaris
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	TARGET_HAS_DEBUG_LED=1
 
 GLOBAL_INCLUDES += $(LOCAL_DIR)/include
diff --git a/target/stm32-h103/rules.mk b/target/stm32-h103/rules.mk
index 92798012..6893c34c 100644
--- a/target/stm32-h103/rules.mk
+++ b/target/stm32-h103/rules.mk
@@ -6,7 +6,7 @@ STM32_CHIP := stm32f103_md
 
 PLATFORM := stm32f1xx
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ENABLE_UART1=1 \
 	TARGET_HAS_DEBUG_LED=1
 
diff --git a/target/stm32-p107/rules.mk b/target/stm32-p107/rules.mk
index 0b823e3e..17091d8a 100644
--- a/target/stm32-p107/rules.mk
+++ b/target/stm32-p107/rules.mk
@@ -6,7 +6,7 @@ STM32_CHIP := stm32f107
 
 PLATFORM := stm32f1xx
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1
 
diff --git a/target/stm32-p407/rules.mk b/target/stm32-p407/rules.mk
index 91cb0af3..458257fd 100644
--- a/target/stm32-p407/rules.mk
+++ b/target/stm32-p407/rules.mk
@@ -6,7 +6,7 @@ STM32_CHIP := stm32f407
 
 PLATFORM := stm32f2xx
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1
 
diff --git a/target/stm3220g/rules.mk b/target/stm3220g/rules.mk
index 7b81a475..5a61c657 100644
--- a/target/stm3220g/rules.mk
+++ b/target/stm3220g/rules.mk
@@ -6,7 +6,7 @@ STM32_CHIP := stm32f207
 
 PLATFORM := stm32f2xx
 
-DEFINES += \
+GLOBAL_DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1