summaryrefslogtreecommitdiff
path: root/doc/README.mpc85xx
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-09-20 19:02:18 -0500
committerScott Wood <scottwood@freescale.com>2012-11-26 15:41:25 -0600
commitc97cd1ba480482e220c5dcef0cd751d21a1bf74e (patch)
tree72fc693655e3e8e6b9532a347202103db2d5ff8a /doc/README.mpc85xx
parent4b919725b66152edd8c7cecc9e42864eec12c57d (diff)
downloadu-boot-imx-c97cd1ba480482e220c5dcef0cd751d21a1bf74e.zip
u-boot-imx-c97cd1ba480482e220c5dcef0cd751d21a1bf74e.tar.gz
u-boot-imx-c97cd1ba480482e220c5dcef0cd751d21a1bf74e.tar.bz2
spl/85xx: new SPL support
Update CONFIG_RAMBOOT and CONFIG_NAND_SPL references to accept CONFIG_SPL and CONFIG_SPL_BUILD, respectively. CONFIG_NAND_SPL can be removed once the last mpc85xx nand_spl target is gone. CONFIG_RAMBOOT will need to remain for other use cases, but it doesn't seem right to overload it for meaning SPL as well as nand_spl does. Even if it's somewhat appropriate for the main u-boot, the SPL itself isn't (necessarily) ramboot, and we don't have separate configs for SPL and main u-boot. It was also inconsistent, as other platforms such as mpc83xx didn't use CONFIG_RAMBOOT in this way. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'doc/README.mpc85xx')
-rw-r--r--doc/README.mpc85xx2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.mpc85xx b/doc/README.mpc85xx
index 5a4b591..f9b023f 100644
--- a/doc/README.mpc85xx
+++ b/doc/README.mpc85xx
@@ -26,7 +26,7 @@ Major Config Switches during various boot Modes
----------------------------------------------
NOR boot
- !defined(CONFIG_SYS_RAMBOOT)
+ !defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_SPL)
NOR boot Secure
!defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SECURE_BOOT)
RAMBOOT(SD, SPI & NAND boot)