rockchip: Don't use spl_boot_device() with of-platdata

[u-boot] / README

diff --git a/README b/README
index 6f4c09a3a1fc13b47a6510b01c5c96a260c503ff..e906253fa2b03dafa7dc20a3f41bec5854c9af0d 100644 (file)
--- a/README
+++ b/README
@@ -890,23 +890,6 @@ The following options need to be configured:
                'Sane' compilers will generate smaller code if
                CONFIG_PRE_CON_BUF_SZ is a power of 2
 
-- Boot Delay:  CONFIG_BOOTDELAY - in seconds
-               Delay before automatically booting the default image;
-               set to -1 to disable autoboot.
-               set to -2 to autoboot with no delay and not check for abort
-               (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
-
-               See doc/README.autoboot for these options that
-               work with CONFIG_BOOTDELAY. None are required.
-               CONFIG_BOOT_RETRY_TIME
-               CONFIG_BOOT_RETRY_MIN
-               CONFIG_AUTOBOOT_KEYED
-               CONFIG_AUTOBOOT_PROMPT
-               CONFIG_AUTOBOOT_DELAY_STR
-               CONFIG_AUTOBOOT_STOP_STR
-               CONFIG_ZERO_BOOTDELAY_CHECK
-               CONFIG_RESET_TO_RETRY
-
 - Autoboot Command:
                CONFIG_BOOTCOMMAND
                Only needed when CONFIG_BOOTDELAY is enabled;
@@ -3852,9 +3835,6 @@ Configuration Settings:
                The memory will be freed (or in fact just forgotten) when
                U-Boot relocates itself.
 
-               Pre-relocation malloc() is only supported on ARM and sandbox
-               at present but is fairly easy to enable for other archs.
-
 - CONFIG_SYS_MALLOC_SIMPLE
                Provides a simple and small malloc() and calloc() for those
                boards which do not use the full malloc in SPL (which is
@@ -4048,16 +4028,6 @@ Configuration Settings:
        If defined, don't allow the -f switch to env set override variable
        access flags.
 
-- CONFIG_SYS_GENERIC_BOARD
-       This selects the architecture-generic board system instead of the
-       architecture-specific board files. It is intended to move boards
-       to this new framework over time. Defining this will disable the
-       arch/foo/lib/board.c file and use common/board_f.c and
-       common/board_r.c instead. To use this option your architecture
-       must support it (i.e. must select HAVE_GENERIC_BOARD in arch/Kconfig).
-       If you find problems enabling this option on your board please report
-       the problem and send patches!
-
 - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only)
        This is set by OMAP boards for the max time that reset should
        be asserted. See doc/README.omap-reset-time for details on how
@@ -4834,6 +4804,11 @@ Low Level (hardware related) configuration options:
                other boot loader or by a debugger which performs
                these initializations itself.
 
+- CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+               [ARM926EJ-S only] This allows just the call to lowlevel_init()
+               to be skipped. The normal CPU15 init (such as enabling the
+               instruction cache) is still performed.
+
 - CONFIG_SPL_BUILD
                Modifies the behaviour of start.S when compiling a loader
                that is executed before the actual U-Boot. E.g. when