Skip to contentSkip to conversation

configs: beaglebone: bump kernel and uboot version

PATCH Superseded Lothar Felten 2 participants 3 messages Feb 8, 2018 – Feb 15, 2018

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Lothar Felten

author
#0 lore raw

PATCH v2 1/1 configs: beaglebone: bump kernel and uboot version

Switch to Linux kernel version 4.9.59 from the TI SDK 04.02.00.09 (TI SDK release date: 23.12.2017)
Updated uboot to version 2018.01

v2:
- set uboot version to 2018.01 in defconfig
- keep default rootfs size
- keep Kconfig for uboot

Signed-off-by Lothar Felten <[email protected]>
---
 board/beaglebone/uEnv.txt    | 8 ++++++--
 configs/beaglebone_defconfig | 9 +++------
 2 files changed, 9 insertions(+), 8 deletions(-)
board/beaglebone/uEnv.txt +6 -2
index 70b3b721..8365c3af 100644
@@ -1,4 +1,8 @@
 bootpart=0:1
+devtype=mmc
 bootdir=
-bootargs=console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
-uenvcmd=run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};
+bootfile=zImage
+bootpartition=mmcblk0p2
+set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi; 
+set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
+uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};
configs/beaglebone_defconfig +3 -6
index 611b6941..eea20436 100644
@@ -1,13 +1,13 @@
 BR2_arm=y
 BR2_cortex_a8=y
 BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f9f6f0db2d5e4f9d2ff46eb31a5a05276a92ed7d"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a75d8e93056181d512f6c818e8627bd4554aaf92"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk"

@@ -16,13 +16,10 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 1/1 configs: beaglebone: bump kernel and uboot version

Hi Lothar,

Sorry to bother you with more questions :-)

Quoted 8 lines · Lothar Felten

Switch to Linux kernel version 4.9.59 from the TI SDK 04.02.00.09 (TI SDK release date: 23.12.2017)
Updated uboot to version 2018.01

v2:
- set uboot version to 2018.01 in defconfig
- keep default rootfs size
- keep Kconfig for uboot

Side remark: we don't want to include the patch changelog in our git history,
so in the future put it below a --- line:

Quoted 2 lines
Signed-off-by Lothar Felten <[email protected]>

---
Here.

Quoted 10 lines
---
 board/beaglebone/uEnv.txt    | 8 ++++++--
 configs/beaglebone_defconfig | 9 +++------
 2 files changed, 9 insertions(+), 8 deletions(-)
board/beaglebone/uEnv.txt +0 -0
index 70b3b721..8365c3af 100644

board/beaglebone/uEnv.txt line 6

Quoted 8 lines
board/beaglebone/uEnv.txt +4 -2
@@ -1,4 +1,8 @@
 bootpart=0:1
+devtype=mmc
 bootdir=
-bootargs=console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
-uenvcmd=run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};
+bootfile=zImage
+bootpartition=mmcblk0p2
+set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi;

The ; at the end of the line here is a bit weird but OK.

It would have been nice to mention in the commit message why this change is
made. I guess it is to support a new revision of the board. Which really should have been done in a separate commit, unless this revision is only supported by the newer U-Boot/kernel (though I don't really mind squashing the commits).

Quoted 7 lines
board/beaglebone/uEnv.txt +2 -0
+set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
+uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};
configs/beaglebone_defconfig +0 -0
index 611b6941..eea20436 100644
@@ -1,13 +1,13 @@

[snip]

Quoted 2 lines

BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
-BR2_TARGET_UBOOT_NEEDS_DTC=y

Are you sure U-Boot doesn't need dtc anymore? Did you test with a clean build?

Regards,
Arnout

Quoted 8 lines

# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y

configs/beaglebone_defconfig +0 -2
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#2 lore raw

PATCH v2 1/1 configs: beaglebone: bump kernel and uboot version

Hi Arnout,

thanks for reviewing the patch

Quoted 19 lines · Arnout Vandecappelle

Hi Lothar,

Sorry to bother you with more questions :-)

Quoted 8 lines · Lothar Felten

Switch to Linux kernel version 4.9.59 from the TI SDK 04.02.00.09 (TI SDK release date: 23.12.2017)
Updated uboot to version 2018.01

v2:
- set uboot version to 2018.01 in defconfig
- keep default rootfs size
- keep Kconfig for uboot

Side remark: we don't want to include the patch changelog in our git
history,
so in the future put it below a --- line:

Quoted 1 line
Quoted 4 lines
Quoted 1 line
Signed-off-by Lothar Felten <[email protected]>

---
Here.

ok.

Quoted 15 lines
Quoted 15 lines
---
 board/beaglebone/uEnv.txt    | 8 ++++++--
 configs/beaglebone_defconfig | 9 +++------
 2 files changed, 9 insertions(+), 8 deletions(-)
board/beaglebone/uEnv.txt +1 -1
index 70b3b721..8365c3af 100644
@@ -1,4 +1,8 @@
 bootpart=0:1
+devtype=mmc
 bootdir=
-bootargs=console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw

rootfstype=ext4 rootwait

Quoted 8 lines
Quoted 6 lines

-uenvcmd=run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};

board/beaglebone/uEnv.txt +3 -0
+bootfile=zImage
+bootpartition=mmcblk0p2
+set_mmc1=if test $board_name = A33515BB; then setenv bootpartition

mmcblk1p2; fi;

The ; at the end of the line here is a bit weird but OK.

I'll clean it up.

Quoted 10 lines

It would have been nice to mention in the commit message why this
change is
made. I guess it is to support a new revision of the board. Which really should
have been done in a separate commit, unless this revision is only supported by
the newer U-Boot/kernel (though I don't really mind squashing the commits).

Ti ships a custom u-boot-2017.01, 2018.01 works fine too except it does not pass the correct root device to the kernel in case of the ti- am335x-evm. The additional line fixes this.

Quoted 13 lines
Quoted 11 lines

+set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait +uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr};

configs/beaglebone_defconfig +0 -0
index 611b6941..eea20436 100644
@@ -1,13 +1,13 @@

[snip]

Quoted 5 lines
Quoted 2 lines

BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
-BR2_TARGET_UBOOT_NEEDS_DTC=y

Are you sure U-Boot doesn't need dtc anymore? Did you test with a
clean build?

No, that one should remain.
I do test with a clean build but I do have a local dtc too.

Quoted 4 lines

Regards,
Arnout

Quoted 10 lines

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2_4=y · line 25

Quoted 8 lines

# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y

configs/beaglebone_defconfig +0 -2
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y

Best regards,
Lothar