Merge tag 'rpi-next-2020.07.2' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / README

diff --git a/README b/README
index 2e8ad3bc0cb1f18a983da5eb0d525a66bb26d0e2..17dc0ee33ba23d18f504de11fb5106f91aa328fa 100644 (file)
--- a/README
+++ b/README
@@ -2473,14 +2473,6 @@ Configuration Settings:
 - CONFIG_SYS_BAUDRATE_TABLE:
                List of legal baudrate settings for this board.
 
 - CONFIG_SYS_BAUDRATE_TABLE:
                List of legal baudrate settings for this board.
 

-- CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
-               Begin and End addresses of the area used by the
-               simple memory test.
-
-- CONFIG_SYS_MEMTEST_SCRATCH:
-               Scratch address used by the alternate memory test
-               You only need to set this if address zero isn't writeable
-

 - CONFIG_SYS_MEM_RESERVE_SECURE
                Only implemented for ARMv8 for now.
                If defined, the size of CONFIG_SYS_MEM_RESERVE_SECURE memory
 - CONFIG_SYS_MEM_RESERVE_SECURE
                Only implemented for ARMv8 for now.
                If defined, the size of CONFIG_SYS_MEM_RESERVE_SECURE memory


@@ -2737,10 +2729,6 @@ Configuration Settings:
        regular expression. This allows multiple variables to define the same
        flags without explicitly listing them for each variable.
 
        regular expression. This allows multiple variables to define the same
        flags without explicitly listing them for each variable.
 

-- CONFIG_ENV_ACCESS_IGNORE_FORCE
-       If defined, don't allow the -f switch to env set override variable
-       access flags.
-

 The following definitions that deal with the placement and management
 of environment data (variable area); in general, we support the
 following configurations:
 The following definitions that deal with the placement and management
 of environment data (variable area); in general, we support the
 following configurations: