]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
imx: i.MX7ULP: add get_boot_device
authorPeng Fan <peng.fan@nxp.com>
Mon, 22 Jul 2019 01:24:37 +0000 (01:24 +0000)
committerStefano Babic <sbabic@denx.de>
Tue, 8 Oct 2019 14:35:16 +0000 (16:35 +0200)
Add get_boot_device for i.MX7ULP

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Fabio Estevam <festevam@gmail.com>
arch/arm/include/asm/arch-mx7ulp/imx-regs.h
arch/arm/include/asm/arch-mx7ulp/sys_proto.h
arch/arm/mach-imx/mx7ulp/soc.c

index 63b02de0878b25e31a66082c353ca6f5374f8e3b..d58ed43199e177fe2b61e6802bb1c36346d370c3 100644 (file)
@@ -10,6 +10,8 @@
 
 #define ARCH_MXC
 
+#define ROM_SW_INFO_ADDR        0x000001E8
+
 #define CAAM_SEC_SRAM_BASE      (0x26000000)
 #define CAAM_SEC_SRAM_SIZE      (SZ_32K)
 #define CAAM_SEC_SRAM_END       (CAAM_SEC_SRAM_BASE + CAAM_SEC_SRAM_SIZE - 1)
@@ -1112,6 +1114,17 @@ struct usbphy_regs {
        u32     usb1_pfda_ctrl1_tog;            /* 0x14c */
 };
 
+struct bootrom_sw_info {
+       u8 reserved_1;
+       u8 boot_dev_instance;
+       u8 boot_dev_type;
+       u8 reserved_2;
+       u32 core_freq;
+       u32 axi_freq;
+       u32 ddr_freq;
+       u32 rom_tick_freq;
+       u32 reserved_3[3];
+};
 
 #define        is_boot_from_usb(void)          (!(readl(USB_PHY0_BASE_ADDR) & (1<<20)))
 #define        disconnect_from_pc(void)        writel(0x0, USBOTG0_RBASE + 0x140)
index 6ecde7db937746adb2a68584e29e0bd019d14004..0e4c8ad15d34ac33be050e5ed81f0a1aa085cb0a 100644 (file)
@@ -17,4 +17,5 @@ enum bt_mode {
        SINGLE_BOOT             /* LP_BT = 0, DUAL_BT = 0 */
 };
 
+enum boot_device get_boot_device(void);
 #endif
index c72f0ed3fc69252921ec0aadad8a78dbc4577184..6015c11869dca7d5103e5ad86016444a536ef8eb 100644 (file)
@@ -6,6 +6,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/hab.h>
 
 static char *get_reset_cause(char *);
@@ -244,3 +245,29 @@ int mmc_get_env_dev(void)
        return board_mmc_get_env_dev(devno);
 }
 #endif
+
+enum boot_device get_boot_device(void)
+{
+       struct bootrom_sw_info **p =
+               (struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
+
+       enum boot_device boot_dev = SD1_BOOT;
+       u8 boot_type = (*p)->boot_dev_type;
+       u8 boot_instance = (*p)->boot_dev_instance;
+
+       switch (boot_type) {
+       case BOOT_TYPE_SD:
+               boot_dev = boot_instance + SD1_BOOT;
+               break;
+       case BOOT_TYPE_MMC:
+               boot_dev = boot_instance + MMC1_BOOT;
+               break;
+       case BOOT_TYPE_USB:
+               boot_dev = USB_BOOT;
+               break;
+       default:
+               break;
+       }
+
+       return boot_dev;
+}