| Message ID | 20220513071522.19853-2-heiko.thiery@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | configs/kontron_pitx_imx8m: switch to upstream U-Boot | expand |
Heiko, All, On 2022-05-13 09:15 +0200, Heiko Thiery spake thusly: > Switch U-Boot from vendor downstream version to upstream. Since the > upstream U-Boot uses binman to build the bootable binary (flash.bin) the > need for the iMX specifc prepare script is no longer required. > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/kontron/pitx-imx8m/genimage.cfg | 2 +- > board/kontron/pitx-imx8m/post-image.sh | 3 --- > configs/kontron_pitx_imx8m_defconfig | 20 +++++++++++++------- > 3 files changed, 14 insertions(+), 11 deletions(-) > delete mode 100755 board/kontron/pitx-imx8m/post-image.sh > > diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg > index 4a0aa117fb..bc100b171d 100644 > --- a/board/kontron/pitx-imx8m/genimage.cfg > +++ b/board/kontron/pitx-imx8m/genimage.cfg > @@ -5,7 +5,7 @@ image sdcard.img { > > partition imx-boot { > in-partition-table = "no" > - image = "imx8-boot-sd.bin" > + image = "flash.bin" > offset = 33K > } > > diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh > deleted file mode 100755 > index 3452fd4501..0000000000 > --- a/board/kontron/pitx-imx8m/post-image.sh > +++ /dev/null > @@ -1,3 +0,0 @@ > -#!/bin/sh > - > -support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig > index 8f756f5246..161b9cfe3b 100644 > --- a/configs/kontron_pitx_imx8m_defconfig > +++ b/configs/kontron_pitx_imx8m_defconfig > @@ -3,9 +3,9 @@ BR2_aarch64=y > > # System > BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/kontron/pitx-imx8m/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/pitx-imx8m/post-image.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/pitx-imx8m/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # Kernel > BR2_LINUX_KERNEL=y > @@ -37,12 +37,18 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://gitlab.kontron.com/imx/u-boot-imx/-/archive/PITX-IMX8M-R12/u-boot-imx-PITX-IMX8M-R12.tar.gz" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pitx-imx8m" > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_pitx_imx8m" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > BR2_TARGET_UBOOT_SPL=y > > # Required host tools to create the SD/eMMC image > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index 4a0aa117fb..bc100b171d 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -5,7 +5,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" - image = "imx8-boot-sd.bin" + image = "flash.bin" offset = 33K } diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh deleted file mode 100755 index 3452fd4501..0000000000 --- a/board/kontron/pitx-imx8m/post-image.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 8f756f5246..161b9cfe3b 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -3,9 +3,9 @@ BR2_aarch64=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/kontron/pitx-imx8m/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/pitx-imx8m/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/pitx-imx8m/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y @@ -37,12 +37,18 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://gitlab.kontron.com/imx/u-boot-imx/-/archive/PITX-IMX8M-R12/u-boot-imx-PITX-IMX8M-R12.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pitx-imx8m" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_pitx_imx8m" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y # Required host tools to create the SD/eMMC image
Switch U-Boot from vendor downstream version to upstream. Since the upstream U-Boot uses binman to build the bootable binary (flash.bin) the need for the iMX specifc prepare script is no longer required. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- board/kontron/pitx-imx8m/genimage.cfg | 2 +- board/kontron/pitx-imx8m/post-image.sh | 3 --- configs/kontron_pitx_imx8m_defconfig | 20 +++++++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) delete mode 100755 board/kontron/pitx-imx8m/post-image.sh