Merge git://git.denx.de/u-boot-marvell

[people/ms/u-boot.git] / README

diff --git a/README b/README
index ca07f7a3f9109e9139fd6ec4a2513bc6befe262c..06f3ed057d5ed24fa24b7c3ebdccb07a55665048 100644 (file)
--- a/README
+++ b/README
@@ -1028,21 +1028,6 @@ The following options need to be configured:
                        control registers. This behavior won't affect the
                        correctnessof 10/100 link speed update.
 
-               CONFIG_SMC911X
-               Support for SMSC's LAN911x and LAN921x chips
-
-                       CONFIG_SMC911X_BASE
-                       Define this to hold the physical address
-                       of the device (I/O space)
-
-                       CONFIG_SMC911X_32_BIT
-                       Define this if data bus is 32 bits
-
-                       CONFIG_SMC911X_16_BIT
-                       Define this if data bus is 16 bits. If your processor
-                       automatically converts one 32 bit word to two 16 bit
-                       words you may also try CONFIG_SMC911X_32_BIT.
-
                CONFIG_SH_ETHER
                Support for Renesas on-chip Ethernet controller
 
@@ -1618,6 +1603,15 @@ The following options need to be configured:
 
                See doc/README.link-local for more information.
 
+ - MAC address from environment variables
+
+               FDT_SEQ_MACADDR_FROM_ENV
+
+               Fix-up device tree with MAC addresses fetched sequentially from
+               environment variables. This config work on assumption that
+               non-usable ethernet node of device-tree are either not present
+               or their status has been marked as "disabled".
+
  - CDP Options:
                CONFIG_CDP_DEVICE_ID
 
@@ -2183,16 +2177,6 @@ The following options need to be configured:
                currently only supports clearing the memory.
 
 - Error Recovery:
-               CONFIG_PANIC_HANG
-
-               Define this variable to stop the system in case of a
-               fatal error, so that you have to reset it manually.
-               This is probably NOT a good idea for an embedded
-               system where you want the system to reboot
-               automatically as fast as possible, but it may be
-               useful during development since you can try to debug
-               the conditions that lead to the situation.
-
                CONFIG_NET_RETRY_COUNT
 
                This variable defines the number of retries for
@@ -2312,13 +2296,6 @@ The following options need to be configured:
                this is instead controlled by the value of
                /config/load-environment.
 
-- DataFlash Support:
-               CONFIG_HAS_DATAFLASH
-
-               Defining this option enables DataFlash features and
-               allows to read/write in Dataflash via the standard
-               commands cp, md...
-
 - Serial Flash support
                Usage requires an initial 'sf probe' to define the serial
                flash parameters, followed by read/write/erase/update
@@ -2384,6 +2361,13 @@ The following options need to be configured:
                        CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
                                                    the bootcounter.
                        CONFIG_BOOTCOUNT_ALEN = address len
+               CONFIG_BOOTCOUNT_EXT
+               enable support for the bootcounter in EXT filesystem
+                       CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read
+                                                    and write.
+                       CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE = interface
+                       CONFIG_SYS_BOOTCOUNT_EXT_DEVPART = device and part
+                       CONFIG_SYS_BOOTCOUNT_EXT_NAME = filename
 
 - Show boot progress:
                CONFIG_SHOW_BOOT_PROGRESS
@@ -5141,8 +5125,9 @@ Coding Standards:
 -----------------
 
 All contributions to U-Boot should conform to the Linux kernel
-coding style; see the file "Documentation/CodingStyle" and the script
-"scripts/Lindent" in your Linux kernel source directory.
+coding style; see the kernel coding style guide at
+https://www.kernel.org/doc/html/latest/process/coding-style.html, and the
+script "scripts/Lindent" in your Linux kernel source directory.
 
 Source files originating from a different project (for example the
 MTD subsystem) are generally exempt from these guidelines and are not
@@ -5174,7 +5159,7 @@ may be rejected, even when they contain important and valuable stuff.
 Please see http://www.denx.de/wiki/U-Boot/Patches for details.
 
 Patches shall be sent to the u-boot mailing list <u-boot@lists.denx.de>;
-see http://lists.denx.de/mailman/listinfo/u-boot
+see https://lists.denx.de/listinfo/u-boot
 
 When you send a patch, please include the following information with
 it: