* [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs
@ 2017-09-21 13:59 Fabio Estevam
2017-09-21 13:59 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Fabio Estevam @ 2017-09-21 13:59 UTC (permalink / raw)
To: buildroot
Pass an offset of 1MB for the start of the rootfs.
Otherwise we get rootfs corruption when the bootloader is manually
written to the SD card.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
board/wandboard/genimage.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg
index b23a91b..ad4a6a5 100644
--- a/board/wandboard/genimage.cfg
+++ b/board/wandboard/genimage.cfg
@@ -26,6 +26,7 @@ image sdcard.img {
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
+ offset = 1M
size = 512M
}
}
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions
2017-09-21 13:59 [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Fabio Estevam
@ 2017-09-21 13:59 ` Fabio Estevam
2017-09-26 22:05 ` [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Arnout Vandecappelle
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2017-09-21 13:59 UTC (permalink / raw)
To: buildroot
Bump U-Boot to 2017.09 version and kernel to 4.13.3.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
configs/wandboard_defconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index caa4c51..e6ba1d4 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.7 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="wandboard"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
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"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs
2017-09-21 13:59 [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Fabio Estevam
2017-09-21 13:59 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
@ 2017-09-26 22:05 ` Arnout Vandecappelle
2017-09-29 7:45 ` Peter Korsgaard
2017-10-16 22:03 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-09-26 22:05 UTC (permalink / raw)
To: buildroot
On 21-09-17 15:59, Fabio Estevam wrote:
> Pass an offset of 1MB for the start of the rootfs.
>
> Otherwise we get rootfs corruption when the bootloader is manually
> written to the SD card.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Applied both to master, thanks.
Regards,
Arnout
> ---
> board/wandboard/genimage.cfg | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg
> index b23a91b..ad4a6a5 100644
> --- a/board/wandboard/genimage.cfg
> +++ b/board/wandboard/genimage.cfg
> @@ -26,6 +26,7 @@ image sdcard.img {
> partition rootfs {
> partition-type = 0x83
> image = "rootfs.ext4"
> + offset = 1M
> size = 512M
> }
> }
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs
2017-09-21 13:59 [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Fabio Estevam
2017-09-21 13:59 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
2017-09-26 22:05 ` [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Arnout Vandecappelle
@ 2017-09-29 7:45 ` Peter Korsgaard
2017-10-16 22:03 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-09-29 7:45 UTC (permalink / raw)
To: buildroot
>>>>> "Fabio" == Fabio Estevam <fabio.estevam@nxp.com> writes:
> Pass an offset of 1MB for the start of the rootfs.
> Otherwise we get rootfs corruption when the bootloader is manually
> written to the SD card.
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs
2017-09-21 13:59 [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Fabio Estevam
` (2 preceding siblings ...)
2017-09-29 7:45 ` Peter Korsgaard
@ 2017-10-16 22:03 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-16 22:03 UTC (permalink / raw)
To: buildroot
>>>>> "Fabio" == Fabio Estevam <fabio.estevam@nxp.com> writes:
> Pass an offset of 1MB for the start of the rootfs.
> Otherwise we get rootfs corruption when the bootloader is manually
> written to the SD card.
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Committed to 2017.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] board/wandboard: Switch to extlinux.conf
@ 2021-07-11 12:48 Fabio Estevam
2021-07-11 12:48 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
0 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2021-07-11 12:48 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
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
diff --git a/board/wandboard/boot.scr.txt b/board/wandboard/boot.scr.txt
deleted file mode 100644
index 7a8aa4bd5475..000000000000
--- a/board/wandboard/boot.scr.txt
+++ /dev/null
@@ -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}
diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg
deleted file mode 100644
index ad4a6a55d56d..000000000000
--- a/board/wandboard/genimage.cfg
+++ /dev/null
@@ -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
- }
-}
diff --git a/board/wandboard/post-build.sh b/board/wandboard/post-build.sh
deleted file mode 100755
index 6ddc1137022d..000000000000
--- a/board/wandboard/post-build.sh
+++ /dev/null
@@ -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
diff --git a/board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf b/board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf
new file mode 100644
index 000000000000..e3b90660c0e4
--- /dev/null
+++ b/board/wandboard/rootfs_overlay/boot/extlinux/extlinux.conf
@@ -0,0 +1,4 @@
+Label imx6qdl-wandboard Buildroot
+ kernel ../zImage
+ fdtdir ../
+ append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 7915248cf106..37628ea403b0 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions
2021-07-11 12:48 [Buildroot] [PATCH 1/2] board/wandboard: Switch to extlinux.conf Fabio Estevam
@ 2021-07-11 12:48 ` Fabio Estevam
0 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2021-07-11 12:48 UTC (permalink / raw)
To: buildroot
Bump U-Boot to 2021.07 and kernel to 5.13 version.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
configs/wandboard_defconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 37628ea403b0..0966719d486b 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -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"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-11 12:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-21 13:59 [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Fabio Estevam
2017-09-21 13:59 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
2017-09-26 22:05 ` [Buildroot] [PATCH 1/2] wandboard: genimage: Pass an offset for the rootfs Arnout Vandecappelle
2017-09-29 7:45 ` Peter Korsgaard
2017-10-16 22:03 ` Peter Korsgaard
2021-07-11 12:48 [Buildroot] [PATCH 1/2] board/wandboard: Switch to extlinux.conf Fabio Estevam
2021-07-11 12:48 ` [Buildroot] [PATCH 2/2] configs/wandboard: Bump U-Boot and kernel versions Fabio Estevam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.