Skip to contentSkip to conversation

NAND/MMC environment in SPL, Falcon Mode enhancements

PATCH Superseded Tom Rini 2 participants 15 messages Dec 9, 2013 – Dec 16, 2013

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

v2 cover NAND/MMC environment in SPL, Falcon Mode enhancements

Hey all,

This series fixes a few bugs / issues, and then sets things up so that we can use MMC (or NAND) for environment in SPL, in addition to NOR flash or simply built-in. The end result is that Falcon Mode becomes much more configurable via the environment, and thus from within Linux.

Changes in v2:
- Add patch to make TI ARMv7 platforms have SPL stack in DDR, once DDR is configured.
- Dropped change to make redundant mmc env use malloc (Wolfgang)
- Fixed fw_printenv tool to use '%ms' for device name (Wolfgang)
- Add a patch to drop some now useless code in env_mmc.c wrt checking for NULL temp buffers (they're stack not malloc now).
- Document CONFIG_SPL_MTD_SUPPORT in the README (Scott)
- Surround adding nand_util.o with CONFIG_SPL_ENV_SUPPORT test (Scott noted the problem, hopefully this solution is good enough until Kconfig)

Signature · 1 line
Tom
author
#1 lore raw

PATCH v2 1/12 TI:armv7: Change CONFIG_SPL_STACK to not be CONFIG_SYS_INIT_SP_ADDR

There are times where we may need more than a few kilobytes of stack space. We also will not be using CONFIG_SPL_STACK location prior to DDR being initialized (CONFIG_SYS_INIT_SP_ADDR is still used there) so pick a good location within DDR for this to be. Tested on OMAP4/AM335x/OMAP5/DRA7xx.

---
 include/configs/ti_armv7_common.h |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
include/configs/ti_armv7_common.h +10 -7
index 99b60fc..4d09ad9 100644
@@ -176,14 +176,17 @@
 
 /*
  * Place the image at the start of the ROM defined image space.
- * We limit our size to the ROM-defined downloaded image area, and use the
- * rest of the space for stack.  We load U-Boot itself into memory at
- * 0x80800000 for legacy reasons (to not conflict with older SPLs).  We
- * have our BSS be placed 1MiB after this, to allow for the default
- * Linux kernel address of 0x80008000 to work, in the Falcon Mode case.
- * We have the SPL malloc pool at the end of the BSS area.
+ * We limit our size to the ROM-defined downloaded image area, and use
+ * the rest of the space for a temporary stack space.  We reserve 4MiB
+ * between the malloc space at device tree space (for Falcon Mode) for
+ * SPL stack as some operations may use a large amount of spsce.  We
+ * load U-Boot itself into memory at 0x80800000 for legacy reasons (to
+ * not conflict with older SPLs).  We have our BSS be placed 2MiB after
+ * this, to allow for the default Linux kernel address of 0x80008000 to
+ * work, in the Falcon Mode case.  We have the SPL malloc pool at the
+ * end of the BSS area.
  */
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+#define CONFIG_SPL_STACK		0x80e80000
 #define CONFIG_SYS_TEXT_BASE		0x80800000
 #define CONFIG_SPL_BSS_START_ADDR	0x80a00000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH v2 1/12 TI:armv7: Change CONFIG_SPL_STACK to not be CONFIG_SYS_INIT_SP_ADDR

Quoted 7 lines · Tom Rini

There are times where we may need more than a few kilobytes of stack space. We also will not be using CONFIG_SPL_STACK location prior to DDR being initialized (CONFIG_SYS_INIT_SP_ADDR is still used there) so pick a good location within DDR for this to be. Tested on OMAP4/AM335x/OMAP5/DRA7xx.

After getting this tested on AM43xx, there's something to be changed / solved here as those boards do not like this change. So, some sort of change is requested, but I'm not sure just what yet.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/e0e09212/attachment.pgp>
author
#3 lore raw

PATCH v2 2/12 fw_env.c: Switch get_config to use '%ms' in sscanf

In reply to Tom Rini

We currently limit ourself to 16 characters for the device name to read the environment from. This is insufficient for /dev/mmcblk0boot1 to work for example. Switch to '%ms' which gives us a dynamically allocated buffer instead. We're short lived enough to not bother free()ing the buffer.

---
Changes in v2:
- Rework to use '%ms' in get_config per Wolfgang

---
 tools/env/fw_env.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
tools/env/fw_env.c +8 -5
index 577ce2d..14485c1 100644
@@ -40,7 +40,7 @@
 	_min1 < _min2 ? _min1 : _min2; })
 
 struct envdev_s {
-	char devname[16];		/* Device name */
+	const char *devname;		/* Device name */
 	ulong devoff;			/* Device offset */
 	ulong env_size;			/* environment size */
 	ulong erase_size;		/* device erase size */
@@ -1243,7 +1243,7 @@ static int parse_config ()
 		return -1;
 	}
 #else
-	strcpy (DEVNAME (0), DEVICE1_NAME);
+	DEVNAME (0) = DEVICE1_NAME;
 	DEVOFFSET (0) = DEVICE1_OFFSET;
 	ENVSIZE (0) = ENV1_SIZE;
 	/* Default values are: erase-size=env-size, #sectors=1 */
@@ -1257,7 +1257,7 @@ static int parse_config ()
 #endif
 
 #ifdef HAVE_REDUND
-	strcpy (DEVNAME (1), DEVICE2_NAME);
+	DEVNAME (1) = DEVICE2_NAME;
 	DEVOFFSET (1) = DEVICE2_OFFSET;
 	ENVSIZE (1) = ENV2_SIZE;
 	/* Default values are: erase-size=env-size, #sectors=1 */
@@ -1295,6 +1295,7 @@ static int get_config (char *fname)
 	int i = 0;
 	int rc;
 	char dump[128];
+	char *devname;
 
 	fp = fopen (fname, "r");
 	if (fp == NULL)
@@ -1305,8 +1306,8 @@ static int get_config (char *fname)
 		if (dump[0] == '#')
 			continue;
 
-		rc = sscanf (dump, "%s %lx %lx %lx %lx",
-			     DEVNAME (i),
+		rc = sscanf (dump, "%ms %lx %lx %lx %lx",
+			     &devname,
 			     &DEVOFFSET (i),
 			     &ENVSIZE (i),
 			     &DEVESIZE (i),
@@ -1315,6 +1316,8 @@ static int get_config (char *fname)
 		if (rc < 3)
 			continue;
 
+		DEVNAME(i) = devname;
+
 		if (rc < 4)
 			/* Assume the erase size is the same as the env-size */
 			DEVESIZE(i) = ENVSIZE(i);
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH v2 3/12 env_mmc.c: Allow environment to be used within SPL

In reply to Tom Rini

Inside of SPL we only concern ourself with one MMC device, so instead of being able to use CONFIG_SYS_MMC_ENV_DEV we need to use 0 in SPL. Switch the code to use a 'dev' variable to facilitate this.

---
 common/env_mmc.c |   45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)
common/env_mmc.c +37 -8
index 045428c..d42168b 100644
@@ -64,6 +64,14 @@ int env_init(void)
 
 static int init_mmc_for_env(struct mmc *mmc)
 {
+#ifdef CONFIG_SYS_MMC_ENV_PART
+	int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+	dev = 0;
+#endif
+#endif
+
 	if (!mmc) {
 		puts("No MMC card found\n");
 		return -1;
@@ -76,8 +84,7 @@ static int init_mmc_for_env(struct mmc *mmc)
 
 #ifdef CONFIG_SYS_MMC_ENV_PART
 	if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) {
-		if (mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
-				    CONFIG_SYS_MMC_ENV_PART)) {
+		if (mmc_switch_part(dev, CONFIG_SYS_MMC_ENV_PART)) {
 			puts("MMC partition switch failed\n");
 			return -1;
 		}
@@ -90,9 +97,13 @@ static int init_mmc_for_env(struct mmc *mmc)
 static void fini_mmc_for_env(struct mmc *mmc)
 {
 #ifdef CONFIG_SYS_MMC_ENV_PART
+	int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+	dev = 0;
+#endif
 	if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num)
-		mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
-				mmc->part_num);
+		mmc_switch_part(dev, mmc->part_num);
 #endif
 }
 
@@ -174,12 +185,16 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
 			   unsigned long offset, const void *buffer)
 {
 	uint blk_start, blk_cnt, n;
+	int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+	dev = 0;
+#endif
 
 	blk_start	= ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
 	blk_cnt		= ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
 
-	n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
-					blk_cnt, (uchar *)buffer);
+	n = mmc->block_dev.block_read(dev, blk_start, blk_cnt, (uchar *)buffer);
 
 	return (n == blk_cnt) ? 0 : -1;
 }
@@ -188,16 +203,23 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
 void env_relocate_spec(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
-	struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+	struct mmc *mmc;
 	u32 offset1, offset2;
 	int read1_fail = 0, read2_fail = 0;
 	int crc1_ok = 0, crc2_ok = 0;
 	env_t *ep;
 	int ret;
+	int dev = CONFIG_SYS_MMC_ENV_DEV;
 
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1);
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
 
+#ifdef CONFIG_SPL_BUILD
+	dev = 0;
+#endif
+
+	mmc = find_mmc_device(dev);
+
 	if (tmp_env1 == NULL || tmp_env2 == NULL) {
 		puts("Can't allocate buffers for environment\n");
 		ret = 1;
@@ -274,9 +296,16 @@ void env_relocate_spec(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
-	struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+	struct mmc *mmc;
 	u32 offset;
 	int ret;
+	int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+	dev = 0;
+#endif
+
+	mmc = find_mmc_device(dev);
 
 	if (init_mmc_for_env(mmc)) {
 		ret = 1;
Signature · 1 line
1.7.9.5
author
#5 lore raw

PATCH v2 4/12 env_mmc.c: Remove NULL check on tmp_env1/2

In reply to Tom Rini

With 452a272 we moved to allocating these variables on the stack. So they will never now be NULL so remove these checks.

---
 common/env_mmc.c |    6 ------
 1 file changed, 6 deletions(-)
common/env_mmc.c +0 -6
index d42168b..f47bd77 100644
@@ -220,12 +220,6 @@ void env_relocate_spec(void)
 
 	mmc = find_mmc_device(dev);
 
-	if (tmp_env1 == NULL || tmp_env2 == NULL) {
-		puts("Can't allocate buffers for environment\n");
-		ret = 1;
-		goto err;
-	}
-
 	if (init_mmc_for_env(mmc)) {
 		ret = 1;
 		goto err;
Signature · 1 line
1.7.9.5
author
#6 lore raw

PATCH v2 5/12 mtd: Add a CONFIG_SPL_MTD_SUPPORT for a more full NAND subsystem in SPL

In reply to Tom Rini

This mainly converts the am335x_spl_bch driver to the "normal" format which means a slight change to nand_info within the driver.

---
Changes in v2:
- Document CONFIG_SPL_MTD_SUPPORT in the README

---
 README                            |    4 +++
 drivers/mtd/nand/am335x_spl_bch.c |   54 ++++++++++++++++++-------------------
 include/configs/ti_armv7_common.h |    1 +
 spl/Makefile                      |    1 +
 4 files changed, 33 insertions(+), 27 deletions(-)
README +4 -0
index 265e81e..1b5a598 100644
@@ -3229,6 +3229,10 @@ FIT uImage format:
 		Support for NAND boot using simple NAND drivers that
 		expose the cmd_ctrl() interface.
 
+		CONFIG_SPL_MTD_SUPPORT
+		Support for the MTD subsystem within SPL.  Useful for
+		environment on NAND support within SPL.
+
 		CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 		Set for the SPL on PPC mpc8xxx targets, support for
 		drivers/ddr/fsl/libddr.o in SPL binary.
drivers/mtd/nand/am335x_spl_bch.c +27 -27

146 lines not on this page · raw message

include/configs/ti_armv7_common.h +1 -0
index 4d09ad9..c3ca5a5 100644
@@ -245,6 +245,7 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
+#define CONFIG_SPL_MTD_SUPPORT
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 #endif
spl/Makefile +1 -0
index 2a787af..97a4905 100644
@@ -79,6 +79,7 @@ LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
 LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \
 	drivers/power/pmic/
 LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/
+LIBS-$(CONFIG_SPL_MTD_SUPPORT) += drivers/mtd/
 LIBS-$(CONFIG_SPL_ONENAND_SUPPORT) += drivers/mtd/onenand/
 LIBS-$(CONFIG_SPL_DMA_SUPPORT) += drivers/dma/
 LIBS-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
Signature · 1 line
1.7.9.5
author
#7 lore raw

PATCH v2 6/12 mtd: Build nand_util.o for CONFIG_ENV_IS_IN_NAND in SPL

In reply to Tom Rini

---
Changes in v2:
- Surround adding nand_util.o with CONFIG_SPL_ENV_SUPPORT test

---
 drivers/mtd/nand/Makefile |    3 +++
 1 file changed, 3 insertions(+)
drivers/mtd/nand/Makefile +3 -0
index e145cd1..ca978ae 100644
@@ -20,6 +20,9 @@ obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o
 obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o
 obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o
 obj-$(CONFIG_SPL_NAND_INIT) += nand.o
+ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
+obj-$(CONFIG_ENV_IS_IN_NAND) += nand_util.o
+endif
 
 else # not spl
 
Signature · 1 line
1.7.9.5
author
#9 lore raw

PATCH v2 7/12 spl: Make CONFIG_SPL_ENV_SUPPORT have to be set by all users of env in SPL

In reply to Tom Rini

Previously, we forced a "no environment" choice on network using SPL. Now we allow all users to set where they want to look for their environment. This means we have to set CONFIG_SPL_ENV_SUPPORT now for ti_armv7_common.h.

---
 common/Makefile                   |    7 ++++---
 include/configs/ti_armv7_common.h |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
common/Makefile +4 -3
index 74404be..5ddddfb 100644
@@ -197,14 +197,15 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
-ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
+ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
-else
-obj-y += env_nowhere.o
 endif
 endif
 # core command
include/configs/ti_armv7_common.h +1 -0
index c3ca5a5..8ee34b2 100644
@@ -203,6 +203,7 @@
 #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
 
 #ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_SPL_ENV_SUPPORT			/* For 'boot_os' and similar */
 #define CONFIG_SYS_SPL_ARGS_ADDR		0x80F80000
 
 /* FAT */
Signature · 1 line
1.7.9.5
author
#10 lore raw

PATCH v2 8/12 am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode

In reply to Tom Rini

We use the same variable as a3m071 in the environment to determine if we should boot into Linux or U-Boot. This is useful on boards like Beaglebone Black or AM335x GP EVM where we have persistent storage for the environment.

---
 board/ti/am335x/board.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
board/ti/am335x/board.c +12 -1
index db225ce..faf2bda 100644
@@ -30,6 +30,7 @@
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
+#include <environment.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -236,7 +237,17 @@ static struct emif_regs ddr3_evm_emif_reg_data = {
 int spl_start_uboot(void)
 {
 	/* break into full u-boot on 'c' */
-	return (serial_tstc() && serial_getc() == 'c');
+	if (serial_tstc() && serial_getc() == 'c')
+		return 1;
+
+#ifdef CONFIG_SPL_ENV_SUPPORT
+	env_init();
+	env_relocate_spec();
+	if (getenv_yesno("boot_os") != 1)
+		return 1;
+#endif
+
+	return 0;
 }
 #endif
 
Signature · 1 line
1.7.9.5
author
#11 lore raw

PATCH v2 9/12 README: Add CONFIG_SPL_OS_BOOT to README

In reply to Tom Rini
---
 README |    4 ++++
 1 file changed, 4 insertions(+)
README +4 -0
index 1b5a598..4b42a71 100644
@@ -3157,6 +3157,10 @@ FIT uImage format:
 		supports MMC, NAND and YMODEM loading of U-Boot and NAND
 		NAND loading of the Linux Kernel.
 
+		CONFIG_SPL_OS_BOOT
+		Enable booting directly to an OS from SPL.
+		See also: doc/README.falcon
+
 		CONFIG_SPL_DISPLAY_PRINT
 		For ARM, enable an optional function to print more information
 		about the running system.
Signature · 1 line
1.7.9.5
author
#12 lore raw

PATCH v2 10/12 README.falcon: Document environment variables for falcon mode

In reply to Tom Rini
---
 doc/README.falcon |    9 +++++++++
 1 file changed, 9 insertions(+)
doc/README.falcon +9 -0
index 6357b1e..bccf6c9 100644
@@ -80,6 +80,15 @@ spl_start_uboot() : required
 		Returns "0" if SPL should start the kernel, "1" if U-Boot
 		must be started.
 
+Environment variables
+---------------------
+
+A board may chose to look at the environment for decisions about falcon
+mode.  In this case the following variables may be supported:
+
+boot_os : 		Set to yes/Yes/true/True/1 to enable booting to OS,
+			any other value to fall back to U-Boot (including
+			unset)
 
 Using spl command
 -----------------
Signature · 1 line
1.7.9.5
author
#13 lore raw

PATCH v2 11/12 a3m071: Make spl_start_uboot test like getenv_yesno does

In reply to Tom Rini

This change makes the behaviour slightly more rebust and will match other implementations which can use getenv_yesno directly.

---
 board/a3m071/a3m071.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/a3m071/a3m071.c +2 -1
index 7aeefb2..b96ba81 100644
@@ -412,7 +412,8 @@ int spl_start_uboot(void)
 
 	env_init();
 	getenv_f("boot_os", s, sizeof(s));
-	if ((s != NULL) && (strcmp(s, "yes") == 0))
+	if ((s != NULL) && (*s == '1' || *s == 'y' || *s == 'Y' ||
+			    *s == 't' || *s == 'T'))
 		return 0;
 
 	return 1;
Signature · 1 line
1.7.9.5
author
#14 lore raw

PATCH v2 12/12 spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot

In reply to Tom Rini

We add two new environment variables, falcon_args_file and falcon_image_file, which when set will override the compiled in default values for falcon mode.

---
 common/spl/spl_mmc.c |   28 +++++++++++++++++++++++++++-
 doc/README.falcon    |    4 ++++
 2 files changed, 31 insertions(+), 1 deletion(-)
common/spl/spl_mmc.c +27 -1
index fc2f226..5405bbc 100644
@@ -100,7 +100,33 @@ end:
 static int mmc_load_image_fat_os(struct mmc *mmc)
 {
 	int err;
-
+#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+	char *file;
+
+	file = getenv("falcon_args_file");
+	if (file) {
+		err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
+		if (err <= 0) {
+			printf("spl: error reading image %s, err - %d, falling back to default\n",
+			       file, err);
+			goto defaults;
+		}
+		file = getenv("falcon_image_file");
+		if (file) {
+			err = mmc_load_image_fat(mmc, file);
+			if (err != 0) {
+				puts("spl: falling back to default\n");
+				goto defaults;
+			}
+
+			return 0;
+		} else
+			puts("spl: falcon_image_file not set in environment, falling back to default\n");
+	} else
+		puts("spl: falcon_args_file not set in environment, falling back to default\n");
+
+defaults:
+#endif
 	err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
 			    (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
 	if (err <= 0) {
doc/README.falcon +4 -0
index bccf6c9..82a254b 100644
@@ -89,6 +89,10 @@ mode.  In this case the following variables may be supported:
 boot_os : 		Set to yes/Yes/true/True/1 to enable booting to OS,
 			any other value to fall back to U-Boot (including
 			unset)
+falcon_args_file :	Filename to load as the 'args' portion of falcon mode
+			rather than the hard-coded value.
+falcon_image_file :	Filename to load as the OS image portion of falcon
+			mode rather than the hard-coded value.
 
 Using spl command
 -----------------
Signature · 1 line
1.7.9.5