From: Jagan Teki <jagan@amarulasolutions.com>
To: u-boot@lists.denx.de
Subject: [PATCH 02/11] distro_bootcmd: Add SF support
Date: Sat, 21 Dec 2019 13:24:31 +0530 [thread overview]
Message-ID: <20191221075440.6944-3-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20191221075440.6944-1-jagan@amarulasolutions.com>
Add distro boot command support for SPI flash.
This distro boot will read the boot script at specific
location at the flash and start sourcing the same.
The common macro like BOOTENV_SHARED_FLASH would help
to extend the support for nand flash in future.
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/config_distro_bootcmd.h | 35 +++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index fc0935fa21..d68b79e290 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -43,6 +43,22 @@
#define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \
#devtypel #instance " "
+#define BOOTENV_SHARED_SF_BODY(devtypel) \
+ "if " #devtypel " probe ${devnum}; then " \
+ "devtype=" #devtypel "; " \
+ "run scan_flash_for_scripts; " \
+ "fi\0"
+
+#define BOOTENV_SHARED_FLASH(devtypel) \
+ #devtypel "_boot=" \
+ BOOTENV_SHARED_SF_BODY(devtypel)
+
+#define BOOTENV_DEV_FLASH(devtypeu, devtypel, instance) \
+ BOOTENV_DEV_BLKDEV(devtypeu, devtypel, instance)
+
+#define BOOTENV_DEV_NAME_FLASH(devtypeu, devtypel, instance) \
+ BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance)
+
#ifdef CONFIG_SANDBOX
#define BOOTENV_SHARED_HOST BOOTENV_SHARED_BLKDEV(host)
#define BOOTENV_DEV_HOST BOOTENV_DEV_BLKDEV
@@ -398,6 +414,18 @@
BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
#endif
+#if defined(CONFIG_CMD_SF)
+#define BOOTENV_SHARED_SF BOOTENV_SHARED_FLASH(sf)
+#define BOOTENV_DEV_SF BOOTENV_DEV_FLASH
+#define BOOTENV_DEV_NAME_SF BOOTENV_DEV_NAME_FLASH
+#else
+#define BOOTENV_SHARED_SF
+#define BOOTENV_DEV_SF \
+ BOOT_TARGET_DEVICES_references_SF_without_CONFIG_CMD_SF
+#define BOOTENV_DEV_NAME_SF \
+ BOOT_TARGET_DEVICES_references_SF_without_CONFIG_CMD_SF
+#endif
+
#define BOOTENV_DEV_NAME(devtypeu, devtypel, instance) \
BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance)
#define BOOTENV_BOOT_TARGETS \
@@ -412,6 +440,7 @@
BOOTENV_SHARED_USB \
BOOTENV_SHARED_SATA \
BOOTENV_SHARED_SCSI \
+ BOOTENV_SHARED_SF \
BOOTENV_SHARED_NVME \
BOOTENV_SHARED_IDE \
BOOTENV_SHARED_UBIFS \
@@ -436,6 +465,12 @@
"echo SCRIPT FAILED: continuing...; " \
"fi\0" \
\
+ "scan_flash_for_scripts=" \
+ "${devtype} read ${scriptaddr} " \
+ "${script_offset_f} ${script_size_f}; " \
+ "source ${scriptaddr}; " \
+ "echo SCRIPT FAILED: continuing...\0" \
+ \
"boot_a_script=" \
"load ${devtype} ${devnum}:${distro_bootpart} " \
"${scriptaddr} ${prefix}${script}; " \
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2019-12-21 7:54 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 7:54 [PATCH 00/11] rk3399: SPI boot support (fixes, updates) Jagan Teki
2019-12-21 7:54 ` [PATCH 01/11] spi: rk: Limit transfers to (64K - 1) bytes Jagan Teki
2019-12-23 2:30 ` Kever Yang
2019-12-27 5:55 ` Jagan Teki
2019-12-21 7:54 ` Jagan Teki [this message]
2019-12-30 3:07 ` [PATCH 02/11] distro_bootcmd: Add SF support Kever Yang
2020-01-20 17:22 ` Tom Rini
2020-01-20 17:40 ` Alexander Graf
2020-01-23 16:55 ` Jagan Teki
2020-01-23 17:03 ` Tom Rini
2020-01-23 17:11 ` Jagan Teki
2020-01-23 17:15 ` Tom Rini
2020-01-23 17:29 ` Jagan Teki
2020-01-23 17:59 ` Tom Rini
2019-12-21 7:54 ` [PATCH 03/11] rockchip: Include SF on distrocmd devices Jagan Teki
2020-01-07 8:44 ` Kever Yang
2019-12-21 7:54 ` [PATCH 04/11] rk3399: Add boot flash script offet, size Jagan Teki
2019-12-30 3:06 ` Kever Yang
2019-12-21 7:54 ` [PATCH 05/11] rk3399: Check MMC env while defining it Jagan Teki
2019-12-30 3:06 ` Kever Yang
2019-12-21 7:54 ` [PATCH 06/11] env: kconfig: Restrict rockchip env for MMC Jagan Teki
2019-12-30 3:05 ` Kever Yang
2019-12-21 7:54 ` [PATCH 07/11] env: Enable SPI flash env for rockchip Jagan Teki
2019-12-23 2:34 ` Kever Yang
2019-12-27 6:50 ` Jagan Teki
2019-12-27 10:02 ` Kever Yang
2019-12-27 10:10 ` Jagan Teki
2019-12-27 10:30 ` Soeren Moch
2019-12-27 12:04 ` Jagan Teki
2019-12-27 13:19 ` Soeren Moch
2019-12-28 12:08 ` Jagan Teki
2019-12-30 9:04 ` Soeren Moch
2019-12-30 2:59 ` Kever Yang
2019-12-21 7:54 ` [PATCH 08/11] rockchip: dts: Sync ROC-RK3399-PC changes from Linux Jagan Teki
2019-12-30 3:00 ` Kever Yang
2019-12-21 7:54 ` [PATCH 09/11] roc-pc-rk3399: Enable SPI Flash Jagan Teki
2019-12-30 3:00 ` Kever Yang
2019-12-21 7:54 ` [PATCH 10/11] rockpro-rk3399: " Jagan Teki
2019-12-30 3:00 ` Kever Yang
2019-12-30 11:51 ` Emmanuel Vadot
2020-01-08 12:59 ` Jagan Teki
2019-12-21 7:54 ` [PATCH 11/11] roc-rk3399-pc: Add SPI boot support Jagan Teki
2019-12-30 3:05 ` Kever Yang
2019-12-30 7:52 ` Jagan Teki
2020-01-07 8:53 ` Kever Yang
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=20191221075440.6944-3-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox