diff options
Diffstat (limited to 'include')
304 files changed, 335 insertions, 1211 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index bc0bc2b6c8..b1f41abf4f 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,18 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_DTT /* Digital Therm and Thermostat */ -#define CONFIG_CMD_EEPROM /* EEPROM read/write support */ -#define CONFIG_CMD_FDC /* Floppy Disk Support */ -#define CONFIG_CMD_FUSE /* Device fuse support */ -#define CONFIG_CMD_GETTIME /* Get time since boot */ -#define CONFIG_CMD_HASH /* calculate hash / digest */ -#define CONFIG_CMD_IDE /* IDE harddisk support */ -#define CONFIG_CMD_IMMAP /* IMMR dump support */ -#define CONFIG_CMD_IO /* Access to X86 IO space */ -#define CONFIG_CMD_IRQ /* irqinfo */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ -#define CONFIG_CMD_KGDB /* kgdb */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ #define CONFIG_CMD_NAND /* NAND support */ diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 0e01e8240d..4b2c493ae3 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -186,16 +186,16 @@ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_SCSI #endif -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define BOOTENV_SHARED_IDE BOOTENV_SHARED_BLKDEV(ide) #define BOOTENV_DEV_IDE BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_NAME_IDE BOOTENV_DEV_NAME_BLKDEV #else #define BOOTENV_SHARED_IDE #define BOOTENV_DEV_IDE \ - BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE + BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #define BOOTENV_DEV_NAME_IDE \ - BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE + BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif #if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 7aa5b02396..5a698a8349 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -43,7 +43,7 @@ #endif /* Rather than repeat this expression each time, add a define for it */ -#if defined(CONFIG_CMD_IDE) || \ +#if defined(CONFIG_IDE) || \ defined(CONFIG_CMD_SATA) || \ defined(CONFIG_SCSI) || \ defined(CONFIG_CMD_USB) || \ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2041b7bb3e..2226aba674 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,21 +702,12 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * USB */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 72dc8ba710..59b2252e6f 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -228,7 +228,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 /* I2C EEPROM */ -#define CONFIG_CMD_EEPROM #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 @@ -294,8 +293,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* @@ -328,12 +325,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 1b956fc7da..407e499de1 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -417,7 +417,6 @@ combinations. this should be removed later #define CONFIG_SYS_EEPROM_BUS_NUM 0 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #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 @@ -521,16 +520,8 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index f95c3b9eeb..398d0e0550 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -371,7 +371,6 @@ /* I2C EEPROM */ /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 @@ -437,16 +436,8 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c3b2353f5f..6d2919ff55 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -46,8 +46,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index deb6f826e1..ab4b060906 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -61,9 +61,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 3f7c1c9988..fc9b26ff46 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #define CONFIG_HOSTNAME M52277EVB diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index b1a49b07c3..3efd7e59cf 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -37,9 +37,8 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE /* ATA */ # define CONFIG_IDE_RESET 1 # define CONFIG_IDE_PREINIT 1 diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 380221e732..4f7a19b5d3 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE /* ATA */ #define CONFIG_IDE_RESET 1 diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 7b162cccef..f4d970d0d8 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_JFFS2 #undef CONFIG_CMD_NAND #define CONFIG_CMD_REGINFO @@ -60,7 +59,7 @@ #define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY #define CONFIG_SYS_RX_ETH_BUFFER 2 -#define CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN +#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN #define CONFIG_SYS_TX_ETH_BUFFER 2 #define CONFIG_HAS_ETH1 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 553e877ae7..7d6edda361 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#undef CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO /* Network configuration */ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 806f00555f..39ba94065a 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,8 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Command line configuration */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 30db7edde8..b13809f88a 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,10 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IDE -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index d782fc3cf1..ea99aead45 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -320,7 +320,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 6d35d705ec..46f09d6b60 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -478,7 +478,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_SDRAM #if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \ @@ -486,10 +485,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SUPPORT_VFAT #endif -#ifdef CONFIG_COMPACT_FLASH - #define CONFIG_CMD_IDE -#endif - #ifdef CONFIG_SATA_SIL3114 #define CONFIG_CMD_SATA #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 8375ead394..18b6b4e13e 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -589,8 +589,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c5d581589a..0f96ac0242 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -315,7 +315,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 4509a6d707..029aa572ce 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -342,7 +342,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b186e012d3..9b2f8364d5 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -348,7 +348,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index df50fa3cce..43e05516ab 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -461,7 +461,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 67093dfa31..96a125c323 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -340,7 +340,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 8170b9f17d..8d026addb3 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -354,7 +354,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 0bc71d4ae6..618d5377fc 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -355,7 +355,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 81d2d4f931..eb7db20b7f 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -448,7 +448,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2c1be228ee..79e11bb6f8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,8 +547,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 867004fb48..220b07040e 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -589,7 +589,6 @@ extern unsigned long get_sdram_size(void); #define MAX_NUM_PORTS 9 /* for 128Bytes EEPROM */ #endif /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #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 @@ -725,8 +724,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #undef CONFIG_WATCHDOG /* watchdog disabled */ @@ -735,12 +732,6 @@ extern unsigned long get_sdram_size(void); || defined(CONFIG_FSL_SATA) #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0763cf312e..3d12c84ce9 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -593,8 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 8821be3410..719043d5a1 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -241,7 +241,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7629fe8eb4..b008e3d9e2 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -580,8 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #ifdef CONFIG_PCI #define CONFIG_CMD_PCI @@ -604,12 +602,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/PATI.h b/include/configs/PATI.h index e53db2485b..1f26ac4c2d 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,8 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ #define CONFIG_BOOTCOMMAND "" /* autoboot command */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 6c74b00cd5..393a02dd78 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -37,12 +37,8 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FDC #define CONFIG_SCSI #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVES diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 4bb07d8bd4..78ce91d089 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -55,10 +55,7 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE #define CONFIG_CMD_NAND -#define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index d889306653..a94e790b95 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,8 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index b9599b5e3b..54a1a2546f 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -163,26 +163,6 @@ #define CONFIG_SYS_EEPROM_WREN 1 #define CONFIG_SYS_I2C_BOOT_EEPROM_ADDR 0x52 -/* - * standard dtt sensor configuration - bottom bit will determine local or - * remote sensor of the TMP401 - */ -#define CONFIG_DTT_SENSORS { 0, 1 } - -/* - * The PMC440 uses a TI TMP401 temperature sensor. This part - * is basically compatible to the ADM1021 that is supported - * by U-Boot. - * - * - i2c addr 0x4c - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT ouput disabled - * - local temp sensor enabled, min set to 0 deg, max set to 70 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 70 deg - */ -#define CONFIG_DTT_ADM1021 -#define CONFIG_SYS_DTT_ADM1021 { { 0x4c, 0x02, 0, 1, 70, 0, 1, 70, 0} } - #define CONFIG_PREBOOT "echo Add \\\"run fpga\\\" and " \ "\\\"painit\\\" to preboot command" @@ -258,8 +238,6 @@ /* Partitions */ -#define CONFIG_CMD_DTT -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 42e692c4a0..2209cfdb96 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,9 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI @@ -865,12 +862,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #include <asm/fsl_secure_boot.h> #endif /* __T1024QDS_H */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c2175bda34..025e7de8d0 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,9 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI @@ -884,12 +881,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #include <asm/fsl_secure_boot.h> #endif /* __T1024RDB_H */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 25658871e4..3953145030 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -629,7 +629,6 @@ unsigned long get_board_ddr_clk(void); /* Enable VSC9953 L2 Switch driver */ #define CONFIG_VSC9953 -#define CONFIG_CMD_ETHSW #define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR 0x14 #define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR 0x18 @@ -659,21 +658,12 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index d2ece40d4a..0035e67544 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -748,7 +748,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* Enable VSC9953 L2 Switch driver on T1040 SoC */ #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB) #define CONFIG_VSC9953 -#define CONFIG_CMD_ETHSW #ifdef CONFIG_TARGET_T1040RDB #define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR 0x04 #define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR 0x08 @@ -772,20 +771,12 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 02fd37d5cb..e792ec5c9d 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,20 +744,12 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index faa1111e9f..fdafeeb38f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -690,19 +690,12 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 5d030d1179..dc3ebfa7fa 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -498,12 +498,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * USB */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 8ebfde19f9..0d9cdfb510 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -272,8 +272,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #ifdef CONFIG_PCI #define CONFIG_CMD_PCI @@ -696,12 +694,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #define __USB_PHY_TYPE utmi diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 19e0b1be1b..e1f04459c4 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -143,7 +143,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI @@ -153,7 +152,6 @@ #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) - #define CONFIG_CMD_IDE #endif #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index f56bd239af..74636b9162 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,8 +91,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index ed08d972f8..6b345c427c 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,8 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index e3c2cca3c3..a79dabef61 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -184,13 +184,6 @@ #define CONFIG_RTC_DS1337 /* use ds1337 rtc via i2c */ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* at address 0x68 */ -/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM75 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 - /* * TSEC */ @@ -280,9 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index c2b35fd196..b4ed561544 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,8 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 76b52ab6b1..1dc13295ff 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,8 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 10ba21d97d..b4c3a79387 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,8 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 7cfc351191..14b76a66bc 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,9 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 7569cd1e83..f55fe56abb 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,8 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index d2cb4b9a87..52c4d68693 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,8 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 03ad2e63a0..06981c9861 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,8 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 485bd6c8a6..3f87d8aa11 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,8 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 2906fcfca4..975f4b76dc 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,9 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index eaf0741071..184cb62e19 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,8 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IDE /* * Miscellaneous configurable options diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index cd46db4f6f..b2feccfd39 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -129,27 +129,6 @@ #define CONFIG_HWCONFIG -#define CONFIG_DTT_ADM1021 1 /* ADM1021 temp sensor support */ -#define CONFIG_SYS_DTT_BUS_NUM 1 /* The I2C bus for DTT */ -#define CONFIG_DTT_SENSORS { 0, 1 } /* Sensor index */ -/* - * ADM1021/NCT72 temp sensor configuration (see dtt/adm1021.c for details). - * there will be one entry in this array for each two (dummy) sensors in - * CONFIG_DTT_SENSORS. - * - * For uCP1020 module: - * - only one ADM1021/NCT72 - * - i2c addr 0x41 - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT output disabled - * - local temp sensor enabled, min set to 0 deg, max set to 85 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 85 deg - */ -#define CONFIG_SYS_DTT_ADM1021 { { CONFIG_SYS_I2C_NCT72_ADDR, \ - 0x02, 0, 1, 0, 85, 1, 0, 85} } - -#define CONFIG_CMD_DTT - /* * These can be toggled for performance analysis, otherwise use default. */ @@ -442,10 +421,7 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_ERRATA /* * USB diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index fbadcd17f1..a180b381cf 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -53,8 +53,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 07f74db089..82b9ff471d 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -388,7 +388,6 @@ * SPL related defines */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_TEXT_BASE 0xfc000000 /* Place BSS for SPL near end of SDRAM */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index 2ea43ffce1..6a26269807 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -81,7 +81,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 2a46e9b864..4eb8f39aaf 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,9 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 -#undef CONFIG_CMD_FUSE -#undef CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 9f35e71d0c..0be310d4a3 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -124,14 +124,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#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 - /*----------------------------------------------------------------------- * Ethernet *----------------------------------------------------------------------*/ @@ -160,7 +152,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND /*----------------------------------------------------------------------- diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h new file mode 100644 index 0000000000..edc742d379 --- /dev/null +++ b/include/configs/adp-ae3xx.h @@ -0,0 +1,260 @@ +/* + * Copyright (C) 2011 Andes Technology Corporation + * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com> + * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch-ae3xx/ae3xx.h> + +/* + * CPU and Board Configuration Options + */ +#define CONFIG_USE_INTERRUPT + +#define CONFIG_SKIP_LOWLEVEL_INIT + +#define CONFIG_SKIP_TRUNOFF_WATCHDOG + +#define CONFIG_CMDLINE_EDITING +#define CONFIG_PANIC_HANG + +#define CONFIG_SYS_ICACHE_OFF +#define CONFIG_SYS_DCACHE_OFF + +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_SERVERIP + +#ifdef CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SYS_TEXT_BASE 0x00500000 +#ifdef CONFIG_OF_CONTROL +#undef CONFIG_OF_SEPARATE +#define CONFIG_OF_EMBED +#endif +#else + +#define CONFIG_SYS_TEXT_BASE 0x80000000 +#endif + +/* + * Timer + */ +#define CONFIG_SYS_CLK_FREQ 39062500 +#define VERSION_CLOCK CONFIG_SYS_CLK_FREQ + +/* + * Use Externel CLOCK or PCLK + */ +#undef CONFIG_FTRTC010_EXTCLK + +#ifndef CONFIG_FTRTC010_EXTCLK +#define CONFIG_FTRTC010_PCLK +#endif + +#ifdef CONFIG_FTRTC010_EXTCLK +#define TIMER_CLOCK 32768 /* CONFIG_FTRTC010_EXTCLK */ +#else +#define TIMER_CLOCK CONFIG_SYS_HZ /* CONFIG_FTRTC010_PCLK */ +#endif + +#define TIMER_LOAD_VAL 0xffffffff + +/* + * Real Time Clock + */ +#define CONFIG_RTC_FTRTC010 + +/* + * Real Time Clock Divider + * RTC_DIV_COUNT (OSC_CLK/OSC_5MHZ) + */ +#define OSC_5MHZ (5*1000000) +#define OSC_CLK (4*OSC_5MHZ) +#define RTC_DIV_COUNT (0.5) /* Why?? */ + +/* + * Serial console configuration + */ + +/* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE +#ifndef CONFIG_DM_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE -4 +#endif +#define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ + +/* + * Ethernet + */ +#define CONFIG_FTMAC100 + +/* + * SD (MMC) controller + */ +#define CONFIG_FTSDC010 +#define CONFIG_FTSDC010_NUMBER 1 +#define CONFIG_FTSDC010_SDIO + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ + +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE \ + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) + +/* max number of command args */ +#define CONFIG_SYS_MAXARGS 16 + +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +/* + * Size of malloc() pool + */ +/* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */ +#define CONFIG_SYS_MALLOC_LEN (512 << 10) + +/* + * Physical Memory Map + */ +#define PHYS_SDRAM_0 0x00000000 /* SDRAM Bank #1 */ + +#define PHYS_SDRAM_1 \ + (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE) /* SDRAM Bank #2 */ + +#define CONFIG_NR_DRAM_BANKS 2 /* we have 2 bank of DRAM */ + +#define PHYS_SDRAM_0_SIZE 0x20000000 /* 512 MB */ +#define PHYS_SDRAM_1_SIZE 0x20000000 /* 512 MB */ + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_0 + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0xA0000 - \ + GENERATED_GBL_DATA_SIZE) + +/* + * Load address and memory test area should agree with + * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself. + */ +#define CONFIG_SYS_LOAD_ADDR 0x300000 + +/* memtest works on 63 MB in DRAM */ +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_0 +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_0 + 0x03F00000) + +/* + * Static memory controller configuration + */ +#define CONFIG_FTSMC020 + +#ifdef CONFIG_FTSMC020 +#include <faraday/ftsmc020.h> + +#define CONFIG_SYS_FTSMC020_CONFIGS { \ + { FTSMC020_BANK0_CONFIG, FTSMC020_BANK0_TIMING, }, \ + { FTSMC020_BANK1_CONFIG, FTSMC020_BANK1_TIMING, }, \ +} + +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* FLASH is on BANK 0 */ +#define FTSMC020_BANK0_LOWLV_CONFIG (FTSMC020_BANK_ENABLE | \ + FTSMC020_BANK_SIZE_32M | \ + FTSMC020_BANK_MBW_32) + +#define FTSMC020_BANK0_LOWLV_TIMING (FTSMC020_TPR_RBE | \ + FTSMC020_TPR_AST(1) | \ + FTSMC020_TPR_CTW(1) | \ + FTSMC020_TPR_ATI(1) | \ + FTSMC020_TPR_AT2(1) | \ + FTSMC020_TPR_WTC(1) | \ + FTSMC020_TPR_AHT(1) | \ + FTSMC020_TPR_TRNA(1)) +#endif + +/* + * FLASH on ADP_AG101P is connected to BANK0 + * Just disalbe the other BANK to avoid detection error. + */ +#define FTSMC020_BANK0_CONFIG (FTSMC020_BANK_ENABLE | \ + FTSMC020_BANK_BASE(PHYS_FLASH_1) | \ + FTSMC020_BANK_SIZE_32M | \ + FTSMC020_BANK_MBW_32) + +#define FTSMC020_BANK0_TIMING (FTSMC020_TPR_AST(3) | \ + FTSMC020_TPR_CTW(3) | \ + FTSMC020_TPR_ATI(0xf) | \ + FTSMC020_TPR_AT2(3) | \ + FTSMC020_TPR_WTC(3) | \ + FTSMC020_TPR_AHT(3) | \ + FTSMC020_TPR_TRNA(0xf)) + +#define FTSMC020_BANK1_CONFIG (0x00) +#define FTSMC020_BANK1_TIMING (0x00) +#endif /* CONFIG_FTSMC020 */ + +/* + * FLASH and environment organization + */ +/* use CFI framework */ +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER + +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_CFI_FLASH_STATUS_POLL + +/* support JEDEC */ +#ifdef CONFIG_CFI_FLASH +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#endif + +/* Do not use CONFIG_FLASH_CFI_LEGACY to detect on board flash */ +#define PHYS_FLASH_1 0x88000000 /* BANK 0 */ +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 +#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, } +#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1 + +#define CONFIG_SYS_FLASH_ERASE_TOUT 120000 /* TO for Flash Erase (ms) */ +#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* TO for Flash Write (ms) */ + +/* max number of memory banks */ +/* + * There are 4 banks supported for this Controller, + * but we have only 1 bank connected to flash on board + */ +#ifndef CONFIG_SYS_MAX_FLASH_BANKS_DETECT +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#endif +#define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} + +/* max number of sectors on one chip */ +#define CONFIG_FLASH_SECTOR_SIZE (0x10000*2) +#define CONFIG_ENV_SECT_SIZE CONFIG_FLASH_SECTOR_SIZE +#define CONFIG_SYS_MAX_FLASH_SECT 512 + +/* environments */ +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000) +#define CONFIG_ENV_SIZE 8192 +#define CONFIG_ENV_OVERWRITE + +/* + * For booting Linux, the board info and command line data + * have to be in the first 16 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ + +/* Initial Memory map for Linux*/ +#define CONFIG_SYS_BOOTMAPSZ (64 << 20) +/* Increase max gunzip size */ +#define CONFIG_SYS_BOOTM_LEN (64 << 20) + +#endif /* __CONFIG_H */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index b42fcfa8d5..bc122d3a74 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -20,14 +20,13 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_GENERIC_GLOBAL_DATA +#define CONFIG_CMDLINE_EDITING -/* - * Definitions related to passing arguments to kernel. - */ -#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */ -#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */ -#define CONFIG_INITRD_TAG /* send initrd params */ +#define CONFIG_SYS_ICACHE_OFF +#define CONFIG_SYS_DCACHE_OFF + +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_SERVERIP #ifndef CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_MEM_REMAP @@ -35,6 +34,10 @@ #ifdef CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_TEXT_BASE 0x00500000 +#ifdef CONFIG_OF_CONTROL +#undef CONFIG_OF_SEPARATE +#define CONFIG_OF_EMBED +#endif #else #ifdef CONFIG_MEM_REMAP #define CONFIG_SYS_TEXT_BASE 0x80000000 @@ -87,7 +90,9 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 +#endif #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* @@ -95,7 +100,6 @@ */ #define CONFIG_FTMAC100 - /* * SD (MMC) controller */ @@ -348,7 +352,9 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ +#ifndef CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_BANKS 1 +#endif #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ @@ -362,4 +368,15 @@ #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OVERWRITE +/* + * For booting Linux, the board info and command line data + * have to be in the first 16 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ + +/* Initial Memory map for Linux*/ +#define CONFIG_SYS_BOOTMAPSZ (64 << 20) +/* Increase max gunzip size */ +#define CONFIG_SYS_BOOTM_LEN (64 << 20) + #endif /* __CONFIG_H */ diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index b76f376a04..f320792cfd 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -36,7 +36,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP /* SATA Configs */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index b6b14d38bd..0c6d2880da 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 6855f62865..2c4033ca59 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 5de39cf740..eb768b9e97 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -101,7 +101,6 @@ #endif /* CONFIG_USB_AM35X */ /* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_NAND /* NAND support */ @@ -250,7 +249,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index feb7b6eb97..829dd3ecb9 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -300,7 +300,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 1feb946834..25f63e8311 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -23,7 +23,6 @@ #endif /* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 6962039c3a..b379e0839d 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -31,6 +31,10 @@ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 + #define CONFIG_SYS_OMAP_ABE_SYSCK /* Define the default GPT table for eMMC */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 01406640b0..450a2ebc11 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,8 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 8ae3c77942..2284b8bc66 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -33,7 +33,6 @@ #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f650000" -#define CONFIG_LZMA #define MTDIDS_DEFAULT "nor0=spi-flash.0" #define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \ diff --git a/include/configs/ap143.h b/include/configs/ap143.h index a2c31a2fd5..2950783097 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -37,7 +37,6 @@ #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f680000" -#define CONFIG_LZMA #define MTDIDS_DEFAULT "nor0=spi-flash.0" #define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \ diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 1cd4d32c6d..b3c22cf4a4 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -14,7 +14,6 @@ #define CONFIG_AP325RXA 1 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_IDE #define CONFIG_BOOTARGS "console=ttySC2,38400" diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index d3d72b634d..440505dd1f 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8BFC0000 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV #define CONFIG_BOOTARGS "console=ttySC4,115200" diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c1c0f592d2..9220d04e79 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* OCOTP Configs */ -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif @@ -134,7 +133,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 40a82b884b..073f3b4fef 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,8 +54,6 @@ /* * U-Boot Commands */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */ #define CONFIG_CMD_MTDPARTS /* MTD partition support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK diff --git a/include/configs/aria.h b/include/configs/aria.h index 4d946fc44a..0a7ef9919e 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,9 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 -#undef CONFIG_CMD_FUSE -#undef CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8899579faa..61989d6bab 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -59,11 +59,7 @@ /* Define which commands should be available at u-boot command prompt */ -#if ENABLE_JFFS -#define CONFIG_CMD_JFFS2 -#endif #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMDLINE_EDITING #define CONFIG_MCFRTC diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index e7b9ad245c..411d7412af 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -197,7 +197,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MASTER_CLOCK 132096000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index a5489cd28c..33cc5fc7aa 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -191,7 +191,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MASTER_CLOCK 132096000 diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 4c27225d84..bf13d937fb 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -74,7 +74,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 64d7c45aad..a7f5e06c68 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -93,7 +93,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 3c03ed3eb1..c8e9340af2 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -95,7 +95,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/baltos.h b/include/configs/baltos.h index c65eeedb53..fe4ac05f38 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -229,7 +229,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 924a351c38..71b1b96ec4 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -330,7 +330,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index d9b88fa2d3..957cd9e0ba 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -67,10 +67,7 @@ #define CONFIG_FAT_WRITE /* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY -#define CONFIG_SHA1 -#define CONFIG_SHA256 /* Enable Time Command */ diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 7aad7ea51f..7907310084 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -105,7 +105,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN /* General parts of the framework, required. */ -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #endif /* ! __BUR_AM335X_COMMON_H__ */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 6e2fd33563..f5d108e359 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -299,7 +299,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifndef CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/canmb.h b/include/configs/canmb.h index c70979ed1a..b7c74b4264 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index a330372d19..b495d0645b 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -261,18 +261,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 /* use AD7414 */ -#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 - -#if defined(CONFIG_ARCHES) -#define CONFIG_SYS_I2C_DTT_ADDR 0x4a /* AD7414 I2C address */ -#endif - #if !defined(CONFIG_ARCHES) /* RTC configuration */ #define CONFIG_RTC_M41T62 @@ -373,17 +361,14 @@ * Commands additional to the ones defined in amcc-common.h */ #if defined(CONFIG_ARCHES) -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM #elif defined(CONFIG_CANYONLANDS) -#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_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 3000453563..96e5c9cdd5 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -60,8 +60,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 3 -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EEPROM_LAYOUT #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_EEPROM_SIZE 256 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 0c51d2a288..3397aaf2eb 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI /* I2C */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 3a7d826837..3777a0d863 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -21,7 +21,6 @@ /* * Supported commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f5f3df3ad6..dd8010cd48 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -258,14 +258,10 @@ #define CONFIG_VIDEO_BMP_LOGO /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_FX6_H */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 9a8e1302c5..3fb9daebbc 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -153,16 +153,12 @@ /* Status LED polarity is inversed, so init it in the "off" state */ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #ifndef CONFIG_SPL_BUILD /* * Enable PCA9555 at I2C0-0x26. diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 1898e3837d..ee7c9de969 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -262,7 +262,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -306,14 +305,10 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "legacy, v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 0df7d4269c..dd78b0c7e8 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -257,14 +257,10 @@ #define CONFIG_OMAP3_SPI /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4f44a6752e..1e63098d5f 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -150,14 +150,10 @@ #define CONFIG_SPL_SPI_LOAD /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_T43_H */ diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index ccaa568009..14042ada7d 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -67,16 +67,12 @@ /* Enabled commands */ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - /* USB Networking options */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9c4085245a..0882ef8f89 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* OCOTP Configs */ -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif @@ -115,7 +114,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 62a404a7b1..587963963a 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -51,7 +51,6 @@ /* * Bootloader Components Configuration */ -#define CONFIG_CMD_ENV /* I2C support */ #ifdef CONFIG_SYS_I2C diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 28383f49da..6e8cd914b3 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -20,7 +20,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 7535ad5a62..6641408fcb 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -185,7 +185,6 @@ #define CONFIG_PCA9698 /* NXP PCA9698 */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 @@ -199,8 +198,6 @@ #define CONFIG_SF_DEFAULT_MODE 0 #endif -#define CONFIG_SHA1 - /* * MMC */ @@ -344,8 +341,6 @@ #ifndef CONFIG_TRAILBLAZER -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index add5f90cc2..a04af31284 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -17,7 +17,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_BOARD_LATE_INIT #define CONFIG_LAST_STAGE_INIT -#define CONFIG_SPL_BOARD_INIT /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -33,7 +32,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_I2C #define CONFIG_CMD_PCI #define CONFIG_CMD_SCSI diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 7e606cd794..7bbe31ceea 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -593,8 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI @@ -618,12 +616,6 @@ #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 71b428f1f7..3847a19cad 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -148,7 +148,6 @@ #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K) -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 435929723b..a23da191ab 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -411,8 +411,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 9442c05943..e0bbf94f0e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -273,7 +273,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI @@ -302,13 +301,11 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 6e2561cb5a..699c03f844 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 1cdefa0549..0f0ab01f62 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI /* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 676dfc996b..0890a4db62 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI #define CONFIG_SCSI diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index fc8a3ec7dc..821aa9dec1 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -25,7 +25,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index e788f9c635..9db3380a95 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -69,13 +69,7 @@ #ifdef CONFIG_DBAU1550 -#undef CONFIG_CMD_IDE #undef CONFIG_CMD_PCMCIA - -#else - -#define CONFIG_CMD_IDE - #endif /* diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 6e95064fe1..a8b6802235 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_NAND_PAGE_SIZE NAND_LARGE_BLOCK_PAGE_SIZE #define CONFIG_SYS_NAND_USE_FLASH_BBT -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND /* @@ -181,7 +180,6 @@ /* SPL will use SRAM as stack */ #define CONFIG_SPL_STACK 0x0000FFF8 -#define CONFIG_SPL_BOARD_INIT /* Use the framework and generic lib */ #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5884d5c67c..c892b5faa9 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -91,7 +91,6 @@ /* partition */ /* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ #undef CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index ab546c50cd..6710507a8d 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,8 +85,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index e32651f541..59ba0afb29 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -31,9 +31,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66 -/* new uImage format support */ -#define CONFIG_FIT_DISABLE_SHA256 - #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ /* @@ -57,9 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) @@ -111,13 +105,6 @@ #define CONFIG_SYS_SPD_BUS_NUM 4 /* Temp sensor/hwmon/dtt */ -#define CONFIG_SYS_DTT_BUS_NUM 4 -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0x4c, 0x4e, 0x18 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 46, 10 }, { 48, 14 }, { 50, 19 }, { 52, 23 },\ - { 54, 27 }, { 56, 31 }, { 58, 36 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 #define CONFIG_SYS_ICS8N3QV01_I2C {1, 3} #define CONFIG_SYS_SIL1178_I2C {0, 2} diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 2b7d62b034..11397bd8e9 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -29,9 +29,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66_33 #define PLLMR1_DEFAULT PLLMR1_266_133_66_33 -/* new uImage format support */ -#define CONFIG_FIT_DISABLE_SHA256 - #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ /* @@ -55,9 +52,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 9450b62e4a..470e26256a 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,9 +28,7 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 69429ed34e..3b56fd6739 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* * mv-common.h should be defined after CMD configs since it used them @@ -80,7 +79,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index a9ca0231f5..17608a54cd 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -41,6 +41,10 @@ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 + #define CONFIG_SYS_OMAP_ABE_SYSCK #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index b97c6c4240..11c842d952 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -46,7 +46,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* Extra Commands */ -#define CONFIG_CMD_ENV /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 2c83a716a3..aaba5d8eab 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 3a5b5c7285..53ee1adc0b 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -128,7 +128,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI @@ -169,7 +168,6 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif /* additions for new relocation code, must added to all boards */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index f8fb97b08e..2404441860 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 2fc85983e0..def28f2cf1 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 */ -#define CONFIG_CMD_JFFS2 #define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index d1c7b937e3..cc5cc7bac6 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x00040000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x0001ffff #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/orion5x/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_UBOOT_BASE 0xfff90000 #define CONFIG_SYS_UBOOT_START 0x00800000 #define CONFIG_SYS_TEXT_BASE 0x00800000 @@ -120,7 +119,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE /* * Network @@ -141,7 +139,7 @@ /* * IDE */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT /* ED Mini V has an IDE-compatible SATA connector for port 1 */ diff --git a/include/configs/espt.h b/include/configs/espt.h index ace71862dd..845bcc1c9a 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -18,7 +18,6 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 481051c9c6..e7f7a7cbe6 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -84,7 +84,6 @@ #define CONFIG_AT91_GPIO /* Command line configuration */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 5411e5ff49..6915dc1a48 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -26,7 +26,6 @@ /* Enable ACE acceleration for SHA1 and SHA256 */ #define CONFIG_EXYNOS_ACE_SHA -#define CONFIG_SHA_HW_ACCEL /* Power Down Modes */ #define S5P_CHECK_SLEEP 0x00000BAD @@ -42,12 +41,8 @@ /* select serial console configuration */ #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 -#define CONFIG_CMD_HASH - /* Thermal Management Unit */ #define CONFIG_EXYNOS_TMU -#define CONFIG_CMD_DTT -#define CONFIG_TMU_CMD_DTT /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 @@ -137,10 +132,7 @@ #endif /*CONFIG_CMD_NET*/ /* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY -#define CONFIG_SHA1 -#define CONFIG_SHA256 /* Enable Time Command */ diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index fee46add80..7e03dd63ee 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -147,7 +147,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_PCI -#undef CONFIG_CMD_EEPROM /* * PCI stuff diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 198259b3c0..f60a0298d6 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -47,7 +47,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP /* SATA Configs */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index f9bced3f8f..d1635b098e 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -43,9 +43,7 @@ * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ /* diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index abc4214bc0..83b78907f2 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -86,7 +86,6 @@ * Command line configuration. */ /* add useful commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 1c18a380fe..2227eead62 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -8,7 +8,6 @@ #define __CONFIG_H /* SPL */ -#define CONFIG_SPL_BOARD_INIT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M) @@ -141,9 +140,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC -#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE @@ -176,7 +172,6 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/h2200.h b/include/configs/h2200.h index d8724f86a7..530a88e9e1 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -109,7 +109,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } -#define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 584ce52bd0..0fb6fb3b60 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -73,7 +73,6 @@ #define CONFIG_FS_EXT4 /* Command line configuration */ -#define CONFIG_CMD_ENV #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 5574e7715a..405129b7e2 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,9 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_CMD_FPGAD -#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 2cf0027d9c..a5782f3300 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -23,13 +23,11 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA /* * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE /* * mv-common.h should be defined after CMD configs since it used them @@ -88,14 +86,14 @@ /* * SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */ /* * RTC driver configuration diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 950a7195fd..63e50606d7 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -25,14 +25,12 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA #define CONFIG_LZO /* * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* @@ -88,7 +86,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 7ffc9d1dd9..7bedcb94d7 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -413,7 +413,6 @@ */ #define CONFIG_CMD_NAND #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_JFFS2 #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME @@ -444,7 +443,6 @@ #define CONFIG_UBOOTPATH "ids8313/u-boot.bin" #define CONFIG_FDTFILE "ids8313/ids8313.dtb" #define CONFIG_LOADADDR 0x400000 -#define CONFIG_CMD_ENV_FLAGS #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo" /* Initial Memory map for Linux*/ @@ -541,8 +539,5 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 #define CONFIG_IMAGE_FORMAT_LEGACY -#define CONFIG_CMD_HASH -#define CONFIG_SHA1 -#define CONFIG_SHA256 #endif /* __CONFIG_H */ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index b8a867c7ba..18d8d2fd3d 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -159,7 +159,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 0a66720a7d..739af03e88 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -48,7 +48,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#define CONFIG_CMD_EEPROM #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:128k(uboot)ro," \ diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h index f783eac5db..741bdfa807 100644 --- a/include/configs/imx6qdl_icore.h +++ b/include/configs/imx6qdl_icore.h @@ -126,8 +126,6 @@ /* FIT */ #ifdef CONFIG_FIT # define CONFIG_HASH_VERIFY -# define CONFIG_SHA1 -# define CONFIG_SHA256 # define CONFIG_IMAGE_FORMAT_LEGACY #endif diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h index a6394681d9..f52865b5a0 100644 --- a/include/configs/imx6qdl_icore_rqs.h +++ b/include/configs/imx6qdl_icore_rqs.h @@ -108,8 +108,6 @@ /* FIT */ #ifdef CONFIG_FIT # define CONFIG_HASH_VERIFY -# define CONFIG_SHA1 -# define CONFIG_SHA256 # define CONFIG_IMAGE_FORMAT_LEGACY #endif diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h index 9f66dd324f..2e12b97767 100644 --- a/include/configs/imx6ul_geam.h +++ b/include/configs/imx6ul_geam.h @@ -125,8 +125,6 @@ /* FIT */ #ifdef CONFIG_FIT # define CONFIG_HASH_VERIFY -# define CONFIG_SHA1 -# define CONFIG_SHA256 # define CONFIG_IMAGE_FORMAT_LEGACY #endif diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h index 5ce70ae466..76ae159da3 100644 --- a/include/configs/imx6ul_isiot.h +++ b/include/configs/imx6ul_isiot.h @@ -125,8 +125,6 @@ /* FIT */ #ifdef CONFIG_FIT # define CONFIG_HASH_VERIFY -# define CONFIG_SHA1 -# define CONFIG_SHA256 # define CONFIG_IMAGE_FORMAT_LEGACY #endif diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 5ee9c2bcb4..d651eff4b2 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -72,7 +72,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ @@ -219,86 +218,6 @@ #define CONFIG_SYS_GPS_PORT_CONFIG 0x01501444 /* - * RTC configuration - */ -#define CONFIG_RTC_RTC4543 1 /* use external RTC */ - -/* - * Software (bit-bang) three wire serial configuration - * - * Note that we need the ifdefs because otherwise compilation of - * mkimage.c fails. - */ -#define CONFIG_SOFT_TWS 1 - -#ifdef TWS_IMPLEMENTATION -#include <mpc5xxx.h> -#include <asm/io.h> - -#define TWS_CE MPC5XXX_GPIO_WKUP_PSC1_4 /* GPIO_WKUP_0 */ -#define TWS_WR MPC5XXX_GPIO_WKUP_PSC2_4 /* GPIO_WKUP_1 */ -#define TWS_DATA MPC5XXX_GPIO_SINT_PSC3_4 /* GPIO_SINT_0 */ -#define TWS_CLK MPC5XXX_GPIO_SINT_PSC3_5 /* GPIO_SINT_1 */ - -static inline void tws_ce(unsigned bit) -{ - struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - if (bit) - setbits_8(&wu_gpio->dvo, TWS_CE); - else - clrbits_8(&wu_gpio->dvo, TWS_CE); -} - -static inline void tws_wr(unsigned bit) -{ - struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - if (bit) - setbits_8(&wu_gpio->dvo, TWS_WR); - else - clrbits_8(&wu_gpio->dvo, TWS_WR); -} - -static inline void tws_clk(unsigned bit) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (bit) - setbits_8(&gpio->sint_dvo, TWS_CLK); - else - clrbits_8(&gpio->sint_dvo, TWS_CLK); -} - -static inline void tws_data(unsigned bit) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (bit) - setbits_8(&gpio->sint_dvo, TWS_DATA); - else - clrbits_8(&gpio->sint_dvo, TWS_DATA); -} - -static inline unsigned tws_data_read(void) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - return !!(in_8(&gpio->sint_ival) & TWS_DATA); -} - -static inline void tws_data_config_output(unsigned output) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (output) - setbits_8(&gpio->sint_ddr, TWS_DATA); - else - clrbits_8(&gpio->sint_ddr, TWS_DATA); -} -#endif /* TWS_IMPLEMENTATION */ - -/* * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/intip.h b/include/configs/intip.h index f1f840923b..036fd20eb4 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -218,13 +218,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 -/* I2C SYSMON */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /* RTC configuration */ #define CONFIG_RTC_DS1337 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 @@ -272,7 +265,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#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 3e44a8c607..3fde912bcf 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -31,9 +31,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66 -/* new uImage format support */ -#define CONFIG_FIT_DISABLE_SHA256 - #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ /* @@ -57,9 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) @@ -93,11 +87,6 @@ #define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 /* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 /* * FLASH organization diff --git a/include/configs/io64.h b/include/configs/io64.h index 8e754fc10b..1b58f04540 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -327,14 +327,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 -/* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0x18, 0x4c, 0x4e } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 43, 13 }, { 46, 16 }, \ - { 50, 20 }, { 53, 27 }, { 56, 34 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /*----------------------------------------------------------------------- * Ethernet *----------------------------------------------------------------------*/ @@ -373,7 +365,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 9c3be78bc7..99e920b46a 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -33,9 +33,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66 -/* new uImage format support */ -#define CONFIG_FIT_DISABLE_SHA256 - #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ /* @@ -57,9 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_FPGAD -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 5caf02e8d9..a3c0cfa60a 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -241,7 +241,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI @@ -273,7 +272,6 @@ /* defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index ece72c6aa1..c6390dbdbe 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,8 +88,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE /* IDE harddisk support */ -#define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */ #define CONFIG_SYS_LOWBOOT 1 diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 3143b631ce..3f39a26d3b 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -123,31 +123,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 1900 /* play along with linux */ -/* I2C DTT */ -#define CONFIG_DTT_ADM1021 1 /* ADM1021 temp sensor support */ -#define CONFIG_SYS_DTT_BUS_NUM 1 /* The I2C bus for DTT */ -/* - * standard dtt sensor configuration - bottom bit will determine local or - * remote sensor of the ADM1021, the rest determines index into - * CONFIG_SYS_DTT_ADM1021 array below. - */ -#define CONFIG_DTT_SENSORS { 0, 1 } - -/* - * ADM1021 temp sensor configuration (see dtt/adm1021.c for details). - * there will be one entry in this array for each two (dummy) sensors in - * CONFIG_DTT_SENSORS. - * - * For Katmai board: - * - only one ADM1021 - * - i2c addr 0x18 - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT ouput disabled - * - local temp sensor enabled, min set to 0 deg, max set to 85 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 85 deg - */ -#define CONFIG_SYS_DTT_ADM1021 { { 0x18, 0x02, 0, 1, 0, 85, 1, 0, 58} } - /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ @@ -170,7 +145,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 343685a652..408e5634b6 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -90,7 +90,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE (1024 * 1024) #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT /* * Console diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 1f5c2ad234..a91a6a9ee5 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -317,11 +317,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 -/* Standard DTT sensor configuration */ -#define CONFIG_DTT_DS1775 1 -#define CONFIG_DTT_SENSORS { 0 } -#define CONFIG_SYS_I2C_DTT_ADDR 0x48 - /* RTC configuration */ #define CONFIG_RTC_DS1338 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 872e2b3403..c2b38d8af6 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,9 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 8293607c9c..0d50538a8e 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -14,7 +14,6 @@ #define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE /* standard km ethernet_present for piggy */ diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 35ec0972bf..7d69224bd1 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -215,13 +215,6 @@ #define CONFIG_KM_IVM_BUS 2 /* I2C2 (Mux-Port 1)*/ -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0, 1, 2, 3} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_HYSTERESIS 3 -#define CONFIG_SYS_DTT_BUS_NUM 1 - #if defined(CONFIG_CMD_NAND) #define CONFIG_NAND_KMETER1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 9bfcfdefe9..664a64c55a 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -370,7 +370,6 @@ int get_scl(void); * additionnal command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_ERRATA /* we don't need flash support */ #undef CONFIG_FLASH_CFI_MTD diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index aeece20bda..09c3aa9ca8 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -268,13 +268,6 @@ int get_sda(void); int get_scl(void); #endif -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_HYSTERESIS 3 -#define CONFIG_SYS_DTT_BUS_NUM 2 - #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_IMMR 0xF0000000 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 9e9d879541..66e65c878c 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,8 +43,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #endif @@ -120,7 +118,6 @@ */ #ifdef CONFIG_CMD_I2C /* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 8-bit device address */ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 09f890d55c..561b81a6f4 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* Command line configuration */ -#define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 2b3833d61b..5b8500b91b 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -61,7 +61,6 @@ /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 35d17b96f4..d6839c0916 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -305,16 +305,6 @@ #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ - -#ifdef CONFIG_FSL_CAAM - -#define CONFIG_CMD_HASH - -#define CONFIG_SHA_HW_ACCEL - -#endif - #include <asm/fsl_secure_boot.h> #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 333bb26623..a27d70eae7 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -570,12 +570,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 81f38a30a4..60c3d5d6cc 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -434,12 +434,6 @@ #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e26924877d..b35f96db3d 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -174,9 +174,6 @@ #endif /* Command line configuration */ -#ifndef SPL_NO_ENV -#define CONFIG_CMD_ENV -#endif /* MMC */ #ifndef SPL_NO_MMC @@ -301,10 +298,4 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #endif /* __LS1043A_COMMON_H */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 957ffd3634..1fbafaa9c2 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -139,9 +139,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* Command line configuration */ -#ifndef SPL_NO_ENV -#define CONFIG_CMD_ENV -#endif /* MMC */ #ifndef SPL_NO_MMC @@ -230,10 +227,4 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #endif /* __LS1046A_COMMON_H */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 427f623e8c..285e48dbac 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -160,7 +160,6 @@ unsigned long long get_qixis_addr(void); #endif /* Command line configuration */ -#define CONFIG_CMD_ENV /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) @@ -230,10 +229,4 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - #endif /* __LS2_COMMON_H */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index f50ad42917..dc52b223cb 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -332,7 +332,6 @@ unsigned long get_board_ddr_clk(void); /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index d0bf5520b7..2e0d95efd7 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -278,7 +278,6 @@ unsigned long get_board_sys_clk(void); /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index ce6d7c9998..43e4a325b4 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -38,8 +38,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE /* * mv-common.h should be defined after CMD configs since it used them @@ -147,7 +145,7 @@ #undef CONFIG_RESET_PHY_R #endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #undef CONFIG_IDE_LED #undef CONFIG_SYS_IDE_MAXBUS #define CONFIG_SYS_IDE_MAXBUS 1 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 6893bf24ff..8971096a98 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,8 +381,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index c729e0938f..b237cea1da 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -218,7 +218,6 @@ */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_TEXT_BASE 0x70008000 #define CONFIG_SPL_PAD_TO 0x8000 #define CONFIG_SPL_STACK 0x70004000 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 8413c5c234..6dc1fb047e 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -206,7 +206,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SPL_SPI_LOAD diff --git a/include/configs/makalu.h b/include/configs/makalu.h index da5cfa19d3..a92bc43538 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -189,11 +189,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 /* I2C boot EEPROM (24C02BN) */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* Bytes of address */ -/* Standard DTT sensor configuration */ -#define CONFIG_DTT_DS1775 1 -#define CONFIG_DTT_SENSORS { 0 } -#define CONFIG_SYS_I2C_DTT_ADDR 0x48 - /* RTC configuration */ #define CONFIG_RTC_X1205 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x6f @@ -232,7 +227,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI /* POST support */ diff --git a/include/configs/malta.h b/include/configs/malta.h index fcee37400d..1f977cb71a 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -101,7 +101,6 @@ /* * Commands */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_SYS_LONGHELP /* verbose help, undef to save memory */ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index cdb3a473ea..b82a684cc9 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 4b9b5312bf..fca1af9d2b 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -14,7 +14,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #include "imx6_spl.h" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) #define CONFIG_SPL_OS_BOOT diff --git a/include/configs/mcx.h b/include/configs/mcx.h index c70e68c5b0..0c237a59cb 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -80,7 +80,6 @@ #define CONFIG_USB_ETHER_MCS7830 /* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_UBIFS @@ -289,7 +288,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index fe94e663c5..17a97dfc3a 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,9 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_FUSE -#undef CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 /* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index f1734c0e21..12a4dfce6b 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -26,8 +26,6 @@ #define GICD_BASE 0xc4301000 #define GICC_BASE 0xc4302000 -#define CONFIG_CMD_ENV - /* Monitor Command Prompt */ /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e8fe2f673c..cc7f81955e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -168,11 +168,9 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL #if defined(FLASH) -# define CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS # if !defined(RAMENV) @@ -186,7 +184,6 @@ # define CONFIG_CMD_SAVES # endif #else -# undef CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS #endif #endif @@ -275,7 +272,6 @@ /* SPL part */ #define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds" diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index cb5c346807..75633f66ef 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,10 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT -#define CONFIG_CMD_IDE -#define CONFIG_CMD_IMMAP -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 7919320c88..e11a0e628a 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -378,12 +378,8 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_FUSE - #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif @@ -414,10 +410,10 @@ "1m(u-boot);" \ "mpc5121.nand:-(data)" -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) +#if defined(CONFIG_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) #define CONFIG_SUPPORT_VFAT -#endif /* defined(CONFIG_CMD_IDE) */ +#endif /* defined(CONFIG_IDE) */ /* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 0015be980b..2855c00723 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -14,7 +14,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCMCIA -#define CONFIG_CMD_IDE #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 26472e9474..de6e58a71e 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -12,7 +12,6 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MS7722SE 1 -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 2e373175dc..ed83eeba54 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -39,7 +39,6 @@ /* * FPGA */ -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_SPARTAN3 diff --git a/include/configs/munices.h b/include/configs/munices.h index 1679430951..ad2d69e6a5 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -26,7 +26,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index d000d7617a..13bd6cff3d 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -128,7 +128,6 @@ * File system */ #ifdef CONFIG_SYS_MVFS -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 83c559ed66..a2f68ad70a 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -22,14 +22,11 @@ */ #ifdef CONFIG_SYS_MVFS #define CONFIG_BZIP2 -#define CONFIG_LZMA #endif /* CONFIG_SYS_MVFS */ /* * Commands configuration */ -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE /* * Extra file system diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 54bc563467..4513adf2c4 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -33,7 +33,6 @@ * Hardware drivers */ #define CONFIG_FSL_IIM -#define CONFIG_CMD_FUSE #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 21ac3fc357..1a8ab4ee33 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -78,7 +78,6 @@ #define CONFIG_FSL_USDHC /* Fuses */ -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP /* Secure boot (HAB) support */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b2cecc5d0e..bc22f56d1d 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -40,7 +40,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_VIDEO_SKIP /* USB */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 9a20c7732d..fe460109d1 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -59,7 +59,6 @@ #define CONFIG_FSL_USDHC /* Fuses */ -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #define CONFIG_ARMV7_SECURE_BASE 0x00900000 diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 7004176c4a..dfa81223c4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -42,7 +42,6 @@ * Commands configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING @@ -102,7 +101,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_LZO #define CONFIG_CMD_UBIFS diff --git a/include/configs/neo.h b/include/configs/neo.h index 9115e251b1..5a8a5c2422 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -31,9 +31,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66_33 #define PLLMR1_DEFAULT PLLMR1_266_133_66_33 -/* new uImage format support */ -#define CONFIG_FIT_DISABLE_SHA256 - #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ /* @@ -57,9 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ /* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) @@ -100,13 +94,6 @@ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 -/* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /* * FLASH organization */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 13625286c5..00b84f757a 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) #define CONFIG_BMP_16BPP #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/novena.h b/include/configs/novena.h index e0ed304586..6cb1807a8e 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_EEPROM #define CONFIG_FAT_WRITE #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA @@ -157,7 +156,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #endif diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index eba31c4abf..bc67270af7 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -21,11 +21,9 @@ /* compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA /* commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE /* * mv-common.h should be defined after CMD configs since it used them @@ -80,12 +78,12 @@ #endif /* CONFIG_CMD_NET */ /* SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */ /* RTC driver configuration */ #ifdef CONFIG_CMD_DATE diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 246fb808a9..ba29f3e7d1 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -61,7 +61,6 @@ /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */ #undef CONFIG_EXYNOS_TMU -#undef CONFIG_TMU_CMD_DTT #define CONFIG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index d8ca6225d6..53bfc13264 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -25,8 +25,6 @@ * ---------------------------------------------------------------------------- */ -#define CONFIG_CMD_JFFS2 - #define CONFIG_CMD_NAND /* ---------------------------------------------------------------------------- @@ -317,7 +315,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 0cc0042bca..9db4eeb54e 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -284,7 +284,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS @@ -309,7 +308,6 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif /* SD/MMC */ @@ -330,7 +328,6 @@ #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 19660db080..89e963d524 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -26,9 +26,7 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 34da90f20b..0582fa3688 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* OCOTP Configs */ -#define CONFIG_CMD_IMXOTP #define CONFIG_IMX_OTP #define IMX_OTP_BASE OCOTP_BASE_ADDR #define IMX_OTP_ADDR_MAX 0x7F @@ -91,7 +90,6 @@ #define CONFIG_PHY_SMSC #ifndef CONFIG_SPL -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_BUS 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 638e9da028..71b4f40921 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -631,7 +631,6 @@ #define CONFIG_SYS_I2C_PCA9557_ADDR 0x18 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #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 @@ -814,7 +813,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 427629f409..fd644f22da 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -230,7 +230,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PCA9555_ADDR 0x23 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #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 @@ -385,7 +384,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index f6bd4fec88..efbcbd2e05 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -148,6 +148,4 @@ * Command line configuration. */ -#undef CONFIG_CMD_IDE - #endif /* __CONFIG_H */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 406f3e547a..6da17be11c 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -49,7 +49,6 @@ Serial console configuration /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index ea3872f5c9..fc75ca85c5 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -108,7 +108,6 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ /* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 51b489a809..8c0e26486f 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_RTC_BUS_NUM 2 /* EEPROM (24FC256) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_BUS 2 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index f622be62b7..39018ac62f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -86,9 +86,6 @@ #define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)" /* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC -#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_RBTREE /* Physical Memory Map */ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 4bd8236b33..676d55f5e8 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -340,8 +340,6 @@ #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_FUSE - /* * Miscellaneous configurable options */ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 2cb6f56f7d..9c8720bee9 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -107,7 +107,6 @@ /* I2C Configuration */ #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index b220d14dd8..41d5722490 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -226,7 +226,6 @@ #endif -#define CONFIG_CMD_JFFS2 1 #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND device jffs2 lives on */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 22b3c2e2d1..5e58b6b021 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -69,7 +69,6 @@ */ #define CONFIG_CMD_NAND 1 -#define CONFIG_CMD_JFFS2 1 #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND dev jffs2 lives on */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 36f6e95ced..f94e74f0fc 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* @@ -78,7 +77,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 59a793babe..abdc93c7d2 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -50,8 +50,6 @@ #define CONFIG_SYS_NS16550_COM1 0xb40003f8 #define CONFIG_CONS_INDEX 1 -#define CONFIG_CMD_IDE - #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO #endif @@ -123,6 +121,4 @@ #define MEM_SIZE 128 -#define CONFIG_LZMA - #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 28b791acdd..f1e096fddd 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -50,8 +50,6 @@ #define CONFIG_SYS_NS16550_COM1 0xffffffffb40003f8 #define CONFIG_CONS_INDEX 1 -#define CONFIG_CMD_IDE - #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO #endif @@ -123,6 +121,4 @@ #define MEM_SIZE 128 -#define CONFIG_LZMA - #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index ffd776f6bf..c26810723e 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -127,7 +127,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 687befdad3..3509c2f659 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -25,10 +25,9 @@ * - AHCI controller is supported for QEMU '-M q35' target * * Default configuraion is to support the QEMU default x86 target - * Undefine CONFIG_CMD_IDE to support q35 target + * Undefine CONFIG_IDE to support q35 target */ -#define CONFIG_CMD_IDE -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define CONFIG_SYS_IDE_MAXBUS 2 #define CONFIG_SYS_IDE_MAXDEVICE 4 #define CONFIG_SYS_ATA_BASE_ADDR 0 diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index b159b1ed8d..6212dbae21 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV #define CONFIG_BOOTARGS "console=ttySC3,115200" diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 64fc5b2f03..744d567805 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -12,7 +12,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IDE #define CONFIG_CMD_SH_ZIMAGEBOOT /* SCIF */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 2efe36f854..bb79a9ffea 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -22,7 +22,6 @@ */ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCI -#define CONFIG_CMD_IDE #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF0 1 @@ -120,7 +119,7 @@ #endif /* Compact flash Support */ -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) #define CONFIG_IDE_RESET 1 #define CONFIG_SYS_PIO_MODE 1 #define CONFIG_SYS_IDE_MAXBUS 1 /* IDE bus */ @@ -131,6 +130,6 @@ #define CONFIG_SYS_ATA_REG_OFFSET 0x1000 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x800 /* alternate register offset */ #define CONFIG_IDE_SWAP_IO -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */ #endif /* __R7780RP_H */ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index c5e508e4ab..81a1553390 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_NS16550_MEM32 -#define CONFIG_SPL_BOARD_INIT #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index e7a8f724f1..4cf71fa17e 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -23,7 +23,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_NS16550_MEM32 -#define CONFIG_SPL_BOARD_INIT #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM /* Bootrom will load u-boot binary to 0x0 once return from SPL */ diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 33487cd86f..b25a7ea344 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -117,7 +117,6 @@ #define CONFIG_LOADADDR 0xC307FFC0 #define CONFIG_BOOTARGS "console=ttyLF0 root=/dev/ram rw" -#define CONFIG_CMD_ENV #define CONFIG_EXTRA_ENV_SETTINGS \ "boot_scripts=boot.scr.uimg boot.scr\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 7d20d65bf3..57fa67d234 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_SERIALFLASH diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index f044f0e6de..42fb1e11d0 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_MMC diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index b4a62bd63a..074c7568f0 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_MMC diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 509457b9bf..9540a4a0ff 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_MMC diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index c584b0b9e3..f1cf65f42c 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -75,7 +75,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_MMC diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 91f286b647..09a9757e6e 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) #ifdef CONFIG_SYS_USE_MMC diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 37c6132b8a..c62b45e51c 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -18,7 +18,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_IO_TRACE -#define CONFIG_CMD_IOTRACE #endif #ifndef CONFIG_TIMER @@ -29,7 +28,6 @@ #define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_CMD_PCI -#define CONFIG_CMD_IO #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE @@ -100,18 +98,10 @@ #define CONFIG_BOOTP_SERVERIP #define CONFIG_IP_DEFRAG -/* Can't boot elf images */ - -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY -#define CONFIG_SHA1 -#define CONFIG_SHA256 #define CONFIG_CMD_SANDBOX -#define CONFIG_CMD_ENV_FLAGS -#define CONFIG_CMD_ENV_CALLBACK - #define CONFIG_BOOTARGS "" #ifndef SANDBOX_NO_SDL @@ -159,12 +149,8 @@ #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2 #define CONFIG_LZO -#define CONFIG_LZMA - -#define CONFIG_CMD_LZMADEC #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_IDE #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_ATA_IDE0_OFFSET 0 #define CONFIG_SYS_IDE_MAXDEVICE 2 diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h index 2aaa3ab976..93b595dd10 100644 --- a/include/configs/sandbox_spl.h +++ b/include/configs/sandbox_spl.h @@ -8,8 +8,6 @@ #include <configs/sandbox.h> -#define CONFIG_SPL_BOARD_INIT - #define CONFIG_SPL_FRAMEWORK #endif diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index c39bb24420..7a120ed5a6 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -159,14 +159,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#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 - /* * Default environment variables */ @@ -219,7 +211,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 69073e8a66..2186f21f7a 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -18,7 +18,6 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_JFFS2 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index a111057313..9d2c106d46 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -90,13 +90,13 @@ /* * SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */ #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index bc1eba32ff..995f76a1ea 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -16,7 +16,6 @@ /* #define CONFIG_T_SH7706LSR 1 */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5bb471c8f6..9161867675 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -127,7 +127,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index e09dfe6dd3..1236da724e 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -233,7 +233,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/sniper.h b/include/configs/sniper.h index c56169dcff..6b065c9dc7 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -87,7 +87,6 @@ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index da7e4ada49..bdc6512959 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -307,9 +307,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE -#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) -#define CONFIG_SPL_BOARD_INIT -#endif /* SPL SDMMC boot support */ #ifdef CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index e208f45649..251dd0e901 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -12,8 +12,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG -#define CONFIG_CMD_EEPROM - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 76b4038d50..bfd4e5fe3f 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -210,13 +210,6 @@ /* I2C W83782G HW-Monitoring IC */ #define CONFIG_SYS_I2C_W83782G_ADDR 0x28 /* W83782G address */ -/* I2C temp sensor */ -/* Socrates uses Maxim's DS75, which is compatible with LM75 */ -#define CONFIG_DTT_LM75 1 -#define CONFIG_DTT_SENSORS {4} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 125 -#define CONFIG_SYS_DTT_LOW_TEMP -55 -#define CONFIG_SYS_DTT_HYSTERESIS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* @@ -286,8 +279,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM #define CONFIG_CMD_SDRAM #define CONFIG_CMD_REGINFO diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 75fd27a373..86e14ffac8 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -97,7 +97,6 @@ * Command support defines */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES /* diff --git a/include/configs/strider.h b/include/configs/strider.h index 1298808b13..994ac73e13 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_ALT_MEMTEST -#define CONFIG_CMD_FPGAD -#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 997a92c8be..f042f0d0c2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -32,6 +32,10 @@ # define CONFIG_MACH_TYPE_COMPAT_REV 1 #endif +#ifdef CONFIG_ARM64 +#define CONFIG_BUILD_TARGET "u-boot.itb" +#endif + /* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ @@ -185,12 +189,17 @@ #endif #ifdef CONFIG_SUNXI_HIGH_SRAM -#define CONFIG_SPL_TEXT_BASE 0x10040 /* sram start+header */ -#define CONFIG_SPL_MAX_SIZE 0x7fc0 /* 32 KiB */ +#define CONFIG_SPL_TEXT_BASE 0x10060 /* sram start+header */ +#define CONFIG_SPL_MAX_SIZE 0x7fa0 /* 32 KiB */ +#ifdef CONFIG_ARM64 +/* end of SRAM A2 for now, as SRAM A1 is pretty tight for an ARM64 build */ +#define LOW_LEVEL_SRAM_STACK 0x00054000 +#else #define LOW_LEVEL_SRAM_STACK 0x00018000 +#endif /* !CONFIG_ARM64 */ #else -#define CONFIG_SPL_TEXT_BASE 0x40 /* sram start+header */ -#define CONFIG_SPL_MAX_SIZE 0x5fc0 /* 24KB on sun4i/sun7i */ +#define CONFIG_SPL_TEXT_BASE 0x60 /* sram start+header */ +#define CONFIG_SPL_MAX_SIZE 0x5fa0 /* 24KB on sun4i/sun7i */ #define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */ #endif diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index 964115f980..ed5aaa2a63 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_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 55b8e3ebfc..260cdee001 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -241,8 +241,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 34ce122489..0b87c9ca97 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -71,7 +71,6 @@ /* commands to include */ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 @@ -170,7 +169,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_CONSOLE #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index ae6c768c22..f994d2dbf3 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -244,7 +244,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 4505be8eaf..bed2a5c3c0 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -246,7 +246,6 @@ #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_MAX_SIZE (3 * SZ_512) -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 9720a09b32..84ca1c443e 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -69,7 +69,6 @@ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_HDMIDETECT #endif /* PCI */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 5107a1f609..6982eaa1af 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -87,11 +87,8 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_CMD_ENTERRCM - /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 2a671e84ec..27cae9d528 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SATA /* diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 60322b1938..a4066a8494 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -156,8 +156,6 @@ #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT - /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 51b09d4b56..2303970d88 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -122,8 +122,6 @@ #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT - #define CONFIG_SYS_TEXT_BASE 0x80800000 #define CONFIG_SYS_SPL_MALLOC_START 0x80208000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 1561d54c9a..0bd3c9f94c 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -216,7 +216,6 @@ #endif /* General parts of the framework, required. */ -#define CONFIG_SPL_BOARD_INIT #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 868464cd32..3161c50abb 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -208,7 +208,6 @@ /* U-Boot command configuration */ #define CONFIG_CMD_SAVES #define CONFIG_CMD_UBIFS -#define CONFIG_CMD_EEPROM /* U-Boot general configuration */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 23160bd88d..a28922585c 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -44,10 +44,6 @@ #undef CONFIG_SPL_FPGA_SUPPORT /* FPGA commands that we don't use */ -#undef CONFIG_CMD_FPGA_LOADMK -#undef CONFIG_CMD_FPGA_LOADP -#undef CONFIG_CMD_FPGA_LOADBP -#undef CONFIG_CMD_FPGA_LOADFS /* Extras */ #define CONFIG_CMD_MEMTEST diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index d39dd92198..fc99dbd91e 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -36,7 +36,6 @@ "console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" #define CONFIG_BOOTCOMMAND \ "dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr" -#define CONFIG_LZMA #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 738693c0c0..0b362559f2 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -57,19 +57,11 @@ #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_SPEED 100000 -/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM75 -#define CONFIG_DTT_MAX_TEMP 70 -#define CONFIG_DTT_MIN_TEMP -30 -#define CONFIG_DTT_HYSTERESIS 3 -#define CONFIG_CMD_DTT - /* I2C EEPROM (M24C64) */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS 5 /* 32 Bytes */ #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS 20 -#define CONFIG_CMD_EEPROM #define CONFIG_POWER #define CONFIG_POWER_I2C @@ -371,8 +363,5 @@ #endif /* Support at least the sensor on TQMa6 SOM */ -#if !defined(CONFIG_DTT_SENSORS) -#define CONFIG_DTT_SENSORS { 0 } -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 3d6e4383e1..69e9079339 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_TQMA6_MBA6_H #define __CONFIG_TQMA6_MBA6_H -#define CONFIG_DTT_SENSORS { 0, 1 } - #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index b9cc5d632f..4ab4c6559d 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -7,10 +7,6 @@ #ifndef __CONFIG_TQMA6_WRU4_H #define __CONFIG_TQMA6_WRU4_H -/* DTT sensors */ -#define CONFIG_DTT_SENSORS { 0, 1 } -#define CONFIG_SYS_DTT_BUS_NUM 2 - /* Ethernet */ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 8fe4165a77..d18a333d01 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -66,7 +66,6 @@ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_BUS_NUM 1 @@ -105,8 +104,6 @@ #define CONFIG_CMD_UBIFS /* UBIFS commands */ #define CONFIG_LZO /* LZO is needed for UBIFS */ -#undef CONFIG_CMD_JFFS2 /* JFFS2 Support */ - /* needed for ubi */ #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ @@ -273,7 +270,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_SIMPLE -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/twister.h b/include/configs/twister.h index a7de75ec6f..94dde90e60 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -43,6 +43,5 @@ 0x600000) #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_SPL_BOARD_INIT #endif /* __CONFIG_H */ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 6271b07766..bc57e8a73a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -289,8 +289,6 @@ #define CONFIG_SPL_BOARD_LOAD_IMAGE #endif -#define CONFIG_SPL_BOARD_INIT - #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 /* subtract sizeof(struct image_header) */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f725b79cd4..e25bf99e1c 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ /* Fuse */ -#define CONFIG_CMD_FUSE #define CONFIG_FSL_IIM /* U-Boot memory offsets */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 0bc0ae517a..2bd6cc11ae 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,9 +73,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/vct.h b/include/configs/vct.h index b1dccdf666..7b04e65d70 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -77,7 +77,6 @@ /* * Commands */ -#define CONFIG_CMD_EEPROM /* * Only Premium/Platinum have ethernet support right now @@ -235,7 +234,6 @@ int vct_gpio_get(int pin); */ #if defined(CONFIG_VCT_ONENAND) #define CONFIG_SYS_USE_UBI -#define CONFIG_CMD_JFFS2 #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS @@ -254,10 +252,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_IRQ -#undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_STRINGS #undef CONFIG_CMD_TERMINAL diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index ae13246478..11cb53587c 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,7 +125,6 @@ #endif /*#define CONFIG_MENU_SHOW*/ -#define CONFIG_CMD_ENV /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 3e7dc9b685..2460294d88 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -20,7 +20,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index ae18bd6338..1aed81fc14 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -351,10 +351,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_ENV -#endif - /* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0 diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 3e0ea71e69..2a6c6fbb70 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -74,7 +74,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #endif diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index eb42d8c347..bab7fdf93c 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -22,7 +22,6 @@ */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm1136/u-boot-spl.lds" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_TEXT_BASE 0x10002300 #define CONFIG_SPL_MAX_SIZE (64 * 1024) /* 8 KB for stack */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 82f4af9c93..56f53b9732 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -74,7 +74,6 @@ * I2C EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x56 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 @@ -85,14 +84,6 @@ #define CONFIG_RTC_DS1374 /* - * I2C Temperature Sensor (DTT) - */ - -#define CONFIG_CMD_DTT -#define CONFIG_DTT_SENSORS { 0, 1 } -#define CONFIG_DTT_DS620 - -/* * U-Boot General Configurations */ #define CONFIG_SYS_LONGHELP @@ -143,7 +134,6 @@ #define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 100000 #define CONFIG_CMD_MAX6957 -#define CONFIG_CMD_HD44760 /* * Environment */ @@ -173,7 +163,6 @@ #define CONFIG_SPL_TEXT_BASE 0x00000000 /* SPL will use SRAM as stack */ #define CONFIG_SPL_STACK 0x0000FFF8 -#define CONFIG_SPL_BOARD_INIT /* Use the framework and generic lib */ #define CONFIG_SPL_FRAMEWORK /* SPL will use serial */ diff --git a/include/configs/x600.h b/include/configs/x600.h index bf6fafce98..c7d32fedb3 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -106,8 +106,6 @@ /* * Command support defines */ -#define CONFIG_CMD_ENV -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_SAVES diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 29be55a840..b5ef8b5c56 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,11 +70,7 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_CMD_IO -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI -#define CONFIG_CMD_GETTIME #define CONFIG_SCSI #define CONFIG_CMD_ZBOOT diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index ea4b739d0b..e8a0c1c33d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -24,12 +24,8 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) /*Cmd*/ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS -#undef CONFIG_CMD_DTT -#undef CONFIG_CMD_EEPROM /*Misc*/ #define CONFIG_SYS_LONGHELP /* undef to save memory */ @@ -78,7 +74,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO 1 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_PROTECTION -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 30b5b34520..1b43620540 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -52,7 +52,6 @@ { 4800, 9600, 19200, 38400, 57600, 115200 } /* Command line configuration */ -#define CONFIG_CMD_ENV #define CONFIG_MP /* BOOTP options */ @@ -184,7 +183,6 @@ /* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 @@ -271,7 +269,6 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT /* u-boot is like dtb */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin" diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 8d018da23e..4194b66c66 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -44,7 +44,6 @@ #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_EEPROM_BUS 5 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0x20 diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 2a7a48d21d..93afb2062f 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,9 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI /* diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 447fd9557a..07f26544fd 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -87,17 +87,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY |\ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ - CONFIG_SYS_I2C_DS4510_ADDR, \ - CONFIG_SYS_I2C_EEPROM_ADDR, \ - CONFIG_SYS_I2C_LM90_ADDR, \ - CONFIG_SYS_I2C_PCA9553_ADDR, \ - CONFIG_SYS_I2C_PCA953X_ADDR0, \ - CONFIG_SYS_I2C_PCA953X_ADDR1, \ - CONFIG_SYS_I2C_PCA953X_ADDR2, \ - CONFIG_SYS_I2C_PCA953X_ADDR3, \ - CONFIG_SYS_I2C_PEX8518_ADDR, \ - CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5170 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50} @@ -232,9 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 /* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 -#define CONFIG_DTT_DS1621 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM90_ADDR 0x4c /* I2C EEPROM - AT24C128B */ @@ -248,10 +234,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000 -/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 @@ -502,12 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO -#define CONFIG_CMD_DTT -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index ffc0d009ba..2645006b37 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,8 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 48f07b08c0..abbaeaad10 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -81,16 +81,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ - CONFIG_SYS_I2C_DS4510_ADDR, \ - CONFIG_SYS_I2C_EEPROM_ADDR, \ - CONFIG_SYS_I2C_LM90_ADDR, \ - CONFIG_SYS_I2C_PCA953X_ADDR0, \ - CONFIG_SYS_I2C_PCA953X_ADDR1, \ - CONFIG_SYS_I2C_PCA953X_ADDR2, \ - CONFIG_SYS_I2C_PCA953X_ADDR3, \ - CONFIG_SYS_I2C_PEX8518_ADDR, \ - CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5370 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50} @@ -229,9 +219,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 /* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 -#define CONFIG_DTT_DS1621 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM90_ADDR 0x4c /* I2C EEPROM - AT24C128B */ @@ -245,10 +232,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000 -/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 @@ -354,11 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO -#define CONFIG_CMD_DTT -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index ad4247ab48..254fc12cf6 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -219,8 +219,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100 /* I2C DS7505 temperature sensor */ -#define CONFIG_DTT_LM75 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM75_ADDR 0x48 /* I2C ADT7461 temperature sensor */ @@ -338,9 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DTT -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 77648d78bc..d9c09b80cd 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -131,14 +131,6 @@ #define CONFIG_ENV_OFFSET 0x0 #endif /* CONFIG_ENV_IS_IN_EEPROM */ -/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#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 - /* * Default environment variables */ @@ -184,7 +176,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #ifdef CONFIG_440EP diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 841cc6dbb2..9b3769b5f1 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -42,7 +42,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SYS_TEXT_BASE 0x0 -#define CONFIG_LZMA /* LZMA compression support */ /* * Serial Console Configuration @@ -54,7 +53,6 @@ /* * Bootloader Components Configuration */ -#define CONFIG_CMD_ENV /* * MMC Card Configuration diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 51edd463a1..df4765c076 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -145,7 +145,6 @@ /* EEPROM */ #ifdef CONFIG_ZYNQ_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 @@ -260,10 +259,6 @@ #define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_ZYNQPL -#define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_CMD_FPGA_LOADP -#define CONFIG_CMD_FPGA_LOADBP -#define CONFIG_CMD_FPGA_LOADFS /* FIT support */ #define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */ @@ -284,7 +279,6 @@ /* SPL part */ #define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds" diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 1488fd8b2f..808967cee3 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -14,7 +14,6 @@ #define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA #define CONFIG_DISPLAY diff --git a/include/ds4510.h b/include/ds4510.h deleted file mode 100644 index e54db35265..0000000000 --- a/include/ds4510.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#ifndef __DS4510_H_ -#define __DS4510_H_ - -/* General defines */ -#define DS4510_NUM_IO 0x04 -#define DS4510_IO_MASK ((1 << DS4510_NUM_IO) - 1) -#define DS4510_EEPROM_PAGE_WRITE_DELAY_MS 20 - -/* EEPROM from 0x00 - 0x39 */ -#define DS4510_EEPROM 0x00 -#define DS4510_EEPROM_SIZE 0x40 -#define DS4510_EEPROM_PAGE_SIZE 0x08 -#define DS4510_EEPROM_PAGE_OFFSET(x) ((x) & (DS4510_EEPROM_PAGE_SIZE - 1)) - -/* SEEPROM from 0xf0 - 0xf7 */ -#define DS4510_SEEPROM 0xf0 -#define DS4510_SEEPROM_SIZE 0x08 - -/* Registers overlapping SEEPROM from 0xf0 - 0xf7 */ -#define DS4510_PULLUP 0xF0 -#define DS4510_PULLUP_DIS 0x00 -#define DS4510_PULLUP_EN 0x01 -#define DS4510_RSTDELAY 0xF1 -#define DS4510_RSTDELAY_MASK 0x03 -#define DS4510_RSTDELAY_125 0x00 -#define DS4510_RSTDELAY_250 0x01 -#define DS4510_RSTDELAY_500 0x02 -#define DS4510_RSTDELAY_1000 0x03 -#define DS4510_IO3 0xF4 -#define DS4510_IO2 0xF5 -#define DS4510_IO1 0xF6 -#define DS4510_IO0 0xF7 - -/* Status configuration registers from 0xf8 - 0xf9*/ -#define DS4510_IO_STATUS 0xF8 -#define DS4510_CFG 0xF9 -#define DS4510_CFG_READY 0x80 -#define DS4510_CFG_TRIP_POINT 0x40 -#define DS4510_CFG_RESET 0x20 -#define DS4510_CFG_SEE 0x10 -#define DS4510_CFG_SWRST 0x08 - -/* SRAM from 0xfa - 0xff */ -#define DS4510_SRAM 0xfa -#define DS4510_SRAM_SIZE 0x06 - -int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_see_write(uint8_t chip, uint8_t nv); -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay); -int ds4510_pullup_write(uint8_t chip, uint8_t val); -int ds4510_pullup_read(uint8_t chip); -int ds4510_gpio_write(uint8_t chip, uint8_t val); -int ds4510_gpio_read(uint8_t chip); -int ds4510_gpio_read_val(uint8_t chip); - -#endif /* __DS4510_H_ */ diff --git a/include/dtt.h b/include/dtt.h deleted file mode 100644 index 173159dc62..0000000000 --- a/include/dtt.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Digital Thermometers and Thermostats. - */ -#ifndef _DTT_H_ -#define _DTT_H_ - -#if defined(CONFIG_DTT_ADM1021) || \ - defined(CONFIG_DTT_ADT7460) || \ - defined(CONFIG_DTT_DS1621) || \ - defined(CONFIG_DTT_DS1775) || \ - defined(CONFIG_DTT_DS620) || \ - defined(CONFIG_DTT_LM63) || \ - defined(CONFIG_DTT_LM73) || \ - defined(CONFIG_DTT_LM75) || \ - defined(CONFIG_DTT_LM81) - -#define CONFIG_DTT /* We have a DTT */ - -#ifndef CONFIG_DTT_ADM1021 -#define DTT_COMMERCIAL_MAX_TEMP 70 /* 0 - +70 C */ -#define DTT_INDUSTRIAL_MAX_TEMP 85 /* -40 - +85 C */ -#define DTT_AUTOMOTIVE_MAX_TEMP 105 /* -40 - +105 C */ - -#ifndef CONFIG_SYS_DTT_MAX_TEMP -#define CONFIG_SYS_DTT_MAX_TEMP DTT_COMMERCIAL_MAX_TEMP -#endif - -#ifndef CONFIG_SYS_DTT_HYSTERESIS -#define CONFIG_SYS_DTT_HYSTERESIS 5 /* 5 C */ -#endif -#endif /* CONFIG_DTT_ADM1021 */ - -extern void dtt_init(void); -extern int dtt_init_one(int); -extern int dtt_read(int sensor, int reg); -extern int dtt_write(int sensor, int reg, int val); -extern int dtt_get_temp(int sensor); -#endif - -#endif /* _DTT_H_ */ diff --git a/include/i2c.h b/include/i2c.h index a88cc7cddf..2c1643d650 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -571,9 +571,6 @@ void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs); #if !defined(CONFIG_SYS_RTC_BUS_NUM) #define CONFIG_SYS_RTC_BUS_NUM 0 #endif -#if !defined(CONFIG_SYS_DTT_BUS_NUM) -#define CONFIG_SYS_DTT_BUS_NUM 0 -#endif #if !defined(CONFIG_SYS_SPD_BUS_NUM) #define CONFIG_SYS_SPD_BUS_NUM 0 #endif diff --git a/include/image.h b/include/image.h index 3f26f9bd1f..8d380e0e84 100644 --- a/include/image.h +++ b/include/image.h @@ -29,6 +29,9 @@ struct lmb; #define IMAGE_ENABLE_FIT 1 #define IMAGE_ENABLE_OF_LIBFDT 1 #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ +#define CONFIG_FIT_ENABLE_SHA256_SUPPORT +#define CONFIG_SHA1 +#define CONFIG_SHA256 #define IMAGE_ENABLE_IGNORE 0 #define IMAGE_INDENT_STRING "" @@ -62,24 +65,13 @@ struct lmb; # ifdef CONFIG_SPL_SHA1_SUPPORT # define IMAGE_ENABLE_SHA1 1 # endif -# ifdef CONFIG_SPL_SHA256_SUPPORT -# define IMAGE_ENABLE_SHA256 1 -# endif # else # define CONFIG_CRC32 /* FIT images need CRC32 support */ -# define CONFIG_SHA1 /* and SHA1 */ -# define CONFIG_SHA256 /* and SHA256 */ # define IMAGE_ENABLE_CRC32 1 # define IMAGE_ENABLE_MD5 1 # define IMAGE_ENABLE_SHA1 1 -# define IMAGE_ENABLE_SHA256 1 # endif -#ifdef CONFIG_FIT_DISABLE_SHA256 -#undef CONFIG_SHA256 -#undef IMAGE_ENABLE_SHA256 -#endif - #ifndef IMAGE_ENABLE_CRC32 #define IMAGE_ENABLE_CRC32 0 #endif @@ -92,7 +84,10 @@ struct lmb; #define IMAGE_ENABLE_SHA1 0 #endif -#ifndef IMAGE_ENABLE_SHA256 +#if defined(CONFIG_FIT_ENABLE_SHA256_SUPPORT) || \ + defined(CONFIG_SPL_SHA256_SUPPORT) +#define IMAGE_ENABLE_SHA256 1 +#else #define IMAGE_ENABLE_SHA256 0 #endif diff --git a/include/pcmcia.h b/include/pcmcia.h index c8a730c4d0..aaaf6511a8 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -16,7 +16,7 @@ * or try to generate a useful default */ #if defined(CONFIG_CMD_PCMCIA) || \ - (defined(CONFIG_CMD_IDE) && \ + (defined(CONFIG_IDE) && \ (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) ) #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) @@ -268,7 +268,7 @@ extern u_int *pcmcia_pgcrx[]; #define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot]) #endif -#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD) extern int check_ide_device(int slot); #endif diff --git a/include/tws.h b/include/tws.h deleted file mode 100644 index 7dd5268125..0000000000 --- a/include/tws.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * (C) Copyright 2009 - * Detlev Zundel, DENX Software Engineering, dzu@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _TWS_H_ -#define _TWS_H_ - -/* - * Read/Write interface: - * buffer: Where to read/write the data - * len: How many bits to read/write - * - * Returns: 0 on success, not 0 on failure - */ -int tws_read(uchar *buffer, int len); -int tws_write(uchar *buffer, int len); - -#endif /* _TWS_H_ */ |