All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
To: u-boot@lists.denx.de
Subject: [PATCH 31/37] arm: iMX8ULP: Add boot device relevant functions
Date: Mon, 12 Apr 2021 20:13:00 +0800	[thread overview]
Message-ID: <20210412121306.11484-32-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20210412121306.11484-1-peng.fan@oss.nxp.com>

From: Ye Li <ye.li@nxp.com>

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 |  1 +
 arch/arm/mach-imx/imx8ulp/soc.c               | 83 +++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h
index 47ee46bdf4..1a142dce72 100644
--- a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h
+++ b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h
@@ -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
diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c
index 527a4e17d8..3fd49b220b 100644
--- a/arch/arm/mach-imx/imx8ulp/soc.c
+++ b/arch/arm/mach-imx/imx8ulp/soc.c
@@ -26,6 +26,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);
+	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);
+	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;
-- 
2.30.0

  parent reply	other threads:[~2021-04-12 12:13 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12 12:12 [PATCH 00/37] imx: add i.MX8ULP support Peng Fan
2021-04-12 12:12 ` [PATCH 01/37] arm: imx: add i.MX8ULP basic Kconfig option Peng Fan
2021-04-12 12:12 ` [PATCH 02/37] arm: imx: add i.MX8ULP cpu type and helper Peng Fan
2021-04-12 12:12 ` [PATCH 03/37] arm: imx: sys_proto: move boot mode define to common header Peng Fan
2021-04-12 12:12 ` [PATCH 04/37] arm: imx8ulp: support print cpu info Peng Fan
2021-04-12 12:12 ` [PATCH 05/37] imx: imx8ulp: add get reset cause Peng Fan
2021-04-12 12:12 ` [PATCH 06/37] arm: imx: basic i.MX8ULP support Peng Fan
2021-04-12 12:12 ` [PATCH 07/37] arm: imx8: Move container parser and image to mach-imx common folder Peng Fan
2021-04-12 12:12 ` [PATCH 08/37] arm: imx8: Move container image header file to mach-imx Peng Fan
2021-04-12 12:12 ` [PATCH 09/37] arm: imx: parse-container: guard included header files Peng Fan
2021-04-12 12:12 ` [PATCH 10/37] arm: imx8ulp: add container support Peng Fan
2021-04-12 12:12 ` [PATCH 11/37] arm: imx: move container Kconfig under mach-imx Peng Fan
2021-04-12 12:12 ` [PATCH 12/37] driver: misc: Add MU and S400 API to communicate with Sentinel Peng Fan
2021-04-12 12:12 ` [PATCH 13/37] net: fec_mxc: support i.MX8ULP Peng Fan
2021-04-15  1:42   ` Ramon Fried
2021-04-12 12:12 ` [PATCH 14/37] pinctrl: Add pinctrl driver for imx8ulp Peng Fan
2021-04-12 12:12 ` [PATCH 15/37] driver: serial: fsl_lpuart: support i.MX8ULP Peng Fan
2021-04-12 12:12 ` [PATCH 16/37] arm: imx8ulp: add clock support Peng Fan
2021-04-12 12:12 ` [PATCH 17/37] drivers: mmc: fsl_esdhc_imx: support i.MX8ULP Peng Fan
2021-04-12 12:12 ` [PATCH 18/37] arm: imx8ulp: soc: Change to use CMC1 to get bootcfg Peng Fan
2021-04-12 12:12 ` [PATCH 19/37] arm: imx8ulp: Enable full L2 cache in SPL Peng Fan
2021-04-12 12:12 ` [PATCH 20/37] arm: imx8ulp: disable wdog3 Peng Fan
2021-04-12 12:12 ` [PATCH 21/37] arm: imx8ulp: Update the reset vector in u-boot Peng Fan
2021-04-12 12:12 ` [PATCH 22/37] drivers: misc: s400_api: Update S400_SUCCESS_IND to 0xd6 Peng Fan
2021-04-12 12:12 ` [PATCH 23/37] drivers: misc: imx8ulp: Add S400 API for image authentication Peng Fan
2021-04-12 12:12 ` [PATCH 24/37] drivers: misc: imx8ulp: Update S400 API for release RDC Peng Fan
2021-04-12 12:12 ` [PATCH 25/37] drivers: misc: s400_api: Update API for fuse read and write Peng Fan
2021-04-12 12:12 ` [PATCH 26/37] arm: imx8ulp: release and configure XRDC at early phase Peng Fan
2021-04-12 12:12 ` [PATCH 27/37] arm: imx8ulp: add xrdc support Peng Fan
2021-04-12 12:12 ` [PATCH 28/37] arm: imx8ulp: add trdc release request Peng Fan
2021-04-12 12:12 ` [PATCH 29/37] arm: imx8ulp: release trdc and assign lpav from RTD to APD Peng Fan
2021-04-12 12:12 ` [PATCH 30/37] arm: imx8ulp: Probe the S400 MU device in arch init Peng Fan
2021-04-12 12:13 ` Peng Fan [this message]
2021-04-12 12:13 ` [PATCH 32/37] arm: imx8ulp: Allocate DCNANO and MIPI_DSI to AD domain Peng Fan
2021-04-12 12:13 ` [PATCH 33/37] arm: imx8ulp: add dummy imx_get_mac_from_fuse Peng Fan
2021-04-12 12:13 ` [PATCH 34/37] arm: imx8ulp: add iomuxc support Peng Fan
2021-04-12 12:13 ` [PATCH 35/37] driver: misc: imx8ulp: Add fuse driver for imx8ulp Peng Fan
2021-04-12 12:13 ` [PATCH 36/37] arm: dts: add i.MX8ULP dtsi Peng Fan
2021-04-12 12:13 ` [PATCH 37/37] arm: imx: add i.MX8ULP EVK support Peng Fan
2021-04-23 16:57   ` Fabio Estevam
2021-04-23 17:18     ` Fabio Estevam
2021-04-25  1:36       ` Peng Fan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210412121306.11484-32-peng.fan@oss.nxp.com \
    --to=peng.fan@oss.nxp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.