From: Frieder Schrempf <[email protected]> Now that the fallback to SPI NOR as boot device can be properly detected, remove the workaround.
Signed-off-by: Frieder Schrempf <[email protected]> --- board/sielaff/imx6dl-sielaff/spl.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/board/sielaff/imx6dl-sielaff/spl.c b/board/sielaff/imx6dl-sielaff/spl.c index 6815952c0fb..ae36ff5712c 100644 --- a/board/sielaff/imx6dl-sielaff/spl.c +++ b/board/sielaff/imx6dl-sielaff/spl.c @@ -249,25 +249,3 @@ void board_init_f(ulong dummy) /* load/boot image from boot device */ board_init_r(NULL, 0); } - -void board_boot_order(u32 *spl_boot_list) -{ - u32 bootdev = spl_boot_device(); - - /* - * The default boot fuse settings use the SD card (MMC1) as primary - * boot device, but allow SPI NOR as a fallback boot device. - * We can't detect the fallback case and spl_boot_device() will return - * BOOT_DEVICE_MMC1 despite the actual boot device being SPI NOR. - * Therefore we try to load U-Boot proper vom SPI NOR after loading - * from MMC has failed. - */ - spl_boot_list[0] = bootdev; - - switch (bootdev) { - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: - spl_boot_list[1] = BOOT_DEVICE_SPI; - break; - } -} -- 2.55.0
