Skip to contentSkip to conversation

imx: remove board specific boot order from spl

PATCH New Parthiban Nallathambi 2 participants 6 messages Aug 23, 2019 – Aug 26, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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.

---
 board/phytec/pcl063/spl.c | 23 -----------------------
 1 file changed, 23 deletions(-)
board/phytec/pcl063/spl.c +0 -23
index 6d4c827918..18fc251890 100644
@@ -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)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/3 imx: initialize fec only when enabled

board early initialize fec ethernet controller pinmux only when FEC is enabled

---
 board/phytec/pcl063/pcl063.c | 2 ++
 1 file changed, 2 insertions(+)
board/phytec/pcl063/pcl063.c +2 -0
index f8cbd1c11e..96dd9e38f3 100644
@@ -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;
 }
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 imx: initialize fec only when enabled

Quoted 14 lines

Subject: [PATCH 2/3] imx: initialize fec only when enabled

board early initialize fec ethernet controller pinmux only when FEC is enabled

---
 board/phytec/pcl063/pcl063.c | 2 ++
 1 file changed, 2 insertions(+)
board/phytec/pcl063/pcl063.c +0 -0
index f8cbd1c11e..96dd9e38f3 100644

board/phytec/pcl063/pcl063.c int board_phy_config(struct phy_device *phydev) · line 183

Quoted 6 lines
board/phytec/pcl063/pcl063.c +2 -0
@@ -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
 

It would be better if dm pinctrl used.

Regards,
Peng.

Quoted 4 lines
board/phytec/pcl063/pcl063.c +0 -1
 	return 0;
 }
--

2.21.0

#3 lore raw

PATCH 3/3 imx: nandbcb: include long help only when enabled

In reply to Parthiban Nallathambi

conditionally include long help text when enabled

---
 arch/arm/mach-imx/cmd_nandbcb.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-imx/cmd_nandbcb.c +2 -0
index 065b814b2e..7811c61d22 100644
@@ -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",
Signature · 1 line
2.21.0
#4 lore raw

PATCH 3/3 imx: nandbcb: include long help only when enabled

Quoted 17 lines

Subject: [PATCH 3/3] imx: nandbcb: include long help only when enabled

conditionally include long help text when enabled

---
 arch/arm/mach-imx/cmd_nandbcb.c | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/arch/arm/mach-imx/cmd_nandbcb.c index 065b814b2e..7811c61d22 100644

arch/arm/mach-imx/cmd_nandbcb.c +0 -0
@@ -359,9 +359,11 @@ usage:
 	return CMD_RET_USAGE;
 }

arch/arm/mach-imx/cmd_nandbcb.c usage:

Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +2 -1
 
+#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",
--
Quoted 1 line

2.21.0

#5 lore raw

PATCH 1/3 imx: remove board specific boot order from spl

In reply to Parthiban Nallathambi
Quoted 33 lines

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.

---
 board/phytec/pcl063/spl.c | 23 -----------------------
 1 file changed, 23 deletions(-)
board/phytec/pcl063/spl.c index renamed from board/phytec/pcl063/spl.c +0 -0

6d4c827918..18fc251890 100644

board/phytec/pcl063/spl.c +0 -15
@@ -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:

board/phytec/pcl063/spl.c int board_mmc_init(bd_t *bis) · line 187

Quoted 10 lines
board/phytec/pcl063/spl.c +0 -7
-		/* 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)
Quoted 2 lines
board/phytec/pcl063/spl.c +0 -1
--

2.21.0