Always pass armv7 flags when building for armv7

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5ebe0619d39972dfcc9b9f888ead386827792b88..4335b0d93547c3c7a0b15930b8cf85dc813c0129 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -12,8 +12,7 @@ arch-$(CONFIG_CPU_ARM926EJS)  =-march=armv5te
 arch-$(CONFIG_CPU_ARM946ES)    =-march=armv5te
 arch-$(CONFIG_CPU_ARM1136)     =-march=armv5t
 arch-$(CONFIG_CPU_ARM1176)     =-march=armv5t
-arch-$(CONFIG_CPU_V7A)         =$(call cc-option, -march=armv7-a, \
-                                $(call cc-option, -march=armv7))
+arch-$(CONFIG_CPU_V7A)         =-march=armv7-a
 arch-$(CONFIG_CPU_V7M)         =-march=armv7-m
 arch-$(CONFIG_CPU_V7R)         =-march=armv7-r
 ifeq ($(CONFIG_ARM64_CRC32),y)

diff --git a/debian/changelog b/debian/changelog
index 21c3888928d6933a2152fdcb41fe9d379d98d2a8..7a333ee0fc2ead48908ef9fd81993876c753ac06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ u-boot (2024.01+dfsg-5+rpi1) trixie-staging; urgency=medium
   [changes introduced in 2024.01+dfsg-5+rpi1 by Peter Michael Green]
   * Don't build mips* targets for quemu either. I don't want to add
     more cross-compilers to raspbian.
+  * Always pass armv7 flags when building for armv7 (don't use cc-option,
+    whatever that is).
 
  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Sep 2024 15:59:18 +0000