[U-Boot] [PATCH 1/3] imx: remove board specific boot order from spl
boot order was added to handle both SD and eMMC. But commit 14d319b1 introduced to handle both eMMC and SD globally.
Signed-off-by: Parthiban Nallathambi pn@denx.de --- board/phytec/pcl063/spl.c | 23 ----------------------- 1 file changed, 23 deletions(-)
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c index 6d4c827918..18fc251890 100644 --- a/board/phytec/pcl063/spl.c +++ b/board/phytec/pcl063/spl.c @@ -182,29 +182,6 @@ int board_mmc_init(bd_t *bis)
return 0; } - -void board_boot_order(u32 *spl_boot_list) -{ - u32 bmode = imx6_src_get_boot_mode(); - u8 boot_dev = BOOT_DEVICE_MMC1; - - switch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: - boot_dev = BOOT_DEVICE_MMC1; - break; - case IMX6_BMODE_MMC: - case IMX6_BMODE_EMMC: - boot_dev = BOOT_DEVICE_MMC2; - break; - default: - /* Default - BOOT_DEVICE_MMC1 */ - printf("Wrong board boot order\n"); - break; - } - - spl_boot_list[0] = boot_dev; -} #endif /* CONFIG_FSL_ESDHC_IMX */
void board_init_f(ulong dummy)
board early initialize fec ethernet controller pinmux only when FEC is enabled
Signed-off-by: Parthiban Nallathambi pn@denx.de --- board/phytec/pcl063/pcl063.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c index f8cbd1c11e..96dd9e38f3 100644 --- a/board/phytec/pcl063/pcl063.c +++ b/board/phytec/pcl063/pcl063.c @@ -178,7 +178,9 @@ int board_phy_config(struct phy_device *phydev) int board_early_init_f(void) { setup_iomux_uart(); +#ifdef CONFIG_FEC_MXC setup_iomux_fec(); +#endif
return 0; }
Subject: [PATCH 2/3] imx: initialize fec only when enabled
board early initialize fec ethernet controller pinmux only when FEC is enabled
Signed-off-by: Parthiban Nallathambi pn@denx.de
board/phytec/pcl063/pcl063.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c index f8cbd1c11e..96dd9e38f3 100644 --- a/board/phytec/pcl063/pcl063.c +++ b/board/phytec/pcl063/pcl063.c @@ -178,7 +178,9 @@ int board_phy_config(struct phy_device *phydev) int board_early_init_f(void) { setup_iomux_uart(); +#ifdef CONFIG_FEC_MXC setup_iomux_fec(); +#endif
Reviewed-by: Peng Fan peng.fan@nxp.com
It would be better if dm pinctrl used.
Regards, Peng.
return 0; } -- 2.21.0
conditionally include long help text when enabled
Signed-off-by: Parthiban Nallathambi pn@denx.de --- arch/arm/mach-imx/cmd_nandbcb.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 065b814b2e..7811c61d22 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -359,9 +359,11 @@ usage: return CMD_RET_USAGE; }
+#ifdef CONFIG_SYS_LONGHELP static char nandbcb_help_text[] = "update addr off|partition len - update 'len' bytes starting at\n" " 'off|part' to memory address 'addr', skipping bad blocks"; +#endif
U_BOOT_CMD(nandbcb, 5, 1, do_nandbcb, "i.MX6 Nand BCB",
Subject: [PATCH 3/3] imx: nandbcb: include long help only when enabled
conditionally include long help text when enabled
Signed-off-by: Parthiban Nallathambi pn@denx.de
arch/arm/mach-imx/cmd_nandbcb.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 065b814b2e..7811c61d22 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -359,9 +359,11 @@ usage: return CMD_RET_USAGE; }
+#ifdef CONFIG_SYS_LONGHELP static char nandbcb_help_text[] = "update addr off|partition len - update 'len' bytes starting at\n" " 'off|part' to memory address 'addr', skipping bad blocks"; +#endif
U_BOOT_CMD(nandbcb, 5, 1, do_nandbcb, "i.MX6 Nand BCB", --
Reviewed-by: Peng Fan peng.fan@nxp.com
2.21.0
Subject: [PATCH 1/3] imx: remove board specific boot order from spl
boot order was added to handle both SD and eMMC. But commit 14d319b1 introduced to handle both eMMC and SD globally.
Signed-off-by: Parthiban Nallathambi pn@denx.de
board/phytec/pcl063/spl.c | 23 ----------------------- 1 file changed, 23 deletions(-)
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c index 6d4c827918..18fc251890 100644 --- a/board/phytec/pcl063/spl.c +++ b/board/phytec/pcl063/spl.c @@ -182,29 +182,6 @@ int board_mmc_init(bd_t *bis)
return 0; }
-void board_boot_order(u32 *spl_boot_list) -{
- u32 bmode = imx6_src_get_boot_mode();
- u8 boot_dev = BOOT_DEVICE_MMC1;
- switch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {
- case IMX6_BMODE_SD:
- case IMX6_BMODE_ESD:
boot_dev = BOOT_DEVICE_MMC1;break;- case IMX6_BMODE_MMC:
- case IMX6_BMODE_EMMC:
boot_dev = BOOT_DEVICE_MMC2;break;- default:
/* Default - BOOT_DEVICE_MMC1 */printf("Wrong board boot order\n");break;- }
- spl_boot_list[0] = boot_dev;
-} #endif /* CONFIG_FSL_ESDHC_IMX */
void board_init_f(ulong dummy)
Reviewed-by: Peng Fan peng.fan@nxp.com
-- 2.21.0
participants (2)
-
Parthiban Nallathambi -
Peng Fan