Skip to contentSkip to conversation

Move arch-specific checks to "archprepare" target

PATCH New Masahiro Yamada 3 participants 7 messages Mar 5, 2014 – Mar 7, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover 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(-)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/2 kbuild: move "checkthumb" to ARM archprepare

"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".

---

 Makefile           |  8 --------
 arch/arm/config.mk | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)
Makefile +0 -8
index 6882d10..7ed2d97 100644
@@ -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
arch/arm/config.mk +11 -1
index c5fd22f..be9e4c7 100644
@@ -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,
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH 1/2 kbuild: move "checkthumb" to ARM archprepare

In reply to Masahiro Yamada
Quoted 7 lines · Masahiro Yamada

"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".

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140307/dbcc8e36/attachment.pgp>
#4 lore raw

PATCH 2/2 kbuild: move "checkgcc4" to PowerPC archprepare

In reply to Masahiro Yamada

"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".

---

 Makefile               |  9 ---------
 arch/powerpc/config.mk | 11 ++++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)
Makefile +0 -9
index 7ed2d97..ea9400d 100644
@@ -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'; \
arch/powerpc/config.mk +10 -1
index ac94b2e..9821068 100644
@@ -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
Signature · 1 line
1.8.3.2
#6 lore raw

PATCH 2/2 kbuild: move "checkgcc4" to PowerPC archprepare

In reply to Masahiro Yamada
Quoted 7 lines · Masahiro Yamada

"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".

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140307/a279ea66/attachment.pgp>