[U-Boot] [PATCH 0/2] Move arch-specific checks to "archprepare" target

Masahiro Yamada (2): kbuild: move "checkthumb" to ARM archprepare kbuild: move "checkgcc4" to PowerPC archprepare
Makefile | 17 ----------------- arch/arm/config.mk | 12 +++++++++++- arch/powerpc/config.mk | 11 ++++++++++- 3 files changed, 21 insertions(+), 19 deletions(-)

"checkthumb" makes sense only for ARM architecture. Move it to arch/arm/config.mk.
To make sure gcc supports THUMB mode before beginning build, run "checkthumb" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
Makefile | 8 -------- arch/arm/config.mk | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile index 6882d10..7ed2d97 100644 --- a/Makefile +++ b/Makefile @@ -1114,14 +1114,6 @@ SYSTEM_MAP = \ System.map: u-boot @$(call SYSTEM_MAP,$<) > $@
-checkthumb: - @if test $(call cc-version) -lt 0404; then \ - echo -n '*** Your GCC does not produce working '; \ - echo 'binaries in THUMB mode.'; \ - echo '*** Your board is configured for THUMB mode.'; \ - false; \ - fi - # GCC 3.x is reported to have problems generating the type of relocation # that U-Boot wants. # See http://lists.denx.de/pipermail/u-boot/2012-September/135156.html diff --git a/arch/arm/config.mk b/arch/arm/config.mk index c5fd22f..be9e4c7 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -41,7 +41,17 @@ endif
# Only test once ifneq ($(CONFIG_SPL_BUILD),y) -ALL-$(CONFIG_SYS_THUMB_BUILD) += checkthumb +ifeq ($(CONFIG_SYS_THUMB_BUILD),y) +archprepare: checkthumb + +checkthumb: + @if test "$(call cc-version)" -lt "0404"; then \ + echo -n '*** Your GCC does not produce working '; \ + echo 'binaries in THUMB mode.'; \ + echo '*** Your board is configured for THUMB mode.'; \ + false; \ + fi +endif endif
# Try if EABI is supported, else fall back to old API,

On 5 March 2014 01:49, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
"checkthumb" makes sense only for ARM architecture. Move it to arch/arm/config.mk.
To make sure gcc supports THUMB mode before beginning build, run "checkthumb" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Acked-by: Simon Glass sjg@chromium.org

On Wed, Mar 05, 2014 at 05:49:22PM +0900, Masahiro Yamada wrote:
"checkthumb" makes sense only for ARM architecture. Move it to arch/arm/config.mk.
To make sure gcc supports THUMB mode before beginning build, run "checkthumb" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Applied to u-boot/master, thanks!

"checkgcc4" is used only for PowerPC. Move it to arch/powerpc/config.mk.
To make sure gcc is new enough before beginning build, run "checkgcc4" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
Makefile | 9 --------- arch/powerpc/config.mk | 11 ++++++++++- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile index 7ed2d97..ea9400d 100644 --- a/Makefile +++ b/Makefile @@ -1114,15 +1114,6 @@ SYSTEM_MAP = \ System.map: u-boot @$(call SYSTEM_MAP,$<) > $@
-# GCC 3.x is reported to have problems generating the type of relocation -# that U-Boot wants. -# See http://lists.denx.de/pipermail/u-boot/2012-September/135156.html -checkgcc4: - @if test $(call cc-version) -lt 0400; then \ - echo -n '*** Your GCC is too old, please upgrade to GCC 4.x or newer'; \ - false; \ - fi - checkdtc: @if test $(call dtc-version) -lt 0104; then \ echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \ diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index ac94b2e..9821068 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -35,5 +35,14 @@ endif
# Only test once ifneq ($(CONFIG_SPL_BUILD),y) -ALL-y += checkgcc4 +archprepare: checkgcc4 + +# GCC 3.x is reported to have problems generating the type of relocation +# that U-Boot wants. +# See http://lists.denx.de/pipermail/u-boot/2012-September/135156.html +checkgcc4: + @if test $(call cc-version) -lt 0400; then \ + echo -n '*** Your GCC is too old, please upgrade to GCC 4.x or newer'; \ + false; \ + fi endif

On 5 March 2014 01:49, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
"checkgcc4" is used only for PowerPC. Move it to arch/powerpc/config.mk.
To make sure gcc is new enough before beginning build, run "checkgcc4" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Acked-by: Simon Glass sjg@chromium.org

On Wed, Mar 05, 2014 at 05:49:23PM +0900, Masahiro Yamada wrote:
"checkgcc4" is used only for PowerPC. Move it to arch/powerpc/config.mk.
To make sure gcc is new enough before beginning build, run "checkgcc4" during "archprepare".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Applied to u-boot/master, thanks!
participants (3)
-
Masahiro Yamada
-
Simon Glass
-
Tom Rini