Skip to contentSkip to conversation

Fixes for new regressions

PATCH New Maxime Ripard 2 participants 5 messages May 6, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

cover Fixes for new regressions

Hi,

This patchset fixes a bunch of regressions introduced recently caught by building the defconfig.

Maxime

Maxime Ripard (3):
armv8: Fix defconfig build
pandaboard: Fix defconfig build
toolchain/gcc: Enable --with-float for powerpc

 Makefile                        | 3 ++-
 configs/pandaboard_defconfig    | 5 +++++
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/3 armv8: Fix defconfig build

Commit 14f48861 ("arc: Add ARC and ARC BE architecture") introduced a sed match against arc* buildroot architecture to translate it to arc.

This causes a problem with armv8, which is called in buildroot aarch64, which is also matching, resulting in a build failure.

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -1
index 1692a36..9128c75 100644
@@ -238,7 +238,8 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
-	-e s/arc.*/arc/ \
+	-e s/arcle/arc/ \
+	-e s/arcbe/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64/arm64/ \
 	-e s/bfin/blackfin/ \
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/3 pandaboard: Fix defconfig build

In reply to Maxime Ripard

Commit 75b7dc68 ("linux: default to 3.9, remove 3.8") made 3.9 the default kernel version.

The omap kernel switched to multiplatform kernel during the 3.9 kernel development cycle. Obviously, the uImage generation doesn't work anymore with multiplatform kernels, since you have to provide the kernel load address, resulting in a build error.

Lock down the kernel version to 3.8 to keep the old behaviour until someone submits a patch to switch to multiplatform kernel.

---
 configs/pandaboard_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
configs/pandaboard_defconfig +5 -0
index 9496b7f..95cfdd6 100644
@@ -11,8 +11,13 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.11"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 
 # GCC
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/3 toolchain/gcc: Enable --with-float for powerpc

In reply to Maxime Ripard

Commit 8d929f4b ("toolchain/gcc: Only enable --with-float when it makes sense") restricted the --with-float use to only MIPS, ARM and SPARC, while it seems that powerpc needs it as well.

Fixes the qemu_ppc_virtex_ml507_defconfig build.

---
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
toolchain/gcc/gcc-uclibc-4.x.mk +2 -1
index 128b7ab..959568f 100644
@@ -66,7 +66,8 @@ endif
 # Determine soft-float options
 ifeq ($(BR2_SOFT_FLOAT),y)
 # only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
-ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_sparc),y)
+# powerpc seems to be needing it as well
+ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
 endif
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
Signature · 1 line
1.8.1.2
#4 lore raw

cover Fixes for new regressions

In reply to Maxime Ripard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Maxime" == Maxime Ripard <[email protected]> writes:

Maxime> Hi,

Maxime> This patchset fixes a bunch of regressions introduced recently Maxime> caught by building the defconfig.

Maxime> Maxime

Maxime> Maxime Ripard (3):

 Maxime>   armv8: Fix defconfig build
 Maxime>   pandaboard: Fix defconfig build
 Maxime>   toolchain/gcc: Enable --with-float for powerpc

Committed series, thanks!

Signature · 1 line
Bye, Peter Korsgaard