Skip to contentSkip to conversation

configs/kontron_pitx_imx8m_defconfig: use linux kernel 5.17.7

PATCH Applied Heiko Thiery 2 participants 5 messages May 13, 2022 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/kontron_pitx_imx8m_defconfig: use linux kernel 5.17.7

---
 configs/kontron_pitx_imx8m_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/kontron_pitx_imx8m_defconfig +1 -1
index 161b9cfe3b..b69516b8cc 100644
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7"
 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"
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/1 configs/kontron_pitx_imx8m: switch to upstream U-Boot

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.

---
 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
board/kontron/pitx-imx8m/genimage.cfg +1 -1
index 4a0aa117fb..bc100b171d 100644
@@ -5,7 +5,7 @@ image sdcard.img {
 
 	partition imx-boot {
 		in-partition-table = "no"
-		image = "imx8-boot-sd.bin"
+		image = "flash.bin"
 		offset = 33K
 	}
 
board/kontron/pitx-imx8m/post-image.sh deleted +0 -3
deleted file mode 100755
index 3452fd4501..0000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg
configs/kontron_pitx_imx8m_defconfig +13 -7
index 8f756f5246..161b9cfe3b 100644
@@ -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
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH] configs/kontron_pitx_imx8m: switch to upstream U-Boot

Heiko, All,

On 2022-05-13 09:15 +0200, Heiko Thiery spake thusly:

Quoted 5 lines

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.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 76 lines
---
 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
board/kontron/pitx-imx8m/genimage.cfg +1 -1
index 4a0aa117fb..bc100b171d 100644
@@ -5,7 +5,7 @@ image sdcard.img {
 
 	partition imx-boot {
 		in-partition-table = "no"
-		image = "imx8-boot-sd.bin"
+		image = "flash.bin"
 		offset = 33K
 	}
 
board/kontron/pitx-imx8m/post-image.sh deleted +0 -3
deleted file mode 100755
index 3452fd4501..0000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg
configs/kontron_pitx_imx8m_defconfig +13 -7
index 8f756f5246..161b9cfe3b 100644
@@ -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
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to Heiko Thiery

Heiko, All,

On 2022-05-13 09:15 +0200, Heiko Thiery spake thusly:

Quoted 10 lines
---
 configs/kontron_pitx_imx8m_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/kontron_pitx_imx8m_defconfig +0 -0
index 161b9cfe3b..b69516b8cc 100644

configs/kontron_pitx_imx8m_defconfig BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" · line 13

Quoted 5 lines
configs/kontron_pitx_imx8m_defconfig +1 -1
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7"

Since we now have support for 5.17 headers, I've also changed that:

    -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
    +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y

Could you please check that I did not bork it?

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 10 lines
configs/kontron_pitx_imx8m_defconfig +0 -0
 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"
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Hi Yann,

Am Fr., 13. Mai 2022 um 19:01 Uhr schrieb Yann E. MORIN <[email protected]>:

Quoted 22 lines

Heiko, All,

On 2022-05-13 09:15 +0200, Heiko Thiery spake thusly:

Quoted 10 lines
---
 configs/kontron_pitx_imx8m_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/kontron_pitx_imx8m_defconfig +0 -0
index 161b9cfe3b..b69516b8cc 100644

configs/kontron_pitx_imx8m_defconfig BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" · line 13

Quoted 5 lines
configs/kontron_pitx_imx8m_defconfig +1 -1
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7"

Since we now have support for 5.17 headers, I've also changed that:

Quoted 4 lines
    -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
    +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y

Could you please check that I did not bork it?

Just did a build and that finished fine. I will do a runtime test as soon as I am at a device.

Quoted 17 lines

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 10 lines
configs/kontron_pitx_imx8m_defconfig +0 -1
 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"
--

2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Quoted 7 lines

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Thanks

Signature · 5 lines
Heiko
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot