bsp-imx: Update U-Boot to support phyBOARD-Pollux 4GB model

The current U-Boot from pkg/bsp-imx doesn't support newer models (with 4GB) of the phyBOARD-Pollux board. This commit port the changes in order to allow EVE to run on both models. Signed-off-by: Renê de Souza Pinto <[email protected]>
lf-edge · Oct 5, 2023 · e1538b5 · e1538b5
1 parent eec7808
commit e1538b5
Show file tree

Hide file tree

Showing 25 changed files with 10,634 additions and 111 deletions.
diff --git a/...atches/uboot-patches-lf_v2022.04/0001-Add-support-to-Phytec-s-phyBOARD-Pollux-board.patch b/...atches/uboot-patches-lf_v2022.04/0001-Add-support-to-Phytec-s-phyBOARD-Pollux-board.patch
diff --git a/...-imx8m-Disable-BINMAN-for-iMX8M-EVK.patch → ...-imx8m-Disable-BINMAN-for-iMX8M-EVK.patch b/...-imx8m-Disable-BINMAN-for-iMX8M-EVK.patch → ...-imx8m-Disable-BINMAN-for-iMX8M-EVK.patch
@@ -1,15 +1,16 @@
-From 39f5340e0916c949ed1ddad662b0523362e45bbf Mon Sep 17 00:00:00 2001
+From 80b9b9e6b2921c6341c8ccb63be7f53eb0de4a78 Mon Sep 17 00:00:00 2001
 From: Aleksandrov Dmitriy <[email protected]>
 Date: Wed, 2 Nov 2022 16:34:15 -0100
-Subject: [PATCH] Revert "LFU-278-20 imx8m: Disable BINMAN for iMX8M EVK build"
+Subject: [PATCH 02/25] Revert "LFU-278-20 imx8m: Disable BINMAN for iMX8M EVK
+ build"
 
 This reverts commit d955c2248dd12f5c0d6afd3cf0ba1a013ed39646.
 ---
  arch/arm/mach-imx/imx8m/Kconfig | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig
-index 456073873d..67e600453a 100644
+index d7edf88a655..a732da8f050 100644
 --- a/arch/arm/mach-imx/imx8m/Kconfig
 +++ b/arch/arm/mach-imx/imx8m/Kconfig
 @@ -66,6 +66,7 @@ config TARGET_IMX8MQ_CM
@@ -28,7 +29,7 @@ index 456073873d..67e600453a 100644
  	select IMX8MM
  	select SUPPORT_SPL
  	select IMX8M_LPDDR4
-@@ -188,6 +190,7 @@ config TARGET_IMX8MN_VENICE
+@@ -233,6 +235,7 @@ config TARGET_IMX8MN_VENICE
 
  config TARGET_IMX8MP_EVK
  	bool "imx8mp LPDDR4 EVK board"
@@ -37,5 +38,5 @@ index 456073873d..67e600453a 100644
  	select SUPPORT_SPL
  	select IMX8M_LPDDR4
 -- 
-2.25.1
+2.40.1
 
diff --git a/...q-evk-add-smbios-dt-node-and-config.patch → ...q-evk-add-smbios-dt-node-and-config.patch b/...q-evk-add-smbios-dt-node-and-config.patch → ...q-evk-add-smbios-dt-node-and-config.patch
@@ -1,7 +1,7 @@
-From 3209fb3d95ed82421c7d969688758e8645fab851 Mon Sep 17 00:00:00 2001
+From 1d7cba03de2d7d8d4e06a89b2dc302ae2f1f8265 Mon Sep 17 00:00:00 2001
 From: Aleksandrov Dmitriy <[email protected]>
 Date: Wed, 2 Nov 2022 23:06:20 -0100
-Subject: [PATCH] borad: imx8mq-evk: add smbios dt node and config
+Subject: [PATCH 03/25] borad: imx8mq-evk: add smbios dt node and config
 
 Signed-off-by: Aleksandrov Dmitriy <[email protected]>
 ---
@@ -10,14 +10,13 @@ Signed-off-by: Aleksandrov Dmitriy <[email protected]>
  2 files changed, 20 insertions(+)
 
 diff --git a/arch/arm/dts/imx8mq-evk.dts b/arch/arm/dts/imx8mq-evk.dts
-index de709088e5..9ad98bcd6e 100644
+index de709088e51..9af5b695360 100644
 --- a/arch/arm/dts/imx8mq-evk.dts
 +++ b/arch/arm/dts/imx8mq-evk.dts
-@@ -11,6 +11,24 @@
- / {
+@@ -12,6 +12,24 @@
  	model = "NXP i.MX8MQ EVK";
  	compatible = "fsl,imx8mq-evk", "fsl,imx8mq";
-+
+ 
 +	sysinfo {
 +		compatible = "u-boot,sysinfo-smbios";
 +		smbios {
@@ -35,19 +34,20 @@ index de709088e5..9ad98bcd6e 100644
 +			};
 +		};
 +	};
- 
++
  	chosen {
  		bootargs = "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200";
+ 		stdout-path = &uart1;
 diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
-index dc2c5003f2..802fa920de 100644
+index 51f24980ccc..307a2a4202a 100644
 --- a/configs/imx8mq_evk_defconfig
 +++ b/configs/imx8mq_evk_defconfig
-@@ -169,3 +169,5 @@ CONFIG_TEE=y
+@@ -170,3 +170,5 @@ CONFIG_TEE=y
  CONFIG_EFI_ESRT=y
  CONFIG_EFI_HAVE_CAPSULE_UPDATE=y
  CONFIG_FIT_SIGNATURE=y
 +CONFIG_SYSINFO=y
 +CONFIG_SYSINFO_SMBIOS=y
 -- 
-2.25.1
+2.40.1
 
diff --git a/...mq-evk-add-fdt-kernel-node-to-binma.patch → ...mq-evk-add-fdt-kernel-node-to-binma.patch b/...mq-evk-add-fdt-kernel-node-to-binma.patch → ...mq-evk-add-fdt-kernel-node-to-binma.patch
@@ -1,23 +1,22 @@
-From fe9962e501632b58e04c896a523140fd8acb1312 Mon Sep 17 00:00:00 2001
+From e1cf0e912a8ca47ea42776f78e2fce705a735c87 Mon Sep 17 00:00:00 2001
 From: Insei <[email protected]>
 Date: Thu, 8 Dec 2022 05:38:41 +0300
-Subject: [PATCH] arch: arm: dts: imx8mq-evk: add fdt-kernel node to binman
- configuration
+Subject: [PATCH 04/25] arch: arm: dts: imx8mq-evk: add fdt-kernel node to
+ binman configuration
 
 Signed-off-by: Insei <[email protected]>
 ---
  arch/arm/dts/imx8mq-u-boot.dtsi | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
-index 1dc060ce0c..408b0cc8d8 100644
+index 1dc060ce0c2..e91b4d785f4 100644
 --- a/arch/arm/dts/imx8mq-u-boot.dtsi
 +++ b/arch/arm/dts/imx8mq-u-boot.dtsi
-@@ -103,6 +103,18 @@
- 						type = "blob-ext";
+@@ -104,6 +104,18 @@
  					};
  				};
-+
+ 
 +				fdt-kernel {
 +					compression = "none";
 +					description = "NAME";
@@ -29,9 +28,10 @@ index 1dc060ce0c..408b0cc8d8 100644
 +						type = "blob-ext";
 +					};
 +				};
- 
++
  				fdt {
  					compression = "none";
+ 					description = "NAME";
 @@ -123,7 +135,7 @@
  					description = "NAME";
  					fdt = "fdt";
@@ -42,5 +42,5 @@ index 1dc060ce0c..408b0cc8d8 100644
  			};
  		};
 -- 
-2.34.1
+2.40.1
 
diff --git a/...-framebuffer-dt-node-initialization.patch → ...-framebuffer-dt-node-initialization.patch b/...-framebuffer-dt-node-initialization.patch → ...-framebuffer-dt-node-initialization.patch
@@ -1,8 +1,8 @@
-From 21424076af911f57dea49ed7c1d03ec0bd339a51 Mon Sep 17 00:00:00 2001
+From 5f56058c71fb83f364ee87ecc6bcd6449d049564 Mon Sep 17 00:00:00 2001
 From: Insei <[email protected]>
 Date: Thu, 8 Dec 2022 05:41:40 +0300
-Subject: [PATCH] imx8mq_evk: simple-framebuffer dt node initialization at
- ft_board_setup
+Subject: [PATCH 05/25] imx8mq_evk: simple-framebuffer dt node initialization
+ at ft_board_setup
 
 Signed-off-by: Insei <[email protected]>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: Insei <[email protected]>
  2 files changed, 14 insertions(+)
 
 diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
-index 81a961883f..499ad1f4ee 100644
+index f470e6c7f50..89ff150ef67 100644
 --- a/board/freescale/imx8mq_evk/imx8mq_evk.c
 +++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
-@@ -29,6 +29,8 @@
+@@ -30,6 +30,8 @@
  #include "../common/pfuze.h"
  #include <usb.h>
  #include <dwc3-uboot.h>
@@ -23,7 +23,7 @@ index 81a961883f..499ad1f4ee 100644
 
  DECLARE_GLOBAL_DATA_PTR;
 
-@@ -280,6 +282,16 @@ int board_late_init(void)
+@@ -298,6 +300,16 @@ int board_late_init(void)
  	return 0;
  }
 
@@ -41,7 +41,7 @@ index 81a961883f..499ad1f4ee 100644
  bool is_power_key_pressed(void) {
  	return (bool)(!!(readl(SNVS_HPSR) & (0x1 << 6)));
 diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
-index cf1c1f1c26..c0c894b557 100644
+index 307a2a4202a..ce900ef7390 100644
 --- a/configs/imx8mq_evk_defconfig
 +++ b/configs/imx8mq_evk_defconfig
 @@ -33,6 +33,7 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
@@ -52,7 +52,7 @@ index cf1c1f1c26..c0c894b557 100644
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_BOARD_LATE_INIT=y
  CONFIG_SPL_BOARD_INIT=y
-@@ -146,6 +147,7 @@ CONFIG_VIDEO_LOGO=y
+@@ -147,6 +148,7 @@ CONFIG_VIDEO_LOGO=y
  CONFIG_SYS_WHITE_ON_BLACK=y
  CONFIG_VIDEO_IMX8M_DCSS=y
  CONFIG_VIDEO_IMX8M_HDMI=y
@@ -61,5 +61,5 @@ index cf1c1f1c26..c0c894b557 100644
  CONFIG_SPLASH_SCREEN_ALIGN=y
  CONFIG_LEGACY_IMAGE_FORMAT=y
 -- 
-2.34.1
+2.40.1
 
diff --git a/...configs-imx8mq-evk-disable-optee-os.patch → ...k-disable-optee-os-We-get-an-error-.patch b/...configs-imx8mq-evk-disable-optee-os.patch → ...k-disable-optee-os-We-get-an-error-.patch
@@ -1,7 +1,7 @@
-From 3f1bdc167456e9d043541e8d959b7d26eb5af74d Mon Sep 17 00:00:00 2001
+From 1a1e880a8ac0b404d48bff5b05a50c6f9ee3bee7 Mon Sep 17 00:00:00 2001
 From: Aleksandrov Dmitriy <[email protected]>
 Date: Wed, 2 Nov 2022 23:13:03 -0100
-Subject: [PATCH] configs: imx8mq-evk: disable optee-os * We get an error
+Subject: [PATCH 06/25] configs: imx8mq-evk: disable optee-os * We get an error
  initializing the UEFI subsystem in u-boot, if we boot without
  optee-os(trusted execution environment) on bl32, so we will turn off optee
  driver.
@@ -12,10 +12,10 @@ Signed-off-by: Aleksandrov Dmitriy <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
-index 802fa920de..cf1c1f1c26 100644
+index ce900ef7390..c40ae8c0092 100644
 --- a/configs/imx8mq_evk_defconfig
 +++ b/configs/imx8mq_evk_defconfig
-@@ -90,7 +90,7 @@ CONFIG_DM_I2C=y
+@@ -92,7 +92,7 @@ CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
  CONFIG_SYS_I2C_MXC=y
  CONFIG_DM_MMC=y
@@ -24,7 +24,7 @@ index 802fa920de..cf1c1f1c26 100644
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
-@@ -162,8 +162,8 @@ CONFIG_SHA384=y
+@@ -165,8 +165,8 @@ CONFIG_SHA384=y
  CONFIG_EFI_VAR_BUF_SIZE=139264
  CONFIG_EFI_IGNORE_OSINDICATIONS=y
  CONFIG_EFI_CAPSULE_AUTHENTICATE=y
@@ -36,5 +36,5 @@ index 802fa920de..cf1c1f1c26 100644
  CONFIG_TEE=y
  CONFIG_EFI_ESRT=y
 -- 
-2.34.1
+2.40.1
 
diff --git a/...s-imx8mp-u-boot-select-correct-bl31.patch → ...s-imx8mp-u-boot-select-correct-bl31.patch b/...s-imx8mp-u-boot-select-correct-bl31.patch → ...s-imx8mp-u-boot-select-correct-bl31.patch
@@ -1,7 +1,7 @@
-From 69074cf413469dbb49e146c88556002d8e67703c Mon Sep 17 00:00:00 2001
+From 438cbd87a4dc206baab086b1bb269d41a8d3bbb6 Mon Sep 17 00:00:00 2001
 From: Troy Kisky <[email protected]>
 Date: Sat, 4 Jun 2022 11:39:19 -0700
-Subject: [PATCH 1/6] arm: dts: imx8mp-u-boot: select correct bl31
+Subject: [PATCH 07/25] arm: dts: imx8mp-u-boot: select correct bl31
 
 Signed-off-by: Troy Kisky <[email protected]>
 ---
@@ -56,5 +56,5 @@ index 120c4c4dbb1..6d31e206c03 100644
  				};
  			};
 -- 
-2.35.1
+2.40.1
 
diff --git a/...boot-make-offset-reflect-MMC_ENV_PA.patch → ...boot-make-offset-reflect-MMC_ENV_PA.patch b/...boot-make-offset-reflect-MMC_ENV_PA.patch → ...boot-make-offset-reflect-MMC_ENV_PA.patch
@@ -1,7 +1,8 @@
-From c4f02a3b97ca3fec6de8c08c78b5030b6bb73be3 Mon Sep 17 00:00:00 2001
+From 513a3429b9deab6d802e0cfc52e83d0274d41e19 Mon Sep 17 00:00:00 2001
 From: Troy Kisky <[email protected]>
 Date: Thu, 8 Sep 2022 16:48:20 -0700
-Subject: [PATCH 2/6] arm: dts: imx8mp-u-boot: make offset reflect MMC_ENV_PART
+Subject: [PATCH 08/25] arm: dts: imx8mp-u-boot: make offset reflect
+ MMC_ENV_PART
 
 Signed-off-by: Troy Kisky <[email protected]>
 ---
@@ -35,5 +36,5 @@ index 6d31e206c03..9f3beaf1086 100644
  	};
  };
 -- 
-2.35.1
+2.40.1
 
diff --git a/...SMBIOS-information-for-Phytec-Pollu.patch → ...SMBIOS-information-for-Phytec-Pollu.patch b/...SMBIOS-information-for-Phytec-Pollu.patch → ...SMBIOS-information-for-Phytec-Pollu.patch
@@ -1,7 +1,8 @@
-From fc532a2b79a612cb0eda3c2176045f5347cf084e Mon Sep 17 00:00:00 2001
+From 9ee71fea7e8577c743abb8d24692de26cdb5ed6b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ren=C3=AA=20de=20Souza=20Pinto?= <[email protected]>
 Date: Wed, 4 Jan 2023 19:11:13 +0100
-Subject: [PATCH 3/6] arch: arm: dts: Add SMBIOS information for Phytec Pollux
+Subject: [PATCH 09/25] arch: arm: dts: Add SMBIOS information for Phytec
+ Pollux
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,7 +17,7 @@ Signed-off-by: Renê de Souza Pinto <[email protected]>
  2 files changed, 20 insertions(+)
 
 diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
-index 984a6b9ded8..5f66e1a5fe0 100644
+index 3083530cd38..3ccc36ada71 100644
 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
 +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
 @@ -15,6 +15,24 @@
@@ -45,15 +46,15 @@ index 984a6b9ded8..5f66e1a5fe0 100644
  		stdout-path = &uart1;
  	};
 diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig
-index 2391aa49141..e38b7a52896 100644
+index 9623b84a783..d563aadc879 100644
 --- a/configs/phycore-imx8mp_defconfig
 +++ b/configs/phycore-imx8mp_defconfig
-@@ -107,3 +107,5 @@ CONFIG_SYSRESET_PSCI=y
+@@ -112,3 +112,5 @@ CONFIG_SYSRESET_PSCI=y
  CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_IMX_WATCHDOG=y
 +CONFIG_SYSINFO=y
 +CONFIG_SYSINFO_SMBIOS=y
 -- 
-2.35.1
+2.40.1
 
diff --git a/...ode-to-imx8mp-phyboard-pollux-rdk-u.patch → ...ode-to-imx8mp-phyboard-pollux-rdk-u.patch b/...ode-to-imx8mp-phyboard-pollux-rdk-u.patch → ...ode-to-imx8mp-phyboard-pollux-rdk-u.patch
@@ -1,7 +1,7 @@
-From 35761515e1a2a2dcca15117faaa3dafa45b1d9d5 Mon Sep 17 00:00:00 2001
+From 5e924f26253bf686300bfa115a0f8fb72ae7ba8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ren=C3=AA=20de=20Souza=20Pinto?= <[email protected]>
 Date: Wed, 4 Jan 2023 19:23:04 +0100
-Subject: [PATCH 4/6] dts: Add mcu_rdc node to
+Subject: [PATCH 10/25] dts: Add mcu_rdc node to
  imx8mp-phyboard-pollux-rdk-u-boot.dtsi
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -89,5 +89,5 @@ index dbc48dfb484..78d7512fac5 100644
 
  &reg_usdhc2_vmmc {
 -- 
-2.35.1
+2.40.1
 
diff --git a/...-imx8mp-u-boot-Revert-bl31-filename.patch → ...-imx8mp-u-boot-Revert-bl31-filename.patch b/...-imx8mp-u-boot-Revert-bl31-filename.patch → ...-imx8mp-u-boot-Revert-bl31-filename.patch
@@ -1,7 +1,7 @@
-From 0f2e1fd5bc5d64538bdc4c04e51db693db3e4c1d Mon Sep 17 00:00:00 2001
+From 1efa5c4525985738cd1400ef0bf94058794eb9fe Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ren=C3=AA=20de=20Souza=20Pinto?= <[email protected]>
 Date: Wed, 4 Jan 2023 19:46:56 +0100
-Subject: [PATCH 5/6] arm: dts: imx8mp-u-boot: Revert bl31 filename
+Subject: [PATCH 11/25] arm: dts: imx8mp-u-boot: Revert bl31 filename
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,5 +32,5 @@ index 9f3beaf1086..17daef31a27 100644
  					};
  				};
 -- 
-2.35.1
+2.40.1
 
diff --git a/...mx8mp-Enable-GPT-EFI-partition-supp.patch → ...mx8mp-Enable-GPT-EFI-partition-supp.patch b/...mx8mp-Enable-GPT-EFI-partition-supp.patch → ...mx8mp-Enable-GPT-EFI-partition-supp.patch
@@ -1,7 +1,7 @@
-From f2ccbac5dae658b83009cbd5f888960f5532db55 Mon Sep 17 00:00:00 2001
+From 94ad3031f5b77787a3ed63d11bf304dc8af38067 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ren=C3=AA=20de=20Souza=20Pinto?= <[email protected]>
 Date: Wed, 4 Jan 2023 19:50:43 +0100
-Subject: [PATCH 6/6] configs: phycore-imx8mp: Enable GPT EFI partition
+Subject: [PATCH 12/25] configs: phycore-imx8mp: Enable GPT EFI partition
  support.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -13,10 +13,10 @@ Signed-off-by: Renê de Souza Pinto <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig
-index e38b7a52896..77697e66c21 100644
+index d563aadc879..bdab98c7c62 100644
 --- a/configs/phycore-imx8mp_defconfig
 +++ b/configs/phycore-imx8mp_defconfig
-@@ -62,6 +62,10 @@ CONFIG_CMD_EXT4=y
+@@ -64,6 +64,10 @@ CONFIG_CMD_EXT4=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
@@ -28,5 +28,5 @@ index e38b7a52896..77697e66c21 100644
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
 -- 
-2.35.1
+2.40.1