diff options
Diffstat (limited to 'include/configs')
277 files changed, 253 insertions, 858 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 078b215450..abfdbc9276 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index b23ec8fc8b..9097932581 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -522,7 +522,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index bc5fa0394c..c3b2353f5f 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -47,7 +47,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index feabc5fc09..deb6f826e1 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -63,8 +63,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE -#define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 126f889e97..7f5eecaad5 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -36,10 +36,8 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_BMP #define CONFIG_HOSTNAME M52277EVB #define CONFIG_SYS_UBOOT_END 0x3FFFF diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 0c18b14c72..b88c3709c6 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -26,7 +26,6 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* Command line configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_REGINFO #define CONFIG_SYS_UNIFY_CACHE diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 46c50ea1f2..999bcd9495 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -26,7 +26,6 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_REGINFO #ifdef CONFIG_NANDFLASH_SIZE diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 0204cd5694..3a39e5031d 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -26,7 +26,6 @@ #define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */ /* Command line configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_REGINFO #ifdef CONFIG_NANDFLASH_SIZE diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index cbe0d1ef63..1817571efe 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -37,7 +37,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#undef CONFIG_CMD_DATE #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_NAND #define CONFIG_CMD_REGINFO diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 770472d8e0..553e877ae7 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#define CONFIG_CMD_DATE #undef CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index db80871190..806f00555f 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_PCI diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 2c31d99a62..cf9d3b8e1b 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -26,7 +26,6 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#undef CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index b9222e40d9..934c9d8903 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -26,7 +26,6 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ /* Command line configuration */ -#undef CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index d362197ed5..30db7edde8 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ @@ -54,7 +53,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES -#define CONFIG_CMD_BSP /************************************************************** * I2C Stuff: diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index b9745f60f4..0f26467e29 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -416,7 +416,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 32ca242f35..38a4a6220b 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -468,7 +468,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMDLINE_EDITING 1 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 3093c56ec1..493e3fa646 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -448,7 +448,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 70ef1b80b1..2f91dd57bb 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -463,7 +463,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index ecad625098..719c27966a 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -479,7 +479,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IRQ #define CONFIG_CMD_SDRAM diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 32274750a5..85b7c48fdf 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -469,7 +469,6 @@ extern int board_pci_host_broken(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 5bd0d52135..d39dc1b465 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -481,7 +481,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 0e9aaf4d66..2014450be8 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -21,7 +21,6 @@ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 97a75709f9..95b42208e9 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -727,7 +727,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 823eaf673f..db66c309e7 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -365,7 +365,6 @@ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 2c048abba6..e53db2485b 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,7 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index b00cf8eeb2..6c74b00cd5 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -44,10 +44,8 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_FDC #define CONFIG_SCSI -#define CONFIG_CMD_DATE #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVES -#define CONFIG_CMD_BSP /************************************************************** * I2C Stuff: diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 3fc3bb844a..4bb07d8bd4 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -58,7 +58,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE #define CONFIG_CMD_NAND -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 5c3f56682c..d889306653 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,9 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BSP -#define CONFIG_CMD_CHIP_CONFIG -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 1b059d4f58..b9599b5e3b 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -258,8 +258,6 @@ /* Partitions */ -#define CONFIG_CMD_BSP -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 5b4ea141da..4da829d838 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -486,7 +486,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_DIU_FB #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS @@ -781,7 +780,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c9a848f6b1..3b55404cda 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -493,7 +493,6 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS @@ -791,7 +790,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 0d60747dc8..b2810b65f9 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -396,7 +396,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_DIU_FB #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS @@ -662,7 +661,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 5107dc342d..5577408015 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -505,7 +505,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #ifdef CONFIG_FSL_DIU_FB #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif @@ -775,9 +774,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#ifdef CONFIG_TARGET_T1042RDB_PI -#define CONFIG_CMD_DATE -#endif #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index e5911d0d96..13f4ef67e1 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -144,15 +144,9 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_BSP - -#ifdef CONFIG_VIDEO - #define CONFIG_CMD_BMP -#endif #ifdef CONFIG_PCI #define CONFIG_CMD_PCI @@ -170,10 +164,6 @@ #define CONFIG_CFG_FAT #endif -#ifdef CONFIG_POST - #define CONFIG_CMD_DIAG -#endif - #define CONFIG_TIMESTAMP /* display image timestamps */ #if (CONFIG_SYS_TEXT_BASE != 0xFFF00000) diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 61748ca412..f56bd239af 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,14 +91,9 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#ifdef CONFIG_SPLASH_SCREEN - #define CONFIG_CMD_BMP -#endif - #define CONFIG_NETCONSOLE /* diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 4b9ef9f945..ed08d972f8 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 42a9f77e7c..e3c2cca3c3 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -280,7 +280,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 7edfab9050..c2b35fd196 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 3931eba60e..76b52ab6b1 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 9b2ec372a9..10ba21d97d 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index b1b38e7388..7cfc351191 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index dc2fe30e29..7569cd1e83 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 06c92851eb..d2cb4b9a87 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index aca58b1adf..03ad2e63a0 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 371d19f4fd..485bd6c8a6 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 98cec3d8c9..eaf0741071 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,7 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index f1b72a329c..c60743acd0 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -443,11 +443,9 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ERRATA -#define CONFIG_CMD_CRAMFS /* * USB diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 7e42115540..fbadcd17f1 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -53,7 +53,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BSP #define CONFIG_CMD_IRQ #define CONFIG_CMD_EEPROM diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 60158f96d4..07f74db089 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -42,7 +42,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BSP #define CONFIG_CMD_REGINFO #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index e07a782fec..79099518e7 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -83,7 +83,6 @@ */ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE -#define CONFIG_CMD_DISPLAY #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index d557c42567..b42fcfa8d5 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -104,11 +104,6 @@ #define CONFIG_FTSDC010_SDIO /* - * Command line configuration. - */ -#define CONFIG_CMD_DATE - -/* * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 30dd9e5966..52f8475669 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -91,9 +91,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep003x.h index 7ee8ea7975..55b511c408 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep003x.h @@ -11,20 +11,17 @@ * GNU General Public License for more details. */ -#ifndef __CONFIG_IGEP0033_H -#define __CONFIG_IGEP0033_H +#ifndef __CONFIG_IGEP003X_H +#define __CONFIG_IGEP003X_H #define CONFIG_NAND #include <configs/ti_am335x_common.h> -/* Mach type */ -#define CONFIG_MACH_TYPE MACH_TYPE_IGEP0033 - /* Clock defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_ENV_SIZE (96 << 10) /* 96 KiB */ /* Make the verbose messages from UBI stop printing */ #define CONFIG_UBI_SILENCE_MSG @@ -37,7 +34,6 @@ DEFAULT_LINUX_BOOT_ENV \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ - "dtbfile=am335x-base0033.dtb\0" \ "console=ttyO0,115200n8\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ @@ -51,7 +47,7 @@ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ "mmcload=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}; " \ - "load mmc ${mmcdev}:2 ${fdtaddr} ${bootdir}/${dtbfile}\0" \ + "load mmc ${mmcdev}:2 ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ @@ -70,11 +66,11 @@ "fi;\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ - "nandroot=ubi0:filesystem rw ubi.mtd=3,2048\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=1\0" \ "nandrootfstype=ubifs rootwait\0" \ - "nandload=ubi part filesystem 2048; ubifsmount ubi0; " \ - "ubifsload ${loadaddr} ${bootdir}/${bootfile}; " \ - "ubifsload ${fdtaddr} ${bootdir}/${dtbfile} \0" \ + "nandload=ubi part UBI; " \ + "ubi read ${loadaddr} kernel; " \ + "ubi read ${fdtaddr} dtb \0" \ "nandargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${nandroot} " \ @@ -82,12 +78,33 @@ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ "run nandload; " \ - "bootz ${loadaddr} - ${fdtaddr} \0" + "bootz ${loadaddr} - ${fdtaddr} \0" \ + "netload=tftpboot ${loadaddr} ${bootfile}; " \ + "tftpboot ${fdtaddr} ${fdtfile} \0" \ + "netargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=/dev/nfs " \ + "ip=${ipaddr} nfsroot=${serverip}:${rootnfs},v3,tcp \0" \ + "netboot=echo Booting from net ...; " \ + "run netargs; " \ + "run netload; " \ + "bootz ${loadaddr} - ${fdtaddr} \0" \ + "findfdt="\ + "if test ${board_name} = igep0033; then " \ + "setenv fdtfile am335x-igep-base0033.dtb; fi; " \ + "if test ${board_name} = igep0034; then " \ + "setenv fdtfile am335x-igep-base0040.dtb; fi; " \ + "if test ${board_name} = igep0034-lite; then " \ + "setenv fdtfile am335x-igep-base0040-lite.dtb; fi; " \ + "if test ${fdtfile} = ''; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" #endif #define CONFIG_BOOTCOMMAND \ + "run findfdt;" \ "run mmcboot;" \ - "run nandboot;" + "run nandboot;" \ + "run netboot;" /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ @@ -100,12 +117,6 @@ /* NAND support */ #define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION 1 -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x180000 /* environment starts here */ -#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_OFFSET + CONFIG_SYS_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE @@ -113,13 +124,32 @@ #define CONFIG_LZO #define MTDIDS_DEFAULT "nand0=omap2-nand.0" -#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(spl),"\ - "1m(uboot),256k(environment),"\ - "-(filesystem)" +#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL),-(UBI)" /* SPL */ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/am33xx/u-boot-spl.lds" +/* UBI configuration */ +#define CONFIG_SPL_UBI 1 +#define CONFIG_SPL_UBI_MAX_VOL_LEBS 256 +#define CONFIG_SPL_UBI_MAX_PEB_SIZE (256*1024) +#define CONFIG_SPL_UBI_MAX_PEBS 4096 +#define CONFIG_SPL_UBI_VOL_IDS 8 +#define CONFIG_SPL_UBI_LOAD_MONITOR_ID 0 +#define CONFIG_SPL_UBI_LOAD_KERNEL_ID 3 +#define CONFIG_SPL_UBI_LOAD_ARGS_ID 4 +#define CONFIG_SPL_UBI_PEB_OFFSET 4 +#define CONFIG_SPL_UBI_VID_OFFSET 512 +#define CONFIG_SPL_UBI_LEB_START 2048 +#define CONFIG_SPL_UBI_INFO_ADDR 0x88080000 + +/* environment organization */ +#define CONFIG_ENV_IS_IN_UBI 1 +#define CONFIG_ENV_UBI_PART "UBI" +#define CONFIG_ENV_UBI_VOLUME "config" +#define CONFIG_ENV_UBI_VOLUME_REDUND "config_r" + +/* NAND config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) @@ -139,8 +169,4 @@ #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE - -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 - -#endif /* ! __CONFIG_IGEP0033_H */ +#endif /* ! __CONFIG_IGEP003X_H */ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index dc7a370208..6962039c3a 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -14,8 +14,6 @@ #include <environment/ti/dfu.h> -#define CONFIG_DRA7XX - #ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION #endif diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 0f0fe4bedd..01406640b0 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,7 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 4f462d61e0..acae6914e5 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -30,9 +30,6 @@ "erase 0xfff00000 0xffffffff; " \ "cp.b 0x20000 0xfff00000 ${filesize}\0" -#undef CONFIG_CMD_AES -#define CONFIG_CMD_DIAG - /* undef to save memory */ #undef CONFIG_SYS_LONGHELP diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 84652decd6..c6c956e1ee 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -11,9 +11,6 @@ #include <linux/sizes.h> -/* enable PMIC */ -#define CONFIG_AS3722_POWER - #include "tegra124-common.h" #define CONFIG_ARCH_MISC_INIT diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c0c575a490..c1c0f592d2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -121,7 +121,6 @@ #define CONFIG_DFU_MMC /* Miscellaneous commands */ -#define CONFIG_CMD_BMODE #define CONFIG_MXC_GPIO /* Framebuffer and LCD */ @@ -139,7 +138,6 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_BMP /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 82898bfa13..40a82b884b 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,8 +54,6 @@ /* * U-Boot Commands */ -#define CONFIG_CMD_BSP /* Board Specific functions */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IMX_FUSE /* imx iim fuse */ #define CONFIG_CMD_MTDPARTS /* MTD partition support */ diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 5ae622c205..a4c7847dab 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -20,7 +20,6 @@ /* U-Boot Commands */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND /* Memory configuration */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 5c27055e45..4d16d33585 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -41,9 +41,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=u-boot.scr\0" \ "fit_file=/boot/system.itb\0" \ @@ -203,7 +200,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_RTC_BUS_NUM 2 #define CONFIG_RTC_M41T11 -#define CONFIG_CMD_DATE /* USB Configs */ #define CONFIG_USB_EHCI @@ -236,8 +232,6 @@ #define CONFIG_IPUV3_CLK 198000000 #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_BMP - #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 961a29a86a..30abafc0ae 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -50,8 +50,6 @@ #define CONFIG_LG4573_BUS 0 #define CONFIG_LG4573_CS 0 -#define CONFIG_CMD_BMP - #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index 638c89e53c..7a47514515 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -50,8 +50,6 @@ #define CONFIG_LG4573_BUS 0 #define CONFIG_LG4573_CS 1 -#define CONFIG_CMD_BMP - #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 7e81c5e349..2023895c3e 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -16,7 +16,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define BOARD_LATE_INIT diff --git a/include/configs/arndale.h b/include/configs/arndale.h index e6f2422f03..4d770e6077 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -36,7 +36,6 @@ /* PMIC */ #define CONFIG_POWER -#define CONFIG_PMIC #define CONFIG_POWER_I2C #define CONFIG_PREBOOT diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 4e3e5589f9..8899579faa 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -59,7 +59,6 @@ /* Define which commands should be available at u-boot command prompt */ -#define CONFIG_CMD_DATE #if ENABLE_JFFS #define CONFIG_CMD_JFFS2 #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 0afc92c91d..505f945bd3 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -51,7 +51,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_LCD #ifdef CONFIG_AT91SAM9261EK #define CONFIG_ATMEL_LCD_BGR555 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 5194131243..663c193a5b 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -59,7 +59,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD_BGR555 1 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0708d53662..a62b70b459 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -44,7 +44,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_LCD #define CONFIG_ATMEL_LCD_RGB565 /* board specific(not enough SRAM) */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 872d471d05..dd49f4ebd3 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -42,7 +42,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 8752f1f3b6..31a7cb18d8 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -47,7 +47,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD_RGB565 1 /* Let board_init_f handle the framebuffer allocation */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index c81003e311..ff0a78ba43 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -39,7 +39,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index aeb6507fc2..8868deb1c1 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -181,7 +181,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index c187df233c..d9b88fa2d3 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -58,7 +58,6 @@ /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index ec2ce3f926..dc2860382d 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -49,7 +49,6 @@ /* version string, parser, etc */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_SYS_LONGHELP #endif /* __BCM_NORTHSTAR2_H */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 68e9efef1c..0c1a54d7ba 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -18,7 +18,6 @@ #define CONFIG_AM335X_LCD #define CONFIG_LCD_ROTATION #define CONFIG_LCD_DT_SIMPLEFB -#define CONFIG_SYS_WHITE_ON_BLACK #define LCD_BPP LCD_COLOR32 #define CONFIG_HW_WATCHDOG diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 82ee7c62e0..49f223a32a 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -17,12 +17,10 @@ /* ------------------------------------------------------------------------- */ #define CONFIG_AM335X_LCD #define CONFIG_LCD_NOSTDOUT -#define CONFIG_SYS_WHITE_ON_BLACK #define LCD_BPP LCD_COLOR32 #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) -#define CONFIG_CMD_BMP #define CONFIG_BMP_24BMP #define CONFIG_BMP_32BPP diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 8a5994af51..7274b2d4fe 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -90,7 +90,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/calimain.h b/include/configs/calimain.h index a4ff1e8995..425a38f551 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -301,7 +301,6 @@ * U-Boot commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifndef CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 6cd66f28bd..c70979ed1a 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 9babc3d62c..a330372d19 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -372,20 +372,17 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #if defined(CONFIG_ARCHES) #define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM #elif defined(CONFIG_CANYONLANDS) -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA #define CONFIG_CMD_SDRAM #elif defined(CONFIG_GLACIER) -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 5ec63cd8be..8185926590 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -14,9 +14,6 @@ #include <linux/sizes.h> -/* enable PMIC */ -#define CONFIG_AS3722_POWER - #include "tegra124-common.h" /* High-level configuration options */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index c32372a66c..e05db3ed8a 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -43,9 +43,6 @@ #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) -/* Miscellaneous commands */ -#define CONFIG_CMD_BMODE - /* Thermal support */ #define CONFIG_IMX_THERMAL diff --git a/include/configs/charon.h b/include/configs/charon.h index 578c108228..913b707a5f 100644 --- a/include/configs/charon.h +++ b/include/configs/charon.h @@ -24,7 +24,6 @@ /* defines special on charon board */ #undef CONFIG_RTC_MPC5200 -#undef CONFIG_CMD_DATE #undef CUSTOM_ENV_SETTINGS #define CUSTOM_ENV_SETTINGS \ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index a4950f39e3..3000453563 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_CL_SOM_AM57X_H #define __CONFIG_CL_SOM_AM57X_H -#define CONFIG_DRA7XX - #define CONFIG_NR_DRAM_BANKS 2 #define CONSOLEDEV "ttyO2" @@ -84,6 +82,8 @@ #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } +#endif /* !CONFIG_SPL_BUILD */ + /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 @@ -98,8 +98,6 @@ #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 -#endif /* !CONFIG_SPL_BUILD */ - /* CPSW Ethernet */ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 51a5f6dce7..0073cb5373 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -21,9 +21,6 @@ /* * Supported commands */ -#define CONFIG_CMD_BSP -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DIAG #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 14b25d410b..f5f3df3ad6 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -252,7 +252,6 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SOURCE -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_LOGO diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8e6571b9f0..4da8d54eda 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -262,7 +262,6 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SOURCE -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_SCF0403_LCD diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 55d4786fd8..e12dc020ff 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -263,7 +263,6 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASHIMAGE_GUARD -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_SCF0403_LCD diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 0b58e5b9f5..9c4085245a 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -102,7 +102,6 @@ #define CONFIG_DFU_MMC /* Miscellaneous commands */ -#define CONFIG_CMD_BMODE #define CONFIG_MXC_GPIO /* Framebuffer and LCD */ @@ -120,7 +119,6 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_BMP /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 87d2012984..3388a95ed3 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -25,8 +25,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) -#define CONFIG_CMD_BMODE - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_MII @@ -218,7 +216,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 015f98241e..62a404a7b1 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -65,8 +65,6 @@ #ifdef CONFIG_LCD #define CONFIG_PXA_LCD #define CONFIG_PXA_VGA -#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CMD_BMP #define CONFIG_LCD_LOGO #endif diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 8b854c37a1..023e75cf33 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -39,8 +39,6 @@ #define CONFIG_TFTP_TSIZE /* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CMD_BMP #define CONFIG_LCD_LOGO /* NAND support */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 5dc5ed0b71..c7f174839f 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -26,7 +26,6 @@ #endif #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_CMD_BMP #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index a70845e101..231e5990ec 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -28,7 +28,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_CMD_BMP #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ef000 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 1bd3195ff1..b52f300af9 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -214,7 +214,6 @@ */ #define CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -#define CONFIG_CMD_BMP /* * General PCI diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index dfeee513a4..904da1a8ac 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -239,7 +239,6 @@ #define CONFIG_SYS_I2C_MAC2_CHIP_ADDR 0x50 #define CONFIG_SYS_I2C_MAC2_DATA_ADDR 0xfa -#define CONFIG_CMD_DATE 1 #define CONFIG_RTC_MCP79411 1 #define CONFIG_SYS_RTC_BUS_NUM 3 #define CONFIG_SYS_I2C_RTC_ADDR 0x6f diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3ce905859e..9442c05943 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -274,7 +274,6 @@ * U-Boot commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 04372962f6..e788f9c635 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -66,7 +66,6 @@ /* * Command line configuration. */ -#undef CONFIG_CMD_BEDBUG #ifdef CONFIG_DBAU1550 diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index edb495842b..1cb4b5ee81 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -39,7 +39,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_CMD_BMP #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ef000 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 71068a8ae3..2b56945dd9 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,11 +85,6 @@ /* * Command line configuration. */ -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP -#endif -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 6b3cd15cb6..e32651f541 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -58,7 +58,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_DTT -#undef CONFIG_CMD_DIAG #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 6269768df1..2b7d62b034 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -56,7 +56,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_DTT -#undef CONFIG_CMD_DIAG #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index c907d82b55..9450b62e4a 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE #define CONFIG_SYS_MVFS #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7d6f7ff278..a9ca0231f5 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -14,8 +14,6 @@ #include <environment/ti/dfu.h> -#define CONFIG_DRA7XX - #ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION #endif diff --git a/include/configs/ea20.h b/include/configs/ea20.h index a7b2dc82e1..7510071883 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -102,7 +102,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CMD_BMP #endif /* @@ -131,7 +130,6 @@ * U-Boot commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index edd948522e..45ce944eb1 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -57,7 +57,6 @@ * Command line configuration. */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_DATE #define CONFIG_MCFTMR diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index f012af547f..2fc85983e0 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_CLK_FREQ 14745600 /* EP93xx has a 14.7456 clock */ /* Monitor configuration */ -#undef CONFIG_CMD_DATE #define CONFIG_CMD_JFFS2 #define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 084839702b..575610d410 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -57,8 +57,6 @@ #define CONFIG_MXC_UART_BASE UART2_BASE /* Command definition */ - -#define CONFIG_CMD_BMODE #undef CONFIG_CMD_IMLS #define CONFIG_BOARD_NAME EL6Q diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 658f4d932d..68d48b2e6a 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -65,8 +65,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #endif -#define CONFIG_CMD_BMODE - #define CONFIG_ARP_TIMEOUT 200UL /* Print Buffer Size */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index b83eb45111..481051c9c6 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -89,8 +89,6 @@ #define CONFIG_CMD_NAND #ifndef MINIMAL_LOADER -#define CONFIG_CMD_BSP -#define CONFIG_CMD_DATE #define CONFIG_CMD_REISER #define CONFIG_CMD_SAVES #define CONFIG_CMD_UBIFS diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index bbd54a1160..0dc3532f33 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -13,6 +13,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h index 3a39a1bffe..fe3ec8c177 100644 --- a/include/configs/evb_rk3328.h +++ b/include/configs/evb_rk3328.h @@ -20,7 +20,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 #endif diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index 8fdefa29c7..b9fd5b417a 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -20,6 +20,4 @@ #define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index 7cb3a296b5..1b94d07f67 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -31,7 +31,6 @@ #define CONFIG_EXYNOS_FB #define CONFIG_EXYNOS_DP #define LCD_BPP LCD_COLOR16 -#define CONFIG_SYS_WHITE_ON_BLACK #endif /* Enable keyboard */ diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index bbd54a1160..0dc3532f33 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -13,6 +13,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index ec555dd966..b4dcf23b1c 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -17,6 +17,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 43b1fb030c..776910c6cd 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -114,9 +114,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index f36f34040f..f9bced3f8f 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -46,7 +46,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ /* diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 2b98f535c6..92eded6cda 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_I2C_GSC 0 -#define CONFIG_I2C_PMIC 1 #define CONFIG_I2C_EDID /* MMC Configs */ @@ -142,7 +141,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ -#define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 923c38f968..1a5d4b1dd5 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -45,11 +45,6 @@ #define CONFIG_USB_ETHER_MCS7830 #define CONFIG_USB_ETHER_SMSC95XX -/* General networking support */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 4cdb27ccec..584ce52bd0 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -107,8 +107,6 @@ BOOTENV /* Preserve environment on sd card */ -#define CONFIG_COMMAND_HISTORY - #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_IS_IN_FAT #define FAT_ENV_INTERFACE "mmc" diff --git a/include/configs/icon.h b/include/configs/icon.h index 22e5f87286..3ad296be90 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -159,13 +159,8 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP -#endif #define CONFIG_IBM_EMAC4_V4 /* 440SPe has this EMAC version */ #define CONFIG_PHY_ADDR 1 /* PHY address, See schematics */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index e2c2552e7c..6b6bbbd5c0 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -413,7 +413,6 @@ * U-Boot environment setup */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_DATE #define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_JFFS2 #define CONFIG_BOOTP_SUBNETMASK diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index db745b28a7..b8a867c7ba 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -159,7 +159,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_DIAG #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index ae5009a556..0a66720a7d 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -177,7 +177,6 @@ #define CONFIG_VIDEO_MX3 #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #endif diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 175ddc4886..821f1ffacd 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -33,9 +33,6 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index c3e1cae6cb..5ee9c2bcb4 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -72,7 +72,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_PCI diff --git a/include/configs/intip.h b/include/configs/intip.h index 3477059865..f1f840923b 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -272,8 +272,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/io.h b/include/configs/io.h index 8a21b3f60f..3e44a8c607 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -58,7 +58,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_DTT -#undef CONFIG_CMD_DIAG #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ diff --git a/include/configs/io64.h b/include/configs/io64.h index 8619de4af9..8e754fc10b 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -373,7 +373,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DTT #define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 41e7dca653..5caf02e8d9 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -242,7 +242,6 @@ * U-Boot commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index a99e928e2e..aff4adf5d0 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,10 +88,6 @@ /* * Command line configuration. */ -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP /* BMP support */ -#endif -#define CONFIG_CMD_DATE /* support for RTC, date/time...*/ #define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 7c0456c5ce..b31ba6a4ee 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -10,9 +10,6 @@ #include <linux/sizes.h> -/* enable PMIC */ -#define CONFIG_AS3722_POWER - #include "tegra124-common.h" /* High-level configuration options */ diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 45c1e06fbd..3143b631ce 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -170,8 +170,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG -#define CONFIG_CMD_DATE #define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 43eb405e63..1f5c2ad234 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -364,8 +364,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 24830ee6ee..872e2b3403 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DEFAULTENV_VARS #define CONFIG_CMD_IMMAP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 @@ -69,8 +68,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_CONCAT -#define CONFIG_CMD_CRAMFS - #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS #define CONFIG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0" diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h index 0fe89af32f..f9fed79127 100644 --- a/include/configs/km/km8309-common.h +++ b/include/configs/km/km8309-common.h @@ -19,7 +19,6 @@ #define CONFIG_MPC8309 1 /* MPC8309 CPU specific */ #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" -#define CONFIG_CMD_DIAG 1 /* include common defines/options for all 83xx Keymile boards */ #include "km83xx-common.h" diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index c44ab36128..0c5f6e7515 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -310,7 +310,6 @@ int get_scl(void); #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS) #define CONFIG_POST_SKIP_ENV_FLAGS #define CONFIG_POST_EXTERNAL_WORD_FUNCS -#define CONFIG_CMD_DIAG /* we do the whole PCIe FPGA config stuff here */ diff --git a/include/configs/km8360.h b/include/configs/km8360.h index 6fa4e63e74..3104a8f05c 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -270,7 +270,6 @@ #define CPM_POST_WORD_ADDR CONFIG_SYS_MEMTEST_END #define CONFIG_TESTPIN_REG gprt3 /* for kmcoge5ne */ #define CONFIG_TESTPIN_MASK 0x20 /* for kmcoge5ne */ -#define CONFIG_CMD_DIAG /* so that testpin is inquired for POST test */ #else #define CONFIG_SYS_IBAT6L (0) diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 07f42e3496..c5e7d629ab 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -201,7 +201,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 258fd3ac62..2294106802 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -135,8 +135,6 @@ #define CONFIG_SYS_MMC_ENV_PART 0 #define CONFIG_MMCROOT "/dev/mmcblk0p2" -#define CONFIG_CMD_BMODE - /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 1a0c7f8e5f..09f890d55c 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -123,6 +123,4 @@ #define CONFIG_PANIC_HANG #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -#include <asm/fsl_secure_boot.h> - #endif /* __LS1012A_COMMON_H */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 5aaf3a7c6a..8d7e54305d 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -58,7 +58,6 @@ #define RTC #define CONFIG_RTC_PCF8563 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/ -#define CONFIG_CMD_DATE /* EEPROM */ #define CONFIG_ID_EEPROM diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 70d3a71eb3..276fe1050c 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -74,4 +74,7 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff + +#include <asm/fsl_secure_boot.h> + #endif /* __LS1012ARDB_H__ */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index d8bbc802d2..35d17b96f4 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR #define CONFIG_SYS_FSL_CLK diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 97b81274b0..373de40d29 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR @@ -422,7 +420,6 @@ unsigned long get_board_ddr_clk(void); * Video */ #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index a60b4b2990..1ff3d9ee9e 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR @@ -301,7 +299,6 @@ * Video */ #ifdef CONFIG_VIDEO_FSL_DCU_FB -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 46d54a0f0d..e26924877d 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -7,9 +7,27 @@ #ifndef __LS1043A_COMMON_H #define __LS1043A_COMMON_H +/* SPL build */ +#ifdef CONFIG_SPL_BUILD +#define SPL_NO_FMAN +#define SPL_NO_DSPI +#define SPL_NO_PCIE +#define SPL_NO_ENV +#define SPL_NO_MISC +#define SPL_NO_USB +#define SPL_NO_SATA +#define SPL_NO_QE +#define SPL_NO_EEPROM +#endif +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) +#define SPL_NO_MMC +#endif +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) +#define SPL_NO_IFC +#endif + #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE -#define CONFIG_LS1043A #define CONFIG_MP #define CONFIG_GICV2 @@ -52,7 +70,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x10000000 -#define CONFIG_SPL_MAX_SIZE 0x1d000 +#define CONFIG_SPL_MAX_SIZE 0x17000 #define CONFIG_SPL_STACK 0x1001e000 #define CONFIG_SPL_PAD_TO 0x1d000 @@ -61,7 +79,19 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_SECURE_BOOT */ #endif /* NAND SPL */ @@ -79,10 +109,27 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#endif /* ifdef CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_U_BOOT_HDR_SIZE +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ + #endif /* IFC */ +#ifndef SPL_NO_IFC #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_IFC /* @@ -103,6 +150,7 @@ #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #endif #endif +#endif /* I2C */ #define CONFIG_SYS_I2C @@ -113,6 +161,7 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* PCIe */ +#ifndef SPL_NO_PCIE #define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE2 /* PCIE controller 2 */ #define CONFIG_PCIE3 /* PCIE controller 3 */ @@ -122,17 +171,23 @@ #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI #endif +#endif /* Command line configuration */ +#ifndef SPL_NO_ENV #define CONFIG_CMD_ENV +#endif /* MMC */ +#ifndef SPL_NO_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif +#endif /* DSPI */ +#ifndef SPL_NO_DSPI #define CONFIG_FSL_DSPI #ifdef CONFIG_FSL_DSPI #define CONFIG_DM_SPI_FLASH @@ -144,8 +199,10 @@ #define CONFIG_SF_DEFAULT_CS 0 #endif #endif +#endif /* FMan ucode */ +#ifndef SPL_NO_FMAN #define CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 @@ -177,6 +234,7 @@ #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #endif +#endif /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) @@ -184,6 +242,7 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 +#ifndef SPL_NO_MISC #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \ "5m(kernel),1m(dtb),9m(file_system)" @@ -224,6 +283,7 @@ #define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \ "$kernel_size && bootm $kernel_load" #endif +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ @@ -231,7 +291,11 @@ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP + +#ifndef SPL_NO_MISC #define CONFIG_CMDLINE_EDITING 1 +#endif + #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index f185380ae3..5e570cd5e8 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -90,7 +90,9 @@ /* * NAND Flash Definitions */ +#ifndef SPL_NO_IFC #define CONFIG_NAND_FSL_IFC +#endif #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE @@ -134,7 +136,7 @@ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PAD_TO 0x20000 /* block aligned */ #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO -#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 << 10) +#define CONFIG_SYS_NAND_U_BOOT_SIZE (1024 << 10) #endif /* @@ -213,6 +215,7 @@ #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_CPLD_FTIM3 /* EEPROM */ +#ifndef SPL_NO_EEPROM #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 @@ -220,11 +223,14 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 +#endif /* * Environment */ +#ifndef SPL_NO_ENV #define CONFIG_ENV_OVERWRITE +#endif #if defined(CONFIG_NAND_BOOT) #define CONFIG_ENV_IS_IN_NAND @@ -243,6 +249,7 @@ #endif /* FMan */ +#ifndef SPL_NO_FMAN #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET #define CONFIG_PHYLIB @@ -266,23 +273,29 @@ #define CONFIG_ETHPRIME "FM1@DTSEC3" #endif +#endif /* QE */ +#ifndef SPL_NO_QE #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE #endif #define CONFIG_SYS_QE_FW_ADDR 0x60600000 +#endif /* USB */ +#ifndef SPL_NO_USB #define CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif +#endif /* SATA */ +#ifndef SPL_NO_SATA #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_CMD_SCSI @@ -299,6 +312,7 @@ #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#endif #include <asm/fsl_secure_boot.h> diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index cb792961b8..957ffd3634 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -7,6 +7,23 @@ #ifndef __LS1046A_COMMON_H #define __LS1046A_COMMON_H +/* SPL build */ +#ifdef CONFIG_SPL_BUILD +#define SPL_NO_QBMAN +#define SPL_NO_FMAN +#define SPL_NO_ENV +#define SPL_NO_MISC +#define SPL_NO_QSPI +#define SPL_NO_USB +#define SPL_NO_SATA +#endif +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) +#define SPL_NO_MMC +#endif +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) +#define SPL_NO_IFC +#endif + #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE #define CONFIG_MP @@ -68,7 +85,19 @@ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ CONFIG_SPL_BSS_MAX_SIZE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_SECURE_BOOT */ #endif /* NAND SPL */ @@ -88,7 +117,7 @@ #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_TEXT_BASE 0x10000000 -#define CONFIG_SPL_MAX_SIZE 0x1d000 /* 116 KiB */ +#define CONFIG_SPL_MAX_SIZE 0x17000 /* 90 KiB */ #define CONFIG_SPL_STACK 0x1001f000 #define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE @@ -110,20 +139,28 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* Command line configuration */ +#ifndef SPL_NO_ENV #define CONFIG_CMD_ENV +#endif /* MMC */ +#ifndef SPL_NO_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif +#endif +#ifndef SPL_NO_QBMAN #define CONFIG_SYS_DPAA_QBMAN /* Support Q/Bman */ +#endif /* FMan ucode */ +#ifndef SPL_NO_FMAN #define CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 +#endif #ifdef CONFIG_SD_BOOT /* @@ -157,6 +194,7 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 +#ifndef SPL_NO_MISC /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -174,13 +212,19 @@ #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ "earlycon=uart8250,mmio,0x21c0500 " \ MTDPARTS_DEFAULT +#endif + /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP + +#ifndef SPL_NO_MISC #define CONFIG_CMDLINE_EDITING 1 +#endif + #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 2141b8299a..67ee62608c 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -51,13 +51,14 @@ #endif #endif +#ifndef SPL_NO_IFC /* IFC */ #define CONFIG_FSL_IFC - /* * NAND Flash Definitions */ #define CONFIG_NAND_FSL_IFC +#endif #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE @@ -161,7 +162,9 @@ /* * Environment */ +#ifndef SPL_NO_ENV #define CONFIG_ENV_OVERWRITE +#endif #if defined(CONFIG_SD_BOOT) #define CONFIG_ENV_IS_IN_MMC @@ -176,6 +179,7 @@ #endif /* FMan */ +#ifndef SPL_NO_FMAN #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET #define CONFIG_PHYLIB @@ -196,16 +200,20 @@ #define CONFIG_ETHPRIME "FM1@DTSEC3" #endif +#endif /* QSPI device */ +#ifndef SPL_NO_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 26) #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SPI_FLASH_BAR #endif +#endif /* USB */ +#ifndef SPL_NO_USB #define CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_HCD @@ -216,8 +224,10 @@ #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif +#endif /* SATA */ +#ifndef SPL_NO_SATA #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT @@ -229,7 +239,9 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) +#endif +#ifndef SPL_NO_MISC #define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \ "$kernel_start $kernel_size;" \ "bootm $kernel_load" @@ -238,5 +250,8 @@ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \ "48m(nand_kernel),448m(nand_free)" +#endif + +#include <asm/fsl_secure_boot.h> #endif /* __LS1046ARDB_H__ */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index beacb997a3..f50ad42917 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -329,7 +329,6 @@ unsigned long get_board_ddr_clk(void); #define RTC #define CONFIG_RTC_DS3231 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 -#define CONFIG_CMD_DATE /* EEPROM */ #define CONFIG_ID_EEPROM diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 2155a89e36..d0bf5520b7 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -275,7 +275,6 @@ unsigned long get_board_sys_clk(void); #define RTC #define CONFIG_RTC_DS3231 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 -#define CONFIG_CMD_DATE /* EEPROM */ #define CONFIG_ID_EEPROM diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 70e75880cf..911192da7a 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -382,17 +382,11 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP -#endif - #ifdef CONFIG_440EPX #endif diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 7f98f1f8a8..f6fa599e6b 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -16,8 +16,6 @@ /* U-Boot Commands */ #define CONFIG_FAT_WRITE -#define CONFIG_CMD_BMP -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS @@ -115,7 +113,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 275ecf36ca..d85de5fa17 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -8,7 +8,6 @@ #ifndef __M53EVK_CONFIG_H__ #define __M53EVK_CONFIG_H__ -#define CONFIG_MX53 #define CONFIG_MXC_GPIO #include <asm/arch/imx-regs.h> @@ -23,8 +22,6 @@ */ #define CONFIG_FAT_WRITE -#define CONFIG_CMD_BMP -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_CMD_SATA diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index a5db11ce12..db58f735bc 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -71,7 +71,6 @@ * LCD */ #ifdef CONFIG_LCD -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_BMP_24BPP #define CONFIG_BMP_32BPP diff --git a/include/configs/makalu.h b/include/configs/makalu.h index 42fdb370a7..da5cfa19d3 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -232,7 +232,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_PCI diff --git a/include/configs/malta.h b/include/configs/malta.h index 14298f56b9..fcee37400d 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -101,7 +101,6 @@ /* * Commands */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_CMD_PCI diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h deleted file mode 100644 index 7f3231bd0c..0000000000 --- a/include/configs/manroland/common.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * (C) Copyright 2009 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __MANROLAND_COMMON_H -#define __MANROLAND_COMMON_H - -/* - * High Level Configuration Options - * (easy to change) - */ - -#define CONFIG_BOARD_EARLY_INIT_R - -/* - * Command line configuration. - */ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DISPLAY -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_DTT -#define CONFIG_CMD_IDE - -/* - * 8-symbol LED display (can be accessed with 'display' command) - */ -#define CONFIG_PDSP188x - -#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ - -/* - * Autobooting - */ - -#define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ - "echo" - -#undef CONFIG_BOOTARGS - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=${serverip}:${rootpath}\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ - "addwdt=setenv bootargs ${bootargs} wdt=off\0" \ - "logval=4\0" \ - "addlog=setenv bootargs ${bootargs} loglevel=${logval}\0" \ - "addip=setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off panic=1\0" \ - "kernel_addr=ff810000\0" \ - "fdt_addr="__stringify(CONFIG_SYS_FLASH_BASE)"\0" \ - "flash_nfs=run nfsargs addip addcon addwdt addlog;" \ - "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "rootpath=/opt/eldk/ppc_82xx\0" \ - "kernel_addr_r=300000\0" \ - "fdt_addr_r=200000\0" \ - "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ - "load_fdt=tftp ${fdt_addr_r} ${fdt_file};\0" \ - "load_kernel=tftp ${kernel_addr_r} ${kernel_file};\0" \ - "addcon=setenv bootargs ${bootargs} console=ttyPSC0,${baudrate}\0"\ - "net_nfs=run load_fdt load_kernel; " \ - "run nfsargs addip addcon addwdt addlog;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin \0" \ - "u-boot_addr_r=200000\0" \ - "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ - "update=protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\ - "erase " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\ - "cp.b ${u-boot_addr_r} " __stringify(CONFIG_SYS_TEXT_BASE) \ - " ${filesize};" \ - "protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize}\0"\ - "" - -#define CONFIG_BOOTCOMMAND "run net_nfs" - -#define CONFIG_MISC_INIT_R 1 - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#if defined(CONFIG_CMD_KGDB) -#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#else -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -#endif -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) -#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - -/* Enable an alternate, more extensive memory test */ -#define CONFIG_SYS_ALT_MEMTEST - -/* - * Enable loopw command. - */ - -#endif /* __MANROLAND_COMMON_H */ diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h deleted file mode 100644 index 60e8716a79..0000000000 --- a/include/configs/manroland/mpc5200-common.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - * (C) Copyright 2009 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __MANROLAND_MPC52XX__COMMON_H -#define __MANROLAND_MPC52XX__COMMON_H - -/* - * High Level Configuration Options - * (easy to change) - */ -#define CONFIG_MPC5200 1 /* MPC5200 CPU */ - -#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ - -#define CONFIG_HIGH_BATS 1 /* High BATs supported */ - -/* - * Serial console configuration - */ -#define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200,\ - 230400 } - -#if (CONFIG_SYS_TEXT_BASE == 0xFFF00000) /* Boot low */ -# define CONFIG_SYS_LOWBOOT 1 -#endif - -/* - * IPB Bus clocking configuration. - */ -#define CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ - -/* - * I2C configuration - */ -#define CONFIG_HARD_I2C 1 /* I2C with hardware support */ -#define CONFIG_SYS_I2C_MODULE 2 /* Select I2C module #1 or #2 */ - -#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */ -#define CONFIG_SYS_I2C_SLAVE 0x7F - -/* - * EEPROM configuration - */ -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x58 -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 - -/* - * RTC configuration - */ -#define CONFIG_RTC_PCF8563 -#define CONFIG_SYS_I2C_RTC_ADDR 0x51 - -/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM81 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - -/* - * Flash configuration - */ -#define CONFIG_SYS_FLASH_BASE 0xFF800000 - -#define CONFIG_SYS_FLASH_SIZE 0x00800000 /* 8 MByte */ - -#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE+0x40000) /* second sector */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks - (= chip selects) */ -#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout [ms]*/ -#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout [ms]*/ - -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -#define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_FLASH_CFI_AMD_RESET - -/* - * Environment settings - */ -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) - -/* - * Memory map - */ -#define CONFIG_SYS_MBAR 0xF0000000 -#define CONFIG_SYS_DEFAULT_MBAR 0x80000000 - -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE -\ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET - -#define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_SRAM_BASE 0x80100000 /* CS 1 */ -#define CONFIG_SYS_DISPLAY_BASE 0x80600000 /* CS 3 */ - -/* Settings for XLB = 132 MHz */ -#define SDRAM_DDR 1 -#define SDRAM_MODE 0x018D0000 -#define SDRAM_EMODE 0x40090000 -#define SDRAM_CONTROL 0x714f0f00 -#define SDRAM_CONFIG1 0x73722930 -#define SDRAM_CONFIG2 0x47770000 -#define SDRAM_TAPDELAY 0x10000000 - -/* Use ON-Chip SRAM until RAM will be available */ -#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM -#ifdef CONFIG_POST -/* preserve space for the post_word at end of on-chip SRAM */ -#define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_POST_SIZE -#else -#define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE -#endif - -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) -# define CONFIG_SYS_RAMBOOT 1 -#endif - -#define CONFIG_SYS_MONITOR_LEN (192 << 10) -#define CONFIG_SYS_MALLOC_LEN (512 << 10) -#define CONFIG_SYS_BOOTMAPSZ (8 << 20) - -/* - * Ethernet configuration - */ -#define CONFIG_MPC5xxx_FEC 1 -#define CONFIG_MPC5xxx_FEC_MII100 -#define CONFIG_PHY_ADDR 0x00 -#define CONFIG_MII 1 - -/*use Hardware WDT */ -#define CONFIG_HW_WATCHDOG - -#define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ -#if defined(CONFIG_CMD_KGDB) -# define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value*/ -#endif - -/* - * Various low-level settings - */ -#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI -#define CONFIG_SYS_HID0_FINAL HID0_ICE - -#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE -#define CONFIG_SYS_CS0_START CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_CS0_SIZE CONFIG_SYS_FLASH_SIZE - -/* 8Mbit SRAM @0x80100000 */ -#define CONFIG_SYS_CS1_START CONFIG_SYS_SRAM_BASE - -#define CONFIG_SYS_CS_BURST 0x00000000 -#define CONFIG_SYS_CS_DEADCYCLE 0x33333333 - -/*----------------------------------------------------------------------- - * IDE/ATA stuff Supports IDE harddisk - *----------------------------------------------------------------------- - */ - -#undef CONFIG_IDE_8xx_PCCARD /* Use IDE with PC Card Adapter */ - -#undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */ -#undef CONFIG_IDE_LED /* LED for ide not supported */ - -#define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus */ - -#define CONFIG_IDE_PREINIT 1 - -#define CONFIG_SYS_ATA_IDE0_OFFSET 0x0000 - -#define CONFIG_SYS_ATA_BASE_ADDR MPC5XXX_ATA - -/* Offset for data I/O */ -#define CONFIG_SYS_ATA_DATA_OFFSET (0x0060) - -/* Offset for normal register accesses */ -#define CONFIG_SYS_ATA_REG_OFFSET (CONFIG_SYS_ATA_DATA_OFFSET) - -/* Offset for alternate registers */ -#define CONFIG_SYS_ATA_ALT_OFFSET (0x005C) - -/* Interval between registers */ -#define CONFIG_SYS_ATA_STRIDE 4 - -#define CONFIG_ATAPI 1 - -#define OF_CPU "PowerPC,5200@0" -#define OF_SOC "soc5200@f0000000" -#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc5200@f0000000/serial@2000" -#define CONFIG_OF_IDE_FIXUP - -#endif /* __MANROLAND_MPC52XX__COMMON_H */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 6894c0b4b8..e4f2a02dcf 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -89,7 +89,6 @@ /* commands to include */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE @@ -353,7 +352,6 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_OMAP3 #endif /* __CONFIG_H */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index dbb242696b..1a9cb675df 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -289,7 +289,6 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_DATE #undef CONFIG_CMD_FUSE #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 342bcf3051..b9b666fd3e 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -36,11 +36,6 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX -/* General networking support */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index cc2b5b61d4..f1734c0e21 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -39,6 +39,9 @@ #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> @@ -48,8 +51,10 @@ "scriptaddr=0x1f000000\0" \ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ - "ramdisk_addr_r=0x10000000\0" \ + "ramdisk_addr_r=0x13000000\0" \ MESON_FDTFILE_SETTING \ BOOTENV +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64 MiB */ + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h index f686042499..477f296542 100644 --- a/include/configs/miqi_rk3288.h +++ b/include/configs/miqi_rk3288.h @@ -17,6 +17,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 7ebcd03872..136db0dd26 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,8 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BEDBUG -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 1714a9bec8..dafb724e3f 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -36,7 +36,6 @@ /* video */ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100) -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif @@ -397,7 +396,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 3172c0e725..dfebde20ec 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -52,7 +52,6 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_CMD_BMP #define CONFIG_VIDEO_OMAP3 /* DSS Support */ #define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 2e43fab1ef..83c559ed66 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index d485445875..3405172803 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -42,7 +42,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 4cee64da96..a11a491fe6 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -101,7 +101,6 @@ /* RTC */ #define CONFIG_RTC_IMXDI -#define CONFIG_CMD_DATE /* Ethernet Configs */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 33c9e95dec..fac26fb2f2 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -17,7 +17,6 @@ /* U-Boot Commands */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS @@ -123,7 +122,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 6ab822e58b..5db3677566 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -55,12 +55,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -/*********************************************************** - * Command definition - ***********************************************************/ -#define CONFIG_CMD_DATE - - #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 920507007b..e45649f566 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -72,7 +72,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#define CONFIG_CMD_DATE #define CONFIG_CMD_NAND diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 9683a6511a..79d92bb06a 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -80,7 +80,6 @@ #define CONFIG_CMD_NAND #define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_CMD_DATE #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 98c9f9bbf6..dfd7ea9d45 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -13,8 +13,6 @@ /* High Level Configuration Options */ -#define CONFIG_MX51 /* in a mx51 */ - #define CONFIG_SYS_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000 @@ -97,13 +95,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -/*********************************************************** - * Command definition - ***********************************************************/ - -#define CONFIG_CMD_DATE - - #define CONFIG_ETHPRIME "FEC0" #define CONFIG_LOADADDR 0x92000000 /* loadaddr env var */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 8612614437..aee6e70c39 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_ARD #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index b3519ae7e7..ac9beb60ab 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_EVK #include <asm/arch/imx-regs.h> @@ -57,11 +55,6 @@ #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1F -#define CONFIG_CMD_DATE - -/* Miscellaneous commands */ -#define CONFIG_CMD_BMODE - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index fed40eb58d..945be5835b 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index e9d570e1d7..d064337f47 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_SMD #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index c841ca9115..21ac3fc357 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -84,7 +84,6 @@ /* Secure boot (HAB) support */ #ifdef CONFIG_SECURE_BOOT #define CONFIG_CSF_SIZE 0x2000 -#define CONFIG_CMD_DEKBLOB #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #endif diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c04ae96f9d..9b0fe5a3c2 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -39,9 +39,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #endif -/* Command definition */ -#define CONFIG_CMD_BMODE - #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ "emmcdev=2\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index e63da43692..dafa946e47 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -204,7 +204,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index f466c626a2..240d3a226c 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -172,8 +172,6 @@ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -#define CONFIG_CMD_BMODE - #ifndef CONFIG_SYS_DCACHE_OFF #endif @@ -224,7 +222,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 5bc26aac7e..19b0630d9d 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -159,8 +159,6 @@ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_OFFSET (12 * SZ_64K) -#define CONFIG_CMD_BMODE - #define CONFIG_IMX_THERMAL #define CONFIG_IOMUX_LPSR diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index e2b05caa94..9a20c7732d 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -67,7 +67,6 @@ /* Secure boot (HAB) support */ #ifdef CONFIG_SECURE_BOOT #define CONFIG_CSF_SIZE 0x2000 -#define CONFIG_CMD_DEKBLOB #endif #endif diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 9807ace1d9..9c3cec1992 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -248,7 +248,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 476825ecf1..861cb5df57 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -42,7 +42,6 @@ * Commands configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_DATE #define CONFIG_CMD_IDE #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/neo.h b/include/configs/neo.h index f6b4cc01c2..9115e251b1 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -58,7 +58,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_DTT -#undef CONFIG_CMD_DIAG #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index efa5065d9b..cacc1b81f0 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -86,9 +86,6 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP -/* Miscellaneous commands */ -#define CONFIG_CMD_BMODE - /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 @@ -298,8 +295,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -#define CONFIG_CMD_BMP - #define CONFIG_SYS_ALT_MEMTEST /* diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e99968c805..eb2a60a57d 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -106,8 +106,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */ - #ifdef ONENAND_SUPPORT #define CONFIG_CMD_ONENAND /* ONENAND support */ diff --git a/include/configs/novena.h b/include/configs/novena.h index 5a07bf3891..df0efbca92 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -17,7 +17,6 @@ #include "mx6_common.h" /* U-Boot Commands */ -#define CONFIG_CMD_BMODE #define CONFIG_CMD_EEPROM #define CONFIG_FAT_WRITE #define CONFIG_CMD_PCI diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index acf9d66ae0..d9d4f2d583 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -30,11 +30,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -/* LCD support */ -#define CONFIG_AS3722_POWER -#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CMD_BMP - /* Align LCD to 1MB boundary */ #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 1470c513a3..e2881a7177 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -72,9 +72,6 @@ #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -#ifdef CONFIG_POST -#define CONFIG_CMD_DIAG -#endif #if (CONFIG_SYS_TEXT_BASE == 0xFC000000) || (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 or 32 MB Flash */ diff --git a/include/configs/o3dnt.h b/include/configs/o3dnt.h index 77907507b3..f0fcedaffc 100644 --- a/include/configs/o3dnt.h +++ b/include/configs/o3dnt.h @@ -26,7 +26,6 @@ #include "o2dnt-common.h" /* Additional commands */ -#define CONFIG_CMD_BSP #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 072b97ec99..b82ad13489 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -21,11 +21,6 @@ #include <configs/ti_omap4_common.h> -/* Battery Charger */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_BAT 1 -#endif - /* ENV related config options */ #define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 9d90e46b80..4efddb6207 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -286,7 +286,6 @@ * U-Boot commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index e5ab06777a..e7bc044acf 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -68,7 +68,6 @@ #define CONFIG_SPLASH_SOURCE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 6704e973de..b4d2b0a871 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -101,9 +101,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #endif -/* Miscellaneous commands */ -#define CONFIG_CMD_BMODE - #define CONFIG_PREBOOT "" /* Print Buffer Size */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 479f45db02..d995d0448c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -815,7 +815,6 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_DATE #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/paz00.h b/include/configs/paz00.h index fe7be6983d..2e8cbd94cf 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -36,11 +36,6 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -/* General networking support */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 504ddf729b..f6bd4fec88 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -149,6 +149,5 @@ */ #undef CONFIG_CMD_IDE -#undef CONFIG_CMD_BEDBUG #endif /* __CONFIG_H */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 87aa9dc988..6d8a2338a2 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -49,7 +49,6 @@ Serial console configuration /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index f506c9c8df..51b489a809 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -86,7 +86,6 @@ #define CONFIG_SYS_I2C_MXC /* RTC (actually an RV-4162 but M41T62-compatible) */ -#define CONFIG_CMD_DATE #define CONFIG_RTC_M41T62 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_RTC_BUS_NUM 2 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 098b02afa8..f622be62b7 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -86,7 +86,6 @@ #define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)" /* Various command support */ -#define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index eca984a9ef..501611dde7 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -367,16 +367,11 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_FUSE -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index b8fb371827..cdfaf7c912 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -155,8 +155,6 @@ #define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_DIAG /* monitor functions : Diagnostics */ - #define MTDIDS_DEFAULT "nand0=omap2-nand.0" /* Size must be a multiple of Nand erase size (524288 b) */ #define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL)," \ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 9042dc269e..2dcc6c4539 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -53,7 +53,6 @@ * Commands */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMD_CLK /*------------------------------------------------------------ * Console Configuration diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 61c4b98b1d..733768aa7b 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -47,7 +47,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_LCD #define CONFIG_ATMEL_LCD_RGB565 /* board specific(not enough SRAM) */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 2610e243e7..6687c38c99 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -19,7 +19,6 @@ * Console configuration */ -#define CONFIG_CMD_BMODE #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index ca1404ae9f..b22a3b6a2b 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -152,7 +152,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD_BGR555 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 52791bce55..b220d14dd8 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -165,7 +165,6 @@ #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD_BGR555 1 diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index bbd54a1160..0dc3532f33 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -13,6 +13,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index fd62c72a20..f778744319 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -22,6 +22,4 @@ #define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 4776e97ed6..c8bc8f3512 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -128,7 +128,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CMD_BMP #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE #define PWM_TICKS 0x1388 #define PWM_DUTY 0x200 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index be7f4f2487..59a793babe 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -80,7 +80,7 @@ /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN 128*1024 +#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 128*1024 @@ -102,7 +102,6 @@ */ /* The following #defines are needed to get flash environment right */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 @@ -115,10 +114,10 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 39afbff2d8..28b791acdd 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -80,7 +80,7 @@ /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN 128*1024 +#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 128*1024 @@ -102,7 +102,6 @@ */ /* The following #defines are needed to get flash environment right */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 @@ -115,10 +114,10 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index afa37a5779..3a719c0b37 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -11,7 +11,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM /* Support File sytems */ diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 36e07dc73d..056aea3fdb 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -12,7 +12,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 diff --git a/include/configs/rock2.h b/include/configs/rock2.h index ec555dd966..b4dcf23b1c 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -17,6 +17,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 92eb792989..5caf90a9ac 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -76,7 +76,6 @@ */ #define CONFIG_FB_ADDR 0 #define CONFIG_VIDEO_BCM2835 -#define CONFIG_SYS_WHITE_ON_BLACK #ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 @@ -118,7 +117,7 @@ /* Shell */ #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_COMMAND_HISTORY +#define CONFIG_CMDLINE_EDITING /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/rut.h b/include/configs/rut.h index 51021e0e18..bd819f1aad 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -122,7 +122,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CMD_BMP #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE #define CONFIG_SPI diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 627a341196..6c75626e82 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -190,7 +190,6 @@ int universal_spi_read(void); /* LCD console */ #define LCD_BPP LCD_COLOR16 -#define CONFIG_SYS_WHITE_ON_BLACK /* * LCD Settings diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index ccbcc765c3..ea28fce6ef 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -61,7 +61,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 #endif diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 6c28c4c19e..509457b9bf 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -34,7 +34,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index aced293fa8..c584b0b9e3 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -54,7 +54,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 #endif diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index a5fd37f46b..91f286b647 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -53,7 +53,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 4c112cc1a9..37c6132b8a 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -35,8 +35,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_FS_EXT4 #define CONFIG_EXT4_WRITE -#define CONFIG_CMD_CBFS -#define CONFIG_CMD_CRAMFS #define CONFIG_HOST_MAX_DEVICES 4 /* @@ -54,7 +52,6 @@ /* turn on command-line edit/c/auto */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_SIZE 8192 @@ -123,7 +120,6 @@ /* LCD and keyboard require SDL support */ #ifdef CONFIG_SANDBOX_SDL -#define CONFIG_CMD_BMP #define LCD_BPP LCD_COLOR16 #define CONFIG_LCD_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8 @@ -166,7 +162,6 @@ #define CONFIG_LZMA #define CONFIG_CMD_LZMADEC -#define CONFIG_CMD_DATE #ifndef CONFIG_SPL_BUILD #define CONFIG_CMD_IDE diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 671afa71ec..207b59118d 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -12,7 +12,6 @@ /* LP0 suspend / resume */ #define CONFIG_TEGRA_LP0 -#define CONFIG_AES #define CONFIG_TEGRA_PMU #define CONFIG_TPS6586X_POWER #define CONFIG_TEGRA_CLOCK_SCALING @@ -45,17 +44,10 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -/* General networking support */ - /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD -/* USB keyboard */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index a5de46ac1c..c90626fa23 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -19,9 +19,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 572e6b1766..f5b03caf83 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -222,7 +222,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI @@ -404,7 +403,6 @@ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN -#define CONFIG_CMD_BMP #endif #endif /* __CONFIG_H */ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 0cfcbab48a..3342a2966c 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_TEXT_BASE 0x5ff80000 -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 58aad05358..78670422f7 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_TEXT_BASE 0x5ff80000 -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h new file mode 100644 index 0000000000..302ec200bd --- /dev/null +++ b/include/configs/socfpga_de10_nano.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2017, Intel Corporation + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#ifndef __CONFIG_TERASIC_DE10_H__ +#define __CONFIG_TERASIC_DE10_H__ + +#include <asm/arch/base_addr_ac5.h> + +/* U-Boot Commands */ +#define CONFIG_FAT_WRITE +#define CONFIG_HW_WATCHDOG + +/* Memory configurations */ +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ + +/* Booting Linux */ +#define CONFIG_LOADADDR 0x01000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +/* Ethernet on SoC (EMAC) */ +#if defined(CONFIG_CMD_NET) +#define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9031 +#endif + +#define CONFIG_ENV_IS_IN_MMC + +/* The rest of the configuration is shared */ +#include <configs/socfpga_common.h> + +#endif /* __CONFIG_TERASIC_DE10_H__ */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3f9c34b8f6..76b4038d50 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -286,8 +286,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_BMP -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #define CONFIG_CMD_SDRAM diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index de3d661d60..1ee58156e0 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -16,11 +16,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_RAM_SIZE (8 * 1024 * 1024) -#define CONFIG_SYS_RAM_CS 1 -#define CONFIG_SYS_RAM_FREQ_DIV 2 -#define CONFIG_SYS_RAM_BASE 0xC0000000 -#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_RAM_BASE #define CONFIG_SYS_LOAD_ADDR 0xC0400000 #define CONFIG_LOADADDR 0xC0400000 @@ -30,11 +25,9 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 << 10) -#define CONFIG_STM32_GPIO #define CONFIG_STM32_FLASH #define CONFIG_STM32X7_SERIAL -#define CONFIG_DESIGNWARE_ETH #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) #define CONFIG_DW_ALTDESCRIPTOR #define CONFIG_MII @@ -73,7 +66,7 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING - -#define CONFIG_CMD_MEM #define CONFIG_CMD_CACHE +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_DISPLAY_BOARDINFO #endif /* __CONFIG_H */ diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index d3f2050736..964115f980 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -349,7 +349,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 3f2da5795d..109b8e810d 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -167,7 +167,6 @@ /* turn on command-line edit/hist/auto */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE /* Print Buffer Size */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index dc6db17f76..b4a14eae7c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -44,9 +44,6 @@ #define CONFIG_CONS_INDEX 1 -/* *** Command definition *** */ -#define CONFIG_CMD_BMODE - /* Filesystems / image support */ /* MMC */ @@ -118,7 +115,6 @@ #endif /* CONFIG_CMD_USB */ /* RTC */ -#define CONFIG_CMD_DATE #ifdef CONFIG_CMD_DATE #define CONFIG_RTC_DS1307 #define CONFIG_SYS_RTC_BUS_NUM 2 diff --git a/include/configs/tec.h b/include/configs/tec.h index ebfca8f319..b380a69bdf 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -36,11 +36,6 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX -/* General networking support */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index c0462bce90..5107a1f609 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -51,7 +51,7 @@ #define CONFIG_ENV_OVERWRITE /* turn on command-line edit/hist/auto */ -#define CONFIG_COMMAND_HISTORY +#define CONFIG_CMDLINE_EDITING /* * Increasing the size of the IO buffer as default nfsargs size is more diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index c132d8fa47..2a671e84ec 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -88,8 +88,6 @@ /* Enable LCD and reserve 512KB from top of memory*/ #define CONFIG_SYS_MEM_TOP_HIDE 0x80000 -#define CONFIG_CMD_BMP - /* FPGA programming support */ #define CONFIG_FPGA #define CONFIG_FPGA_ALTERA diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index b5af700e38..b7ec200e06 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -49,7 +49,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_CMD_ASKEN +#define CONFIG_CMD_ASKENV #define CONFIG_OMAP_GPIO #define CONFIG_FS_FAT diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 5d2a7ab509..868464cd32 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -318,7 +318,7 @@ #ifndef CONFIG_SOC_K2G #define CONFIG_SYS_HZ_CLOCK ks_clk_get_rate(KS2_CLK1_6) #else -#define CONFIG_SYS_HZ_CLOCK external_clk[sys_clk] +#define CONFIG_SYS_HZ_CLOCK get_external_clk(sys_clk) #endif #endif /* __CONFIG_KS2_EVM_H */ diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 402ae2def2..72578f9202 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -21,6 +21,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 4a12245810..2c05f9c930 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -56,9 +56,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -/* Miscellaneous commands */ -#define CONFIG_CMD_BMODE - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20)) diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index a56ceef85a..23160bd88d 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -142,6 +142,5 @@ /* Further tweaks to reduce image size */ #undef CONFIG_CMD_BOOTZ #undef CONFIG_CMD_NET -#undef CONFIG_CMD_AES #endif /* __CONFIG_TOPIC_MIAMI_H */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 1bfc438b81..e662e65204 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -96,9 +96,6 @@ #define CONFIG_ARP_TIMEOUT 200UL -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index a378406659..b9cc5d632f 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* Turn off RTC square-wave output to save battery */ #define CONFIG_SYS_RTC_DS1337_NOOSC -#define CONFIG_CMD_DATE /* LED */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 1e68c03242..6806cd9565 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -202,7 +202,6 @@ /* LCD console */ #define LCD_BPP LCD_COLOR16 -#define CONFIG_SYS_WHITE_ON_BLACK /* LCD */ #define CONFIG_BMP_16BPP diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 722d492518..6a4604ce93 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -183,7 +183,6 @@ /* LCD console */ #define LCD_BPP LCD_COLOR16 -#define CONFIG_SYS_WHITE_ON_BLACK /* LCD */ #define CONFIG_BMP_16BPP diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index a65c5f1c71..7bb8c87988 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -14,7 +14,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MX51 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 90b682e100..d84aa1679e 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -46,9 +46,6 @@ #define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL_KSZ9031 -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a67802a160..58b62d2448 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -11,7 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 #define CONFIG_SYS_FSL_CLK #define CONFIG_MXC_GPIO diff --git a/include/configs/v38b.h b/include/configs/v38b.h index dc7186c3cc..cc0007827d 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -74,11 +74,9 @@ * Command line configuration. */ #define CONFIG_CMD_IDE -#define CONFIG_CMD_DIAG #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_DATE #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 99cb31148a..9db6fee6e7 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -255,7 +255,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_BEDBUG #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 87b5136fac..0e851a1b10 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -34,13 +34,6 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -/* General networking support */ - -/* USB keyboard */ - -/* LCD support */ -#define CONFIG_SYS_WHITE_ON_BLACK - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/veyron.h b/include/configs/veyron.h index b15cc26beb..3bd8dd60b5 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -22,6 +22,4 @@ #define CONFIG_KEYBOARD -#define CONFIG_SYS_WHITE_ON_BLACK - #endif diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 738b13ddfb..ae18bd6338 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -342,7 +342,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_SYS_RTC_BUS_NUM 0x01 #define CONFIG_SYS_I2C_RTC_ADDR 0x32 #define CONFIG_RTC_RX8025 diff --git a/include/configs/walnut.h b/include/configs/walnut.h index c48a6ae445..d2d1ce95bc 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -51,7 +51,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 7e9757a480..47daf724ab 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -34,9 +34,6 @@ #define CONFIG_LIBATA #endif -/* Command definition */ -#define CONFIG_CMD_BMODE - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index f546c385e9..46a6706171 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -72,7 +72,6 @@ /* * Command definition */ -#define CONFIG_CMD_DATE #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_DNS diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index b35ba55d53..82f4af9c93 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -82,7 +82,6 @@ * I2C RTC */ -#define CONFIG_CMD_DATE #define CONFIG_RTC_DS1374 /* diff --git a/include/configs/x600.h b/include/configs/x600.h index cf68374d1f..6e52e56222 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -107,7 +107,6 @@ /* * Command support defines */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_ENV #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index e8ad29d3d0..b0e7e8115f 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -46,8 +46,6 @@ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x003f8000 -#define CONFIG_SYS_WHITE_ON_BLACK - #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d69e609bd9..653a30d3bd 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -60,22 +60,16 @@ #define CONFIG_SYS_NS16550_PORT_MAPPED #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE #define CONFIG_SUPPORT_VFAT -#ifdef CONFIG_SYS_COREBOOT -#define CONFIG_CMD_CBFS -#endif - /* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_IO #define CONFIG_CMD_IRQ diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 2afc645b7d..ea4b739d0b 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) /*Cmd*/ -#define CONFIG_CMD_DIAG #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index ba8eebe462..2a7a48d21d 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,7 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index d004148950..447fd9557a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -502,7 +502,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_DS4510 #define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 696ac88c3f..ffc0d009ba 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 9c48e5eaaa..48f07b08c0 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -354,7 +354,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_DS4510 #define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index f8a1f4badc..2793a9bfb9 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -339,7 +339,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index e7c82e5bd7..e3ae4e8f74 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -63,8 +63,6 @@ #define CONFIG_SYS_MMC_ENV_PART 1 /* boot parition */ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */ -#define CONFIG_CMD_BMODE - /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index b1aa57935d..7b15f311fe 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -127,7 +127,6 @@ /* U-Boot commands */ /*=================*/ -#define CONFIG_CMD_DIAG #define CONFIG_CMD_SAVES /*==============================*/ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1fa5599865..51edd463a1 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -236,7 +236,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP #define CONFIG_CLOCKS -#define CONFIG_CMD_CLK #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ |