diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
| commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch) | |
| tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /README | |
| parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
| parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
| download | u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.zip u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.gz u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
Makefile
drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'README')
| -rw-r--r-- | README | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -922,6 +922,8 @@ The following options need to be configured: CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_EXT2 * ext2 command support CONFIG_CMD_EXT4 * ext4 command support + CONFIG_CMD_FS_GENERIC * filesystem commands (e.g. load, ls) + that work for multiple fs types CONFIG_CMD_SAVEENV saveenv CONFIG_CMD_FDC * Floppy Disk Support CONFIG_CMD_FAT * FAT command support @@ -2847,7 +2849,7 @@ CBFS (Coreboot Filesystem) support CONFIG_RSA This enables the RSA algorithm used for FIT image verification - in U-Boot. See doc/uImage/signature for more information. + in U-Boot. See doc/uImage.FIT/signature.txt for more information. The signing part is build into mkimage regardless of this option. |