nxp: imx[95,94,952]_evk: Implement board_fix_fdt

Select the OF_BOARD_FIXUP and implement board_fix_fdt in board codes of
iMX95/952/94 EVK to handle fuse setting on various part numbers.

Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
index 7fa6d6369e8057450befffcd6abf7994777f0838..4bb6a87ce26a014ef4d7586966974eda0ea11204 100644 (file)
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@ -150,6 +150,7 @@ config TARGET_PHYCORE_IMX93
 
 config TARGET_IMX95_19X19_EVK
        bool "imx95_19x19_evk"
+       select OF_BOARD_FIXUP
        select IMX95
        imply BOOTSTD_BOOTCOMMAND
        imply BOOTSTD_FULL
@@ -157,6 +158,7 @@ config TARGET_IMX95_19X19_EVK
 
 config TARGET_IMX95_15X15_EVK
        bool "imx95_15x15_evk"
+       select OF_BOARD_FIXUP
        select IMX95
        imply BOOTSTD_BOOTCOMMAND
        imply BOOTSTD_FULL
@@ -164,6 +166,7 @@ config TARGET_IMX95_15X15_EVK
 
 config TARGET_IMX943_EVK
        bool "imx943_evk"
+       select OF_BOARD_FIXUP
        select IMX94
        imply BOOTSTD_BOOTCOMMAND
        imply BOOTSTD_FULL
@@ -180,6 +183,7 @@ config TARGET_VERDIN_IMX95
 
 config TARGET_IMX952_EVK
        bool "imx952_evk"
+       select OF_BOARD_FIXUP
        select IMX_SM_CPU
        select IMX_SM_LMM
        select IMX952

diff --git a/board/nxp/imx94_evk/imx94_evk.c b/board/nxp/imx94_evk/imx94_evk.c
index 4731b79b55da3d95b586167f3f4eafc056a55559..02149afae879cb1bc7e5804b7ce4674873f469b0 100644 (file)
--- a/board/nxp/imx94_evk/imx94_evk.c
+++ b/board/nxp/imx94_evk/imx94_evk.c
@@ -7,7 +7,7 @@
 #include <fdt_support.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
-#include <asm/mach-imx/sys_proto.h>
+#include <asm/arch/sys_proto.h>
 
 int board_init(void)
 {
@@ -26,3 +26,11 @@ int board_late_init(void)
 
        return 0;
 }
+
+#if IS_ENABLED(CONFIG_OF_BOARD_FIXUP)
+int board_fix_fdt(void *fdt)
+{
+       /* Remove nodes based on fuses. */
+       return imx9_uboot_fixup_by_fuse(fdt);
+}
+#endif

diff --git a/board/nxp/imx952_evk/imx952_evk.c b/board/nxp/imx952_evk/imx952_evk.c
index 2a61817939e310baf579125785c6752f6c73bd2f..b5c2da032a84a6cd9066e4ba20dd79b181a5d846 100644 (file)
--- a/board/nxp/imx952_evk/imx952_evk.c
+++ b/board/nxp/imx952_evk/imx952_evk.c
@@ -24,3 +24,11 @@ int board_late_init(void)
 
        return 0;
 }
+
+#if IS_ENABLED(CONFIG_OF_BOARD_FIXUP)
+int board_fix_fdt(void *fdt)
+{
+       /* Remove nodes based on fuses. */
+       return imx9_uboot_fixup_by_fuse(fdt);
+}
+#endif

diff --git a/board/nxp/imx95_evk/imx95_evk.c b/board/nxp/imx95_evk/imx95_evk.c
index 99a37e0593fc437ba2a558838aafe46a76da53a0..394d6fd459cabdd90c8a0a343bd941a01b94fac5 100644 (file)
--- a/board/nxp/imx95_evk/imx95_evk.c
+++ b/board/nxp/imx95_evk/imx95_evk.c
@@ -5,7 +5,7 @@
 
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
-#include <asm/mach-imx/sys_proto.h>
+#include <asm/arch/sys_proto.h>
 
 int board_late_init(void)
 {
@@ -14,3 +14,11 @@ int board_late_init(void)
 
        return 0;
 }
+
+#if IS_ENABLED(CONFIG_OF_BOARD_FIXUP)
+int board_fix_fdt(void *fdt)
+{
+       /* Remove nodes based on fuses. */
+       return imx9_uboot_fixup_by_fuse(fdt);
+}
+#endif

diff --git a/configs/imx943_evk_defconfig b/configs/imx943_evk_defconfig
index b60d39a1fa2282eed20ddf4d6b1ff0607df86749..4bc60e1d89f05b453c320df1b559d1f3faf573bf 100644 (file)
--- a/configs/imx943_evk_defconfig
+++ b/configs/imx943_evk_defconfig
@@ -26,7 +26,6 @@ CONFIG_SYS_LOAD_ADDR=0x90400000
 CONFIG_SPL=y
 CONFIG_SPL_RECOVER_DATA_SECTION=y
 CONFIG_PCI=y
-CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SYS_MEMTEST_START=0x90000000
 CONFIG_SYS_MEMTEST_END=0xA0000000
 CONFIG_REMAKE_ELF=y

diff --git a/configs/imx952_evk_defconfig b/configs/imx952_evk_defconfig
index 66a56ddb879b5bfb8b340711d556a07c5dc9d722..b74df3a5d5f0b40dddc403dbe102d75d1142c2e2 100644 (file)
--- a/configs/imx952_evk_defconfig
+++ b/configs/imx952_evk_defconfig
@@ -28,7 +28,6 @@ CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0x0
 CONFIG_SPL=y
 CONFIG_SPL_RECOVER_DATA_SECTION=y
 CONFIG_PCI=y
-CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SYS_MEMTEST_START=0x90000000
 CONFIG_SYS_MEMTEST_END=0xA0000000
 CONFIG_REMAKE_ELF=y