c2bdd018a3
Build tested: apalis, mx6sabresd, nitrogen6dl, nitrogen6dl2g, nitrogen6q,
nitrogen6q2g, nitrogen6s, nitrogen6s1g, wandboard
Run tested: apalis (pending PR #1595)
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Vladimir Vid <vladimir.vid@sartura.hr>
Cc: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
27 lines
766 B
Diff
27 lines
766 B
Diff
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
@@ -290,6 +290,12 @@ static void setup_iomux_enet(void)
|
|
udelay(100);
|
|
}
|
|
|
|
+void board_boot_order(u32 *spl_boot_list)
|
|
+{
|
|
+ spl_boot_list[0] = spl_boot_device();
|
|
+ spl_boot_list[1] = BOOT_DEVICE_MMC1;
|
|
+}
|
|
+
|
|
int board_phy_config(struct phy_device *phydev)
|
|
{
|
|
if (phydev->drv->config)
|
|
--- a/arch/arm/mach-imx/spl.c
|
|
+++ b/arch/arm/mach-imx/spl.c
|
|
@@ -167,7 +167,7 @@ int g_dnl_bind_fixup(struct usb_device_d
|
|
/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
|
|
u32 spl_boot_mode(const u32 boot_device)
|
|
{
|
|
- switch (spl_boot_device()) {
|
|
+ switch (boot_device) {
|
|
/* for MMC return either RAW or FAT mode */
|
|
case BOOT_DEVICE_MMC1:
|
|
case BOOT_DEVICE_MMC2:
|