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

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

diff --git a/README b/README
index b53ea7dfe3f6d8201d75135ffd001e4f7c19a96a..fabd532623924bbdf1a32d471b8862e5e5c2e36c 100644 (file)
--- a/README
+++ b/README
@@ -714,11 +714,6 @@ The following options need to be configured:
                RAM and NFS.
 
 - Bootcount:
                RAM and NFS.
 
 - Bootcount:

-               CONFIG_BOOTCOUNT_LIMIT
-               Implements a mechanism for detecting a repeating reboot
-               cycle, see:
-               http://www.denx.de/wiki/view/DULG/UBootBootCountLimit
-

                CONFIG_BOOTCOUNT_ENV
                If no softreset save registers are found on the hardware
                "bootcount" is stored in the environment. To prevent a
                CONFIG_BOOTCOUNT_ENV
                If no softreset save registers are found on the hardware
                "bootcount" is stored in the environment. To prevent a


@@ -2001,11 +1996,6 @@ The following options need to be configured:
                SPI EEPROM, also an instance works with Crystal A/D and
                D/As on the SACSng board)
 
                SPI EEPROM, also an instance works with Crystal A/D and
                D/As on the SACSng board)
 

-               CONFIG_SH_SPI
-
-               Enables the driver for SPI controller on SuperH. Currently
-               only SH7757 is supported.
-

                CONFIG_SOFT_SPI
 
                Enables a software (bit-bang) SPI driver rather than
                CONFIG_SOFT_SPI
 
                Enables a software (bit-bang) SPI driver rather than


@@ -2024,11 +2014,6 @@ The following options need to be configured:
                Currently supported on some MPC8xxx processors.  For an
                example, see include/configs/mpc8349emds.h.
 
                Currently supported on some MPC8xxx processors.  For an
                example, see include/configs/mpc8349emds.h.
 

-               CONFIG_MXC_SPI
-
-               Enables the driver for the SPI controllers on i.MX and MXC
-               SoCs. Currently i.MX31/35/51 are supported.
-

                CONFIG_SYS_SPI_MXC_WAIT
                Timeout for waiting until spi transfer completed.
                default: (CONFIG_SYS_HZ/100)     /* 10 ms */
                CONFIG_SYS_SPI_MXC_WAIT
                Timeout for waiting until spi transfer completed.
                default: (CONFIG_SYS_HZ/100)     /* 10 ms */


@@ -2311,18 +2296,6 @@ The following options need to be configured:
                CONFIG_SF_DEFAULT_MODE          (see include/spi.h)
                CONFIG_SF_DEFAULT_SPEED         in Hz
 
                CONFIG_SF_DEFAULT_MODE          (see include/spi.h)
                CONFIG_SF_DEFAULT_SPEED         in Hz
 

-               CONFIG_SYSTEMACE
-
-               Adding this option adds support for Xilinx SystemACE
-               chips attached via some sort of local bus. The address
-               of the chip must also be defined in the
-               CONFIG_SYS_SYSTEMACE_BASE macro. For example:
-
-               #define CONFIG_SYSTEMACE
-               #define CONFIG_SYS_SYSTEMACE_BASE 0xf0000000
-
-               When SystemACE support is added, the "ace" device type
-               becomes available to the fat commands, i.e. fatls.

 
 - TFTP Fixed UDP Port:
                CONFIG_TFTP_PORT
 
 - TFTP Fixed UDP Port:
                CONFIG_TFTP_PORT


@@ -2345,11 +2318,6 @@ The following options need to be configured:
                but sometimes that is not allowed.
 
 - bootcount support:
                but sometimes that is not allowed.
 
 - bootcount support:

-               CONFIG_BOOTCOUNT_LIMIT
-
-               This enables the bootcounter support, see:
-               http://www.denx.de/wiki/DULG/UBootBootCountLimit
-

                CONFIG_AT91SAM9XE
                enable special bootcounter support on at91sam9xe based boards.
                CONFIG_SOC_DA8XX
                CONFIG_AT91SAM9XE
                enable special bootcounter support on at91sam9xe based boards.
                CONFIG_SOC_DA8XX


@@ -2726,11 +2694,6 @@ FIT uImage format:
                CONFIG_SYS_SPL_MALLOC_SIZE
                The size of the malloc pool used in SPL.
 
                CONFIG_SYS_SPL_MALLOC_SIZE
                The size of the malloc pool used in SPL.
 

-               CONFIG_SPL_FRAMEWORK
-               Enable the SPL framework under common/.  This framework
-               supports MMC, NAND and YMODEM loading of U-Boot and NAND
-               NAND loading of the Linux Kernel.
-

                CONFIG_SPL_OS_BOOT
                Enable booting directly to an OS from SPL.
                See also: doc/README.falcon
                CONFIG_SPL_OS_BOOT
                Enable booting directly to an OS from SPL.
                See also: doc/README.falcon


@@ -3719,6 +3682,11 @@ this behavior and build U-Boot to some external directory:
 Note that the command line "O=" setting overrides the KBUILD_OUTPUT environment
 variable.
 
 Note that the command line "O=" setting overrides the KBUILD_OUTPUT environment
 variable.
 

+User specific CPPFLAGS, AFLAGS and CFLAGS can be passed to the compiler by
+setting the according environment variables KCPPFLAGS, KAFLAGS and KCFLAGS.
+For example to treat all compiler warnings as errors:
+
+       make KCFLAGS=-Werror

 
 Please be aware that the Makefiles assume you are using GNU make, so
 for instance on NetBSD you might need to use "gmake" instead of
 
 Please be aware that the Makefiles assume you are using GNU make, so
 for instance on NetBSD you might need to use "gmake" instead of