configs/: fix uboot board name for integrator926 defconfig

Closes #817 + #1189

Signed-off-by: Johan Thelin <johan@thelins.se>
Signed-off-by: Grant Edwards <grant.b.edwards@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index aa7c284d3ae11812f8cb811a66c2b25badbbc560..08205be4380909b52069b81a7193abcdee7b558e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,11 +21,13 @@
        #661: lmbench: new package
        #800: [PATCH] iperf update to 2.0.4
        #805: [PATCH] mdadm - version update
+       #817: integrator926_defconfig uses unsupported uboot board name
        #1105: Add new netperf package
        #1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
        #1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in
        #1123: Bump less to 436 and migrate to Makefile.autotools.in
        #1129: Bump memstat to 0.8 and migrate to Makefile.package.in
+       #1189: Wrong u-boot configuration name for integrator926 target
        #1219: kernel headers not correctly installed into toolchain/staging
        #1273: BR2_INET_IPV6 does not enable IPv6 in pppd
        #1303: Add librsync package

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 2d2579b96410b62a284c2dc470001600d1429268..63bc68dae188f914678a3949f146b33914db36ee 100644 (file)
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -712,7 +712,7 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 # bootloader for target device
 #
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
 # BR2_TARGET_UBOOT_1_3_4 is not set

diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 380e2e10d8bd7bff9529f7e747c93dfe8889b481..357e143316c5c756013d3a237e37d7e3a507f508 100644 (file)
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -688,7 +688,7 @@ BR2_TARGET_ROOTFS_CPIO_COPYTO=""
 # bootloader for target device
 #
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
 # BR2_TARGET_UBOOT_1_3_4 is not set