Patchwork [PATCHv2] integrator926: Update the defconfig

login
register
mail settings
Submitter Maxime Ripard
Date April 12, 2013, 10:21 a.m.
Message ID <1365762089-28023-1-git-send-email-maxime.ripard@free-electrons.com>
Download mbox | patch
Permalink /patch/236025/
State Accepted
Commit 74bdc4b9ddf6d4d2ecdd238715dcbf14292b8829
Headers show

Comments

Maxime Ripard - April 12, 2013, 10:21 a.m.
the integrator926 defconfig has not been updated for quite some time,
and is still asking for very old linux and u-boot releases. Now that
these versions aren't present in Buildroot anymore, they default to a
newer release, where, in the u-boot case, the defconfig name has
changed, leading to a build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 configs/integrator926_defconfig |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
Peter Korsgaard - April 25, 2013, 8:56 p.m.
>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> the integrator926 defconfig has not been updated for quite some time,
 Maxime> and is still asking for very old linux and u-boot releases. Now that
 Maxime> these versions aren't present in Buildroot anymore, they default to a
 Maxime> newer release, where, in the u-boot case, the defconfig name has
 Maxime> changed, leading to a build failure.

Committed, thanks.

Patch

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index e596d33..e63f455 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -4,13 +4,16 @@  BR2_arm926t=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="integratorcp_cm926ejs"
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.35"
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_2_6_35=
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
 BR2_LINUX_KERNEL_DEFCONFIG="integrator"
 
 # Filesystem