[U-Boot] [PATCH] config.mk: Move arch-specific condition to $(ARCH)_config.mk
Signed-off-by: Shinya Kuribayashi skuribay@ruby.dti.ne.jp --- config.mk | 16 ---------------- ppc_config.mk | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/config.mk b/config.mk index 1dac29b..c225df1 100644 --- a/config.mk +++ b/config.mk @@ -44,22 +44,6 @@ PLATFORM_RELFLAGS = PLATFORM_CPPFLAGS = PLATFORM_LDFLAGS =
-# -# When cross-compiling on NetBSD, we have to define __PPC__ or else we -# will pick up a va_list declaration that is incompatible with the -# actual argument lists emitted by the compiler. -# -# [Tested on NetBSD/i386 1.5 + cross-powerpc-netbsd-1.3] - -ifeq ($(ARCH),ppc) -ifeq ($(CROSS_COMPILE),powerpc-netbsd-) -PLATFORM_CPPFLAGS+= -D__PPC__ -endif -ifeq ($(CROSS_COMPILE),powerpc-openbsd-) -PLATFORM_CPPFLAGS+= -D__PPC__ -endif -endif - ifeq ($(ARCH),arm) ifeq ($(CROSS_COMPILE),powerpc-netbsd-) PLATFORM_CPPFLAGS+= -D__ARM__ diff --git a/ppc_config.mk b/ppc_config.mk index 31993bd..c95b3b1 100644 --- a/ppc_config.mk +++ b/ppc_config.mk @@ -23,3 +23,17 @@
PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n + +# +# When cross-compiling on NetBSD, we have to define __PPC__ or else we +# will pick up a va_list declaration that is incompatible with the +# actual argument lists emitted by the compiler. +# +# [Tested on NetBSD/i386 1.5 + cross-powerpc-netbsd-1.3] + +ifeq ($(CROSS_COMPILE),powerpc-netbsd-) +PLATFORM_CPPFLAGS+= -D__PPC__ +endif +ifeq ($(CROSS_COMPILE),powerpc-openbsd-) +PLATFORM_CPPFLAGS+= -D__PPC__ +endif
__ARM__ is given by arm_config.mk automatically.
Signed-off-by: Shinya Kuribayashi skuribay@ruby.dti.ne.jp --- config.mk | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/config.mk b/config.mk index c225df1..5a9334c 100644 --- a/config.mk +++ b/config.mk @@ -44,15 +44,6 @@ PLATFORM_RELFLAGS = PLATFORM_CPPFLAGS = PLATFORM_LDFLAGS =
-ifeq ($(ARCH),arm) -ifeq ($(CROSS_COMPILE),powerpc-netbsd-) -PLATFORM_CPPFLAGS+= -D__ARM__ -endif -ifeq ($(CROSS_COMPILE),powerpc-openbsd-) -PLATFORM_CPPFLAGS+= -D__ARM__ -endif -endif - #########################################################################
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
Ping.
[ I should have let you know, Wolfgang. Sorry. ]
Shinya Kuribayashi wrote:
__ARM__ is given by arm_config.mk automatically.
Signed-off-by: Shinya Kuribayashi skuribay@ruby.dti.ne.jp
config.mk | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/config.mk b/config.mk index c225df1..5a9334c 100644 --- a/config.mk +++ b/config.mk @@ -44,15 +44,6 @@ PLATFORM_RELFLAGS = PLATFORM_CPPFLAGS = PLATFORM_LDFLAGS =
-ifeq ($(ARCH),arm) -ifeq ($(CROSS_COMPILE),powerpc-netbsd-) -PLATFORM_CPPFLAGS+= -D__ARM__ -endif -ifeq ($(CROSS_COMPILE),powerpc-openbsd-) -PLATFORM_CPPFLAGS+= -D__ARM__ -endif -endif
#########################################################################
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Dear Shinya Kuribayashi,
In message 48B9AF70.9010203@ruby.dti.ne.jp you wrote:
Signed-off-by: Shinya Kuribayashi skuribay@ruby.dti.ne.jp
config.mk | 16 ---------------- ppc_config.mk | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Shinya Kuribayashi -
Wolfgang Denk