diff options
| -rw-r--r-- | board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.c | 2 | ||||
| -rw-r--r-- | board/phytec/phycore_imx8mm/phycore-imx8mm.c | 2 | ||||
| -rw-r--r-- | board/phytec/phycore_imx8mp/phycore-imx8mp.c | 5 | ||||
| -rw-r--r-- | board/phytec/phycore_imx8mp/phycore_imx8mp.env | 6 | ||||
| -rw-r--r-- | configs/phycore-imx8mp_defconfig | 1 |
5 files changed, 7 insertions, 9 deletions
diff --git a/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.c b/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.c index ffa21da1b34..dbbcbec18cd 100644 --- a/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.c +++ b/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.c @@ -60,7 +60,7 @@ int board_late_init(void) switch (get_boot_device()) { case SD2_BOOT: env_set_ulong("mmcdev", 1); - if (!strcmp(env_get("boot_targets"), env_get_default("boot_targets"))) + if (!env_get("boot_targets")) env_set("boot_targets", "mmc1 mmc2 ethernet"); break; case MMC3_BOOT: diff --git a/board/phytec/phycore_imx8mm/phycore-imx8mm.c b/board/phytec/phycore_imx8mm/phycore-imx8mm.c index 06cffbca3a6..f6ae0bf0308 100644 --- a/board/phytec/phycore_imx8mm/phycore-imx8mm.c +++ b/board/phytec/phycore_imx8mm/phycore-imx8mm.c @@ -41,6 +41,8 @@ int board_late_init(void) switch (get_boot_device()) { case SD2_BOOT: env_set_ulong("mmcdev", 1); + if (!env_get("boot_targets")) + env_set("boot_targets", "mmc1 mmc2 ethernet"); break; case MMC3_BOOT: env_set_ulong("mmcdev", 2); diff --git a/board/phytec/phycore_imx8mp/phycore-imx8mp.c b/board/phytec/phycore_imx8mp/phycore-imx8mp.c index bf2d5ce01fa..b345dc7c985 100644 --- a/board/phytec/phycore_imx8mp/phycore-imx8mp.c +++ b/board/phytec/phycore_imx8mp/phycore-imx8mp.c @@ -76,13 +76,16 @@ int board_late_init(void) switch (get_boot_device()) { case SD2_BOOT: env_set_ulong("mmcdev", 1); + if (!env_get("boot_targets")) + env_set("boot_targets", "mmc1 mmc2 usb ethernet"); break; case MMC3_BOOT: env_set_ulong("mmcdev", 2); break; case USB_BOOT: printf("Detect USB boot. Will enter fastboot mode!\n"); - env_set_ulong("dofastboot", 1); + if (!strcmp(env_get("bootcmd"), env_get_default("bootcmd"))) + env_set("bootcmd", "fastboot 0; bootflow scan -lb;"); break; default: break; diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env index f825c7bc61f..c339c315c30 100644 --- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env +++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env @@ -1,11 +1,5 @@ -bootcmd= - if test ${dofastboot} = 1; then - fastboot 0; - fi; - bootflow scan -lb; boot_script_dhcp=net_boot_fit.scr.uimg console=ttymxc0,115200 -dofastboot=0 emmc_dev=2 /* This is needed by built-in uuu flash scripts */ fastboot_raw_partition_all=0 4194304 fastboot_raw_partition_bootloader=64 8128 diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index c497f0bcd91..2fcf7db9e5c 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -38,7 +38,6 @@ CONFIG_BOOTSTD_FULL=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_FDT_FIXUP_PARTITIONS=y -# CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="oftree" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 |