diff options
Diffstat (limited to 'include/configs')
458 files changed, 946 insertions, 1998 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 6b5aa1b9f2..b396764ffa 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -590,7 +590,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -756,8 +755,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index ec4979634a..a7c927759c 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -279,7 +279,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_FSL_ESPI /* eSPI - Enhanced SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -341,8 +340,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ERRATA #define CONFIG_CMD_ELF diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 65a7067a03..e5cd26797c 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -485,7 +485,6 @@ combinations. this should be removed later /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI /* SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -581,8 +580,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index e737960c54..235780973f 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -432,7 +432,6 @@ /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_EON #define CONFIG_CMD_SF @@ -496,8 +495,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ERRATA #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 3ccb9a725c..638a586492 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -53,8 +53,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_ELF @@ -62,7 +60,6 @@ #define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM -#undef CONFIG_CMD_NFS #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index c20ecbd06d..9c25751c8f 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -67,8 +67,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ @@ -94,7 +92,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#undef CONFIG_SYS_LONGHELP /* undef to save memory */ #undef CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 03fa5e68f1..a2468c3820 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -22,14 +22,9 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #undef CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 04e52f22f8..2e86016184 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -37,19 +37,11 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC -#undef CONFIG_CMD_NFS #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_USB #undef CONFIG_CMD_BMP @@ -140,7 +132,6 @@ #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI # define CONFIG_SYS_DSPI_CS2 -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 8bf4e5318f..ae11e7d879 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -35,23 +35,15 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BOOTD #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index b4fa5afe9b..a93bafcb75 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -39,7 +39,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 5d978747fe..ddb5cdab2d 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -39,16 +39,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_IDE -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_PING #ifdef CONFIG_CMD_IDE diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 0bfa946cde..7f5ee8ad4a 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -49,15 +49,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_IDE -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC /* ATA */ #define CONFIG_DOS_PARTITION diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index f5cd0a0d11..d888c3e549 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -56,18 +56,11 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_MISC #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB #define CONFIG_BOOTDELAY 5 #define CONFIG_MCFFEC diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 3660dda5a8..fa9b973fa8 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -55,19 +55,13 @@ #define CONFIG_BOOTP_HOSTNAME /* Available command configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index aeba9c0f02..860abe7bca 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -47,14 +47,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB - #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC # define CONFIG_MII 1 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 65adadc69d..817b142bf9 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -27,15 +27,10 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #undef CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 16ef80b2aa..4724a9c89d 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -27,15 +27,10 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index e3c36a65f5..32afa44147 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -27,15 +27,10 @@ #define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */ /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index e40bbfd102..1f65918d0d 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -38,30 +38,20 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BOOTD #define CONFIG_CMD_CACHE #undef CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF -#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_I2C #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_UBI -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #undef CONFIG_CMD_NAND -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS /* * NAND FLASH @@ -204,7 +194,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_ATMEL # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index d26ad9125c..2c08512ff6 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -39,27 +39,18 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BOOTD #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #undef CONFIG_CMD_JFFS2 -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS /* Network configuration */ #define CONFIG_MCFFEC @@ -151,7 +142,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index b735a26f0c..e82ba32984 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -39,21 +39,15 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BOOTD #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #undef CONFIG_CMD_PCI #define CONFIG_CMD_PING @@ -61,8 +55,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS /* Network configuration */ #define CONFIG_MCFFEC @@ -182,7 +174,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x13 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 427ccf03c3..3c1bb90de1 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -29,15 +29,10 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #undef CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 26a16eca03..7e1b3646f8 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -29,15 +29,10 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #undef CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 147f122967..cb21b7396e 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -51,8 +51,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 9b196ad2e4..4150d5aad0 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -355,7 +355,6 @@ #ifdef CONFIG_MPC8XXX_SPI #define CONFIG_CMD_SPI #define CONFIG_USE_SPIFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #endif @@ -447,8 +446,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 9cea76ae9b..d558db7e50 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -489,8 +489,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C @@ -498,11 +496,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_PCI -#if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index fbf38c88d9..cbe10af19f 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -469,19 +469,12 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_DATE #define CONFIG_CMD_PCI -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 2dd71b7ed9..7547c12996 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -335,8 +335,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_EEPROM @@ -345,10 +343,6 @@ #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 14abd3512c..9805df75b9 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -420,8 +420,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_ASKENV @@ -430,12 +428,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 17f230f4a1..57547a48bf 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -486,8 +486,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_DATE @@ -497,12 +495,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 720406821b..32cb007ab7 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -496,8 +496,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_IRQ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 521904daad..cebd175ff5 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -490,8 +490,6 @@ extern int board_pci_host_broken(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII @@ -501,11 +499,6 @@ extern int board_pci_host_broken(void); #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 19e0e30eef..5c6ad193c0 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -500,8 +500,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII @@ -511,11 +509,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) -#undef CONFIG_CMD_SAVEENV -#undef CONFIG_CMD_LOADS -#endif - #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index f57afff3c4..6a90531f3d 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -50,7 +50,6 @@ #define CONFIG_MPC8536DS 1 #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ -#define CONFIG_SPI_FLASH 1 /* Has SPI Flash */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI1 1 /* Enable PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -636,8 +635,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_I2C diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index ff9a67de57..931816bf36 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -348,8 +348,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_ELF @@ -359,12 +357,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 6b7f78403b..d24d1ca522 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -366,8 +366,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index ad2c52cb36..ef268a8c1a 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -382,8 +382,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index f49b1e5745..a80221a13a 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -491,8 +491,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 15b6e6c709..675ca874f6 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -364,8 +364,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 2250c2fe01..5a481d5207 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -384,8 +384,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_ELF @@ -400,12 +398,6 @@ #define CONFIG_CMD_MII #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 91bf267165..05e5a3d08e 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -386,8 +386,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 4cb586d43c..78019b9c3a 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -477,8 +477,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 943c575e50..71bd51b168 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -593,8 +593,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 4b99fc3632..de56c489cd 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -467,16 +467,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#if defined(CONFIG_SYS_RAMBOOT) -#undef CONFIG_CMD_SAVEENV -#endif - #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #define CONFIG_CMD_SCSI diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 938874fe42..f20ee79e87 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -627,16 +627,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_REGINFO -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV -#endif - #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #define CONFIG_CMD_SCSI diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index d10bd2a985..f1af928977 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -13,14 +13,8 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MIGO_R 1 -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_SAVEENV #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 37bb42b28f..4e3c05ad27 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -680,7 +680,6 @@ extern unsigned long get_sdram_size(void); #if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT) /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -813,8 +812,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_ERRATA #define CONFIG_CMD_ELF diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0f5915daea..6ddf4470b1 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -479,7 +479,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_HARD_SPI @@ -680,8 +679,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 233995c227..8fff431090 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -271,8 +271,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_MII diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c78a421ce5..cc8700bfb3 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -412,7 +412,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -619,8 +618,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 3ca204e1e2..dfc4fc0f36 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -42,21 +42,11 @@ /* * Command line configuration. */ -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_LOADB #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BDI -#define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_RUN #define CONFIG_CMD_BSP -#define CONFIG_CMD_IMI #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ -#define CONFIG_CMD_MISC #if 0 diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 9a1b2acac3..c9d08e6600 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -41,8 +41,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IDE #define CONFIG_CMD_DHCP #define CONFIG_CMD_PCI diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 80f42768f0..3a71ff8617 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -61,8 +61,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index a64c82a272..5712298743 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -54,8 +54,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BSP #define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE @@ -65,7 +63,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 31b9050032..9ed6c61ab7 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -271,8 +271,6 @@ #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION -#include <config_cmd_default.h> - #define CONFIG_CMD_BSP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -283,7 +281,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_USB diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 0f8b61412a..0fa03cf93c 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -581,7 +581,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #ifndef CONFIG_SPL_BUILD #define CONFIG_SPI_FLASH_SST @@ -849,8 +848,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 5ada99f96a..f99663a65b 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -575,7 +575,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #if defined(CONFIG_T1024RDB) #define CONFIG_SPI_FLASH_STMICRO #elif defined(CONFIG_T1023RDB) @@ -854,8 +853,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM @@ -866,9 +863,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_ECHO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 6cc4cdb82d..0206e54063 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -486,7 +486,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SST #define CONFIG_SPI_FLASH_EON @@ -723,8 +722,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 262aeaf32f..16d2e0e1c7 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -516,7 +516,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_CMD_SF @@ -746,8 +745,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #ifdef CONFIG_T1042RDB_PI #define CONFIG_CMD_DATE #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index e80b0b5031..b0ee0de136 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -15,7 +15,6 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC -#define CONFIG_SPI_FLASH #define CONFIG_USB_EHCI #if defined(CONFIG_PPC_T2080) #define CONFIG_T2080QDS @@ -793,8 +792,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA @@ -804,7 +801,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index c5db4f3eb1..8c637c2377 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -16,7 +16,6 @@ #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC -#define CONFIG_SPI_FLASH #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 @@ -749,17 +748,13 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA #define CONFIG_CMD_MII #define CONFIG_CMD_I2C #define CONFIG_CMD_PING -#define CONFIG_CMD_ECHO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index cfe6557caa..4edb3cb91f 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -402,7 +402,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index e38a6f7f73..8ed6bf71ec 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -318,8 +318,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA @@ -616,7 +614,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index cdccbef1f6..5a59b80d50 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -166,8 +166,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -175,7 +173,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 0d5a2b96f1..9b9217ebc1 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -106,8 +106,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -115,7 +113,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP #ifdef CONFIG_SPLASH_SCREEN diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index e765a03cfb..5240e0f0b1 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -104,8 +104,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -113,7 +111,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 7b496c853f..4164303e94 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -289,15 +289,12 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C -#define CONFIG_CMD_NFS #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_PING @@ -308,11 +305,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index bbdc3f81fc..edadf55f51 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -94,8 +94,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -103,7 +101,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 5fc87f2138..166bb2c6c0 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -94,8 +94,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -103,7 +101,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 589d168eba..8b16ad2750 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -97,8 +97,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -106,7 +104,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 60acb564e8..8a05fa4860 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -126,8 +126,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -136,7 +134,6 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index ebc5571632..bf3a25b993 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -97,8 +97,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -106,7 +104,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index f4ce07f20e..47e5c6cae1 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -97,8 +97,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -106,7 +104,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 97db519d53..fa892a9152 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -100,8 +100,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -109,7 +107,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 25d60a74ef..13319f2cfb 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -100,8 +100,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -109,7 +107,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 928b879609..0e378f29db 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -140,8 +140,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM @@ -149,7 +147,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 598020c867..76ddef54e6 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -136,8 +136,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -146,7 +144,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b9bbe340f3..bdedef5374 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -47,7 +47,6 @@ #define CONFIG_ETHPRIME "eTSEC3" #ifndef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH y #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -89,7 +88,6 @@ #define CONFIG_ETHPRIME "eTSEC1" #ifndef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH y #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -492,8 +490,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_I2C diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 6aee6db3f3..60c2948f07 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -49,8 +49,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index e229256730..ddd6377516 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -59,8 +59,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_BSP #define CONFIG_CMD_IRQ diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index f8cea62b59..fc4595b27c 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -45,8 +45,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BSP #define CONFIG_CMD_CACHE #define CONFIG_CMD_MII diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index b03f163d65..1be78fdf33 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -93,13 +93,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EEPROM #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB #define CONFIG_CMD_MII diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 28f4de21dc..8a5d1e6fa4 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -394,8 +394,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM @@ -405,7 +403,6 @@ #undef CONFIG_CMD_EXT2 #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h index e318c7543f..4d52ba1dcd 100644 --- a/include/configs/adp-ag101.h +++ b/include/configs/adp-ag101.h @@ -109,8 +109,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_PING diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 24904b0b7c..06860b545e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -109,8 +109,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_PING diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h index c46eed9ead..026696ca39 100644 --- a/include/configs/adp-ag102.h +++ b/include/configs/adp-ag102.h @@ -104,8 +104,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_PING @@ -113,8 +111,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_ELF -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS /* * PCI diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 0f125dce09..f113ebd74b 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -217,18 +217,12 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_I2C -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#undef CONFIG_CMD_NFS #define CONFIG_CMD_PCI #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/alt.h b/include/configs/alt.h index 646cb6102c..6d2c242b95 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -41,9 +41,7 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8da3325b7e..035c1569ad 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -54,12 +54,12 @@ "${optargs} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=9,2048\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ "nandrootfstype=ubifs rootwait=1\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ - "nand read ${fdtaddr} u-boot-spl-os; " \ - "nand read ${loadaddr} kernel; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ + "nand read ${loadaddr} NAND.kernel; " \ "bootz ${loadaddr} - ${fdtaddr}\0" #else #define NANDARGS "" @@ -248,7 +248,7 @@ "128k(NAND.u-boot-env)," \ "128k(NAND.u-boot-env.backup1)," \ "8m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_NAND @@ -429,7 +429,6 @@ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 @@ -452,7 +451,6 @@ */ #if defined(CONFIG_NOR) #undef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 9b31b9c590..2f4117db29 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -127,8 +127,6 @@ #endif /* CONFIG_USB_AM35X */ /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ @@ -139,10 +137,6 @@ #define CONFIG_CMD_DHCP #undef CONFIG_CMD_PING -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C @@ -150,7 +144,6 @@ #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_OMAP34XX -#undef CONFIG_CMD_NFS /* * Board NAND Info. */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 31e758d81b..e5b462174e 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -126,8 +126,6 @@ #endif /* CONFIG_USB_MUSB_AM35X */ /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ @@ -138,10 +136,6 @@ #define CONFIG_CMD_DHCP #undef CONFIG_CMD_PING -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index d4f4c236a9..33e534a765 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -12,12 +12,11 @@ #define CONFIG_AM43XX #define CONFIG_CMD_FAT -#define CONFIG_CMD_SAVEENV #define CONFIG_BOARD_LATE_INIT #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_CACHELINE_SIZE 32 -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #include <asm/arch/omap.h> @@ -42,7 +41,16 @@ #define CONFIG_POWER_TPS62362 /* SPL defines. */ +#ifdef CONFIG_SPL_USB_HOST_SUPPORT +/* + * For USB host boot, ROM uses DMA for copying MLO from USB storage + * and ARM internal ram is not accessible for DMA, so SPL text base + * should be in OCMC ram + */ #define CONFIG_SPL_TEXT_BASE 0x40300350 +#else +#define CONFIG_SPL_TEXT_BASE 0x402F4000 +#endif #define CONFIG_SPL_MAX_SIZE (220 << 10) /* 220KB */ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) @@ -95,8 +103,8 @@ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" /* SPL USB Support */ +#ifdef CONFIG_SPL_USB_HOST_SUPPORT #define CONFIG_SPL_USB_SUPPORT -#define CONFIG_SPL_USB_HOST_SUPPORT #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_CMD_USB @@ -108,6 +116,7 @@ #define CONFIG_OMAP_USB_PHY #define CONFIG_AM437X_USB2PHY2_HOST +#endif /* USB GADGET */ #if !defined(CONFIG_SPL_BUILD) || \ @@ -191,12 +200,10 @@ /* SPI */ #undef CONFIG_OMAP3_SPI #define CONFIG_TI_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_TI_SPI_MMAP -#define CONFIG_SPI_FLASH_BAR #define CONFIG_QSPI_SEL_GPIO 48 #define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 @@ -295,21 +302,23 @@ "setenv fdtfile am437x-idk-evm.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree; fi; \0" \ + NANDARGS \ NETARGS \ DFUARGS \ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ "run mmcboot;" \ - "run usbboot;" + "run usbboot;" \ + NANDBOOT \ #endif +#ifndef CONFIG_SPL_BUILD /* CPSW Ethernet */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS @@ -319,13 +328,20 @@ #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_GIGE +#endif + +#define CONFIG_DRIVER_TI_CPSW #define CONFIG_PHYLIB #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM43xx U-Boot SPL" -#define CONFIG_SPL_ETH_SUPPORT +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT) +#undef CONFIG_ENV_IS_IN_FAT +#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_NET_SUPPORT +#endif + #define CONFIG_SYS_RX_ETH_BUFFER 64 /* NAND support */ @@ -378,7 +394,7 @@ "256k(NAND.u-boot-env)," \ "256k(NAND.u-boot-env.backup1)," \ "7m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00180000 /* NAND: SPL related configs */ #ifdef CONFIG_SPL_NAND_SUPPORT @@ -390,6 +406,24 @@ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif -#endif /* !CONFIG_NAND */ +#define NANDARGS \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "nandargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \ + "nandrootfstype=ubifs rootwait=1\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ + "nand read ${loadaddr} NAND.kernel; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" +#define NANDBOOT "run nandboot; " +#else /* !CONFIG_NAND */ +#define NANDARGS +#define NANDBOOT +#endif /* CONFIG_NAND */ #endif /* __CONFIG_AM43XX_EVM_H */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 9d6146a5a3..37dac7d131 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -53,8 +53,6 @@ /* * Commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #if defined(CONFIG_440) #define CONFIG_CMD_CACHE @@ -67,7 +65,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 5e197bec26..45fd265d67 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -21,12 +21,7 @@ #define CONFIG_BOOTDELAY 1 #define CONFIG_BOOTCOMMAND "bootm ffc20000" -#include <config_cmd_default.h> #undef CONFIG_CMD_AES -#undef CONFIG_CMD_BOOTD -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_XIMG #define CONFIG_CMD_CACHE #define CONFIG_CMD_TIMER #define CONFIG_CMD_DIAG diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 573c98f481..03810c3b21 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -14,14 +14,8 @@ #define CONFIG_CPU_SH7723 1 #define CONFIG_AP325RXA 1 -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_IDE #define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 5b95dd3676..4bcfb4c89f 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -18,14 +18,10 @@ #define CONFIG_BOARD_LATE_INIT #define CONFIG_SYS_TEXT_BASE 0x8BFC0000 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_CMD_SAVEENV #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 7554023834..a0a26bbf61 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -25,7 +25,7 @@ /* * Enable the call to miscellaneous platform dependent initialization. */ -#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */ +#define CONFIG_SYS_NO_FLASH /* * Board display option @@ -65,8 +65,6 @@ /* * U-Boot Commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV /* ask for env variable */ #define CONFIG_CMD_BSP /* Board Specific functions */ #define CONFIG_CMD_CACHE /* icache, dcache */ @@ -84,7 +82,6 @@ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING /* ping support */ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 445cb190a7..2bbef551b4 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -21,7 +21,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION @@ -34,9 +33,7 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_USB /* Memory configuration */ diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h index 5e4097fb82..6636e0e3c6 100644 --- a/include/configs/arcangel4.h +++ b/include/configs/arcangel4.h @@ -41,8 +41,6 @@ /* * Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ELF #define CONFIG_OF_LIBFDT diff --git a/include/configs/aria.h b/include/configs/aria.h index 2f9677c332..2265f3e774 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -407,8 +407,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM @@ -417,7 +415,6 @@ #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index eb50639c53..dd012f1c3e 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -45,7 +45,6 @@ #define CONFIG_PHY_MICREL #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MTD #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index e540e3f1f3..7f5cbccb17 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -16,15 +16,11 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_RUN -#define CONFIG_CMD_LOADS #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NFS #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index f4cf1c0980..62c537448b 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -40,9 +40,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_I2C -#undef CONFIG_CMD_NFS /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index bd0919ead9..c6e1f5635a 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -42,8 +42,6 @@ #define CONFIG_ASTRO5373L /* define board type */ /* Command line configuration */ -#include <config_cmd_default.h> - /* * CONFIG_RAM defines if u-boot is loaded via BDM (or started from * a different bootloader that has already performed RAM setup) or @@ -64,19 +62,11 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC -#define CONFIG_CMD_XIMG -#undef CONFIG_CMD_NFS #if ENABLE_JFFS #define CONFIG_CMD_JFFS2 #endif #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 9289964364..c2621ffe84 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -48,10 +48,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_LOADS #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 735c82aa8d..6f1f65fb3c 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -122,14 +122,11 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_FAT #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_USB -#undef CONFIG_CMD_FPGA /* * Network Driver Setting diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index c4b2e1666f..e98cf0ca5c 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -79,14 +79,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 #define CONFIG_CMD_NAND 1 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 407a53e555..42461d2968 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -86,14 +86,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index fa19e8bcc8..731c7f1f0e 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -94,14 +94,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 #define CONFIG_CMD_NAND 1 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index e4c49f4c14..09d8bec064 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -80,14 +80,6 @@ /* No NOR flash */ #define CONFIG_SYS_NO_FLASH - -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c44da1c19e..a19d4d9e17 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -70,9 +70,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA - #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -97,7 +94,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_3 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 637d150fd4..e709f9cf37 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -76,14 +76,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_USB #define CONFIG_CMD_NAND 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 1a481b3fd1..b9a77547b6 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -68,10 +68,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND @@ -97,7 +93,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 56bd7f87d1..1cab0a92c2 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -14,7 +14,6 @@ #define CONFIG_AT32AP7000 #define CONFIG_ATNGW100 -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R @@ -81,8 +80,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 @@ -92,10 +89,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_SOURCE -#undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART #define CONFIG_MACB @@ -107,7 +100,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index ea1fb588a2..486d9ee63c 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -16,7 +16,6 @@ #define CONFIG_AT32AP7000 #define CONFIG_ATNGW100MKII -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R @@ -100,8 +99,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 @@ -112,9 +109,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_MII -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART #define CONFIG_MACB @@ -126,7 +120,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 64b55192e5..1cd99e9765 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -95,15 +95,12 @@ #define CONFIG_BOOTP_GATEWAY /* generic board */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 @@ -111,10 +108,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_SOURCE -#undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 5e8c14d721..25116e50bb 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -121,8 +121,6 @@ /* * Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h index 60981f9f56..12c5a6cd15 100644 --- a/include/configs/balloon3.h +++ b/include/configs/balloon3.h @@ -46,13 +46,8 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_NFS #undef CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_USB -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #undef CONFIG_LCD diff --git a/include/configs/baltos.h b/include/configs/baltos.h new file mode 100644 index 0000000000..68bfee5e8c --- /dev/null +++ b/include/configs/baltos.h @@ -0,0 +1,338 @@ +/* + * am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __CONFIG_BALTOS_H +#define __CONFIG_BALTOS_H + +#include <configs/ti_am335x_common.h> + +#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ +#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM +#define CONFIG_BOARD_LATE_INIT + +/* Clock Defines */ +#define V_OSCK 24000000 /* Clock output from T2 */ +#define V_SCLK (V_OSCK) + +/* Custom script for NOR */ +#define CONFIG_SYS_LDSCRIPT "board/vscom/baltos/u-boot.lds" + +/* Always 128 KiB env size */ +#define CONFIG_ENV_SIZE (128 << 10) + +/* Enhance our eMMC support / experience. */ +#define CONFIG_CMD_GPT +#define CONFIG_EFI_PARTITION +#define CONFIG_PARTITION_UUIDS +#define CONFIG_CMD_PART + +/* FIT support */ +#define CONFIG_FIT +#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ +#define CONFIG_OF_BOARD_SETUP + +/* UBI Support */ +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE +#define CONFIG_RBTREE +#define CONFIG_LZO +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS + +/* I2C configuration */ +#undef CONFIG_SYS_OMAP24_I2C_SPEED +#define CONFIG_SYS_OMAP24_I2C_SPEED 10000 + +#ifdef CONFIG_NAND +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 +#ifdef CONFIG_SPL_OS_BOOT +#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ +#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 +#endif +#define NANDARGS \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "nandargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "${mtdparts} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \ + "nandrootfstype=ubifs rootwait=1\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "setenv loadaddr 0x84000000; " \ + "ubi part UBI; " \ + "ubifsmount ubi0:kernel; " \ + "ubifsload $loadaddr kernel-fit.itb;" \ + "ubifsumount; " \ + "bootm ${loadaddr}#conf${board_name}\0" +#else +#define NANDARGS "" +#endif + +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + +#ifndef CONFIG_SPL_BUILD +#define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + "boot_fdt=try\0" \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ + "fdtfile=undefined\0" \ + "console=ttyO0,115200n8\0" \ + "partitions=" \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ + "optargs=\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p2 ro\0" \ + "mmcrootfstype=ext4 rootwait\0" \ + "rootpath=/export/rootfs\0" \ + "nfsopts=nolock\0" \ + "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ + "::off\0" \ + "ramroot=/dev/ram0 rw\0" \ + "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "${mtdparts} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ + "spiroot=/dev/mtdblock4 rw\0" \ + "spirootfstype=jffs2\0" \ + "spisrcaddr=0xe0000\0" \ + "spiimgsize=0x362000\0" \ + "spibusno=0\0" \ + "spiargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${spiroot} " \ + "rootfstype=${spirootfstype}\0" \ + "netargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=/dev/nfs " \ + "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ + "ip=dhcp\0" \ + "bootenv=uEnv.txt\0" \ + "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${ramroot} " \ + "rootfstype=${ramrootfstype}\0" \ + "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "mmcloados=run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootz; " \ + "fi;\0" \ + "mmcboot=mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ + "fi;\0" \ + "spiboot=echo Booting from spi ...; " \ + "run spiargs; " \ + "sf probe ${spibusno}:0; " \ + "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ + "bootz ${loadaddr}\0" \ + "netboot=echo Booting from network ...; " \ + "setenv autoload no; " \ + "dhcp; " \ + "tftp ${loadaddr} ${bootfile}; " \ + "tftp ${fdtaddr} ${fdtfile}; " \ + "run netargs; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" \ + "ramboot=echo Booting from ramdisk ...; " \ + "run ramargs; " \ + "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ + "findfdt=setenv fdtfile am335x-baltos.dtb\0" \ + NANDARGS + /*DFUARGS*/ +#endif + +#define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "run mmcboot;" \ + "setenv mmcdev 1; " \ + "setenv bootpart 1:2; " \ + "run mmcboot;" \ + "run nandboot;" + + +/* NS16550 Configuration */ +#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ +#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ +#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */ +#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ +#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ +#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ +#define CONFIG_BAUDRATE 115200 + +#define CONFIG_CMD_EEPROM +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_I2C_MULTI_EEPROMS + +/* PMIC support */ +#define CONFIG_POWER_TPS65910 + +/* SPL */ +#ifndef CONFIG_NOR_BOOT +#define CONFIG_SPL_POWER_SUPPORT +#define CONFIG_SPL_YMODEM_SUPPORT + +/* Bootcount using the RTC block */ +#define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_BOOTCOUNT_AM33XX + +/* USB gadget RNDIS */ +/*#define CONFIG_SPL_MUSB_NEW_SUPPORT*/ + +/* General network SPL, both CPSW and USB gadget RNDIS */ +/*#define CONFIG_SPL_NET_SUPPORT +#define CONFIG_SPL_ENV_SUPPORT +#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"*/ + +#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" + +#ifdef CONFIG_NAND +#define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_ELM +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ + CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 +#define CONFIG_SYS_NAND_OOBSIZE 64 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ + 10, 11, 12, 13, 14, 15, 16, 17, \ + 18, 19, 20, 21, 22, 23, 24, 25, \ + 26, 27, 28, 29, 30, 31, 32, 33, \ + 34, 35, 36, 37, 38, 39, 40, 41, \ + 42, 43, 44, 45, 46, 47, 48, 49, \ + 50, 51, 52, 53, 54, 55, 56, 57, } + +#define CONFIG_SYS_NAND_ECCSIZE 512 +#define CONFIG_SYS_NAND_ECCBYTES 14 +#define CONFIG_SYS_NAND_ONFI_DETECTION +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#endif +#endif + +/* + * USB configuration. We enable MUSB support, both for host and for + * gadget. We set USB0 as peripheral and USB1 as host, based on the + * board schematic and physical port wired to each. Then for host we + * add mass storage support and for gadget we add both RNDIS ethernet + * and DFU. + */ +#define CONFIG_USB_MUSB_DSPS +#define CONFIG_ARCH_MISC_INIT +#define CONFIG_MUSB_GADGET +#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 +#define CONFIG_MUSB_HOST +#define CONFIG_AM335X_USB0 +#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL +#define CONFIG_AM335X_USB1 +#define CONFIG_AM335X_USB1_MODE MUSB_HOST + +#ifdef CONFIG_MUSB_HOST +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE +#endif + +#ifdef CONFIG_MUSB_GADGET +#define CONFIG_USB_ETHER +#define CONFIG_USB_ETH_RNDIS +#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" + +/* USB TI's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x0403 +#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" +#endif /* CONFIG_MUSB_GADGET */ + +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +/* disable host part of MUSB in SPL */ +#undef CONFIG_MUSB_HOST +/* disable EFI partitions and partition UUID support */ +#undef CONFIG_PARTITION_UUIDS +#undef CONFIG_EFI_PARTITION +/* + * Disable CPSW SPL support so we fit within the 101KiB limit. + */ +#undef CONFIG_SPL_ETH_SUPPORT +#endif + +/* Network. */ +#define CONFIG_PHY_GIGE +#define CONFIG_PHYLIB +#define CONFIG_PHY_ADDR 0 +#define CONFIG_PHY_SMSC +#define CONFIG_MII +#define CONFIG_CMD_MII +#define CONFIG_PHY_ATHEROS + +/* NAND support */ +#ifdef CONFIG_NAND +#define CONFIG_CMD_NAND +#define GPMC_NAND_ECC_LP_x8_LAYOUT 1 +#if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT) +#define MTDIDS_DEFAULT "nand0=omap2-nand.0" +#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \ + "128k(SPL.backup1)," \ + "128k(SPL.backup2)," \ + "128k(SPL.backup3)," \ + "1920k(u-boot)," \ + "-(UBI)" +#define CONFIG_ENV_IS_NOWHERE +#endif +#endif + +#endif /* ! __CONFIG_BALTOS_H */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 490c53e92f..741fb05a7d 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -579,7 +579,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 @@ -602,7 +601,6 @@ DEFAULT_LINUX_BOOT_ENV \ */ #if defined(CONFIG_NOR) #undef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 900dc42fc3..8f0f7f03fc 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE /* No mtest functions as recommended */ -#undef CONFIG_CMD_MEMORY /* * This is the initial SP which is used only briefly for relocating the u-boot @@ -124,7 +123,6 @@ #define CONFIG_BOOTCOMMAND "" /* Commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_FAT @@ -134,6 +132,5 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_FAT_WRITE -#undef CONFIG_CMD_NFS #endif /* __BCM28155_AP_H */ diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index fb85c7263b..ba26964fea 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -35,9 +35,6 @@ /* Some commands use this as the default load address */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE -/* No mtest functions as recommended */ -#undef CONFIG_CMD_MEMORY - /* * This is the initial SP which is used only briefly for relocating the u-boot * image to the top of SDRAM. After relocation u-boot moves the stack to the @@ -85,8 +82,6 @@ #define CONFIG_MX_CYCLIC /* Commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_FAT diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h index 369f7b82e6..17fdded138 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/beagle_x15.h @@ -14,6 +14,12 @@ #define CONFIG_AM57XX +#ifdef CONFIG_SPL_BUILD +#define CONFIG_IODELAY_RECALIBRATION +#endif + +#define CONFIG_BOARD_EARLY_INIT_F + #define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_ENV_SIZE (64 << 10) @@ -22,8 +28,6 @@ #define FAT_ENV_DEVICE_AND_PART "0:1" #define FAT_ENV_FILE "uboot.env" -#define CONFIG_CMD_SAVEENV - #define CONSOLEDEV "ttyO2" #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ @@ -44,7 +48,6 @@ #define CONFIG_EFI_PARTITION /* CPSW Ethernet */ -#define CONFIG_CMD_NFS #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 84541b9c6e..c403729a8e 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -55,7 +55,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 0b66cdbc01..64db3acd2f 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71 -#define CONFIG_CMD_FLASH #define CONFIG_MONITOR_IS_IN_RAM */ #define CONFIG_SYS_NO_FLASH @@ -74,7 +73,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 /* -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF #define CONFIG_CMD_SPI @@ -97,7 +95,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BFIN_SERIAL -#define CONFIG_CMD_MEMORY #undef CONFIG_GZIP #undef CONFIG_ZLIB #undef CONFIG_BOOTM_RTEMS diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 0df463f5b6..b7ceba40cb 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -105,7 +105,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index 0ac3a09406..fce6fc2e12 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -67,7 +67,6 @@ /* support for serial flash */ #define CONFIG_BFIN_SPI -#define CONFIG_SPI_FLASH #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_HZ 30000000 #define CONFIG_SPI_FLASH_EON @@ -94,9 +93,4 @@ "sf read 0x1000000 0x20000 0x300000;" \ "bootm 0x1000000\0" -/* this sets up the default list of enabled commands */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_IMLS - #endif diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 83f57cdcf9..5767ac1bd7 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -103,7 +103,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index c2958e834e..1c5fc9e492 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -89,7 +89,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 32ac961b67..28b3760f69 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -101,7 +101,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h index b374ab5772..51814a677f 100644 --- a/include/configs/bf527-sdp.h +++ b/include/configs/bf527-sdp.h @@ -77,7 +77,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 322705decb..4876169104 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -98,7 +98,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 /* #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL */ diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 53b7ab51b8..7e52d17627 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -101,7 +101,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO @@ -146,22 +145,16 @@ # define CONFIG_BOOTDELAY 5 #endif -#include <config_cmd_default.h> - #ifdef CONFIG_BFIN_MAC # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING -#else -# undef CONFIG_CMD_NFS #endif #define CONFIG_CMD_BOOTLDR #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_SF #define CONFIG_BOOTCOMMAND "run ramboot" diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 850c5164da..e922bd5637 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -82,7 +82,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 2da5d29302..d8a0cc6b5d 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -100,7 +100,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO @@ -145,22 +144,16 @@ # define CONFIG_BOOTDELAY 5 #endif -#include <config_cmd_default.h> - #ifdef CONFIG_BFIN_MAC # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING -#else -# undef CONFIG_CMD_NFS #endif #define CONFIG_CMD_BOOTLDR #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_I2C -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_SF #define CONFIG_BOOTCOMMAND "run flashboot" diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index b5e59ffe04..f250cdbf0a 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -84,7 +84,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 3c82bf2701..b1d4f263ae 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -83,7 +83,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 /* #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 53f655890f..c7b44ae427 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -92,7 +92,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 299c4c29dc..da28396314 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -114,7 +114,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 10000000 #define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL @@ -122,7 +121,6 @@ * Env Storage Settings */ #define CONFIG_ENV_IS_IN_SPI_FLASH -/* #define CONFIG_CMD_SAVEENV */ #define CONFIG_ENV_SECT_SIZE (1056 * 8) #define CONFIG_ENV_OFFSET ((16 + 256) * 1056) #define CONFIG_ENV_SIZE (8 * 1056) diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 73f3bfe197..0e353b9941 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -84,7 +84,6 @@ /* * Flash Settings */ -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_JFFS2 #define CONFIG_SYS_FLASH_CFI_WIDTH 2 #define CONFIG_FLASH_CFI_DRIVER @@ -101,7 +100,6 @@ #define CONFIG_BFIN_SPI6XX #define CONFIG_ENV_SPI_MAX_HZ 25000000 #define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL /* @@ -141,7 +139,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_UART_CONSOLE 0 -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_SOFTSWITCH #define CONFIG_SYS_MEMTEST_END (CONFIG_STACKBASE - 20*1024*1024 + 4) diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 1c9d584578..7b2faf29cb 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -9,7 +9,6 @@ * Command Settings */ #ifndef _CONFIG_CMD_DEFAULT_H -# include <config_cmd_default.h> # ifdef ADI_CMDS_NETWORK # define CONFIG_CMD_DHCP # define CONFIG_BOOTP_SUBNETMASK @@ -23,9 +22,6 @@ # ifdef CONFIG_BFIN_MAC # define CONFIG_CMD_MII # endif -# else -# undef CONFIG_CMD_BOOTD -# undef CONFIG_CMD_NFS # endif # ifdef CONFIG_LIBATA # define CONFIG_CMD_FAT @@ -75,10 +71,7 @@ # define CONFIG_CMD_I2C # define CONFIG_SOFT_I2C_READ_REPEATED_START # endif -# ifdef CONFIG_SYS_NO_FLASH -# undef CONFIG_CMD_FLASH -# undef CONFIG_CMD_IMLS -# else +# ifndef CONFIG_SYS_NO_FLASH # define CONFIG_CMD_JFFS2 # endif # ifdef CONFIG_CMD_JFFS2 diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 7f364cd649..c45c8c2389 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION @@ -22,9 +21,7 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SF #define CONFIG_CMD_SPI @@ -52,8 +49,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index ee526afab1..c0197ca0e6 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -102,8 +102,6 @@ #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_ENV_OVERWRITE 1 -#include <config_cmd_default.h> - #ifdef CONFIG_SMC91111 # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING @@ -219,7 +217,6 @@ /* For the M25P64 SCK Should be Kept < 15Mhz */ #define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_SF_DEFAULT_SPEED 15000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* @@ -237,8 +234,6 @@ * hardware don't support Parallel Flash at all. */ #define CONFIG_SYS_NO_FLASH -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_FLASH #endif diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h index 27dccf65c4..4752b072a1 100644 --- a/include/configs/blackvme.h +++ b/include/configs/blackvme.h @@ -142,7 +142,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_SF_DEFAULT_SPEED 15000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* @@ -153,8 +152,6 @@ #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_AUTO_COMPLETE 1 -#include <config_cmd_default.h> - #define CONFIG_CMD_BOOTLDR #define CONFIG_CMD_CACHE #define CONFIG_CMD_CPLBINFO @@ -234,8 +231,6 @@ * No Parallel Flash on this board */ #define CONFIG_SYS_NO_FLASH -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_FLASH #endif diff --git a/include/configs/br4.h b/include/configs/br4.h index a44c18c66e..cbef809c5a 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -82,7 +82,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index e28e5ad201..152141531c 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -151,28 +151,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* - * For commands to use, we take the default list and add a few other - * useful commands. Note that we must have set CONFIG_SYS_NO_FLASH - * prior to this include, in order to skip a few commands. When we do - * have flash, if we expect these commands they must be enabled in that - * config. If desired, a specific list of desired commands can be used - * instead. - */ -#include <config_cmd_default.h> -/* undefine commands, which we do not need */ -#undef CONFIG_CMD_EDITENV -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_ITEST -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG -/* define command we need always */ -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_SOURCE /* * Our platforms make use of SPL to initalize the hardware (primarily diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 8353fc95dd..7d8bb4790d 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -311,7 +311,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -319,7 +318,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_GPIO #ifndef CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index f8785dbafc..21e3a0c2db 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -75,7 +75,6 @@ /* SPI support */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE @@ -91,12 +90,6 @@ #define CONFIG_MMC_MBLOCK /* U-Boot command configuration */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BDI -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP diff --git a/include/configs/canmb.h b/include/configs/canmb.h index c90179380f..c6563780d7 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -49,14 +49,11 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SNTP diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index c76a426db8..96dfe07c0a 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -58,7 +58,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 93938642fa..4607d9f6bc 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -26,8 +26,6 @@ /* * Supported commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BSP #define CONFIG_CMD_DATE @@ -37,7 +35,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SNTP diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index a3908d0ef5..231f4ba33d 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -19,10 +19,6 @@ /* CMD */ #define CONFIG_CMD_GREPENV -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_XIMG -#undef CONFIG_CMD_FPGA /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 @@ -167,7 +163,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_MXC_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SPI_FLASH_EON #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3eb7886eb6..41df106ee0 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -110,8 +110,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ @@ -129,9 +127,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 8c63138322..a8d0b97287 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -120,8 +120,6 @@ #define CONFIG_CMD_USB /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ @@ -140,9 +138,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_GPIO -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index a129f68814..2a8b73022e 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -57,7 +57,6 @@ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_CMD_SAVEENV /* Enhance our eMMC support / experience. */ #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index 9bc3795d91..d081865749 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -44,21 +44,8 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_NFS - -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_LOADB #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_LOADS #define CONFIG_CMD_ASKENV -#define CONFIG_CMD_BDI -#define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_RUN -#define CONFIG_CMD_IMI #if 0 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 11dd4d712b..8a6106d3a7 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -120,12 +120,8 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB #undef CONFIG_CMD_MII #ifdef CONFIG_MCFFEC diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 6f25fdba77..e3f0ab027f 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -52,15 +52,9 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_LOADB /* Both together */ -#undef CONFIG_CMD_LOADS /* saves 10 KB */ #define CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC #define CONFIG_CMD_USB -#define CONFIG_CMD_FLASH /* * Networking Configuration diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index a3f27e36a1..8228e4208b 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -55,7 +55,6 @@ #define CONFIG_ENV_SIZE (SZ_64K) /* Debug commands */ -#define CONFIG_CMD_BDI #define CONFIG_CMD_CACHE /* Miscellaneous commands */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index d01c69307f..f2f8e2ee4d 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -13,7 +13,6 @@ #define __CONFIG_H #include <asm/arch/imx-regs.h> -#include <config_cmd_default.h> #define CONFIG_VF610 #define CONFIG_SYS_THUMB_BUILD @@ -70,7 +69,6 @@ "512k(u-boot-env)," \ "-(ubi)" -#undef CONFIG_CMD_IMLS #define CONFIG_MMC #define CONFIG_FSL_ESDHC diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9cab9fb8f9..8f829eddb1 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -219,7 +219,6 @@ #define CONFIG_HARD_SPI #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF @@ -353,7 +352,6 @@ #if defined(CONFIG_TRAILBLAZER) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ -#undef CONFIG_CMD_SAVEENV #elif defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 @@ -395,8 +393,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#include <config_cmd_default.h> - #ifndef CONFIG_TRAILBLAZER #define CONFIG_CMD_ELF diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index bf765afc11..88750e057e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -408,7 +408,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 @@ -620,8 +619,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA diff --git a/include/configs/corvus.h b/include/configs/corvus.h index f5b8f9b442..3cfae212d4 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -70,13 +70,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index 1feaefd14e..d3c6f75a12 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -249,13 +249,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index 77d3ab878c..f990cf7067 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -108,16 +108,10 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_CACHE #undef CONFIG_CMD_USB -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS #undef CONFIG_CMD_DHCP #ifdef CONFIG_SYS_I2C_SOFT diff --git a/include/configs/csb272.h b/include/configs/csb272.h index a5c6f8474b..71cb5dff36 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -71,8 +71,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BEDBUG #define CONFIG_CMD_ELF diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 6aa98efd4e..5bd3867908 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -71,8 +71,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BEDBUG #define CONFIG_CMD_ELF diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index ab5226b5fa..729b6e74aa 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -123,7 +123,6 @@ #define CONFIG_ENV_SECT_SIZE 4096 #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE @@ -171,7 +170,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -179,9 +177,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS @@ -194,8 +189,6 @@ #endif #ifdef CONFIG_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS @@ -203,11 +196,8 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_CMD_SAVEENV #endif /* SD/MMC configuration */ @@ -238,8 +228,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 37a485b0a9..3da9da42df 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -142,7 +142,6 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF @@ -294,7 +293,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -302,7 +300,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS @@ -315,8 +312,6 @@ #endif #ifdef CONFIG_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS @@ -329,10 +324,7 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_SPI -#define CONFIG_CMD_SAVEENV #endif #if !defined(CONFIG_USE_NAND) && \ @@ -341,7 +333,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index e702a50380..89b6f23c93 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -53,7 +53,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index 16b901b01b..847d788292 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -69,13 +69,6 @@ /* NYET -- #define CONFIG_USB_DAVINCI */ /* U-Boot command configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h index 4eed72292d..d4b994ad2b 100644 --- a/include/configs/davinci_dm355leopard.h +++ b/include/configs/davinci_dm355leopard.h @@ -54,13 +54,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* U-Boot command configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index c50c059f65..8b42c50dd9 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -112,13 +112,6 @@ #endif /* CONFIG_MUSB_UDC */ /* U-Boot command configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index b02e73c02a..8571cbdbae 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -112,7 +112,6 @@ extern unsigned int davinci_arm_clk_get(void); "root=/dev/hda1 rw noinitrd ip=dhcp" /* U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DIAG #define CONFIG_CMD_I2C @@ -121,12 +120,7 @@ extern unsigned int davinci_arm_clk_get(void); #define CONFIG_CMD_EEPROM #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR #ifdef CONFIG_SYS_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #endif diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 2467f70522..61087363b2 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -169,7 +169,6 @@ /*=================*/ /* U-Boot commands */ /*=================*/ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG @@ -178,17 +177,12 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES #define CONFIG_CMD_EEPROM -#undef CONFIG_CMD_BDI #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR #ifdef CONFIG_SYS_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #elif defined(CONFIG_SYS_USE_NOR) #define CONFIG_CMD_JFFS2 diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 2505465242..db636e4cf8 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -111,7 +111,6 @@ /*=================*/ /* U-Boot commands */ /*=================*/ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG @@ -122,11 +121,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND #undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index e773835dd9..9ecf6cebc2 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -104,7 +104,6 @@ "nand read 87A00000 100000 300000;" \ "bootelf 87A00000" /* U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG @@ -115,11 +114,6 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF /* Needed to load Integrity kernel. */ -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index dae37cdaf6..410cf68741 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -157,7 +157,6 @@ /*=================*/ /* U-Boot commands */ /*=================*/ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG @@ -166,12 +165,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES #define CONFIG_CMD_EEPROM -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR #ifdef CONFIG_SYS_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #elif defined(CONFIG_SYS_USE_NOR) #define CONFIG_CMD_JFFS2 diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 12a24ced1b..24dbf6bf71 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV @@ -63,6 +62,11 @@ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST +/* Keep device tree and initrd in lower memory so the kernel can access them */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x10000000\0" \ + "initrd_high=0x10000000\0" + /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 77d34080fd..c33a58895a 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -24,7 +24,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_I2C diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index ea55084a31..0abab78d2a 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -74,26 +74,15 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_BDI #undef CONFIG_CMD_BEDBUG #undef CONFIG_CMD_ELF -#undef CONFIG_CMD_SAVEENV #undef CONFIG_CMD_FAT -#undef CONFIG_CMD_FPGA #undef CONFIG_CMD_MII -#undef CONFIG_CMD_RUN - #ifdef CONFIG_DBAU1550 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_LOADB - #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IDE -#undef CONFIG_CMD_NFS #undef CONFIG_CMD_PCMCIA #else @@ -101,10 +90,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS - #endif diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index bd96a7d3f4..4f35234ced 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -49,7 +49,6 @@ /* * NOR Flash */ -#define CONFIG_CMD_FLASH #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71 #define CONFIG_SYS_FLASH_BASE EMC_CS0_BASE @@ -78,7 +77,6 @@ /* * U-Boot Commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE /* diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 84b047e53f..215dc30bde 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -100,8 +100,6 @@ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_SPI #undef CONFIG_CMD_GPIO #undef CONFIG_CMD_ASKENV diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 5ec3c99799..f6d7ec4e78 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -103,8 +103,6 @@ #define CONFIG_LZO /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_UBI /* UBI Support */ #define CONFIG_CMD_UBIFS /* UBIFS Support */ @@ -118,12 +116,6 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */ -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ -#undef CONFIG_CMD_NFS /* NFS support */ - #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 06da3c3e76..a7af35196b 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -99,8 +99,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #ifdef CONFIG_VIDEO #define CONFIG_CMD_BMP #endif diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 0f67595903..e6bfe58e98 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -71,7 +71,6 @@ #undef CONFIG_CMD_ELF #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_NFS /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index a9cfc10d0c..0299d16e83 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -67,7 +67,6 @@ #undef CONFIG_CMD_ELF #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_NFS /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index 3cbd67f6b0..e809f20359 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -118,11 +118,4 @@ "cp.b 0x01000000 0x20030000 0x2c0000\0" \ "runme=bootm 0x01000000\0" -/* this sets up the default list of enabled commands */ -#include <config_cmd_default.h> - -#ifndef CONFIG_BFIN_MAC -# undef CONFIG_CMD_NFS -#endif - #endif diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 379e6c79b8..54be415712 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -32,7 +32,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index ec7f721ff3..b27b2026c3 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -31,7 +31,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_MII diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 77edc21d9c..d84427d1d8 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -15,6 +15,10 @@ #define CONFIG_DRA7XX #define CONFIG_BOARD_EARLY_INIT_F +#ifdef CONFIG_SPL_BUILD +#define CONFIG_IODELAY_RECALIBRATION +#endif + #ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */ #define CONFIG_ENV_IS_IN_MMC @@ -24,7 +28,6 @@ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #endif -#define CONFIG_CMD_SAVEENV #if (CONFIG_CONS_INDEX == 1) #define CONSOLEDEV "ttyO0" @@ -38,6 +41,7 @@ #define CONFIG_SYS_OMAP_ABE_SYSCK +#ifndef CONFIG_SPL_BUILD /* Define the default GPT table for eMMC */ #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ @@ -91,6 +95,7 @@ #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x2F000000 #define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 +#endif #include <configs/ti_omap5_common.h> @@ -117,11 +122,9 @@ /* SPI */ #undef CONFIG_OMAP3_SPI #define CONFIG_TI_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_TI_SPI_MMAP #define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 @@ -248,7 +251,7 @@ "128k(NAND.u-boot-env)," \ "128k(NAND.u-boot-env.backup1)," \ "8m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ #ifdef CONFIG_SPL_NAND_SUPPORT @@ -270,7 +273,6 @@ #define CONFIG_SYS_FLASH_SIZE (64 * 1024 * 1024) /* 64 MB */ /* #define CONFIG_INIT_IGNORE_ERROR */ #undef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/draco.h b/include/configs/draco.h index a2438d883e..acefd3e35d 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -19,18 +19,23 @@ #include "siemens-am33x-common.h" -#define CONFIG_SYS_MPUCLK 275 +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_SYS_MPUCLK 300 #define DDR_PLL_FREQ 303 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC -#define BOARD_DFU_BUTTON_GPIO 27 -#define BOARD_DFU_BUTTON_LED 64 /* red LED */ -#define BOARD_STATUS_LED 103 /* green LED */ +#define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + "button_dfu0=27\0" \ + "led0=103,1,0\0" \ + "led1=64,0,1\0" + #undef CONFIG_DOS_PARTITION #undef CONFIG_CMD_FAT +#define CONFIG_BOARD_LATE_INIT /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ @@ -57,13 +62,25 @@ /* Watchdog */ #define CONFIG_OMAP_WATCHDOG +/* Define own nand partitions */ +#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 +#define CONFIG_ENV_SIZE_REDUND 0x2000 +#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) + + +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2 + #ifndef CONFIG_SPL_BUILD /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ + "hostname=draco\0" \ "nand_img_size=0x400000\0" \ "optargs=\0" \ - CONFIG_COMMON_ENV_SETTINGS + "preboot=draco_led 0\0" \ + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CONFIG_ENV_SETTINGS_V2 \ + CONFIG_ENV_SETTINGS_NAND_V2 #ifndef CONFIG_RESTORE_FLASH /* set to negative value for no autoboot */ @@ -75,6 +92,7 @@ "reset; " \ "fi;" \ "run nand_boot;" \ +"run nand_boot_backup;" \ "reset;" diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index ea6e5c0329..133c7f4a35 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -46,7 +46,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_FAT @@ -73,7 +72,6 @@ #endif #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH 1 #define CONFIG_HARD_SPI 1 #define CONFIG_KIRKWOOD_SPI 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 1e522c3b6b..b9f28a34b8 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -66,7 +66,6 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE @@ -148,7 +147,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -156,7 +154,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_I2C #define CONFIG_CMD_GPIO @@ -172,8 +169,6 @@ /* NAND Setup */ #ifdef CONFIG_SYS_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS @@ -197,11 +192,8 @@ /* SPI Flash */ #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_CMD_SAVEENV #endif #if !defined(CONFIG_SYS_USE_NAND) && \ @@ -210,7 +202,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 5f6148e754..924362cb23 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -64,9 +64,6 @@ * Command line configuration. */ #define CONFIG_CMDLINE_EDITING -#include <config_cmd_default.h> - -#undef CONFIG_CMD_LOADB #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index f7e70aa573..271e071cbb 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -112,9 +112,6 @@ /* * Command line configuration */ - -#include <config_cmd_default.h> - #define CONFIG_CMD_BMP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 358314c240..8e62674b3f 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -30,17 +30,13 @@ #define CONFIG_ECOVEC_ROMIMAGE_ADDR 0xA0040000 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV #define CONFIG_CMD_USB #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_SAVEENV #define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 70f122643a..87b29f8901 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -91,11 +91,6 @@ #undef CONFIG_USE_IRQ /* Don't need IRQ/FIQ */ /* Monitor configuration */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG - #undef CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_JFFS2 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index bd0874065c..b5e8e0ec20 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -135,9 +135,8 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ +sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */ /* - * Commands configuration - using default command set for now + * Commands configuration */ -#include <config_cmd_default.h> #define CONFIG_CMD_IDE #define CONFIG_CMD_I2C #define CONFIG_CMD_USB diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 5dfd56ca21..cba58aa70f 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 @@ -77,9 +76,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #endif -/* Command definition */ -#undef CONFIG_CMD_FPGA - #define CONFIG_CMD_BMODE #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h index 3be17f166f..141489d179 100644 --- a/include/configs/enbw_cmc.h +++ b/include/configs/enbw_cmc.h @@ -152,8 +152,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 128 #define CONFIG_FLASH_16BIT /* Flash is 16-bit */ -#define CONFIG_CMD_FLASH - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_SYS_MONITOR_LEN 0x80000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ @@ -246,7 +244,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -254,7 +251,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_CACHE #ifdef CONFIG_CMD_BDI @@ -268,7 +264,6 @@ #endif #ifdef CONFIG_USE_NAND -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS @@ -286,7 +281,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/espt.h b/include/configs/espt.h index f717954484..d854341b07 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -18,13 +18,9 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_ENV -#define CONFIG_CMD_NFS -#define CONFIG_CMD_SAVEENV #define CONFIG_BOOTDELAY -1 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 2b638bf733..c7b1e5cbf7 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -60,7 +60,6 @@ /* 512kB DataFlash at NPCS0 */ #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 #define CONFIG_HAS_DATAFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 @@ -91,29 +90,13 @@ #define CONFIG_AT91_GPIO /* Command line configuration */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_SPI -#ifdef MINIMAL_LOADER -#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_EDITENV -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_ITEST -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG -#else +#ifndef MINIMAL_LOADER #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BSP #define CONFIG_CMD_CACHE diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 87f8db0fba..d7bf80b69b 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -59,8 +59,6 @@ #define CONFIG_PWM /* Command definition*/ -#include <config_cmd_default.h> - #define CONFIG_CMD_MMC #define CONFIG_CMD_EXT4_WRITE #define CONFIG_FAT_WRITE @@ -79,7 +77,6 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#undef CONFIG_CMD_IMLS #include <config_distro_defaults.h> diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index f6b0a6ff2b..08e2009870 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -22,10 +22,6 @@ #define CONFIG_MMC_SDMA #define CONFIG_MMC_DEFAULT_DEV 0 -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_XIMG #undef CONFIG_CMD_ONENAND #undef CONFIG_CMD_MTDPARTS #define CONFIG_CMD_DFU diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 846b86889b..5d66901f8b 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -72,9 +72,6 @@ /* * Command definition */ - -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_SUBNETMASK diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 836515d178..967a05a2cb 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -53,7 +53,6 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_MII diff --git a/include/configs/gose.h b/include/configs/gose.h index 04f0383cbe..c08e73ac69 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -44,8 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 0ac198df8d..0de6ae8088 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -57,9 +57,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_I2C -#undef CONFIG_CMD_FPGA #define CONFIG_CMD_USB #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT @@ -122,8 +120,6 @@ #define CONFIG_ENV_OFFSET 0x07C000 #define CONFIG_CMD_ASKENV -#define CONFIG_CMD_EDITENV -#define CONFIG_CMD_SAVEENV #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 5d28d8bf08..782746e4e0 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -59,8 +59,6 @@ /* * Supported commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_REGINFO #define CONFIG_CMD_AMBAPP #define CONFIG_CMD_PING diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index dd8653a879..5c466f2929 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -53,8 +53,6 @@ /* * Supported commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_REGINFO #define CONFIG_CMD_AMBAPP #define CONFIG_CMD_PING diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index fdd0aa5455..e01578cbb2 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -40,8 +40,6 @@ /* * Supported commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_REGINFO #define CONFIG_CMD_AMBAPP #define CONFIG_CMD_PING diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index 99d23892b7..231f25a38b 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -62,7 +62,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_USART1 #define CONFIG_USART_ID 1 -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R @@ -93,12 +92,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - -/* remove unneeded commands */ -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR - /* add useful commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 6c52a17ee4..f54919eaae 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -48,22 +48,10 @@ * Supported commands */ #define CONFIG_CMD_AMBAPP /* AMBA Plyg&Play information */ -#define CONFIG_CMD_BDI /* bdinfo */ -#define CONFIG_CMD_CONSOLE /* coninfo */ #define CONFIG_CMD_DIAG -#define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_IRQ -#define CONFIG_CMD_ITEST /* Integer (and string) test */ -#define CONFIG_CMD_LOADB /* loadb */ -#define CONFIG_CMD_LOADS /* loads */ -#define CONFIG_CMD_MISC /* Misc functions like sleep etc */ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_RUN /* run command in env variable */ -#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ -#define CONFIG_CMD_SOURCE /* "source" command support */ -#define CONFIG_CMD_XIMG /* Load part of Multi Image */ /* * Autobooting diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index f050754a75..bd2eaa9fda 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -46,22 +46,10 @@ /* * Supported commands */ -#define CONFIG_CMD_BDI /* bdinfo */ -#define CONFIG_CMD_CONSOLE /* coninfo */ #define CONFIG_CMD_DIAG -#define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_IRQ -#define CONFIG_CMD_ITEST /* Integer (and string) test */ -#define CONFIG_CMD_LOADB /* loadb */ -#define CONFIG_CMD_LOADS /* loads */ -#define CONFIG_CMD_MISC /* Misc functions like sleep etc */ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_RUN /* run command in env variable */ -#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ -#define CONFIG_CMD_SOURCE /* "source" command support */ -#define CONFIG_CMD_XIMG /* Load part of Multi Image */ /* * Autobooting diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 8e53af8c04..5f095677f1 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -46,7 +46,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6b8c82d2b8..902ec2c536 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -48,11 +48,8 @@ /* Driver Model */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_DM #define CONFIG_DM_GPIO -#define CONFIG_DM_SERIAL #define CONFIG_DM_THERMAL -#define CONFIG_CMD_DM #endif /* GPIO */ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index c00b951ac4..1d2d09ad54 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -116,11 +116,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_SOURCE -#define CONFIG_CMD_RUN -#define CONFIG_CMD_IMI - #define CONFIG_FIT #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 08dcdf8986..86823e235c 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -54,11 +54,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BDI -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_LOADS #define CONFIG_CMD_SCSI #define CONFIG_BOOT_RETRY_TIME -1 diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index bea19853c9..08e2f42da6 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -471,8 +471,6 @@ int fpga_gpio_get(unsigned int bus, int pin); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PCI diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index f1ddf21580..ee524527aa 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -45,7 +45,6 @@ */ #define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_IDE diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 2baf50cc4e..1a5c93d11b 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -40,7 +40,6 @@ */ #define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_MII #define CONFIG_CMD_NAND diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 10f840db32..e60e753e40 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -418,18 +418,13 @@ /* * U-Boot environment setup */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_NAND -#define CONFIG_CMD_FLASH #define CONFIG_CMD_SNTP #define CONFIG_CMD_MII #define CONFIG_CMD_DATE #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_EDITENV #define CONFIG_CMD_JFFS2 #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index 71ca77a513..5a0291753d 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -63,7 +63,6 @@ #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0 /* SPI FLASH - not used for environment */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 25000000 @@ -74,7 +73,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 386dbd8895..526659c978 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -171,7 +171,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 0f22032545..c552e9f76e 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -73,9 +73,6 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> - #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SPI diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index db197f340c..54e8121008 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -52,9 +52,6 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 92587349d1..c7bf531f6a 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -80,14 +80,11 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_IDE -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 12c7382c17..1d307ca1e6 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -94,7 +94,6 @@ * - SIB block * - U-Boot environment */ -#define CONFIG_CMD_FLASH #define CONFIG_CMD_ARMFLASH #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 12eb172a14..c76ebcbb60 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -43,8 +43,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAM0 console=tty" #define CONFIG_BOOTCOMMAND "" diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 7518b60fb2..d6f2602875 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -40,8 +40,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" #define CONFIG_BOOTCOMMAND "tftpboot ; bootm" diff --git a/include/configs/io.h b/include/configs/io.h index 810193343f..f5b09b6162 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -71,7 +71,6 @@ #undef CONFIG_CMD_ELF #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_NFS /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 9d9dabf242..f7ae6631cc 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -67,7 +67,6 @@ #undef CONFIG_CMD_ELF #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_NFS /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/ip04.h b/include/configs/ip04.h index a6aed5d65f..dd2a618a88 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -91,7 +91,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 16bc373dd3..e68b6617c5 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -255,7 +255,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -263,7 +262,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 41ced15c48..230f2c4d30 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -101,8 +101,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #ifdef CONFIG_VIDEO #define CONFIG_CMD_BMP /* BMP support */ #endif diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 606e6b4c55..3bbff282df 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -43,7 +43,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/jornada.h b/include/configs/jornada.h index dd30ba2c93..71f2ee18a3 100644 --- a/include/configs/jornada.h +++ b/include/configs/jornada.h @@ -43,14 +43,7 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#define CONFIG_CMD_FLASH #define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_MISC -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG #define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTARGS "root=/dev/hda1 console=ttySA0,19200n8 console=tty1" diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 7dfaa221ee..65b3df601d 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -85,9 +85,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP #if defined(CONFIG_PCI) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 56499018ad..f3248bc1d5 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,13 +13,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DEFAULTENV_VARS #define CONFIG_CMD_GREPENV -#define CONFIG_CMD_ECHO #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 2ed0855fdd..15fca1abe6 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -124,14 +124,11 @@ */ #define CONFIG_CMD_ELF #define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_NFS /* * Without NOR FLASH we need this */ #define CONFIG_SYS_NO_FLASH -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS /* * NAND Flash configuration @@ -253,7 +250,6 @@ int get_scl(void); #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* SPI bus claim MPP configuration */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 686d2f3285..a8cf3f7341 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -299,7 +299,6 @@ int get_scl(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SPANSION @@ -410,8 +409,6 @@ int get_scl(void); /* we don't need flash support */ #define CONFIG_SYS_NO_FLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 61c015f3ca..c905cc2dc2 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -44,8 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 036f2cb85a..e05d56cd82 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -72,7 +72,6 @@ /* SPI Configuration */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_CMD_SPI @@ -209,7 +208,6 @@ #define CONFIG_USB_PHY_CFG_BASE KS2_USB_PHY_CFG_BASE /* U-Boot command configuration */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 7111b08387..93c2976b21 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -24,7 +24,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_OF_LIBFDT -#include <config_cmd_default.h> #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 9ac5d3319e..30810d3752 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -53,7 +53,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING diff --git a/include/configs/lager.h b/include/configs/lager.h index f121b9c9aa..1450e8f53f 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -42,9 +42,7 @@ /* SPI */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h index e3dd5e022c..e9ee3fb638 100644 --- a/include/configs/lp8x4x.h +++ b/include/configs/lp8x4x.h @@ -44,10 +44,7 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC #define CONFIG_CMD_USB #undef CONFIG_LCD diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ca913b0671..8a5a707d3b 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include <config_cmd_default.h> - #define CONFIG_LS102XA #define CONFIG_SYS_GENERIC_BOARD @@ -409,16 +407,24 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION -/* QSPI */ +/* SPI */ #ifdef CONFIG_QSPI_BOOT +/* QSPI */ #define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 +#define CONFIG_SPI_FLASH_SPANSION + +/* DSPI */ +#define CONFIG_FSL_DSPI +/* DM SPI */ +#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_DM_SPI_FLASH +#define CONFIG_SPI_FLASH_DATAFLASH +#endif #endif /* @@ -539,12 +545,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING -#ifdef CONFIG_QSPI_BOOT -#undef CONFIG_CMD_IMLS -#else -#define CONFIG_CMD_IMLS -#endif - #define CONFIG_ARMV7_NONSEC #define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN @@ -587,7 +587,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMD_ENV_EXISTS #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6b6f2ba676..233b3d092c 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include <config_cmd_default.h> - #define CONFIG_LS102XA #define CONFIG_SYS_GENERIC_BOARD @@ -252,16 +250,20 @@ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION -/* QSPI */ +/* SPI */ #ifdef CONFIG_QSPI_BOOT +/* QSPI */ #define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 +#define CONFIG_SPI_FLASH_STMICRO +/* DM SPI */ +#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_DM_SPI_FLASH +#endif #endif /* @@ -356,12 +358,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING -#ifdef CONFIG_QSPI_BOOT -#undef CONFIG_CMD_IMLS -#else -#define CONFIG_CMD_IMLS -#endif - #define CONFIG_ARMV7_NONSEC #define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN @@ -400,7 +396,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMD_ENV_EXISTS #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index 547026ee3f..72ba3b394e 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -205,20 +205,10 @@ unsigned long long get_qixis_addr(void); /* Command line configuration */ #define CONFIG_CMD_CACHE -#define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_IMI -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_RUN -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_SOURCE /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h index cd2b080335..e488ac8ebf 100644 --- a/include/configs/ls2085aqds.h +++ b/include/configs/ls2085aqds.h @@ -8,7 +8,6 @@ #define __LS2_QDS_H #include "ls2085a_common.h" -#include <config_cmd_default.h> #define CONFIG_IDENT_STRING " LS2085A-QDS" #define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-QDS" diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h index 0837fcd306..600261e42b 100644 --- a/include/configs/ls2085ardb.h +++ b/include/configs/ls2085ardb.h @@ -8,8 +8,6 @@ #define __LS2_RDB_H #include "ls2085a_common.h" -#include <config_cmd_default.h> - #define CONFIG_IDENT_STRING " LS2085A-RDB" #define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-RDB" diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 7d22173943..ddbf5cec67 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -53,7 +53,6 @@ /* * Commands configuration */ -#include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 799850a5a1..513167e2ef 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -428,8 +428,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -440,7 +438,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index eba1b2f7b4..29c60b75a5 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -18,7 +18,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE @@ -40,7 +39,6 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SF #define CONFIG_CMD_SPI @@ -127,7 +125,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 2d2b2263ac..35058e222a 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -26,7 +26,6 @@ /* * U-Boot Commands */ -#include <config_cmd_default.h> #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE diff --git a/include/configs/malta.h b/include/configs/malta.h index 9445c9b1d7..ab2335fab8 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -119,13 +119,6 @@ /* * Commands */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index ab4a4710c7..941290c776 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -21,8 +21,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DISPLAY #define CONFIG_CMD_DHCP @@ -32,7 +30,6 @@ #define CONFIG_CMD_DTT #define CONFIG_CMD_IDE #define CONFIG_CMD_FAT -#define CONFIG_CMD_NFS #define CONFIG_CMD_MII #define CONFIG_CMD_SNTP diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index d8811a47cd..4826044857 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -22,7 +22,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_I2C @@ -44,7 +43,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_BAR /* Environment in SPI NOR flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 3405c83bf0..0a7b7cf36e 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -113,8 +113,6 @@ #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ @@ -137,11 +135,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_GPIO -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ - #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 @@ -153,7 +146,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS /* * Board NAND Info. */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 0b9cbae5ba..a8b4b24470 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -296,13 +296,10 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_EEPROM diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 955d0e278a..e5bb87302c 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -86,12 +86,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index db463c0b2e..e16965c56c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -176,7 +176,6 @@ # define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_XILINX_SPI 1 # define CONFIG_SPI 1 -# define CONFIG_SPI_FLASH 1 # define CONFIG_SPI_FLASH_STMICRO 1 # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 # define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ @@ -245,12 +244,9 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL -#define CONFIG_CMD_ECHO #define CONFIG_CMD_GPIO #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE) @@ -259,9 +255,7 @@ # undef CONFIG_CMD_CACHE #endif -#ifndef CONFIG_SYS_ENET -# undef CONFIG_CMD_NFS -#else +#ifdef CONFIG_SYS_ENET # define CONFIG_CMD_PING # define CONFIG_CMD_DHCP # define CONFIG_CMD_TFTPPUT @@ -273,15 +267,11 @@ #endif #if defined(FLASH) -# define CONFIG_CMD_ECHO -# define CONFIG_CMD_FLASH -# define CONFIG_CMD_IMLS # define CONFIG_CMD_JFFS2 # define CONFIG_CMD_UBI # undef CONFIG_CMD_UBIFS # if !defined(RAMENV) -# define CONFIG_CMD_SAVEENV # define CONFIG_CMD_SAVES # endif @@ -290,12 +280,9 @@ # define CONFIG_CMD_SF # if !defined(RAMENV) -# define CONFIG_CMD_SAVEENV # define CONFIG_CMD_SAVES # endif #else -# undef CONFIG_CMD_IMLS -# undef CONFIG_CMD_FLASH # undef CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBI # undef CONFIG_CMD_UBIFS diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index cdd5c79dce..6dc84eb359 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,8 +33,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BEDBUG #define CONFIG_CMD_DATE diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 41ae0a53f8..782b29dc97 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -415,8 +415,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -426,7 +424,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 195bc18996..1b09e7076e 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -398,8 +398,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 8ae497c6d5..3ac4b0b780 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -11,10 +11,7 @@ #define __MPR2_H /* Supported commands */ -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_CACHE -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_FLASH /* Default environment variables */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 585d68f208..3e9996641a 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -12,10 +12,7 @@ #define CONFIG_CPU_SH7720 1 #define CONFIG_MS7720SE 1 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_CACHE #define CONFIG_CMD_PCMCIA #define CONFIG_CMD_IDE diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index fb5fcc6e7e..12bb3a0438 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -12,13 +12,9 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MS7722SE 1 -#define CONFIG_CMD_FLASH #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_SAVEENV #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 4cf8efeca0..bbd2d6bfed 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -18,11 +18,6 @@ /* * Command line configuration. */ -/*#include <config_cmd_default.h>*/ - -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_SAVEENV - #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_BAUDRATE 38400 #define CONFIG_CONS_SCIF1 1 diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 01e395a49d..dd516acff5 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -48,7 +48,6 @@ /* * FPGA */ -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_FPGA #define CONFIG_FPGA_XILINX diff --git a/include/configs/munices.h b/include/configs/munices.h index 535bf2a2f6..42ac0290d8 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -26,8 +26,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_ELF #define CONFIG_CMD_IMMAP diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 51436da64e..b654fffb26 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -59,6 +59,8 @@ #define CONFIG_BOOTDELAY 3 /* default enable autoboot */ #define CONFIG_PREBOOT +#define CONFIG_OF_LIBFDT /* Device tree support */ + /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is @@ -121,7 +123,6 @@ * Common SPI Flash configuration */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH 1 #define CONFIG_SPI_FLASH_MACRONIX 1 #endif diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h index 311fc0c3c5..45a4a7541c 100644 --- a/include/configs/mv88f6281gtw_ge.h +++ b/include/configs/mv88f6281gtw_ge.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_ENV diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 65203a0a21..529f73b852 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -12,7 +12,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 273b7d3a33..b649c7d152 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -15,9 +15,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> -#undef CONFIG_CMD_NFS - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 5f61eb157b..bd7216e47b 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_LONGHELP /* U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index bc0ae28557..588490f3cd 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -17,7 +17,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION @@ -28,9 +27,7 @@ #define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_CMD_USB @@ -130,7 +127,6 @@ /* SPI Flash */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 /* this may vary and depends on the installed chip */ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index bed071fa66..c4513d2df7 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -74,9 +74,6 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_SPI diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 1282a6e77e..7e709cd936 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -80,9 +80,6 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> - #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -91,12 +88,6 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_BOOTZ -/* - * Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require - * that CFG_NO_FLASH is undefined). - */ -#undef CONFIG_CMD_IMLS - #define CONFIG_BOARD_LATE_INIT #define CONFIG_BOOTDELAY 1 diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 4c71360e8a..c9983f3f58 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -77,9 +77,6 @@ /* * Command definition */ - -#include <config_cmd_default.h> - #define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_PING diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index e3386ac52b..22aec4f176 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include <config_cmd_default.h> - /* * High Level Board Configuration Options */ @@ -42,7 +40,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE #define CONFIG_CMD_DATE -#undef CONFIG_CMD_IMLS /* * Environmental settings @@ -93,7 +90,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_SF_DEFAULT_CS 1 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) @@ -198,9 +194,6 @@ */ #ifdef CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION -#ifdef CONFIG_CMD_NET -#define CONFIG_CMD_NFS -#endif #endif /* diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 61e8a9800f..2203c15417 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -128,10 +128,7 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_DATE diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 220d4b807d..0479195d6d 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -75,10 +75,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS - #define CONFIG_BOOTDELAY 3 #define CONFIG_ETHPRIME "smc911x" diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 4af9f7ed58..82c8af802f 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -83,10 +83,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS - #define CONFIG_BOOTDELAY 3 #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index db551a948c..53f725d14e 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -92,12 +92,9 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD -#undef CONFIG_CMD_IMLS - #define CONFIG_BOOTDELAY 1 #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index dcc86b4c37..bcdb054360 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -69,10 +69,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS - #define CONFIG_BOOTDELAY 3 #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index b37477a02b..86d7b16777 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -36,7 +36,6 @@ #include <linux/sizes.h> #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> -#include <config_cmd_default.h> #ifndef CONFIG_MX6 #define CONFIG_MX6 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c8c9f812f8..6c3c52e3e0 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -44,7 +44,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 4b5c637136..a7da111ee9 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -163,7 +163,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 63ec7c6e92..2b278a8ab4 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -189,8 +189,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SYS_FSL_QSPI_LE diff --git a/include/configs/nas220.h b/include/configs/nas220.h index cfb85bfe84..61af61f190 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -45,11 +45,9 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_PING #define CONFIG_CMD_USB #define CONFIG_CMD_DATE diff --git a/include/configs/neo.h b/include/configs/neo.h index 09300ca8ed..33cee43097 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -70,7 +70,6 @@ #undef CONFIG_CMD_ELF #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_NFS /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 8a6d2562be..8755be73b6 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -17,14 +17,8 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */ /* commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NFS -/* There is no NOR flash, so undefine these commands */ -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_SYS_NO_FLASH /* There is NAND storage */ #define CONFIG_NAND_NOMADIK diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 6247bf1569..945cbd4ee7 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -75,15 +75,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BOOTD -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_ITEST -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_XIMG - #ifdef CONFIG_CMD_NET # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index beaa11932c..67a3c97f8b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -36,7 +36,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index ed98425899..efc583f91e 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -124,8 +124,6 @@ #define CONFIG_SYS_NO_FLASH /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_EXT4 /* EXT4 Support */ #define CONFIG_CMD_FAT /* FAT support */ @@ -152,13 +150,6 @@ #endif -/* commands not needed from config_cmd_default.h */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_NFS /* NFS support */ -#undef CONFIG_CMD_SAVEENV /* saveenv */ -#undef CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ - #define CONFIG_OMAP3_SPI #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index b99d762761..dd549aa11a 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -55,7 +55,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/o2d.h b/include/configs/o2d.h index b2905b2697..4b36af699a 100644 --- a/include/configs/o2d.h +++ b/include/configs/o2d.h @@ -25,9 +25,6 @@ */ #include "o2dnt-common.h" -/* additional commands */ -#define CONFIG_CMD_ITEST - /* * GPIO configuration: * CS1 SDRAM activate + no CAN + no PCI diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 3248429631..435f1a27a1 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -76,8 +76,6 @@ /* * Supported commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EEPROM #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C diff --git a/include/configs/o2dnt2.h b/include/configs/o2dnt2.h index 1b765a7e4e..00a8d9618d 100644 --- a/include/configs/o2dnt2.h +++ b/include/configs/o2dnt2.h @@ -25,9 +25,6 @@ */ #include "o2dnt-common.h" -/* additional commands */ -#define CONFIG_CMD_ITEST - /* * GPIO configuration: * CS1 SDRAM activate + no CAN + no PCI diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index c395020919..cf17f3d06e 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -35,8 +35,8 @@ #undef CONFIG_ENV_SIZE #undef CONFIG_ENV_OFFSET -#define CONFIG_ENV_SIZE 4096 -#define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ +#define CONFIG_ENV_SIZE (SZ_1K * 16) +#define CONFIG_ENV_OFFSET (SZ_1K * 3136) /* ~3 MiB offset */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) @@ -46,8 +46,92 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS +/* DWC3 */ +#define CONFIG_USB_DWC3 +#define CONFIG_USB_DWC3_GADGET +#define CONFIG_USB_DWC3_PHY_SAMSUNG + +/* USB gadget */ +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 + +/* Downloader */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung" +#define CONFIG_USBDOWNLOAD_GADGET + +/* DFU */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 + +/* THOR */ +#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM +#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CONFIG_THOR_FUNCTION +#define CONFIG_CMD_THOR_DOWNLOAD + +/* UMS */ +#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_CMD_USB_MASS_STORAGE + /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */ #undef CONFIG_EXYNOS_TMU #undef CONFIG_TMU_CMD_DTT +#define CONFIG_DFU_ALT_SYSTEM \ + "uImage fat 0 1;" \ + "zImage fat 0 1;" \ + "Image.itb fat 0 1;" \ + "uInitrd fat 0 1;" \ + "boot.scr fat 0 1;" \ + "boot.cmd fat 0 1;" \ + "exynos5422-odroidxu3.dtb fat 0 1;" \ + "boot part 0 1;" \ + "root part 0 2\0" + +#define CONFIG_DFU_ALT_BOOT_EMMC \ + "u-boot raw 0x3e 0x800 mmcpart 1;" \ + "bl1 raw 0x0 0x1e mmcpart 1;" \ + "bl2 raw 0x1e 0x1d mmcpart 1;" \ + "tzsw raw 0x83e 0x200 mmcpart 1;" \ + "params.bin raw 0x1880 0x20\0" + +#define CONFIG_DFU_ALT_BOOT_SD \ + "u-boot raw 0x3f 0x800;" \ + "bl1 raw 0x1 0x1e;" \ + "bl2 raw 0x1f 0x1d;" \ + "tzsw raw 0x83f 0x200;" \ + "params.bin raw 0x1880 0x20\0" + +/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ +#define CONFIG_MISC_COMMON +#define CONFIG_SET_DFU_ALT_INFO +#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) + +/* Define new extra env settings, including DFU settings */ +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + EXYNOS_DEVICE_SETTINGS \ + EXYNOS_FDTFILE_SETTING \ + MEM_LAYOUT_ENV_SETTINGS \ + BOOTENV \ + "bootdelay=0\0" \ + "rootfstype=ext4\0" \ + "console=" CONFIG_DEFAULT_CONSOLE \ + "fdtfile=exynos5422-odroidxu3.dtb\0" \ + "boardname=odroidxu3\0" \ + "mmcbootdev=0\0" \ + "mmcrootdev=0\0" \ + "mmcbootpart=1\0" \ + "mmcrootpart=2\0" \ + "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \ + "dfu_alt_info=Autoset by THOR/DFU command run.\0" + #endif /* __CONFIG_H */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 709528be4b..e574742a46 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -95,8 +95,6 @@ #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index ed7956694b..81d4b34876 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -60,14 +60,8 @@ #define CONFIG_NAND /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_NAND_LOCK_UNLOCK -/* Disable some commands */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ - /* * TWL4030 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 4e587e10ff..70fab4b0f4 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -24,8 +24,6 @@ * Supported U-boot commands * ---------------------------------------------------------------------------- */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_EXT2 @@ -38,11 +36,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ - /* ---------------------------------------------------------------------------- * Supported U-boot features * ---------------------------------------------------------------------------- diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 8aecb571b8..89ec73cc36 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -78,7 +78,6 @@ #endif #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS /* NFS support */ /*#undef CONFIG_ENV_IS_NOWHERE*/ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 6783f68cee..af6ae73ef6 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -89,8 +89,6 @@ #define CONFIG_DOS_PARTITION /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ @@ -109,11 +107,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ - #define CONFIG_SYS_NO_FLASH /* diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index e88cdaaca9..4339b0558c 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -114,20 +114,14 @@ #define CONFIG_SYS_NO_FLASH /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ -#define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_SYS_I2C diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index e1db29ad28..76bf3b6216 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -58,9 +58,6 @@ /* commands to include */ #define CONFIG_CMD_CACHE #define CONFIG_CMD_USB -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_NFS /* NFS support */ #ifdef CONFIG_NAND #define CONFIG_CMD_UBI /* UBI-formated MTD partition support */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index a8af1c5309..49467c9c92 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -57,14 +57,7 @@ #define CONFIG_SERIAL3 3 /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE /* Cache control */ -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ -#undef CONFIG_CMD_NFS /* NFS support */ /* * Board NAND Info. diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index d97e4d4536..16ceb91887 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -148,9 +148,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_ENV_SECT_SIZE) /*--------------------------------------------------------------------------*/ -/* commands to include */ -#include <config_cmd_default.h> - /* Enabled commands */ #define CONFIG_CMD_DHCP /* DHCP Support */ #define CONFIG_CMD_EXT2 /* EXT2 Support */ @@ -159,10 +156,6 @@ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_MMC /* MMC support */ -/* Disabled commands */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMLS /* List all found images */ - /*--------------------------------------------------------------------------*/ /* * MMC boot support diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 36a52a93b5..d90cc42d93 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -78,11 +78,6 @@ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #endif -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ -#define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 3313f96fef..95614b94cc 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -48,7 +48,6 @@ #define FAT_ENV_INTERFACE "mmc" #define FAT_ENV_DEVICE_AND_PART "0:1" #define FAT_ENV_FILE "uboot.env" -#define CONFIG_CMD_SAVEENV #define CONFIG_ENV_OVERWRITE #endif /* __CONFIG_PANDA_H */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index a83797454c..072b97ec99 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -30,6 +30,5 @@ #define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_OFFSET 0xE0000 -#define CONFIG_CMD_SAVEENV #endif /* __CONFIG_SDP4430_H */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 4215156063..86479213fc 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -12,10 +12,12 @@ #ifndef __CONFIG_OMAP5_EVM_H #define __CONFIG_OMAP5_EVM_H +#ifndef CONFIG_SPL_BUILD /* Define the default GPT table for eMMC */ #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" +#endif #include <configs/ti_omap5_common.h> @@ -31,7 +33,6 @@ #define CONFIG_ENV_OFFSET 0xE0000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_CMD_SAVEENV /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT @@ -59,7 +60,6 @@ /* Enabled commands */ #define CONFIG_CMD_DHCP /* DHCP Support */ -#define CONFIG_CMD_NFS /* NFS support */ /* USB Networking options */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 91a74138c5..6d0d020690 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_DAVINCI_SPI @@ -230,7 +229,6 @@ /* * U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP @@ -238,7 +236,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MEMORY #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif @@ -250,8 +247,6 @@ #endif #ifdef CONFIG_USE_NAND -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS @@ -264,11 +259,8 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_CMD_SAVEENV #endif #if !defined(CONFIG_USE_NAND) && \ @@ -277,7 +269,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/openrd.h b/include/configs/openrd.h index b6f80af801..72113144b3 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -44,7 +44,6 @@ */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_MII diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index d4de3c3550..23929c2746 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -114,9 +114,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - - #define CONFIG_CMD_IRQ #define CONFIG_CMD_ELF #define CONFIG_CMD_BSP diff --git a/include/configs/origen.h b/include/configs/origen.h index 5d43229de7..dae8fd5aa4 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -60,7 +60,6 @@ #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD -#undef CONFIG_CMD_NFS /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 2bbf2b9a5f..fb58acf508 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -27,7 +27,6 @@ /* SF Configs */ #define CONFIG_CMD_SF #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_MACRONIX diff --git a/include/configs/otc570.h b/include/configs/otc570.h index 2390bebf91..0cada63ef7 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -135,11 +135,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b51379e779..af3086dcff 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -41,7 +41,6 @@ #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -70,7 +69,6 @@ #define CONFIG_BOARDNAME "P1020RDB-PD" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -97,7 +95,6 @@ #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1021 #define CONFIG_QE -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Implement conversion of addresses in the LBC */ @@ -133,7 +130,6 @@ #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1024 #define CONFIG_SLIC -#define CONFIG_SPI_FLASH #define __SW_BOOT_MASK 0xf3 #define __SW_BOOT_NOR 0x00 #define __SW_BOOT_SPI 0x08 @@ -148,7 +144,6 @@ #define CONFIG_P1025 #define CONFIG_QE #define CONFIG_SLIC -#define CONFIG_SPI_FLASH #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Implement conversion of addresses in the LBC */ @@ -164,7 +159,6 @@ #define CONFIG_BOARDNAME "P2020RDB-PCA" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P2020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xc8 @@ -897,8 +891,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_I2C diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 58dc98abc1..8231eb4650 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -422,8 +422,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_I2C diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 4433c7c122..eb1400337d 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -171,8 +171,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -181,7 +179,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/palmld.h b/include/configs/palmld.h index b54c016637..a9f92fa29f 100644 --- a/include/configs/palmld.h +++ b/include/configs/palmld.h @@ -50,11 +50,7 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC #define CONFIG_CMD_IDE #define CONFIG_LCD diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h index 965200a158..b68ad3b7dd 100644 --- a/include/configs/palmtc.h +++ b/include/configs/palmtc.h @@ -54,9 +54,6 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV #define CONFIG_CMD_MMC #define CONFIG_LCD diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h index 38178151fe..3946607512 100644 --- a/include/configs/palmtreo680.h +++ b/include/configs/palmtreo680.h @@ -40,16 +40,6 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_SOURCE -#undef CONFIG_CMD_XIMG - #define CONFIG_CMD_ENV #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 2508702a4a..af2654e0f4 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -168,23 +168,14 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#undef CONFIG_CMD_SAVEENV #undef CONFIG_CMD_FAT -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_FPGA #undef CONFIG_CMD_IDE -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_RUN -#undef CONFIG_CMD_LOADB #undef CONFIG_CMD_ELF -#undef CONFIG_CMD_BDI #undef CONFIG_CMD_BEDBUG #endif /* __CONFIG_H */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 31a93c87de..83c96a8c7b 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -50,15 +50,12 @@ Serial console configuration /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 45c2df6da0..d80cf32cbe 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ + (8 * 1024 * 1024)) -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 3cadf34135..77e20cf8da 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -248,7 +248,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG @@ -260,7 +259,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 17d7bcab00..e7413c9fa2 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -381,8 +381,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index e3cb09e3d5..46699ff635 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -10,7 +10,6 @@ #define __CONFIG_PEACH_PI_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 3ee42ef2c8..c5c9e3aa38 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -10,7 +10,6 @@ #define __CONFIG_PEACH_PIT_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 10415d31a5..f9a1d51747 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -183,13 +183,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 9bdbf53fd1..6c434f0699 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -197,13 +197,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index a8dc0f0b03..c7938656b3 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -72,10 +72,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 @@ -96,7 +92,6 @@ /* NOR flash, not available */ #define CONFIG_SYS_NO_FLASH 1 -#undef CONFIG_CMD_FLASH /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 89560ad1c5..3a0992a5cf 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -34,7 +34,6 @@ */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_MII diff --git a/include/configs/porter.h b/include/configs/porter.h index f85d39cfed..59b14e9061 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -42,9 +42,7 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/pr1.h b/include/configs/pr1.h index b9253b9684..3e4aab45f7 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -83,7 +83,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index af7c076df0..3edeb0812f 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -104,8 +104,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_FAT #define CONFIG_CMD_DHCP diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 946b2c85e9..d896bca68b 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -25,11 +25,14 @@ #define DDR_PLL_FREQ 266 #define BOARD_DFU_BUTTON_GPIO 59 -#define BOARD_DFU_BUTTON_LED 117 #define BOARD_LCD_POWER 111 #define BOARD_BACK_LIGHT 112 #define BOARD_TOUCH_POWER 57 +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + "button_dfu0=59\0" \ + "led0=117,0,1\0" \ + /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ @@ -48,29 +51,25 @@ #define CONFIG_FACTORYSET -/* UBI Support */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_MTDPARTS -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE -#define CONFIG_RBTREE -#define CONFIG_LZO -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#endif /* Watchdog */ #define CONFIG_OMAP_WATCHDOG #ifndef CONFIG_SPL_BUILD +/* Use common default */ +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V1 + /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=pxm2\0" \ "nand_img_size=0x500000\0" \ "optargs=\0" \ + "preboot=draco_led 0\0" \ + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ - CONFIG_COMMON_ENV_SETTINGS \ + CONFIG_ENV_SETTINGS_V1 \ + CONFIG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 75da8a1ebe..b22637b367 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -45,13 +45,9 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS #define CONFIG_CMD_DHCP #define CONFIG_DRIVER_NE2000 diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index b07ca4e02a..fae5b0590b 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -45,13 +45,9 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS #define CONFIG_CMD_DHCP #define CONFIG_DRIVER_NE2000 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index cf9e2ff0e0..be430ff07f 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -158,8 +158,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_BOOTZ diff --git a/include/configs/qong.h b/include/configs/qong.h index 8a9847e58d..f34a54f754 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -111,9 +111,6 @@ /*********************************************************** * Command definition ***********************************************************/ - -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 708647ece8..b1d79fdf53 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -18,14 +18,10 @@ #define CONFIG_BOARD_LATE_INIT #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_CMD_SAVEENV #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 5371a65938..2d1e56aeb8 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -11,10 +11,7 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE -#define CONFIG_CMD_FLASH #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_IDE diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 9c62a04dbf..82a056c690 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -20,12 +20,8 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_NFS #define CONFIG_CMD_IDE #define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h new file mode 100644 index 0000000000..d9dde9cc5e --- /dev/null +++ b/include/configs/rastaban.h @@ -0,0 +1,114 @@ +/* + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/include/configs/am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_RASTABAN_H +#define __CONFIG_RASTABAN_H + +#include "siemens-am33x-common.h" + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_SYS_MPUCLK 300 +#define DDR_PLL_FREQ 303 +#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC + +/* FWD Button = 27 + * SRV Button = 87 */ +#define BOARD_DFU_BUTTON_GPIO 27 +#define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ +/* In dfu mode keep led1 on */ +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + "button_dfu0=27\0" \ + "button_dfu1=87\0" \ + "led0=3,0,1\0" \ + "led1=4,0,0\0" \ + "led2=5,0,1\0" \ + "led3=62,0,1\0" \ + "led4=60,0,1\0" \ + "led5=63,0,1\0" + +#undef CONFIG_DOS_PARTITION +#undef CONFIG_CMD_FAT + +#define CONFIG_BOARD_LATE_INIT + + /* Physical Memory Map */ +#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ + +/* I2C Configuration */ +#define CONFIG_SYS_I2C_SPEED 100000 + +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 +#define EEPROM_ADDR_DDR3 0x90 +#define EEPROM_ADDR_CHIP 0x120 + +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300 + +#undef CONFIG_SPL_NET_SUPPORT +#undef CONFIG_SPL_NET_VCI_STRING +#undef CONFIG_SPL_ETH_SUPPORT + +#undef CONFIG_MII +#undef CONFIG_PHY_GIGE +#define CONFIG_PHY_SMSC + +#define CONFIG_FACTORYSET + +/* Watchdog */ +#define CONFIG_OMAP_WATCHDOG + +/* Define own nand partitions */ +#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 +#define CONFIG_ENV_SIZE_REDUND 0x2000 +#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) + + + +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V3 + +#ifndef CONFIG_SPL_BUILD + +/* Default env settings */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "hostname=rastaban\0" \ + "nand_img_size=0x400000\0" \ + "optargs=\0" \ + "preboot=draco_led 0\0" \ + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CONFIG_ENV_SETTINGS_V2 \ + CONFIG_ENV_SETTINGS_NAND_V2 + +#ifndef CONFIG_RESTORE_FLASH +/* set to negative value for no autoboot */ +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_BOOTCOMMAND \ +"if dfubutton; then " \ + "run dfu_start; " \ + "reset; " \ +"fi;" \ +"run nand_boot;" \ +"run nand_boot_backup;" \ +"reset;" + + +#else +#define CONFIG_BOOTDELAY 0 + +#define CONFIG_BOOTCOMMAND \ + "setenv autoload no; " \ + "dhcp; " \ + "if tftp 80000000 debrick.scr; then " \ + "source 80000000; " \ + "fi" +#endif +#endif /* CONFIG_SPL_BUILD */ +#endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 3845e60b35..7dd9260535 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -11,17 +11,11 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_EDITENV -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_RUN -#define CONFIG_CMD_LOADS #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NFS #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_USB #define CONFIG_CMD_FAT diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h index e80949e3d6..a0120b06fd 100644 --- a/include/configs/rd6281a.h +++ b/include/configs/rd6281a.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_FAT diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index b54cf8bca4..1012cdd292 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -120,7 +120,6 @@ #define CONFIG_COMMAND_HISTORY /* Commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC #define CONFIG_PARTITION_UUIDS @@ -135,9 +134,6 @@ #include <config_distro_defaults.h> -/* Some things don't make sense on this HW or yet */ -#undef CONFIG_CMD_FPGA - /* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial,lcd\0" \ diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index fc8e96735b..039880b133 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -14,12 +14,8 @@ #define CONFIG_CPU_SH7203 1 #define CONFIG_RSK7203 1 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_CACHE #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 2ecf785082..c60e233e9f 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -15,10 +15,6 @@ #define CONFIG_CPU_SH7264 1 #define CONFIG_RSK7264 1 -#ifndef _CONFIG_CMD_DEFAULT_H -# include <config_cmd_default.h> -#endif - #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 14c1da774d..b4fbc9c17d 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -14,10 +14,6 @@ #define CONFIG_CPU_SH7269 1 #define CONFIG_RSK7269 1 -#ifndef _CONFIG_CMD_DEFAULT_H -# include <config_cmd_default.h> -#endif - #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC7,115200" #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/rut.h b/include/configs/rut.h index 0067ea46e0..78264bab55 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -45,29 +45,23 @@ #define CONFIG_FACTORYSET -/* UBI Support */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_MTDPARTS -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE -#define CONFIG_RBTREE -#define CONFIG_LZO -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#endif /* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14 #ifndef CONFIG_SPL_BUILD +/* Use common default */ +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V1 + /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=rut\0" \ "nand_img_size=0x500000\0" \ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ - CONFIG_COMMON_ENV_SETTINGS \ + CONFIG_ENV_SETTINGS_V1 \ + CONFIG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 16770f0594..7994ecf401 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -58,16 +58,8 @@ /* PWM */ #define CONFIG_PWM 1 -/* It should define before config_cmd_default.h */ #define CONFIG_SYS_NO_FLASH 1 -/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_XIMG #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index d933a9e7c6..9497bea946 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -52,7 +52,6 @@ /* NOR flash */ #ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -78,7 +77,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 5fb621ec85..e06dfc9a90 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -40,7 +40,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 546d7a3a9f..eadccc182a 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -40,7 +40,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 3caa83ce09..6965d921d9 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -81,7 +81,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SF_TEST #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SPI_FLASH_EON #define CONFIG_SPI_FLASH_GIGADEVICE @@ -117,7 +116,6 @@ #define CONFIG_SYS_NO_FLASH /* include default commands */ -#include <config_cmd_default.h> #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 8cce34af76..1715678672 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 11bf504832..b2adea976a 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -86,8 +86,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BSP #define CONFIG_CMD_ELF #define CONFIG_CMD_I2C diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 2d264d2ef7..9d89b2a342 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -417,8 +417,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING @@ -427,12 +425,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 5b373cb0f1..0717156c6b 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -536,8 +536,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 021da50aa8..00aab6b3d5 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -479,10 +479,9 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING - #define CONFIG_CMD_I2C - #define CONFIG_CMD_REGINFO +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 0c4ca21a2d..6d35cd3df5 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -16,7 +16,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION @@ -27,7 +26,6 @@ #define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_USB diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index ecb372f941..f367d62593 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -30,15 +30,9 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - /* * Boot options. Setting delay to -1 stops autostart count down. * NOTE: Sending parameters to kernel depends on kernel version and diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 623be7d39b..1f1beeaf2e 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -124,6 +124,7 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_SYS_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ +#endif /* CONFIG_CMD_FLASH */ #ifdef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ @@ -134,7 +135,6 @@ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif -#endif /* CONFIG_CMD_FLASH */ /* * DDR SDRAM diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index d7bc751eab..f1f9ca8632 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -16,18 +16,13 @@ #define CONFIG_SYS_TEXT_BASE 0x5ff80000 #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7752evb/u-boot.lds" -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SF -#define CONFIG_CMD_RUN -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_CMD_LOADS #define CONFIG_CMD_MMC #define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION @@ -102,7 +97,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 2124e0f3dd..d7ed65b188 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -16,18 +16,13 @@ #define CONFIG_SYS_TEXT_BASE 0x5ff80000 #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7753evb/u-boot.lds" -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SF -#define CONFIG_CMD_RUN -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_CMD_LOADS #define CONFIG_CMD_MMC #define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION @@ -102,7 +97,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index fd6a1df48a..cf514b6f94 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -17,17 +17,12 @@ #define CONFIG_SYS_TEXT_BASE 0x8ef80000 #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7757lcr/u-boot.lds" -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SF -#define CONFIG_CMD_RUN -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_CMD_LOADS #define CONFIG_CMD_MMC #define CONFIG_CMD_EXT2 #define CONFIG_DOS_PARTITION @@ -103,7 +98,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 /* MMCIF */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 27ad96e484..7148f1da95 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -18,12 +18,8 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_NFS #define CONFIG_CMD_JFFS2 #define CONFIG_BOOTDELAY -1 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 9f42ae1513..2ba0c58586 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -13,14 +13,9 @@ #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1 -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_RUN -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SH_ZIMAGEBOOT #define CONFIG_CMD_USB diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 84029cb399..272e3ca9b3 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -46,7 +46,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 8c02afedd2..11ae15ced5 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -15,13 +15,9 @@ /* T-SH7706LSR*/ /* #define CONFIG_T_SH7706LSR 1 */ -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_ENV -#define CONFIG_CMD_SAVEENV #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b005c86c32..0f325944b5 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -31,7 +31,9 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_BOARD_LATE_INIT #define CONFIG_SYS_NO_FLASH +#ifdef CONFIG_SIEMENS_MACH_TYPE #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE +#endif #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS @@ -40,11 +42,9 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV -#define CONFIG_CMD_ECHO #define CONFIG_CMD_CACHE +#define CONFIG_CMD_TIME #define CONFIG_SYS_GENERIC_BOARD @@ -69,7 +69,7 @@ #define CONFIG_SYS_MAXARGS 32 /* Console I/O Buffer Size */ -#define CONFIG_SYS_CBSIZE 512 +#define CONFIG_SYS_CBSIZE 1024 /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ @@ -99,7 +99,6 @@ #define CONFIG_SPI #define CONFIG_OMAP3_SPI #define CONFIG_MTD_DEVICE -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED (75000000) @@ -309,22 +308,87 @@ /* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND + +/* UBI Support */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE +#define CONFIG_RBTREE +#define CONFIG_LZO +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#endif + +/* Commen environment */ +#define CONFIG_PREBOOT +#define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \ + "setenv bootargs ${bootargs};" \ + "mtdparts default;" \ + "draco_led 1;" \ + "dfu 0 nand 0;" \ + "draco_led 0;\0" \ + +#define COMMON_ENV_NAND_BOOT \ + "nand_boot=echo Booting from nand; " \ + "if test ${upgrade_available} -eq 1; then " \ + "if test ${bootcount} -gt ${bootlimit}; " \ + "then " \ + "setenv upgrade_available 0;" \ + "setenv ${partitionset_active} true;" \ + "if test -n ${A}; then " \ + "setenv partitionset_active B; " \ + "env delete A; " \ + "fi;" \ + "if test -n ${B}; then " \ + "setenv partitionset_active A; " \ + "env delete B; " \ + "fi;" \ + "saveenv; " \ + "fi;" \ + "fi;" \ + "echo set ${partitionset_active}...;" \ + "run nand_args; " + +#define COMMON_ENV_NAND_CMDS "flash_self=run nand_boot\0" \ + "flash_self_test=setenv testargs test; " \ + "run nand_boot\0" \ + "dfu_start=echo Preparing for dfu mode ...; " \ + "run dfu_args; \0" + +#define COMMON_ENV_SETTINGS \ + "verify=no \0" \ + "project_dir=targetdir\0" \ + "upgrade_available=0\0" \ + "altbootcmd=run bootcmd\0" \ + "bootlimit=3\0" \ + "partitionset_active=A\0" \ + "loadaddr=0x82000000\0" \ + "kloadaddr=0x81000000\0" \ + "script_addr=0x81900000\0" \ + "console=console=ttyMTD,mtdoops console=ttyO0,115200n8 panic=5\0" \ + "nfsopts=nolock rw\0" \ + "ip_method=none\0" \ + "bootenv=uEnv.txt\0" \ + "bootargs_defaults=setenv bootargs " \ + "console=${console} " \ + "${testargs} " \ + "${optargs}\0" \ + "siemens_help=echo; "\ + "echo Type 'run flash_self' to use kernel and root " \ + "filesystem on memory; echo Type 'run flash_self_test' to " \ + "use kernel and root filesystem on memory, boot in test " \ + "mode; echo Not ready yet: 'run flash_nfs' to use kernel " \ + "from memory and root filesystem over NFS; echo Type " \ + "'run net_nfs' to get Kernel over TFTP and mount root " \ + "filesystem over NFS; " \ + "echo Set partitionset_active variable to 'A' " \ + "or 'B' to select kernel and rootfs partition; " \ + "echo" \ + "\0" -#define MTDIDS_NAME_STR "omap2-nand.0" -#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR -#define MTDPARTS_DEFAULT "mtdparts=" MTDIDS_NAME_STR ":" \ - "128k(spl)," \ - "128k(spl.backup1)," \ - "128k(spl.backup2)," \ - "128k(spl.backup3)," \ - "1920k(u-boot)," \ - "128k(uboot.env)," \ - "5120k(kernel_a)," \ - "5120k(kernel_b)," \ - "8192k(mtdoops)," \ - "-(rootfs)" /* + * Variant 1 partition layout * chip-size = 256MiB *| name | size | address area | *------------------------------------------------------- @@ -340,8 +404,21 @@ *| rootfs | 235.500 MiB | 0x 1480000..0x fffffff | *------------------------------------------------------- */ +#define MTDIDS_NAME_STR "omap2-nand.0" +#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR +#define MTDPARTS_DEFAULT_V1 "mtdparts=" MTDIDS_NAME_STR ":" \ + "128k(spl)," \ + "128k(spl.backup1)," \ + "128k(spl.backup2)," \ + "128k(spl.backup3)," \ + "1920k(u-boot)," \ + "128k(uboot.env)," \ + "5120k(kernel_a)," \ + "5120k(kernel_b)," \ + "8192k(mtdoops)," \ + "-(rootfs)" -#define DFU_ALT_INFO_NAND \ +#define DFU_ALT_INFO_NAND_V1 \ "spl part 0 1;" \ "spl.backup1 part 0 2;" \ "spl.backup2 part 0 3;" \ @@ -352,17 +429,7 @@ "kernel_b part 0 8;" \ "rootfs partubi 0 10" -#define CONFIG_COMMON_ENV_SETTINGS \ - "verify=no \0" \ - "project_dir=targetdir\0" \ - "upgrade_available=0\0" \ - "altbootcmd=run bootcmd\0" \ - "bootlimit=3\0" \ - "partitionset_active=A\0" \ - "loadaddr=0x82000000\0" \ - "kloadaddr=0x81000000\0" \ - "script_addr=0x81900000\0" \ - "console=console=ttyMTD,mtdoops console=ttyO0,115200n8 panic=5\0" \ +#define CONFIG_ENV_SETTINGS_NAND_V1 \ "nand_active_ubi_vol=rootfs_a\0" \ "nand_active_ubi_vol_A=rootfs_a\0" \ "nand_active_ubi_vol_B=rootfs_b\0" \ @@ -370,13 +437,6 @@ "nand_src_addr=0x280000\0" \ "nand_src_addr_A=0x280000\0" \ "nand_src_addr_B=0x780000\0" \ - "nfsopts=nolock rw mem=128M\0" \ - "ip_method=none\0" \ - "bootenv=uEnv.txt\0" \ - "bootargs_defaults=setenv bootargs " \ - "console=${console} " \ - "${testargs} " \ - "${optargs}\0" \ "nand_args=run bootargs_defaults;" \ "mtdparts default;" \ "setenv ${partitionset_active} true;" \ @@ -395,15 +455,15 @@ "rootfstype=${nand_root_fs_type} ip=${ip_method} " \ "console=ttyMTD,mtdoops console=ttyO0,115200n8 mtdoops.mtddev" \ "=mtdoops\0" \ - "dfu_args=run bootargs_defaults;" \ - "setenv bootargs ${bootargs} ;" \ - "mtdparts default; " \ - "led dfu 1;" \ - "led stat 0;" \ - "dfu 0 nand 0;" \ - "led dfu 0;" \ - "led stat 1;\0" \ - "dfu_alt_info=" DFU_ALT_INFO_NAND "\0" \ + COMMON_ENV_DFU_ARGS \ + "dfu_alt_info=" DFU_ALT_INFO_NAND_V1 "\0" \ + COMMON_ENV_NAND_BOOT \ + "nand read.i ${kloadaddr} ${nand_src_addr} " \ + "${nand_img_size}; bootm ${kloadaddr}\0" \ + COMMON_ENV_NAND_CMDS + +#define CONFIG_ENV_SETTINGS_V1 \ + COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ "setenv bootfile ${project_dir}/kernel/uImage;" \ @@ -413,48 +473,133 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} " \ "ip=${ipaddr}:${serverip}:" \ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \ - "nand_boot=echo Booting from nand; " \ - "if test ${upgrade_available} -eq 1; then " \ - "if test ${bootcount} -gt ${bootlimit}; " \ - "then " \ - "setenv upgrade_available 0;" \ - "setenv ${partitionset_active} true;" \ - "if test -n ${A}; then " \ - "setenv partitionset_active B; " \ - "env delete A; " \ - "fi;" \ - "if test -n ${B}; then " \ - "setenv partitionset_active A; " \ - "env delete B; " \ - "fi;" \ - "saveenv; " \ - "fi;" \ + "net_nfs=echo Booting from network ...; " \ + "run net_args; " \ + "tftpboot ${kloadaddr} ${serverip}:${bootfile}; " \ + "bootm ${kloadaddr}\0" + +/* + * Variant 2 partition layout + * chip-size = 256MiB + *| name | size | address area | + *------------------------------------------------------- + *| spl | 128.000 KiB | 0x 0..0x 1ffff | + *| spl.backup1 | 128.000 KiB | 0x 20000..0x 3ffff | + *| spl.backup2 | 128.000 KiB | 0x 40000..0x 5ffff | + *| spl.backup3 | 128.000 KiB | 0x 60000..0x 7ffff | + *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | + *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | + *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff | + *| rootfs | 148.000 MiB | 0x 360000..0x 975ffff | + *| mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff | + *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff | + *------------------------------------------------------- + */ + +#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \ + "128k(spl)," \ + "128k(spl.backup1)," \ + "128k(spl.backup2)," \ + "128k(spl.backup3)," \ + "1920k(u-boot)," \ + "512k(u-boot.env0)," \ + "512k(u-boot.env1)," \ + "148m(rootfs)," \ + "512k(mtdoops)," \ + "-(configuration)" + +#define DFU_ALT_INFO_NAND_V2 \ + "spl part 0 1;" \ + "spl.backup1 part 0 2;" \ + "spl.backup2 part 0 3;" \ + "spl.backup3 part 0 4;" \ + "u-boot part 0 5;" \ + "u-boot.env0 part 0 6;" \ + "u-boot.env1 part 0 7;" \ + "rootfs partubi 0 8;" \ + "configuration partubi 0 10" + +#define CONFIG_ENV_SETTINGS_NAND_V2 \ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ + "nand_root_fs_type=ubifs rootwait=1\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ + "if test -n ${A}; then " \ + "setenv nand_active_ubi_vol ${rootfs_name}_a;" \ "fi;" \ - "echo set ${partitionset_active}...;" \ - "run nand_args; " \ - "nand read.i ${kloadaddr} ${nand_src_addr} " \ - "${nand_img_size}; bootm ${kloadaddr}\0" \ + "if test -n ${B}; then " \ + "setenv nand_active_ubi_vol ${rootfs_name}_b;" \ + "fi;" \ + "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ + "ubi.mtd=7,2048 ubi.mtd=9,2048;" \ + "setenv bootargs ${bootargs} " \ + "root=${nand_root} noinitrd ${mtdparts} " \ + "rootfstype=${nand_root_fs_type} ip=${ip_method} " \ + "console=ttyMTD,mtdoops console=ttyO0,115200n8 mtdoops.mtddev" \ + "=mtdoops\0" \ + COMMON_ENV_DFU_ARGS \ + "dfu_alt_info=" DFU_ALT_INFO_NAND_V2 "\0" \ + COMMON_ENV_NAND_BOOT \ + "ubi part rootfs 2048;" \ + "ubifsmount ubi0:${nand_active_ubi_vol};" \ + "ubifsload ${kloadaddr} boot/${kernel_name};" \ + "ubifsload ${loadaddr} boot/${dtb_name}.dtb;" \ + "bootm ${kloadaddr} - ${loadaddr}\0" \ + "nand_boot_backup=ubifsload ${loadaddr} boot/am335x-draco.dtb;" \ + "bootm ${kloadaddr} - ${loadaddr}\0" \ + COMMON_ENV_NAND_CMDS + +#define CONFIG_ENV_SETTINGS_V2 \ + COMMON_ENV_SETTINGS \ + "net_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv bootfile ${project_dir}/kernel/uImage;" \ + "setenv bootdtb ${project_dir}/kernel/dtb;" \ + "setenv rootpath /home/projects/${project_dir}/rootfs;" \ + "setenv bootargs ${bootargs} " \ + "root=/dev/nfs ${mtdparts} " \ + "nfsroot=${serverip}:${rootpath},${nfsopts} " \ + "ip=${ipaddr}:${serverip}:" \ + "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \ "net_nfs=echo Booting from network ...; " \ "run net_args; " \ "tftpboot ${kloadaddr} ${serverip}:${bootfile}; " \ - "bootm ${kloadaddr}\0" \ - "flash_self=run nand_boot\0" \ - "flash_self_test=setenv testargs test; " \ - "run nand_boot\0" \ - "dfu_start=echo Preparing for dfu mode ...; " \ - "run dfu_args; \0" \ - "preboot=echo; "\ - "echo Type 'run flash_self' to use kernel and root " \ - "filesystem on memory; echo Type 'run flash_self_test' to " \ - "use kernel and root filesystem on memory, boot in test " \ - "mode; echo Not ready yet: 'run flash_nfs' to use kernel " \ - "from memory and root filesystem over NFS; echo Type " \ - "'run net_nfs' to get Kernel over TFTP and mount root " \ - "filesystem over NFS; " \ - "echo Set partitionset_active variable to 'A' " \ - "or 'B' to select kernel and rootfs partition; " \ - "echo" \ - "\0" + "tftpboot ${loadaddr} ${serverip}:${bootdtb}; " \ + "bootm ${kloadaddr} - ${loadaddr}\0" + +/* + * Variant 3 partition layout + * chip-size = 512MiB + *| name | size | address area | + *------------------------------------------------------- + *| spl | 128.000 KiB | 0x 0..0x 1ffff | + *| spl.backup1 | 128.000 KiB | 0x 20000..0x 3ffff | + *| spl.backup2 | 128.000 KiB | 0x 40000..0x 5ffff | + *| spl.backup3 | 128.000 KiB | 0x 60000..0x 7ffff | + *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff | + *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff | + *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff | + *| rootfs | 300.000 MiB | 0x 360000..0x12f5ffff | + *| mtdoops | 512.000 KiB | 0x12f60000..0x12fdffff | + *|configuration | 104.125 MiB | 0x12fe0000..0x1fffffff | + *------------------------------------------------------- + */ + +#define MTDPARTS_DEFAULT_V3 "mtdparts=" MTDIDS_NAME_STR ":" \ + "128k(spl)," \ + "128k(spl.backup1)," \ + "128k(spl.backup2)," \ + "128k(spl.backup3)," \ + "1920k(u-boot)," \ + "512k(u-boot.env0)," \ + "512k(u-boot.env1)," \ + "300m(rootfs)," \ + "512k(mtdoops)," \ + "-(configuration)" + #define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_ELM @@ -473,6 +618,9 @@ #define CONFIG_OMAP_GPIO +/* Gpio cmd support */ +#define CONFIG_CMD_GPIO + /* Watchdog */ #define CONFIG_HW_WATCHDOG diff --git a/include/configs/silk.h b/include/configs/silk.h index ccfcede1ea..cd839aa63f 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -42,9 +42,7 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 71eb81c2f7..7b4b3b0af9 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -75,8 +75,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BSP #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 08381e3418..e5655fce19 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -10,7 +10,6 @@ #define __CONFIG_SMDK_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 61f582f375..607877c95d 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -10,7 +10,6 @@ #define __CONFIG_SMDK5420_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 080fc3a845..08a2e9f85e 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -63,10 +63,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_NAND #define CONFIG_CMD_CACHE diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 6c685965a2..70ef9395d7 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -149,14 +149,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* Command line configuration */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_FAT diff --git a/include/configs/snow.h b/include/configs/snow.h index a2fb3f9808..557f86c07c 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -10,7 +10,6 @@ #define __CONFIG_SNOW_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/snowball.h b/include/configs/snowball.h index 126201cf96..91aaffab6a 100644 --- a/include/configs/snowball.h +++ b/include/configs/snowball.h @@ -43,7 +43,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_CMD_ENV -#define CONFIG_CMD_SAVEENV #define CONFIG_ENV_OFFSET 0x0118000 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SLOT2: eMMC */ @@ -79,20 +78,9 @@ /* * Commands */ -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_BDI -#define CONFIG_CMD_IMI -#define CONFIG_CMD_MISC -#define CONFIG_CMD_RUN -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_LOADB #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_SOURCE #ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 1 diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h index 70ee4c91fa..7aee1ce315 100644 --- a/include/configs/socfpga_arria5.h +++ b/include/configs/socfpga_arria5.h @@ -13,7 +13,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG @@ -26,7 +25,6 @@ #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 5ba2f6a831..4c3366a7f1 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -81,7 +81,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR /* @@ -187,7 +186,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); #ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ #define CONFIG_CADENCE_QSPI /* Enable multiple SPI NOR flash manufacturers */ -#define CONFIG_SPI_FLASH /* SPI flash subsystem */ #define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ #define CONFIG_SPI_FLASH_SPANSION /* Spansion flash */ #define CONFIG_SPI_FLASH_MTD diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index e321381622..33d04fdc4a 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -13,7 +13,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG @@ -26,7 +25,6 @@ #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII diff --git a/include/configs/socrates.h b/include/configs/socrates.h index c654a0e4eb..292b5145b9 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -314,8 +314,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BMP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -325,7 +323,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MII -#undef CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index b386c7ca70..f75c306b57 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -105,16 +105,11 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_NAND #define CONFIG_CMD_ENV -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <config_cmd_default.h> - /* * Default Environment Varible definitions */ diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h index 5d51abfc01..086ebcfc17 100644 --- a/include/configs/stamp9g20.h +++ b/include/configs/stamp9g20.h @@ -232,12 +232,6 @@ "bootm 22000000" /* Command line & features configuration */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_NAND #define CONFIG_CMD_USB #define CONFIG_CMD_FAT @@ -246,9 +240,6 @@ #ifdef CONFIG_MACB # define CONFIG_CMD_PING # define CONFIG_CMD_DHCP -#else -# undef CONFIG_CMD_BOOTD -# undef CONFIG_CMD_NFS #endif /* CONFIG_MACB */ #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 84cc19df4f..46869dd47f 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -95,18 +95,13 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_MEM -#define CONFIG_CMD_MISC #define CONFIG_CMD_TIMER #endif /* __CONFIG_H */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index d8f51d8997..6379fd3ab7 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -61,9 +61,6 @@ #define CONFIG_CMD_PING #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ -#include "config_cmd_default.h" -#undef CONFIG_CMD_SAVEENV - #define CONFIG_SYS_MEMTEST_START 0x0000 #define CONFIG_SYS_MEMTEST_END 1024*1024 #define CONFIG_CMD_MEMTEST diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index a0817a0f80..6676f373f2 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -292,16 +292,11 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_REGINFO -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#else +#if !defined(CONFIG_SYS_RAMBOOT) #define CONFIG_CMD_ELF #endif diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 78ac0801d5..5b1f3ab403 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -322,13 +322,10 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #define CONFIG_CMD_REGINFO @@ -341,10 +338,7 @@ #define CONFIG_CMD_MII #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_SAVEENV - #undef CONFIG_CMD_LOADS -#else +#if !defined(CONFIG_SYS_RAMBOOT) #define CONFIG_CMD_ELF #endif diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index a3c9408518..ea079eb5f7 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -18,7 +18,6 @@ #endif #define CONFIG_SUNXI_USB_PHYS 3 -#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19, 20, 21, 22, 24} /* * Include common sunxi configuration where most the settings are diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index 8e13df58bd..d257659903 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -19,9 +19,6 @@ #define CONFIG_SUNXI_USB_PHYS 2 -/* \todo A13 only defines port 19, whereas A10s requires each of these */ -#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19} - /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index a0ebc7e977..93863b59bc 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -27,8 +27,6 @@ #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE #define CONFIG_TIMER_CLK_FREQ 24000000 -#define CONFIG_NAND_SUNXI_GPC_PORTS {24, 25, 26} - /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 3d26ce8d4a..56101a9ffc 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -24,8 +24,6 @@ #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE #define CONFIG_TIMER_CLK_FREQ 24000000 -#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19, 20, 21, 22, 24} - /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index fe8c511448..4fc6365008 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -23,10 +23,8 @@ #define CONFIG_ARMV7_PSCI 1 #if defined(CONFIG_MACH_SUN8I_A23) #define CONFIG_ARMV7_PSCI_NR_CPUS 2 -#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18} #elif defined(CONFIG_MACH_SUN8I_A33) #define CONFIG_ARMV7_PSCI_NR_CPUS 4 -#define CONFIG_NAND_SUNXI_GPC_PORTS {16} #else #error Unsupported sun8i variant #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 063abd56a9..9576bc1a20 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -134,8 +134,6 @@ #define CONFIG_CMD_SCSI #endif -#define CONFIG_CMD_MEMORY - #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG @@ -148,10 +146,8 @@ #define CONFIG_CMD_MMC #define CONFIG_MMC_SUNXI #define CONFIG_MMC_SUNXI_SLOT 0 -#if !defined(CONFIG_SPL_NAND_SUPPORT) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */ -#endif /* CONFIG_SPL_NAND_SUPPORT */ #endif /* 4MB of malloc() pool */ @@ -160,7 +156,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_CMD_ECHO #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ @@ -188,9 +183,6 @@ #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_FPGA - #define CONFIG_FAT_WRITE /* enable write access */ #define CONFIG_SPL_FRAMEWORK @@ -357,24 +349,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_ENV_IS_NOWHERE #endif -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_NAND -#define CONFIG_SYS_NAND_SELF_INIT -#define CONFIG_NAND_SUNXI -#define CONFIG_CMD_SPL_WRITE_SIZE 0x000400 -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x008000 - -/* \todo Make these parameterisable in kernel config ? */ -#define CONFIG_NAND_SUNXI_PAGE_SIZE 8192 -#define CONFIG_NAND_SUNXI_ECC_STEP 1024 -#define CONFIG_NAND_SUNXI_ECC_STRENGTH 40 -#define CONFIG_NAND_SUNXI_ADDR_CYCLES 5 - -#ifndef CONFIG_NAND_SUNXI_GPC_PORTS -#error "No NAND GPC ports defined, NAND unsupported" -#endif -#endif /* CONFIG_SPL_NAND_SUPPORT */ - #define CONFIG_MISC_INIT_R #define CONFIG_SYS_CONSOLE_IS_IN_ENV diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index efd76da119..658f8b2440 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -273,8 +273,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 30bc2be74d..34f1228140 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -100,8 +100,6 @@ #define CONFIG_USB_STORAGE /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 /* EXT2 Support */ @@ -110,15 +108,11 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NFS #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_PING #define CONFIG_CMD_USB #define CONFIG_CMD_EEPROM -#undef CONFIG_CMD_FLASH /* only NAND on the SOM */ -#undef CONFIG_CMD_IMLS - #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 @@ -260,6 +254,7 @@ #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW +#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 49ed79ffbc..c8ec79b196 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -94,8 +94,6 @@ #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ @@ -112,11 +110,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_IMLS /* List all found images */ - #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_OMAP34XX diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2cf4558daa..d5b93eb6e7 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -70,14 +70,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SOURCE - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND @@ -139,7 +131,6 @@ #define CONFIG_SPI #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_ATMEL_SPI #define CONFIG_SPI_FLASH_STMICRO #define TAURUS_SPI_MASK (1 << 4) diff --git a/include/configs/tb100.h b/include/configs/tb100.h index b2b4b1037f..42817aee76 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -68,8 +68,6 @@ /* * Command line configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_PING diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index cfee2c3b84..fa651c1c98 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -38,7 +38,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 2d5842229f..7b4c0d7063 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -67,16 +67,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -/* include default commands */ -#include <config_cmd_default.h> - -/* remove unused commands */ -#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#undef CONFIG_CMD_FPGA /* FPGA configuration support */ -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_NFS /* NFS support */ - /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY diff --git a/include/configs/dxr2.h b/include/configs/thuban.h index 76e6cac77c..40244689d9 100644 --- a/include/configs/dxr2.h +++ b/include/configs/thuban.h @@ -10,27 +10,28 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_DXR2_H -#define __CONFIG_DXR2_H - -#define CONFIG_SIEMENS_DXR2 -#define MACH_TYPE_DXR2 4315 -#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DXR2 +#ifndef __CONFIG_THUBAN_H +#define __CONFIG_THUBAN_H #include "siemens-am33x-common.h" -#define CONFIG_SYS_MPUCLK 275 +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_SYS_MPUCLK 300 #define DDR_PLL_FREQ 303 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC -#define BOARD_DFU_BUTTON_GPIO 27 -#define BOARD_DFU_BUTTON_LED 64 /* red LED */ -#define BOARD_STATUS_LED 103 /* green LED */ +#define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + "button_dfu0=27\0" \ + "led0=103,1,0\0" \ + "led1=64,0,1\0" + #undef CONFIG_DOS_PARTITION #undef CONFIG_CMD_FAT +#define CONFIG_BOARD_LATE_INIT /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ @@ -57,14 +58,25 @@ /* Watchdog */ #define CONFIG_OMAP_WATCHDOG +/* Define own nand partitions */ +#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 +#define CONFIG_ENV_SIZE_REDUND 0x2000 +#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) + + +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2 + #ifndef CONFIG_SPL_BUILD /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "hostname=dxr2\0" \ + "hostname=thuban\0" \ "nand_img_size=0x400000\0" \ "optargs=\0" \ - CONFIG_COMMON_ENV_SETTINGS + "preboot=draco_led 0\0" \ + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CONFIG_ENV_SETTINGS_V2 \ + CONFIG_ENV_SETTINGS_NAND_V2 #ifndef CONFIG_RESTORE_FLASH /* set to negative value for no autoboot */ @@ -76,6 +88,7 @@ "reset; " \ "fi;" \ "run nand_boot;" \ +"run nand_boot_backup;" \ "reset;" @@ -90,4 +103,4 @@ "fi" #endif #endif /* CONFIG_SPL_BUILD */ -#endif /* ! __CONFIG_DXR2_H */ +#endif /* ! __CONFIG_THUBAN_H */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 372a02be0e..fcfb70e309 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -38,8 +38,6 @@ #define CONFIG_INITRD_TAG /* for ramdisk support */ /* commands to include */ -# include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_VERSION_VARIABLE @@ -102,8 +100,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_CMD_ECHO - /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 27a3dd1366..8d52057419 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -32,8 +32,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG /* required for ramdisk support */ -#include <config_cmd_default.h> /* u-boot default commands */ - #define CONFIG_VERSION_VARIABLE #define CONFIG_DISPLAY_CPUINFO @@ -61,7 +59,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ #define CONFIG_CMD_ASKEN -#define CONFIG_CMD_ECHO #define CONFIG_OMAP_GPIO #define CONFIG_MMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f8829425a5..0aea7d12ec 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -166,17 +166,7 @@ #define CONFIG_CMD_MTDPARTS #endif -/* - * For commands to use, we take the default list and add a few other - * useful commands. Note that we must have set CONFIG_SYS_NO_FLASH - * prior to this include, in order to skip a few commands. When we do - * have flash, if we expect these commands they must be enabled in that - * config. If desired, a specific list of desired commands can be used - * instead. - */ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV -#define CONFIG_CMD_ECHO #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD @@ -259,6 +249,11 @@ #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT +#endif + +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ #endif /* General parts of the framework, required. */ @@ -301,7 +296,8 @@ "run netloadfdt; " \ "run netargs; " \ "bootz ${loadaddr} - ${fdtaddr}\0" - +#else +#define NETARGS "" #endif #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 6c3380441d..e96613406b 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -78,9 +78,6 @@ #define CONFIG_USB_TTY 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 -/* Per-Soc commands */ -#undef CONFIG_CMD_NFS - /* * Environment setup */ @@ -166,9 +163,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -/* SPL: Allow to use an EXT partition */ -#define CONFIG_SPL_EXT_SUPPORT - #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ #endif diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 4faffef047..f3e5a7587d 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -57,9 +57,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 -/* Per-SoC commands */ -#undef CONFIG_CMD_NFS - /* * Environment setup */ @@ -71,6 +68,7 @@ #define DFUARGS #endif +#ifndef CONFIG_SPL_BUILD #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ @@ -146,6 +144,7 @@ "setenv mmcroot /dev/mmcblk0p2 rw; " \ "run mmcboot;" \ "" +#endif /* diff --git a/include/configs/tk71.h b/include/configs/tk71.h index a9c6d2e601..46e8c90b45 100644 --- a/include/configs/tk71.h +++ b/include/configs/tk71.h @@ -33,7 +33,6 @@ #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT -#include <config_cmd_default.h> #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_EXT2 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index aa19f1163f..e0c4ada711 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -48,7 +48,6 @@ #define CONFIG_MXC_SPI /* SPI Flash */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K @@ -122,7 +121,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_ITEST #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index b004d099e1..23bf599ec5 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -149,8 +149,6 @@ #define CONFIG_SYS_NAND_MAX_ECCPOS 56 /* commands to include */ -#include <config_cmd_default.h> - #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_I2C /* I2C serial bus support */ @@ -162,9 +160,6 @@ #define CONFIG_CMD_UBIFS /* UBIFS commands */ #define CONFIG_LZO /* LZO is needed for UBIFS */ -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_JFFS2 /* JFFS2 Support */ /* needed for ubi */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 848ef33f20..2db38e5b93 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -24,7 +24,6 @@ /* SPI */ #define CONFIG_TEGRA20_SFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_CMD_SPI diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index b7804d2872..8368931e7b 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -63,10 +63,7 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_FAT -#define CONFIG_CMD_IMLS #define CONFIG_CMD_PING #define CONFIG_CMD_USB diff --git a/include/configs/tseries.h b/include/configs/tseries.h index f3f71f11a6..6a1835efe6 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -162,7 +162,7 @@ BUR_COMMON_ENV \ "kernel=zImage\0" \ "ramdisk=rootfs.cpio.uboot\0" \ "console=ttyO0,115200n8\0" \ -"optargs=consoleblank=0 quiet lpj=1191936 panic=2\0" \ +"optargs=consoleblank=0 quiet panic=2\0" \ "nfsroot=/tftpboot/tseries/rootfs-small\0" \ "nfsopts=nolock\0" \ "ramargs=setenv bootargs ${optargs} console=${console} root=/dev/ram0\0" \ @@ -266,7 +266,6 @@ MMCARGS #define CONFIG_OMAP3_SPI #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/tt01.h b/include/configs/tt01.h index cf169a4c89..9501a830d5 100644 --- a/include/configs/tt01.h +++ b/include/configs/tt01.h @@ -187,13 +187,9 @@ /* * Command definition */ - -#include <config_cmd_default.h> - #define CONFIG_CMD_DATE #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_NAND /* * #define CONFIG_CMD_NAND_LOCK_UNLOCK the NAND01... chip does not support diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 622bd53440..e7b006c2d4 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_LONGHELP /* U-Boot commands */ -#include <config_cmd_default.h> #define CONFIG_CMD_NAND #define CONFIG_CMD_CACHE diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h index 5302b1fb81..6a225710c2 100644 --- a/include/configs/u8500_href.h +++ b/include/configs/u8500_href.h @@ -62,20 +62,9 @@ /* * Commands */ -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_BDI -#define CONFIG_CMD_IMI -#define CONFIG_CMD_MISC -#define CONFIG_CMD_RUN -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_LOADB #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_SOURCE #define CONFIG_CMD_I2C #ifndef CONFIG_BOOTDELAY @@ -191,7 +180,6 @@ #define CONFIG_MMC_DEV_NUM 1 #define CONFIG_CMD_ENV -#define CONFIG_CMD_SAVEENV /* CMD_ENV is obsolete but used in env_emmc.c */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET 0x13F80000 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SLOT2: eMMC */ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 84571f6e93..4774de5c9a 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -61,15 +61,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_ITEST -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NAND diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f29ab2d2d7..4a7702cd09 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -20,13 +20,11 @@ #define CONFIG_MXC_GPIO #include <asm/arch/imx-regs.h> -#include <config_cmd_default.h> #include <config_distro_defaults.h> /* U-Boot commands */ #define CONFIG_CMD_MEMTEST -#undef CONFIG_CMD_IMLS /* U-Boot environment */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 688d60e8fb..63049aba4d 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -85,8 +85,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE diff --git a/include/configs/vct.h b/include/configs/vct.h index ed9378eae8..b54519d3d1 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -83,8 +83,6 @@ /* * Commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_EEPROM @@ -97,8 +95,6 @@ !defined(CONFIG_VCT_SMALL_IMAGE) #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP -#else -#undef CONFIG_CMD_NFS #endif /* @@ -128,11 +124,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ #endif /* CONFIG_CMD_USB */ -#if !defined(CONFIG_VCT_NOR) -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS -#endif - #if defined(CONFIG_VCT_NAND) #define CONFIG_CMD_NAND #endif @@ -293,10 +284,8 @@ int vct_gpio_get(int pin); */ #if defined(CONFIG_VCT_SMALL_IMAGE) #undef CONFIG_CMD_ASKENV -#undef CONFIG_CMD_BDI #undef CONFIG_CMD_BEDBUG #undef CONFIG_CMD_CACHE -#undef CONFIG_CMD_CONSOLE #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_EEPROM @@ -305,16 +294,11 @@ int vct_gpio_get(int pin); #undef CONFIG_CMD_I2C #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_ITEST -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_MII -#undef CONFIG_CMD_MISC #undef CONFIG_CMD_PING #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_SNTP -#undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_STRINGS #undef CONFIG_CMD_TERMINAL #undef CONFIG_CMD_USB diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 107f01a07e..a88216c6ec 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -331,8 +331,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_PING diff --git a/include/configs/venice2.h b/include/configs/venice2.h index bfe5298bf5..1d9d053b35 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -40,7 +40,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 8c3774a735..de23375cd5 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -81,13 +81,8 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_IMI -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV /* * BOOTP options diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index b81dfce7aa..c36237f3eb 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -10,7 +10,6 @@ /* We use generic board and device manager for v8 Versatile Express */ #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_DM #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifndef CONFIG_SEMIHOSTING @@ -114,7 +113,6 @@ #endif /* !CONFIG_GICV3 */ /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_F_LEN 0x2000 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) /* Ethernet Configuration */ @@ -130,7 +128,6 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_DM_SERIAL #define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 0 #define CONFIG_PL01X_SERIAL @@ -145,22 +142,13 @@ #define CONFIG_MENU /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_CACHE -#define CONFIG_CMD_BDI #define CONFIG_CMD_BOOTI #define CONFIG_CMD_UNZIP #define CONFIG_CMD_DHCP #define CONFIG_CMD_PXE #define CONFIG_CMD_ENV -#define CONFIG_CMD_IMI -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_RUN -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_SOURCE #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION @@ -264,7 +252,6 @@ #ifndef CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_SYS_NO_FLASH #else -#define CONFIG_CMD_FLASH #define CONFIG_CMD_ARMFLASH #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index db78c85663..0c1da01edf 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -153,18 +153,12 @@ #define CONFIG_SYS_SERIAL1 V2M_UART1 /* Command line configuration */ -#define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP #define CONFIG_CMD_PXE #define CONFIG_MENU #define CONFIG_CMD_ELF #define CONFIG_CMD_ENV -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_IMI -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_RUN #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD @@ -292,7 +286,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ -#define CONFIG_CMD_SOURCE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_MAXARGS 16 /* max command args */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index dde65ed988..c5131af340 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -10,7 +10,6 @@ #define __CONFIG_H #include <asm/arch/imx-regs.h> -#include <config_cmd_default.h> #define CONFIG_VF610 @@ -43,8 +42,6 @@ #define CONFIG_SYS_UART_PORT (1) #define CONFIG_BAUDRATE 115200 -#undef CONFIG_CMD_IMLS - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS @@ -103,7 +100,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 41680c4caf..93c7348981 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -50,7 +50,6 @@ #define CONFIG_FSL_SF #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* @@ -124,10 +123,7 @@ * Command definition ***********************************************************/ -#include <config_cmd_default.h> - #define CONFIG_CMD_SPI -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h index 7dfb6da357..e4958ce565 100644 --- a/include/configs/vl_ma2sc.h +++ b/include/configs/vl_ma2sc.h @@ -83,12 +83,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_LOADS - #define CONFIG_CMD_BMP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index c7730fc862..39982741ec 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -357,8 +357,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING @@ -374,7 +372,6 @@ #if defined(CONFIG_SYS_RAMBOOT) #undef CONFIG_CMD_ENV - #undef CONFIG_CMD_LOADS #endif #define CONFIG_CMD_ELF diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 0886ba3a9c..95a69b3978 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -67,20 +67,15 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC #define CONFIG_CMD_USB #undef CONFIG_LCD #define CONFIG_CMD_IDE #ifdef CONFIG_ONENAND -#undef CONFIG_CMD_FLASH #define CONFIG_CMD_ONENAND #else -#define CONFIG_CMD_FLASH #undef CONFIG_CMD_ONENAND #endif diff --git a/include/configs/warp.h b/include/configs/warp.h index 39b49198bf..48e2058f5f 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -30,9 +30,6 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SUPPORT_EMMC_BOOT -/* Command definition */ -#undef CONFIG_CMD_NFS - /* Watchdog */ #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h index 036c1e427e..72190340f3 100644 --- a/include/configs/wireless_space.h +++ b/include/configs/wireless_space.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* no NOR or SPI flash */ -#include <config_cmd_default.h> #define CONFIG_CMD_ENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index e8eabdb115..52d392cb16 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -82,9 +82,6 @@ /* * Command definition */ - -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 4725fc3d89..15ee28414d 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -177,11 +177,6 @@ #define CONFIG_ENV_ADDR 0x80000100 /* - * U-Boot Commands - */ -#include <config_cmd_default.h> - -/* * Boot Linux */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/x600.h b/include/configs/x600.h index a07482cb27..1d4c1a9826 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -105,24 +105,18 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C -#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_PING -#define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_LZO -/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <config_cmd_default.h> - #define CONFIG_BOOTDELAY 3 #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 1917d87ac5..349b06cb76 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -100,36 +100,15 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_BDI -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_CONSOLE #define CONFIG_CMD_DATE -#define CONFIG_CMD_ECHO -#undef CONFIG_CMD_FLASH -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_GPIO -#define CONFIG_CMD_IMI -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_IO #define CONFIG_CMD_IRQ -#define CONFIG_CMD_ITEST -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC -#undef CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_RUN -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_SETGETDCR -#define CONFIG_CMD_SOURCE #define CONFIG_CMD_TIME #define CONFIG_CMD_GETTIME -#define CONFIG_CMD_XIMG #define CONFIG_CMD_SCSI #define CONFIG_CMD_FAT @@ -192,7 +171,6 @@ * FLASH configuration */ #define CONFIG_ICH_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index fcb76a27a2..a072464c10 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -59,11 +59,8 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG -#define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SNTP diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 8e6b365364..0551580ccf 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 4f62607ace..309d68d281 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) /*Cmd*/ -#include <config_cmd_default.h> #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_DIAG @@ -41,8 +40,6 @@ #undef CONFIG_CMD_PING #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_NFS /*Misc*/ #define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 880d29ca71..ad82ed6289 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -69,14 +69,12 @@ #define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_MEMORY #define CONFIG_DOS_PARTITION #define CONFIG_CMD_ELF #define CONFIG_MP /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_SST # define CONFIG_CMD_SF #endif diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index ea747c8e6d..4fafb5a77b 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -187,21 +187,17 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SNTP /* diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index a762ec09b3..669aa53c91 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -526,8 +526,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -536,8 +534,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 9484ccb6ae..34a124c9d9 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -311,15 +311,11 @@ /* * Command configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 0391459a6a..58ace2cf48 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -381,8 +381,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP @@ -391,7 +389,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII @@ -401,7 +398,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SNTP #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 09c248a4c5..765aaadf10 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -367,15 +367,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII @@ -386,7 +383,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB diff --git a/include/configs/zeus.h b/include/configs/zeus.h index cc1b96006a..2bc4e1a9fe 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -51,8 +51,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP @@ -62,7 +60,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 49ca978a52..cff3ba837c 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -62,11 +62,7 @@ /* * Bootloader Components Configuration */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC #define CONFIG_CMD_SPI diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 004af386ce..af7cc49751 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -77,7 +77,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> #define CONFIG_CMD_CACHE /* diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1a52e7d538..5526214df2 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -68,7 +68,6 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_SST # define CONFIG_CMD_SF #endif @@ -204,7 +203,6 @@ # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE # define CONFIG_ENV_OFFSET 0xE0000 -# define CONFIG_CMD_SAVEENV #endif /* Default environment */ @@ -272,7 +270,6 @@ #define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_ZYNQPL -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_FPGA_LOADP #define CONFIG_CMD_FPGA_LOADBP @@ -300,8 +297,6 @@ #define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds" /* Commands */ -#include <config_cmd_default.h> - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII |
