]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: iMX8ULP: Add boot device relevant functions
authorYe Li <ye.li@nxp.com>
Sat, 7 Aug 2021 08:01:01 +0000 (16:01 +0800)
committerStefano Babic <sbabic@denx.de>
Mon, 9 Aug 2021 12:46:51 +0000 (14:46 +0200)
Read from ROM API to get current boot device.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
arch/arm/include/asm/arch-imx8ulp/sys_proto.h
arch/arm/mach-imx/imx8ulp/soc.c

index 47ee46bdf4b64f5fb4c826a7e497c54dd11ff514..1a142dce72900a10ecd9253619565e0cb76e227d 100644 (file)
@@ -15,4 +15,5 @@ ulong spl_romapi_get_uboot_base(u32 image_offset, u32 rom_bt_dev);
 enum bt_mode get_boot_mode(void);
 int xrdc_config_pdac(u32 bridge, u32 index, u32 dom, u32 perm);
 int xrdc_config_pdac_openacc(u32 bridge, u32 index);
+enum boot_device get_boot_device(void);
 #endif
index 8828a943183efac2028808e881c071aad4ad0f93..add461844050c46da5c6e88280b74360d20cabfc 100644 (file)
@@ -9,6 +9,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/armv8/mmu.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/global_data.h>
 #include <efi_loader.h>
 #include <spl.h>
 #include <asm/arch/rdc.h>
@@ -27,6 +28,89 @@ DECLARE_GLOBAL_DATA_PTR;
 
 struct rom_api *g_rom_api = (struct rom_api *)0x1980;
 
+enum boot_device get_boot_device(void)
+{
+       volatile gd_t *pgd = gd;
+       int ret;
+       u32 boot;
+       u16 boot_type;
+       u8 boot_instance;
+       enum boot_device boot_dev = SD1_BOOT;
+
+       ret = g_rom_api->query_boot_infor(QUERY_BT_DEV, &boot,
+                                         ((uintptr_t)&boot) ^ QUERY_BT_DEV);
+       set_gd(pgd);
+
+       if (ret != ROM_API_OKAY) {
+               puts("ROMAPI: failure at query_boot_info\n");
+               return -1;
+       }
+
+       boot_type = boot >> 16;
+       boot_instance = (boot >> 8) & 0xff;
+
+       switch (boot_type) {
+       case BT_DEV_TYPE_SD:
+               boot_dev = boot_instance + SD1_BOOT;
+               break;
+       case BT_DEV_TYPE_MMC:
+               boot_dev = boot_instance + MMC1_BOOT;
+               break;
+       case BT_DEV_TYPE_NAND:
+               boot_dev = NAND_BOOT;
+               break;
+       case BT_DEV_TYPE_FLEXSPINOR:
+               boot_dev = QSPI_BOOT;
+               break;
+       case BT_DEV_TYPE_USB:
+               boot_dev = USB_BOOT;
+               break;
+       default:
+               break;
+       }
+
+       return boot_dev;
+}
+
+bool is_usb_boot(void)
+{
+       return get_boot_device() == USB_BOOT;
+}
+
+#ifdef CONFIG_ENV_IS_IN_MMC
+__weak int board_mmc_get_env_dev(int devno)
+{
+       return devno;
+}
+
+int mmc_get_env_dev(void)
+{
+       volatile gd_t *pgd = gd;
+       int ret;
+       u32 boot;
+       u16 boot_type;
+       u8 boot_instance;
+
+       ret = g_rom_api->query_boot_infor(QUERY_BT_DEV, &boot,
+                                         ((uintptr_t)&boot) ^ QUERY_BT_DEV);
+       set_gd(pgd);
+
+       if (ret != ROM_API_OKAY) {
+               puts("ROMAPI: failure at query_boot_info\n");
+               return CONFIG_SYS_MMC_ENV_DEV;
+       }
+
+       boot_type = boot >> 16;
+       boot_instance = (boot >> 8) & 0xff;
+
+       /* If not boot from sd/mmc, use default value */
+       if (boot_type != BOOT_TYPE_SD && boot_type != BOOT_TYPE_MMC)
+               return env_get_ulong("mmcdev", 10, CONFIG_SYS_MMC_ENV_DEV);
+
+       return board_mmc_get_env_dev(boot_instance);
+}
+#endif
+
 u32 get_cpu_rev(void)
 {
        return (MXC_CPU_IMX8ULP << 12) | CHIP_REV_1_0;