board/wandboard: Switch to extlinux.conf
PATCH 1/2 board/wandboard: Switch to extlinux.conf
Currently wandboard uses a custom boot.scr.txt script and custom image generation scripts, genimage.cfg and post-build.sh.
Switch to using the more standard extlinux.conf solution and remove the custom scripts in favor of the standard board/freescale/common/imx/post-image.sh one.
--- board/wandboard/boot.scr.txt | 7 ---- board/wandboard/genimage.cfg | 32 ------------------- board/wandboard/post-build.sh | 8 ----- .../boot/extlinux/extlinux.conf | 4 +++ configs/wandboard_defconfig | 5 ++- 5 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 board/wandboard/boot.scr.txt delete mode 100644 board/wandboard/genimage.cfg delete mode 100755 board/wandboard/post-build.sh create mode 100644 board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf
board/wandboard/boot.scr.txt deleted +0 -7
@@ -1,7 +0,0 @@ -setenv finduuid "part uuid mmc 0:1 uuid" -run finduuid -run findfdt -setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage -bootz ${loadaddr} - ${fdt_addr}
board/wandboard/genimage.cfg deleted +0 -32
@@ -1,32 +0,0 @@ -# Minimal SD card image for the Wandboard -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "SPL" - offset = 1024 - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.img" - offset = 70656 - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - offset = 1M - size = 512M - } -}
board/wandboard/post-build.sh deleted +0 -8
@@ -1,8 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -d -m 755 $TARGET_DIR/boot - -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ - -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr
board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf new file +4 -0
@@ -0,0 +1,4 @@ +Label imx6qdl-wandboard Buildroot + kernel ../zImage + fdtdir ../ + append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
configs/wandboard_defconfig +2 -3
@@ -12,9 +12,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/wandboard/genimage.cfg" +BR2_ROOTFS_OVERLAY="board/wandboard/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Filesystem BR2_TARGET_ROOTFS_EXT2=y
Signature · 1 line
2.25.1
PATCH 2/2 configs/wandboard: Bump U-Boot and kernel versions
Bump U-Boot to 2021.07 and kernel to 5.13 version.
--- configs/wandboard_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/wandboard_defconfig +4 -4
@@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +# Linux headers same as kernel, a 5.13 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -23,7 +23,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y
@@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1"
Signature · 1 line
2.25.1
PATCH 1/2 board/wandboard: Switch to extlinux.conf
In reply to Fabio EstevamQuoted 9 lines · On Sun, 11 Jul 2021 09:48:23 -0300 Fabio Estevam <[email protected]> wrote:
Currently wandboard uses a custom boot.scr.txt script and custom image generation scripts, genimage.cfg and
post-build.sh.Switch to using the more standard extlinux.conf solution and remove the custom scripts in favor of the standard
board/freescale/common/imx/post-image.shone.Signed-off-by Fabio Estevam <[email protected]>
Quoted 11 lines
--- board/wandboard/boot.scr.txt | 7 ---- board/wandboard/genimage.cfg | 32 ------------------- board/wandboard/post-build.sh | 8 ----- .../boot/extlinux/extlinux.conf | 4 +++ configs/wandboard_defconfig | 5 ++- 5 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 board/wandboard/boot.scr.txt delete mode 100644 board/wandboard/genimage.cfg delete mode 100755 board/wandboard/post-build.sh create mode 100644 board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com