diff options
| author | Jagan Teki <jagannadh.teki@gmail.com> | 2017-11-21 00:02:16 +0530 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-11-27 10:36:40 +0100 |
| commit | 52aaddd6f415397bb2eae0d68a8cc1c5c4a98bb3 (patch) | |
| tree | 9370094a6c8c59b0c5fd95cf7619797a3839f43b /board/engicam/common | |
| parent | 539b1e228f0dda602e4b64ccbdf0d338988dec6c (diff) | |
| download | u-boot-52aaddd6f415397bb2eae0d68a8cc1c5c4a98bb3.tar.gz | |
i.MX6: engicam: Add imx6q/imx6ul boards for existing boards
Add new board names for existing board support
imx6q - icore and icore_rqs boards
imx6ul - geam6ul and isiot boards
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'board/engicam/common')
| -rw-r--r-- | board/engicam/common/board.c | 2 | ||||
| -rw-r--r-- | board/engicam/common/spl.c | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index f86fb2be42..f633c71916 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -49,7 +49,7 @@ static void setenv_fdt_file(void) } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit")) env_set("fdt_file", "imx6ul-geam-kit.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc")) - env_set("fdt_file", "imx6ul-isiot-mmc.dtb"); + env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index f8ae3acb0d..6e2389dd4b 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -55,6 +55,32 @@ int board_fit_config_name_match(const char *name) } #endif +#ifdef CONFIG_ENV_IS_IN_MMC +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: + /* SD/eSD - BOOT_DEVICE_MMC1 */ + break; + case IMX6_BMODE_MMC: + case IMX6_BMODE_EMMC: + /* MMC/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 + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { |