Skip to contentSkip to conversation

ci20: update kernel and u-boot

PATCH New Waldemar Brodkorb 2 participants 2 messages Aug 13, 2017 – Aug 14, 2017

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 ci20: update kernel and u-boot

Unbreak failing defconfig.
Resulting kernel and rootfs booted on ci20 device.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 configs/ci20_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/ci20_defconfig +3 -3
index ecf3007..75687ae 100644
@@ -13,7 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS4"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fbf929bc733b82b15f6996d4262a45870f19d214"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7dff33297116643485ca37141d804eddd793e834"
 BR2_LINUX_KERNEL_DEFCONFIG="ci20"
 
 # u-boot

@@ -22,8 +22,8 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y
 BR2_TARGET_UBOOT_BOARDNAME="ci20_mmc"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
-BR2_TARGET_UBOOT_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"
+BR2_TARGET_UBOOT_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 ci20: update kernel and u-boot

Hello,

Quoted 4 lines · Waldemar Brodkorb

Unbreak failing defconfig.
Resulting kernel and rootfs booted on ci20 device.

Signed-off-by Waldemar Brodkorb <[email protected]>

I've applied to master, after doing an additional tweak...

configs/ci20_defconfig BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y · line 26

Quoted 4 lines
configs/ci20_defconfig +2 -2
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
-BR2_TARGET_UBOOT_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"
+BR2_TARGET_UBOOT_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"

I've dropped the BR2_TARGET_UBOOT_VERSION line, which was useless, because BR2_TARGET_UBOOT_VERSION is a hidden variable, and therefore has no business being present in a defconfig.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com