Merge tag 'dm-pull-29jul19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[oweals/u-boot.git] / README

diff --git a/README b/README
index e2efef06301310594f28cf364e232a311bf5f700..d2f466e6f6fae82b996db8cc8a329932fe23c666 100644 (file)
--- a/README
+++ b/README
@@ -212,7 +212,7 @@ board. This allows feature development which is not board- or architecture-
 specific to be undertaken on a native platform. The sandbox is also used to
 run some of U-Boot's tests.
 
-See board/sandbox/README.sandbox for more details.
+See doc/arch/index.rst for more details.
 
 
 Board Initialisation Flow:
@@ -486,10 +486,6 @@ The following options need to be configured:
                PBI commands can be used to configure SoC before it starts the execution.
                Please refer doc/README.pblimage for more details
 
-               CONFIG_SPL_FSL_PBL
-               It adds a target to create boot binary having SPL binary in PBI format
-               concatenated with u-boot binary.
-
                CONFIG_SYS_FSL_DDR_BE
                Defines the DDR controller register space as Big Endian
 
@@ -964,10 +960,6 @@ The following options need to be configured:
                        CONFIG_SH_ETHER_CACHE_WRITEBACK
                        If this option is set, the driver enables cache flush.
 
-- PWM Support:
-               CONFIG_PWM_IMX
-               Support for PWM module on the imx6.
-
 - TPM Support:
                CONFIG_TPM
                Support TPM devices.
@@ -2546,9 +2538,6 @@ FIT uImage format:
                Defines the size and behavior of the NAND that SPL uses
                to read U-Boot
 
-               CONFIG_SPL_NAND_BOOT
-               Add support NAND boot
-
                CONFIG_SYS_NAND_U_BOOT_OFFS
                Location in NAND to read U-Boot from