From e7e413823111ca05dd85f8b572f6c0ac22ffe354 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 8 Dec 2012 09:21:37 +0100 Subject: digital/ucoolib/build: unify TARGET_* defines --- digital/ucoolib/build/arch.mk | 2 ++ digital/ucoolib/build/host.mk | 3 +-- digital/ucoolib/build/stm32f4.mk | 4 +--- digital/ucoolib/ucoolib/hal/uart/uart.hh | 2 +- digital/ucoolib/ucoolib/hal/usb/usb.hh | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) (limited to 'digital') diff --git a/digital/ucoolib/build/arch.mk b/digital/ucoolib/build/arch.mk index 01b797f8..62f0687c 100644 --- a/digital/ucoolib/build/arch.mk +++ b/digital/ucoolib/build/arch.mk @@ -6,6 +6,8 @@ # Define standard commands. define arch_cmds +$1_TARGET_DEFS := -DTARGET_$1=1 $$($1_SUBTARGETS:%=-DTARGET_%=1) +$1_CPPFLAGS += $$($1_TARGET_DEFS) $1_CC := $$($1_PREFIX)gcc $1_CXX := $$($1_PREFIX)g++ $1_OBJCOPY := $$($1_PREFIX)objcopy diff --git a/digital/ucoolib/build/host.mk b/digital/ucoolib/build/host.mk index b061efd1..a07d5258 100644 --- a/digital/ucoolib/build/host.mk +++ b/digital/ucoolib/build/host.mk @@ -2,8 +2,7 @@ # # Rules for Host. -host_CPPFLAGS := $(CPPFLAGS) $(host_DEFS) \ - -DTARGET_HOST=1 +host_CPPFLAGS := $(CPPFLAGS) $(host_DEFS) host_CFLAGS := $(CFLAGS) host_CXXFLAGS := $(sort $(host_CFLAGS) $(CXXFLAGS)) host_ASFLAGS := $(ASFLAGS) diff --git a/digital/ucoolib/build/stm32f4.mk b/digital/ucoolib/build/stm32f4.mk index b60d02db..ae899b53 100644 --- a/digital/ucoolib/build/stm32f4.mk +++ b/digital/ucoolib/build/stm32f4.mk @@ -17,9 +17,7 @@ endif stm32f4_SUBTARGETS := stm32 arm newlib stm32f4_CPPFLAGS := $(CPPFLAGS) $(stm32f4_DEFS) \ - -DSTM32F4 $(LIBOPENCM3_CPPFLAGS) \ - -DTARGET_STM32F4=1 \ - $(foreach sub,$(stm32f4_SUBTARGETS),-DTARGET_SUB_$(sub)=1) + -DSTM32F4 $(LIBOPENCM3_CPPFLAGS) stm32f4_CFLAGS := $(CFLAGS) \ -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 \ -Wl,--gc-sections -ffunction-sections diff --git a/digital/ucoolib/ucoolib/hal/uart/uart.hh b/digital/ucoolib/ucoolib/hal/uart/uart.hh index 86238a50..b5ed4df6 100644 --- a/digital/ucoolib/ucoolib/hal/uart/uart.hh +++ b/digital/ucoolib/ucoolib/hal/uart/uart.hh @@ -24,7 +24,7 @@ // // }}} -#ifdef TARGET_SUB_stm32 +#ifdef TARGET_stm32 # include "uart.stm32.hh" #else # error "not implemented for this target" diff --git a/digital/ucoolib/ucoolib/hal/usb/usb.hh b/digital/ucoolib/ucoolib/hal/usb/usb.hh index c05b7a06..05e89d7a 100644 --- a/digital/ucoolib/ucoolib/hal/usb/usb.hh +++ b/digital/ucoolib/ucoolib/hal/usb/usb.hh @@ -24,7 +24,7 @@ // // }}} -#ifdef TARGET_SUB_stm32 +#ifdef TARGET_stm32 # include "usb.stm32.hh" #else # error "not implemented for this target" -- cgit v1.2.3