All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Thiery <heiko.thiery@gmail.com>
To: buildroot@buildroot.org
Cc: Heiko Thiery <heiko.thiery@gmail.com>
Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script
Date: Mon, 17 Jan 2022 09:06:16 +0100	[thread overview]
Message-ID: <20220117080616.10563-1-heiko.thiery@gmail.com> (raw)

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 board/kontron/pitx-imx8m/boot.cmd      | 8 --------
 board/kontron/pitx-imx8m/extlinux.conf | 4 ++++
 board/kontron/pitx-imx8m/genimage.cfg  | 5 +++--
 board/kontron/pitx-imx8m/post-build.sh | 7 +++++--
 board/kontron/pitx-imx8m/post-image.sh | 2 +-
 configs/kontron_pitx_imx8m_defconfig   | 3 +--
 6 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 board/kontron/pitx-imx8m/boot.cmd
 create mode 100644 board/kontron/pitx-imx8m/extlinux.conf

diff --git a/board/kontron/pitx-imx8m/boot.cmd b/board/kontron/pitx-imx8m/boot.cmd
deleted file mode 100644
index 4d89235392..0000000000
--- a/board/kontron/pitx-imx8m/boot.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Root File Sytem on MMC${devnum}"
-setenv rootfs /dev/mmcblk${devnum}p1
-setenv bootargs root=${rootfs} rootwait rw ${extrabootargs}
-
-load ${devtype} ${devnum} ${kernel_addr_r} boot/Image
-load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb
-
-booti ${kernel_addr_r} - ${fdt_addr_r}
diff --git a/board/kontron/pitx-imx8m/extlinux.conf b/board/kontron/pitx-imx8m/extlinux.conf
new file mode 100644
index 0000000000..2911acec59
--- /dev/null
+++ b/board/kontron/pitx-imx8m/extlinux.conf
@@ -0,0 +1,4 @@
+label buildroot
+  kernel /boot/Image
+  devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb
+  append root=PARTUUID=%PARTUUID% rootwait rw
diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg
index c78ef0f910..4a0aa117fb 100644
--- a/board/kontron/pitx-imx8m/genimage.cfg
+++ b/board/kontron/pitx-imx8m/genimage.cfg
@@ -1,5 +1,6 @@
 image sdcard.img {
 	hdimage {
+		partition-table-type = "gpt"
 	}
 
 	partition imx-boot {
@@ -9,8 +10,8 @@ image sdcard.img {
 	}
 
 	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
 		offset = 8M
+		image = "rootfs.ext4"
+		partition-uuid = %PARTUUID%
 	}
 }
diff --git a/board/kontron/pitx-imx8m/post-build.sh b/board/kontron/pitx-imx8m/post-build.sh
index 4574221fe5..bf8861f6a9 100755
--- a/board/kontron/pitx-imx8m/post-build.sh
+++ b/board/kontron/pitx-imx8m/post-build.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+BOARD_DIR="$(dirname $0)"
+PARTUUID="$($HOST_DIR/bin/uuidgen)"
 
-mkdir -p $TARGET_DIR/boot/
-cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
+install -d "$TARGET_DIR/boot/extlinux/"
+sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf"
+sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg"
diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh
index 564211c829..3452fd4501 100755
--- a/board/kontron/pitx-imx8m/post-image.sh
+++ b/board/kontron/pitx-imx8m/post-image.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg
+support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg
diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig
index 4053e1e398..458083160b 100644
--- a/configs/kontron_pitx_imx8m_defconfig
+++ b/configs/kontron_pitx_imx8m_defconfig
@@ -15,6 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m"
+BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
@@ -50,5 +51,3 @@ BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_IMX_MKIMAGE=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/pitx-imx8m/boot.cmd"
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2022-01-17  8:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-17  8:06 Heiko Thiery [this message]
2022-01-17  8:06 ` [Buildroot] [PATCH 2/2] configs/kontron_pitx_imx8m_defconfig: bump kernel to 5.16.1 Heiko Thiery
2022-01-22 14:11   ` Thomas Petazzoni
2022-01-22 14:11 ` [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script Thomas Petazzoni
2022-01-22 15:59   ` Heiko Thiery
2022-01-23 22:01   ` Giulio Benetti
2022-01-24  5:42     ` Sergey Kuzminov
2022-01-24  8:12       ` Giulio Benetti
2022-02-12 13:50   ` Arnout Vandecappelle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220117080616.10563-1-heiko.thiery@gmail.com \
    --to=heiko.thiery@gmail.com \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.