This option is only used in one driver and two boards. It does not seem worth having the ability to remove this part of the support.

Drop the option.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

README | 1 - drivers/misc/ds4510.c | 8 -------- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 12 deletions(-)

diff --git a/README b/README index 864bf8bc22..3eb2be8922 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_INFO * ds4510 I2C info command CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index d7c9bd73c8..940e2ce6a0 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -186,7 +186,6 @@ int ds4510_gpio_read_val(uint8_t chip) }

#ifdef CONFIG_CMD_DS4510 -#ifdef CONFIG_CMD_DS4510_INFO /* * Display DS4510 information */ @@ -240,7 +239,6 @@ static int ds4510_info(uint8_t chip)

return 0; } -#endif /* CONFIG_CMD_DS4510_INFO */

cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)DS4510_CMD_DEVICE, "", ""), @@ -248,9 +246,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(output, 4, 0, (void *)DS4510_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), -#ifdef CONFIG_CMD_DS4510_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#endif #ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), #endif @@ -324,10 +320,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else tmp &= ~(1 << ul_arg2); return ds4510_pullup_write(chip, tmp); -#ifdef CONFIG_CMD_DS4510_INFO case DS4510_CMD_INFO: return ds4510_info(chip); -#endif #ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); @@ -378,10 +372,8 @@ U_BOOT_CMD( "ds4510 eeprom/seeprom/sram/gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_DS4510_INFO "ds4510 info\n" " - display ds4510 info\n" -#endif "ds4510 output pin 0|1\n" " - set pin low or high-Z\n" "ds4510 input pin\n" diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 447fd9557a..dae61b11e4 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -503,7 +503,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 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 48f07b08c0..ce1ff86135 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -355,7 +355,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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 33501859d6..323118c701 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_INFO CONFIG_CMD_DS4510_MEM CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT

This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support.

Drop the option.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

README | 1 - drivers/misc/ds4510.c | 6 ------ scripts/config_whitelist.txt | 1 - 3 files changed, 8 deletions(-)

diff --git a/README b/README index 142de27b98..455d0d293a 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 936fb3ead4..c08a0bee63 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -247,9 +247,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), -#endif U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""), U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""), U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), @@ -318,10 +316,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return ds4510_pullup_write(chip, tmp); case DS4510_CMD_INFO: return ds4510_info(chip); -#ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); -#endif case DS4510_CMD_EEPROM: end = DS4510_EEPROM + DS4510_EEPROM_SIZE; off = DS4510_EEPROM; @@ -374,11 +370,9 @@ U_BOOT_CMD( " - disable/enable pullup on specified pin\n" "ds4510 nv 0|1\n" " - make gpio and seeprom writes volatile/non-volatile" -#ifdef CONFIG_CMD_DS4510_RST "\n" "ds4510 rstdelay 0-3\n" " - set reset output delay" -#endif "\n" "ds4510 eeprom read addr off cnt\n" "ds4510 eeprom write addr off cnt\n" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index be563df885..956b5faced 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG

This converts the following to Kconfig: CONFIG_DS4510

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

README | 1 - configs/xpedite517x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + drivers/misc/Kconfig | 8 ++++++++ include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README b/README index 455d0d293a..0ef706f78d 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32 * crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DS4510 * ds4510 I2C gpio commands CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 909efb1c08..69fd8fa004 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 41dee5d839..641ef8ff09 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_SYS_FSL_DDR2=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1aae4bcd07..ecca159d14 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -75,6 +75,14 @@ config CROS_EC_SPI provides a faster and more robust interface than I2C but the bugs are less interesting.

+config DS4510 + bool "Enable support for DS4510 CPU supervisor" + help + Enable support for the Maxim DS4510 CPU supervisor. It has an + integrated 64-byte EEPROM, four programmable non-volatile I/O pins + and a configurable timer for the supervisor function. The device is + connected over I2C. + config FSL_SEC_MON bool "Enable FSL SEC_MON Driver" help diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 822f70e7ac..bd1d0c75d9 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -249,7 +249,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000

/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR 0x51

/* GPIO */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index a12a3f8347..a290cf3463 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -246,7 +246,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000

/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR 0x51

/* GPIO */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9e7d2ad75b..86f90539ee 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -682,7 +682,6 @@ CONFIG_DRIVE_MMC CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB -CONFIG_DS4510 CONFIG_DSP_CLUSTER_START CONFIG_DTT CONFIG_DTT_AD7414

This subsystem has not been converted to driver model, there is only one driver and only one board that uses it. Drop it and its CONFIG option.

Also drop the rtc4543 RTC driver since it uses TWS.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

configs/inka4x0_defconfig | 1 - drivers/Makefile | 1 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc4543.c | 101 ------------------------------------------- drivers/twserial/Makefile | 8 ---- drivers/twserial/soft_tws.c | 94 ---------------------------------------- include/configs/inka4x0.h | 80 ---------------------------------- include/tws.h | 21 --------- scripts/config_whitelist.txt | 2 - 9 files changed, 309 deletions(-) delete mode 100644 drivers/rtc/rtc4543.c delete mode 100644 drivers/twserial/Makefile delete mode 100644 drivers/twserial/soft_tws.c delete mode 100644 include/tws.h

diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig index 174719c367..9b30244e3c 100644 --- a/configs/inka4x0_defconfig +++ b/configs/inka4x0_defconfig @@ -8,7 +8,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y diff --git a/drivers/Makefile b/drivers/Makefile index 691642023d..25e42362ce 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -86,7 +86,6 @@ obj-y += spmi/ obj-y += sysreset/ obj-y += timer/ obj-y += tpm/ -obj-y += twserial/ obj-y += video/ obj-y += watchdog/ obj-$(CONFIG_QE) += qe/ diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 87c3d9cae2..438681da7a 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -48,7 +48,6 @@ obj-$(CONFIG_RTC_PCF2127) += pcf2127.o obj-$(CONFIG_RTC_PL031) += pl031.o obj-$(CONFIG_RTC_PT7C4338) += pt7c4338.o obj-$(CONFIG_RTC_RS5C372A) += rs5c372.o -obj-$(CONFIG_RTC_RTC4543) += rtc4543.o obj-$(CONFIG_RTC_RV3029) += rv3029.o obj-$(CONFIG_RTC_RX8025) += rx8025.o obj-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o diff --git a/drivers/rtc/rtc4543.c b/drivers/rtc/rtc4543.c deleted file mode 100644 index 8d36edd65a..0000000000 --- a/drivers/rtc/rtc4543.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * (C) Copyright 2008, 2009 - * Andreas Pfefferle, DENX Software Engineering, ap@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <asm/io.h> -#include <common.h> -#include <command.h> -#include <config.h> -#include <rtc.h> -#include <tws.h> - -#if defined(CONFIG_CMD_DATE) - -/* - * Note: The acrobatics below is due to the hideously ingenius idea of - * the chip designers. As the chip does not allow register - * addressing, all values need to be read and written in one go. Sure - * enough, the 'wday' field (0-6) is transferred using the economic - * number of 4 bits right in the middle of the packet..... - */ - -int rtc_get(struct rtc_time *tm) -{ - int rel = 0; - uchar buffer[7]; - - memset(buffer, 0, 7); - - /* Read 52 bits into our buffer */ - tws_read(buffer, 52); - - tm->tm_sec = bcd2bin( buffer[0] & 0x7F); - tm->tm_min = bcd2bin( buffer[1] & 0x7F); - tm->tm_hour = bcd2bin( buffer[2] & 0x3F); - tm->tm_wday = bcd2bin( buffer[3] & 0x07); - tm->tm_mday = bcd2bin((buffer[3] & 0xF0) >> 4 | (buffer[4] & 0x0F) << 4); - tm->tm_mon = bcd2bin((buffer[4] & 0x30) >> 4 | (buffer[5] & 0x0F) << 4); - tm->tm_year = bcd2bin((buffer[5] & 0xF0) >> 4 | (buffer[6] & 0x0F) << 4) + 2000; - tm->tm_yday = 0; - tm->tm_isdst = 0; - - if (tm->tm_sec & 0x80) { - puts("### Warning: RTC Low Voltage - date/time not reliable\n"); - rel = -1; - } - - debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", - tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - return rel; -} - -int rtc_set(struct rtc_time *tm) -{ - uchar buffer[7]; - uchar tmp; - - debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", - tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - memset(buffer, 0, 7); - buffer[0] = bin2bcd(tm->tm_sec); - buffer[1] = bin2bcd(tm->tm_min); - buffer[2] = bin2bcd(tm->tm_hour); - buffer[3] = bin2bcd(tm->tm_wday); - tmp = bin2bcd(tm->tm_mday); - buffer[3] |= (tmp & 0x0F) << 4; - buffer[4] = (tmp & 0xF0) >> 4; - tmp = bin2bcd(tm->tm_mon); - buffer[4] |= (tmp & 0x0F) << 4; - buffer[5] = (tmp & 0xF0) >> 4; - tmp = bin2bcd(tm->tm_year % 100); - buffer[5] |= (tmp & 0x0F) << 4; - buffer[6] = (tmp & 0xF0) >> 4; - - /* Write the resulting 52 bits to device */ - tws_write(buffer, 52); - - return 0; -} - -void rtc_reset(void) -{ - struct rtc_time tmp; - - tmp.tm_sec = 0; - tmp.tm_min = 0; - tmp.tm_hour = 0; - tmp.tm_wday = 4; - tmp.tm_mday = 1; - tmp.tm_mon = 1; - tmp.tm_year = 2000; - rtc_set(&tmp); -} - -#endif diff --git a/drivers/twserial/Makefile b/drivers/twserial/Makefile deleted file mode 100644 index 7cc7c4de82..0000000000 --- a/drivers/twserial/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2009 -# Detlev Zundel, DENX Software Engineering, dzu@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SOFT_TWS) += soft_tws.o diff --git a/drivers/twserial/soft_tws.c b/drivers/twserial/soft_tws.c deleted file mode 100644 index d0bf93d902..0000000000 --- a/drivers/twserial/soft_tws.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * (C) Copyright 2009 - * Detlev Zundel, DENX Software Engineering, dzu@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#define TWS_IMPLEMENTATION -#include <common.h> - -/*=====================================================================*/ -/* Public Functions */ -/*=====================================================================*/ - -/*----------------------------------------------------------------------- - * Read bits - */ -int tws_read(uchar *buffer, int len) -{ - int rem = len; - uchar accu, shift; - - debug("tws_read: buffer %p len %d\n", buffer, len); - - /* Configure the data pin for input */ - tws_data_config_output(0); - - /* Disable WR, i.e. setup a read */ - tws_wr(0); - udelay(1); - - /* Rise CE */ - tws_ce(1); - udelay(1); - - for (; rem > 0; ) { - for (shift = 0, accu = 0; - (rem > 0) && (shift < 8); - rem--, shift++) { - tws_clk(1); - udelay(10); - accu |= (tws_data_read() << shift); /* LSB first */ - tws_clk(0); - udelay(10); - } - *buffer++ = accu; - } - - /* Lower CE */ - tws_ce(0); - - return len - rem; -} - - -/*----------------------------------------------------------------------- - * Write bits - */ -int tws_write(uchar *buffer, int len) -{ - int rem = len; - uchar accu, shift; - - debug("tws_write: buffer %p len %d\n", buffer, len); - - /* Configure the data pin for output */ - tws_data_config_output(1); - - /* Enable WR, i.e. setup a write */ - tws_wr(1); - udelay(1); - - /* Rise CE */ - tws_ce(1); - udelay(1); - - for (; rem > 0; ) { - for (shift = 0, accu = *buffer++; - (rem > 0) && (shift < 8); - rem--, shift++) { - tws_data(accu & 0x01); /* LSB first */ - tws_clk(1); - udelay(10); - tws_clk(0); - udelay(10); - accu >>= 1; - } - } - - /* Lower CE */ - tws_ce(0); - - return len - rem; -} diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 5ee9c2bcb4..3bdab3310b 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -219,86 +219,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/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_ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c185825a9a..5a9eae3b69 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2348,7 +2348,6 @@ CONFIG_RTC_MV CONFIG_RTC_MXS CONFIG_RTC_PCF8563 CONFIG_RTC_PT7C4338 -CONFIG_RTC_RTC4543 CONFIG_RTC_RV3029 CONFIG_RTC_RX8025 CONFIG_RTC_X1205 @@ -2581,7 +2580,6 @@ CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA CONFIG_SOFT_I2C_READ_REPEATED_START CONFIG_SOFT_SPI -CONFIG_SOFT_TWS CONFIG_SOURCE CONFIG_SPARSE_RCU_POINTER CONFIG_SPDDRAM_SILENT

This subsystem is quite old. It has been replaced with a driver-model version (UCLASS_THERMAL). Boards are free to convert to that if required, but here is a removal patch that could be applied in the meantime.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

README | 6 -- board/gdsys/405ep/dlvision-10g.c | 10 ++- board/gdsys/405ep/io.c | 10 ++- board/gdsys/405ep/neo.c | 10 ++- board/gdsys/405ex/io64.c | 10 ++- cmd/Makefile | 1 - cmd/dtt.c | 120 --------------------------- drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/hwmon/Kconfig | 0 drivers/hwmon/Makefile | 22 ----- drivers/hwmon/adm1021.c | 164 ------------------------------------- drivers/hwmon/adt7460.c | 73 ----------------- drivers/hwmon/ds1621.c | 155 ----------------------------------- drivers/hwmon/ds1722.c | 137 ------------------------------- drivers/hwmon/ds1775.c | 126 ---------------------------- drivers/hwmon/ds620.c | 65 --------------- drivers/hwmon/lm63.c | 160 ------------------------------------ drivers/hwmon/lm73.c | 146 --------------------------------- drivers/hwmon/lm75.c | 139 ------------------------------- drivers/hwmon/lm81.c | 111 ------------------------- include/config_cmd_all.h | 1 - include/configs/PMC440.h | 21 ----- include/configs/TQM834x.h | 8 -- include/configs/UCP1020.h | 21 ----- include/configs/acadia.h | 9 -- include/configs/canyonlands.h | 11 --- include/configs/dlvision-10g.h | 8 -- include/configs/dlvision.h | 1 - include/configs/exynos5-common.h | 2 - include/configs/intip.h | 8 -- include/configs/io.h | 6 -- include/configs/io64.h | 9 -- include/configs/katmai.h | 25 ------ include/configs/kilauea.h | 4 - include/configs/km/km-powerpc.h | 1 - include/configs/km/km83xx-common.h | 7 -- include/configs/km82xx.h | 7 -- include/configs/makalu.h | 5 -- include/configs/motionpro.h | 8 +- include/configs/neo.h | 8 -- include/configs/odroid_xu3.h | 1 - include/configs/sequoia.h | 9 -- include/configs/socrates.h | 8 -- include/configs/tqma6.h | 10 --- include/configs/tqma6_mba6.h | 2 - include/configs/tqma6_wru4.h | 4 - include/configs/work_92105.h | 8 -- include/configs/xilinx-ppc.h | 1 - include/configs/xpedite517x.h | 3 - include/configs/xpedite537x.h | 3 - include/configs/xpedite550x.h | 3 - include/configs/yosemite.h | 9 -- include/dtt.h | 47 ----------- include/i2c.h | 3 - scripts/config_whitelist.txt | 22 ----- 56 files changed, 35 insertions(+), 1736 deletions(-) delete mode 100644 cmd/dtt.c delete mode 100644 drivers/hwmon/Kconfig delete mode 100644 drivers/hwmon/Makefile delete mode 100644 drivers/hwmon/adm1021.c delete mode 100644 drivers/hwmon/adt7460.c delete mode 100644 drivers/hwmon/ds1621.c delete mode 100644 drivers/hwmon/ds1722.c delete mode 100644 drivers/hwmon/ds1775.c delete mode 100644 drivers/hwmon/ds620.c delete mode 100644 drivers/hwmon/lm63.c delete mode 100644 drivers/hwmon/lm73.c delete mode 100644 drivers/hwmon/lm75.c delete mode 100644 drivers/hwmon/lm81.c delete mode 100644 include/dtt.h

diff --git a/README b/README index b58911da49..3d45b29bd5 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32 * crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_EEPROM * EEPROM read/write support @@ -2324,11 +2323,6 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the RTC. If not defined, then U-Boot assumes that RTC is on I2C bus 0.

- CONFIG_SYS_DTT_BUS_NUM - - If defined, then this indicates the I2C bus number for the DTT. - If not defined, then U-Boot assumes that DTT is on I2C bus 0. - CONFIG_SOFT_I2C_READ_REPEATED_START

defining this will force the i2c_read() function in diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c index e400d1945a..b531786653 100644 --- a/board/gdsys/405ep/dlvision-10g.c +++ b/board/gdsys/405ep/dlvision-10g.c @@ -10,7 +10,6 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/ppc4xx-gpio.h> -#include <dtt.h>

#include "405ep.h" #include <gdsys_fpga.h> @@ -61,8 +60,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;

int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */

return 0; } diff --git a/board/gdsys/405ep/io.c b/board/gdsys/405ep/io.c index 81b49659ff..1484469bb0 100644 --- a/board/gdsys/405ep/io.c +++ b/board/gdsys/405ep/io.c @@ -11,7 +11,6 @@ #include <asm/io.h> #include <asm/ppc4xx-gpio.h>

-#include <dtt.h> #include <miiphy.h>

#include "405ep.h" @@ -41,8 +40,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;

int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */

return 0; } diff --git a/board/gdsys/405ep/neo.c b/board/gdsys/405ep/neo.c index ff0edb2547..ad88af2d46 100644 --- a/board/gdsys/405ep/neo.c +++ b/board/gdsys/405ep/neo.c @@ -10,7 +10,6 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/ppc4xx-gpio.h> -#include <dtt.h>

#include "405ep.h" #include <gdsys_fpga.h> @@ -32,8 +31,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;

int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */

return 0; } diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c index 0a7baaa9db..9ef965bbfa 100644 --- a/board/gdsys/405ex/io64.c +++ b/board/gdsys/405ex/io64.c @@ -26,7 +26,6 @@

#include <miiphy.h> #include <i2c.h> -#include <dtt.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -70,8 +69,13 @@ static inline void blank_string(int size) */ int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */

#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ diff --git a/cmd/Makefile b/cmd/Makefile index e98786807b..f043407656 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -43,7 +43,6 @@ ifdef CONFIG_POST obj-$(CONFIG_CMD_DIAG) += diag.o endif obj-$(CONFIG_CMD_DISPLAY) += display.o -obj-$(CONFIG_CMD_DTT) += dtt.o obj-$(CONFIG_CMD_ECHO) += echo.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o obj-$(CONFIG_CMD_EEPROM) += eeprom.o diff --git a/cmd/dtt.c b/cmd/dtt.c deleted file mode 100644 index dd427a3d0b..0000000000 --- a/cmd/dtt.c +++ /dev/null @@ -1,120 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <config.h> -#include <command.h> - -#include <dtt.h> -#include <i2c.h> -#include <tmu.h> -#include <linux/bug.h> - -#if defined CONFIG_DTT_SENSORS -static unsigned long sensor_initialized; - -static void _initialize_dtt(void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - - for (i = 0; i < sizeof(sensors); i++) { - if ((sensor_initialized & (1 << i)) == 0) { - if (dtt_init_one(sensors[i]) != 0) { - printf("DTT%d: Failed init!\n", i); - continue; - } - sensor_initialized |= (1 << i); - } - } -} - -void dtt_init(void) -{ - int old_bus; - - /* switch to correct I2C bus */ - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - - _initialize_dtt(); - - /* switch back to original I2C bus */ - I2C_SET_BUS(old_bus); -} -#endif - -int dtt_i2c(void) -{ -#if defined CONFIG_DTT_SENSORS - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - int old_bus; - - /* Force a compilation error, if there are more then 32 sensors */ - BUILD_BUG_ON(sizeof(sensors) > 32); - /* switch to correct I2C bus */ -#ifdef CONFIG_SYS_I2C - old_bus = i2c_get_bus_num(); - i2c_set_bus_num(CONFIG_SYS_DTT_BUS_NUM); -#else - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); -#endif - - _initialize_dtt(); - - /* - * Loop through sensors, read - * temperature, and output it. - */ - for (i = 0; i < sizeof(sensors); i++) - printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i])); - - /* switch back to original I2C bus */ -#ifdef CONFIG_SYS_I2C - i2c_set_bus_num(old_bus); -#else - I2C_SET_BUS(old_bus); -#endif -#endif - - return 0; -} - -int dtt_tmu(void) -{ -#if defined CONFIG_TMU_CMD_DTT - int cur_temp; - - /* Sense and return latest thermal info */ - if (tmu_monitor(&cur_temp) == TMU_STATUS_INIT) { - puts("TMU is in unknown state, temperature is invalid\n"); - return -1; - } - printf("Current temperature: %u degrees Celsius\n", cur_temp); -#endif - return 0; -} - -int do_dtt(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) -{ - int err = 0; - - err |= dtt_i2c(); - err |= dtt_tmu(); - - return err; -} /* do_dtt() */ - -/***************************************************/ - -U_BOOT_CMD( - dtt, 1, 1, do_dtt, - "Read temperature from Digital Thermometer and Thermostat", - "" -); diff --git a/drivers/Kconfig b/drivers/Kconfig index a5f24d72da..a736386a0d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -30,8 +30,6 @@ source "drivers/fpga/Kconfig"

source "drivers/gpio/Kconfig"

-source "drivers/hwmon/Kconfig" - source "drivers/i2c/Kconfig"

source "drivers/input/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 25e42362ce..fa4e61a31d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -74,7 +74,6 @@ obj-$(CONFIG_CPU) += cpu/ obj-y += crypto/ obj-y += firmware/ obj-$(CONFIG_FPGA) += fpga/ -obj-y += hwmon/ obj-y += misc/ obj-y += pcmcia/ obj-y += dfu/ diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile deleted file mode 100644 index b4fb057c16..0000000000 --- a/drivers/hwmon/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2001 -# Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -#ccflags-y += -DDEBUG - -obj-$(CONFIG_DTT_ADM1021) += adm1021.o -obj-$(CONFIG_DTT_ADT7460) += adt7460.o -obj-$(CONFIG_DTT_DS1621) += ds1621.o -obj-$(CONFIG_DTT_DS1722) += ds1722.o -obj-$(CONFIG_DTT_DS1775) += ds1775.o -obj-$(CONFIG_DTT_DS620) += ds620.o -obj-$(CONFIG_DTT_LM63) += lm63.o -obj-$(CONFIG_DTT_LM73) += lm73.o -obj-$(CONFIG_DTT_LM75) += lm75.o -obj-$(CONFIG_DTT_LM81) += lm81.o diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c deleted file mode 100644 index 99e942b499..0000000000 --- a/drivers/hwmon/adm1021.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * (C) Copyright 2003 - * Murray Jensen, CSIRO-MIT, Murray.Jensen@csiro.au - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Analog Devices's ADM1021 - * "Low Cost Microprocessor System Temperature Monitor" - */ - -#include <common.h> - -#include <i2c.h> -#include <dtt.h> - -#define DTT_READ_LOC_VALUE 0x00 -#define DTT_READ_REM_VALUE 0x01 -#define DTT_READ_STATUS 0x02 -#define DTT_READ_CONFIG 0x03 -#define DTT_READ_CONVRATE 0x04 -#define DTT_READ_LOC_HIGHLIM 0x05 -#define DTT_READ_LOC_LOWLIM 0x06 -#define DTT_READ_REM_HIGHLIM 0x07 -#define DTT_READ_REM_LOWLIM 0x08 -#define DTT_READ_DEVID 0xfe - -#define DTT_WRITE_CONFIG 0x09 -#define DTT_WRITE_CONVRATE 0x0a -#define DTT_WRITE_LOC_HIGHLIM 0x0b -#define DTT_WRITE_LOC_LOWLIM 0x0c -#define DTT_WRITE_REM_HIGHLIM 0x0d -#define DTT_WRITE_REM_LOWLIM 0x0e -#define DTT_WRITE_ONESHOT 0x0f - -#define DTT_STATUS_BUSY 0x80 /* 1=ADC Converting */ -#define DTT_STATUS_LHIGH 0x40 /* 1=Local High Temp Limit Tripped */ -#define DTT_STATUS_LLOW 0x20 /* 1=Local Low Temp Limit Tripped */ -#define DTT_STATUS_RHIGH 0x10 /* 1=Remote High Temp Limit Tripped */ -#define DTT_STATUS_RLOW 0x08 /* 1=Remote Low Temp Limit Tripped */ -#define DTT_STATUS_OPEN 0x04 /* 1=Remote Sensor Open-Circuit */ - -#define DTT_CONFIG_ALERT_MASKED 0x80 /* 0=ALERT Enabled, 1=ALERT Masked */ -#define DTT_CONFIG_STANDBY 0x40 /* 0=Run, 1=Standby */ - -#define DTT_ADM1021_DEVID 0x41 - -typedef - struct { - uint i2c_addr:7; /* 7bit i2c chip address */ - uint conv_rate:3; /* conversion rate */ - uint enable_alert:1; /* enable alert output pin */ - uint enable_local:1; /* enable internal temp sensor */ - uint max_local:8; /* internal temp maximum */ - uint min_local:8; /* internal temp minimum */ - uint enable_remote:1; /* enable remote temp sensor */ - uint max_remote:8; /* remote temp maximum */ - uint min_remote:8; /* remote temp minimum */ - } -dtt_cfg_t; - -dtt_cfg_t dttcfg[] = CONFIG_SYS_DTT_ADM1021; - -int -dtt_read (int sensor, int reg) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - uchar data; - - if (i2c_read(dcp->i2c_addr, reg, 1, &data, 1) != 0) - return -1; - - return (int)data; -} /* dtt_read() */ - -int -dtt_write (int sensor, int reg, int val) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - uchar data; - - data = (uchar)(val & 0xff); - - if (i2c_write(dcp->i2c_addr, reg, 1, &data, 1) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -int -dtt_init_one(int sensor) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - int reg, val; - - if (((sensor & 1) == 0 ? dcp->enable_local : dcp->enable_remote) == 0) - return 1; /* sensor is disabled (or rather ignored) */ - - /* - * Setup High Limit register - */ - if ((sensor & 1) == 0) { - reg = DTT_WRITE_LOC_HIGHLIM; - val = dcp->max_local; - } - else { - reg = DTT_WRITE_REM_HIGHLIM; - val = dcp->max_remote; - } - if (dtt_write (sensor, reg, val) != 0) - return 1; - - /* - * Setup Low Limit register - */ - if ((sensor & 1) == 0) { - reg = DTT_WRITE_LOC_LOWLIM; - val = dcp->min_local; - } - else { - reg = DTT_WRITE_REM_LOWLIM; - val = dcp->min_remote; - } - if (dtt_write (sensor, reg, val) != 0) - return 1; - - /* shouldn't hurt if the rest gets done twice */ - - /* - * Setup Conversion Rate register - */ - if (dtt_write (sensor, DTT_WRITE_CONVRATE, dcp->conv_rate) != 0) - return 1; - - /* - * Setup configuraton register - */ - val = 0; /* running */ - if (dcp->enable_alert == 0) - val |= DTT_CONFIG_ALERT_MASKED; /* mask ALERT pin */ - if (dtt_write (sensor, DTT_WRITE_CONFIG, val) != 0) - return 1; - - return 0; -} /* dtt_init_one() */ - -int -dtt_get_temp (int sensor) -{ - signed char val; - - if ((sensor & 1) == 0) - val = dtt_read(sensor, DTT_READ_LOC_VALUE); - else - val = dtt_read(sensor, DTT_READ_REM_VALUE); - - return (int) val; -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c deleted file mode 100644 index 9b2c5b69ce..0000000000 --- a/drivers/hwmon/adt7460.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de Madrid, ricardo.ribalda@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -#define ADT7460_ADDRESS 0x2c -#define ADT7460_INVALID 128 -#define ADT7460_CONFIG 0x40 -#define ADT7460_REM1_TEMP 0x25 -#define ADT7460_LOCAL_TEMP 0x26 -#define ADT7460_REM2_TEMP 0x27 - -int dtt_read(int sensor, int reg) -{ - u8 dir = reg; - u8 data; - - if (i2c_read(ADT7460_ADDRESS, dir, 1, &data, 1) == -1) - return -1; - if (data == ADT7460_INVALID) - return -1; - - return data; -} - -int dtt_write(int sensor, int reg, int val) -{ - u8 dir = reg; - u8 data = val; - - if (i2c_write(ADT7460_ADDRESS, dir, 1, &data, 1) == -1) - return -1; - - return 0; -} - -int dtt_init_one(int sensor) -{ - printf("ADT7460 at I2C address 0x%2x\n", ADT7460_ADDRESS); - - if (dtt_write(0, ADT7460_CONFIG, 1) == -1) { - puts("Error initialiting ADT7460\n"); - return -1; - } - - return 0; -} - -int dtt_get_temp(int sensor) -{ - int aux; - u8 table[] = - { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; - - if (sensor > 2) { - puts("DTT sensor does not exist\n"); - return -1; - } - - aux = dtt_read(0, table[sensor]); - if (aux == -1) { - puts("DTT temperature read failed\n"); - return -1; - } - - return aux; -} diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c deleted file mode 100644 index 66947a664e..0000000000 --- a/drivers/hwmon/ds1621.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1621/1631 Digital Thermometer and Thermostat. - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1621 */ -#define DTT_READ_TEMP 0xAA -#define DTT_READ_COUNTER 0xA8 -#define DTT_READ_SLOPE 0xA9 -#define DTT_WRITE_START_CONV 0xEE -#define DTT_WRITE_STOP_CONV 0x22 -#define DTT_TEMP_HIGH 0xA1 -#define DTT_TEMP_LOW 0xA2 -#define DTT_CONFIG 0xAC - -/* - * Config register bits - */ -#define DTT_CONFIG_1SHOT 0x01 -#define DTT_CONFIG_POLARITY 0x02 -#define DTT_CONFIG_R0 0x04 /* ds1631 only */ -#define DTT_CONFIG_R1 0x08 /* ds1631 only */ -#define DTT_CONFIG_NVB 0x10 -#define DTT_CONFIG_TLF 0x20 -#define DTT_CONFIG_THF 0x40 -#define DTT_CONFIG_DONE 0x80 - - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* Calculate sensor address and command */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1621*/ - - /* Prepare to handle 2 byte result */ - switch(reg) { - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - break; - default: - dlen = 1; - } - - /* Now try to read the register */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* Handle 2 byte result */ - if (dlen == 2) - return (short)((data[0] << 8) | data[1]); - - return (int)data[0]; -} - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* Calculate sensor address and register */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Handle various data sizes. */ - switch(reg) { - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - break; - case DTT_WRITE_START_CONV: - case DTT_WRITE_STOP_CONV: - dlen = 0; - data[0] = (char)0; - data[1] = (char)0; - break; - default: - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* Write value to device */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* Poll NV memory busy bit in case write was to register stored in EEPROM */ - while(i2c_reg_read(sensor, DTT_CONFIG) & DTT_CONFIG_NVB) - ; - - return 0; -} - - -int dtt_init_one(int sensor) -{ - int val; - - /* Setup High Temp */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HIGH, val) != 0) - return 1; - - /* Setup Low Temp - hysteresis */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_LOW, val) != 0) - return 1; - - /* - * Setup configuraton register - * - * Clear THF & TLF, Reserved = 1, Polarity = Active Low, One Shot = YES - * - * We run in polled mode, since there isn't any way to know if this - * lousy device is ready to provide temperature readings on power up. - */ - val = 0x9; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} - -int dtt_get_temp(int sensor) -{ - int i; - - /* Start a conversion, may take up to 1 second. */ - dtt_write(sensor, DTT_WRITE_START_CONV, 0); - for (i = 0; i <= 10; i++) { - udelay(100000); - if (dtt_read(sensor, DTT_CONFIG) & DTT_CONFIG_DONE) - break; - } - - return (dtt_read(sensor, DTT_READ_TEMP) / 256); -} diff --git a/drivers/hwmon/ds1722.c b/drivers/hwmon/ds1722.c deleted file mode 100644 index c46958846c..0000000000 --- a/drivers/hwmon/ds1722.c +++ /dev/null @@ -1,137 +0,0 @@ -#include <common.h> -#include <asm/ic/ssi.h> -#include <ds1722.h> - -static void ds1722_select(int dev) -{ - ssi_set_interface(4096, 0, 0, 0); - ssi_chip_select(0); - udelay(1); - ssi_chip_select(dev); - udelay(1); -} - - -u8 ds1722_read(int dev, int addr) -{ - u8 res; - - ds1722_select(dev); - - ssi_tx_byte(addr); - res = ssi_rx_byte(); - - ssi_chip_select(0); - - return res; -} - -void ds1722_write(int dev, int addr, u8 data) -{ - ds1722_select(dev); - - ssi_tx_byte(0x80|addr); - ssi_tx_byte(data); - - ssi_chip_select(0); -} - - -u16 ds1722_temp(int dev, int resolution) -{ - static int useconds[] = { - 75000, 150000, 300000, 600000, 1200000 - }; - char temp; - u16 res; - - - /* set up the desired resulotion ... */ - ds1722_write(dev, 0, 0xe0 | (resolution << 1)); - - /* wait while the chip measures the tremperature */ - udelay(useconds[resolution]); - - res = (temp = ds1722_read(dev, 2)) << 8; - - if (temp < 0) { - temp = (16 - (ds1722_read(dev, 1) >> 4)) & 0x0f; - } else { - temp = (ds1722_read(dev, 1) >> 4); - } - - switch (temp) { - case 0: - /* .0000 */ - break; - case 1: - /* .0625 */ - res |=1; - break; - case 2: - /* .1250 */ - res |=1; - break; - case 3: - /* .1875 */ - res |=2; - break; - case 4: - /* .2500 */ - res |=3; - break; - case 5: - /* .3125 */ - res |=3; - break; - case 6: - /* .3750 */ - res |=4; - break; - case 7: - /* .4375 */ - res |=4; - break; - case 8: - /* .5000 */ - res |=5; - break; - case 9: - /* .5625 */ - res |=6; - break; - case 10: - /* .6250 */ - res |=6; - break; - case 11: - /* .6875 */ - res |=7; - break; - case 12: - /* .7500 */ - res |=8; - break; - case 13: - /* .8125 */ - res |=8; - break; - case 14: - /* .8750 */ - res |=9; - break; - case 15: - /* .9375 */ - res |=9; - break; - } - return res; - -} - -int ds1722_probe(int dev) -{ - u16 temp = ds1722_temp(dev, DS1722_RESOLUTION_12BIT); - printf("%d.%d deg C\n\n", (char)(temp >> 8), temp & 0xff); - return 0; -} diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c deleted file mode 100644 index 4c0c0b82a0..0000000000 --- a/drivers/hwmon/ds1775.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1775 Digital Thermometer and Thermostat - */ - -#include <common.h> - -#include <i2c.h> -#include <dtt.h> - -#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1775 device code */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HYST 0x2 -#define DTT_TEMP_OS 0x3 - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and command - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1775 */ - - /* - * Prepare to handle 2 byte result - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_OS) || (reg == DTT_TEMP_HYST)) - dlen = 2; - else - dlen = 1; - - /* - * Now try to read the register - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* - * Handle 2 byte result - */ - if (dlen == 2) - return ((int)((short)data[1] + (((short)data[0]) << 8))); - - return (int) data[0]; -} - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* - * Handle various data sizes - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_OS) || (reg == DTT_TEMP_HYST)) { - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - } else { - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* - * Write value to device - */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} - - -int dtt_init_one(int sensor) -{ - int val; - - /* - * Setup High Temp - */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_OS, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - /* - * Setup Low Temp - hysteresis - */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - /* - * Setup configuraton register - * - * Fault Tolerance limits 4, Thermometer resolution bits is 9, - * Polarity = Active Low,continuous conversion mode, Thermostat - * mode is interrupt mode - */ - val = 0xa; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - return 0; -} - -int dtt_get_temp(int sensor) -{ - return (dtt_read(sensor, DTT_READ_TEMP) / 256); -} diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c deleted file mode 100644 index 1ecc3da799..0000000000 --- a/drivers/hwmon/ds620.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * DS620 DTT support - * - * (C) Copyright 2014 3ADEV http://www.3adev.com - * Written-by: Albert ARIBAUD albert.aribaud@3adev.fr - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1621/1631 Digital Thermometer and Thermostat. - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 -#define DTT_START_CONVERT 0x51 -#define DTT_TEMP 0xAA -#define DTT_CONFIG 0xAC - -/* - * Config register MSB bits - */ -#define DTT_CONFIG_1SHOT 0x01 -#define DTT_CONFIG_AUTOC 0x02 -#define DTT_CONFIG_R0 0x04 /* always 1 */ -#define DTT_CONFIG_R1 0x08 /* always 1 */ -#define DTT_CONFIG_TLF 0x10 -#define DTT_CONFIG_THF 0x20 -#define DTT_CONFIG_NVB 0x40 -#define DTT_CONFIG_DONE 0x80 - -#define CHIP(sensor) (DTT_I2C_DEV_CODE + (sensor & 0x07)) - -int dtt_init_one(int sensor) -{ - uint8_t config = DTT_CONFIG_1SHOT - | DTT_CONFIG_R0 - | DTT_CONFIG_R1; - return i2c_write(CHIP(sensor), DTT_CONFIG, 1, &config, 1); -} - -int dtt_get_temp(int sensor) -{ - uint8_t status; - uint8_t temp[2]; - - /* Start a conversion, may take up to 1 second. */ - i2c_write(CHIP(sensor), DTT_START_CONVERT, 1, NULL, 0); - do { - if (i2c_read(CHIP(sensor), DTT_CONFIG, 1, &status, 1)) - /* bail out if I2C error */ - status |= DTT_CONFIG_DONE; - } while (!(status & DTT_CONFIG_DONE)); - if (i2c_read(CHIP(sensor), DTT_TEMP, 1, temp, 2)) - /* bail out if I2C error */ - return -274; /* below absolute zero == error */ - - return ((int16_t)(temp[1] | (temp[0] << 8))) >> 7; -} diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c deleted file mode 100644 index 053c785fc5..0000000000 --- a/drivers/hwmon/lm63.c +++ /dev/null @@ -1,160 +0,0 @@ -/* - * (C) Copyright 2007-2008 - * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de - * based on lm75.c by Bill Hunter - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * National LM63/LM64 Temperature Sensor - * Main difference: LM 64 has -16 Kelvin temperature offset - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -#define DTT_I2C_LM63_ADDR 0x4C /* National LM63 device */ - -#define DTT_READ_TEMP_RMT_MSB 0x01 -#define DTT_CONFIG 0x03 -#define DTT_READ_TEMP_RMT_LSB 0x10 -#define DTT_TACHLIM_LSB 0x48 -#define DTT_TACHLIM_MSB 0x49 -#define DTT_FAN_CONFIG 0x4A -#define DTT_PWM_FREQ 0x4D -#define DTT_PWM_LOOKUP_BASE 0x50 - -struct pwm_lookup_entry { - u8 temp; - u8 pwm; -}; - -/* - * Device code - */ - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - if (!sensor) - sensor = DTT_I2C_LM63_ADDR; /* legacy config */ - - dlen = 1; - - /* - * Now try to read the register. - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - return (int)data[0]; -} /* dtt_read() */ - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - if (!sensor) - sensor = DTT_I2C_LM63_ADDR; /* legacy config */ - - dlen = 1; - data[0] = (char)(val & 0xff); - - /* - * Write value to register. - */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -static int is_lm64(int sensor) -{ - return sensor && (sensor != DTT_I2C_LM63_ADDR); -} - -int dtt_init_one(int sensor) -{ - int i; - int val; - - struct pwm_lookup_entry pwm_lookup[] = CONFIG_DTT_PWM_LOOKUPTABLE; - - /* - * Set PWM Frequency to 2.5% resolution - */ - val = 20; - if (dtt_write(sensor, DTT_PWM_FREQ, val) != 0) - return 1; - - /* - * Set Tachometer Limit - */ - val = CONFIG_DTT_TACH_LIMIT; - if (dtt_write(sensor, DTT_TACHLIM_LSB, val & 0xff) != 0) - return 1; - if (dtt_write(sensor, DTT_TACHLIM_MSB, (val >> 8) & 0xff) != 0) - return 1; - - /* - * Make sure PWM Lookup-Table is writeable - */ - if (dtt_write(sensor, DTT_FAN_CONFIG, 0x20) != 0) - return 1; - - /* - * Setup PWM Lookup-Table - */ - for (i = 0; i < ARRAY_SIZE(pwm_lookup); i++) { - int address = DTT_PWM_LOOKUP_BASE + 2 * i; - val = pwm_lookup[i].temp; - if (is_lm64(sensor)) - val -= 16; - if (dtt_write(sensor, address, val) != 0) - return 1; - val = dtt_read(sensor, address); - val = pwm_lookup[i].pwm; - if (dtt_write(sensor, address + 1, val) != 0) - return 1; - } - - /* - * Enable PWM Lookup-Table, PWM Clock 360 kHz, Tachometer Mode 2 - */ - val = 0x02; - if (dtt_write(sensor, DTT_FAN_CONFIG, val) != 0) - return 1; - - /* - * Enable Tach input - */ - val = dtt_read(sensor, DTT_CONFIG) | 0x04; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} - -int dtt_get_temp(int sensor) -{ - s16 temp = (dtt_read(sensor, DTT_READ_TEMP_RMT_MSB) << 8) - | (dtt_read(sensor, DTT_READ_TEMP_RMT_LSB)); - - if (is_lm64(sensor)) - temp += 16 << 8; - - /* Ignore LSB for now, U-Boot only prints natural numbers */ - return temp >> 8; -} diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c deleted file mode 100644 index c15c7514d8..0000000000 --- a/drivers/hwmon/lm73.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * (C) Copyright 2007-2008 - * Larry Johnson, lrj@acm.org - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * National Semiconductor LM73 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* National Semi's LM73 device */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HIGH 0x2 -#define DTT_TEMP_LOW 0x3 -#define DTT_CONTROL 0x4 -#define DTT_ID 0x7 - -int dtt_read(int const sensor, int const reg) -{ - int dlen; - uint8_t data[2]; - - /* - * Validate 'reg' param and get register size. - */ - switch (reg) { - case DTT_CONFIG: - case DTT_CONTROL: - dlen = 1; - break; - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - case DTT_ID: - dlen = 2; - break; - default: - return -1; - } - /* - * Try to read the register at the calculated sensor address. - */ - if (0 != - i2c_read(DTT_I2C_DEV_CODE + (sensor & 0x07), reg, 1, data, dlen)) - return -1; - /* - * Handle 2 byte result. - */ - if (2 == dlen) - return (int)((unsigned)data[0] << 8 | (unsigned)data[1]); - - return (int)data[0]; -} /* dtt_read() */ - -int dtt_write(int const sensor, int const reg, int const val) -{ - int dlen; - uint8_t data[2]; - - /* - * Validate 'reg' param and handle register size - */ - switch (reg) { - case DTT_CONFIG: - case DTT_CONTROL: - dlen = 1; - data[0] = (uint8_t) val; - break; - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - data[0] = (uint8_t) (val >> 8); /* MSB first */ - data[1] = (uint8_t) val; - break; - default: - return -1; - } - /* - * Write value to register at the calculated sensor address. - */ - return 0 != i2c_write(DTT_I2C_DEV_CODE + (sensor & 0x07), reg, 1, data, - dlen); -} /* dtt_write() */ - -int dtt_init_one(int const sensor) -{ - int val; - - /* - * Validate the Identification register - */ - if (0x0190 != dtt_read(sensor, DTT_ID)) - return -1; - /* - * Setup THIGH (upper-limit) and TLOW (lower-limit) registers - */ - val = CONFIG_SYS_DTT_MAX_TEMP << 7; - if (dtt_write(sensor, DTT_TEMP_HIGH, val)) - return -1; - - val = CONFIG_SYS_DTT_MIN_TEMP << 7; - if (dtt_write(sensor, DTT_TEMP_LOW, val)) - return -1; - /* - * Setup configuraton register - */ - /* config = alert active low, disabled, and reset */ - val = 0x64; - if (dtt_write(sensor, DTT_CONFIG, val)) - return -1; - /* - * Setup control/status register - */ - /* control = temp resolution 0.25C */ - val = 0x00; - if (dtt_write(sensor, DTT_CONTROL, val)) - return -1; - - dtt_read(sensor, DTT_CONTROL); /* clear temperature flags */ - return 0; -} /* dtt_init_one() */ - -int dtt_get_temp(int const sensor) -{ - int const ret = dtt_read(sensor, DTT_READ_TEMP); - - if (ret < 0) { - printf("DTT temperature read failed.\n"); - return 0; - } - return (int)((int16_t) ret + 0x0040) >> 7; -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c deleted file mode 100644 index aafa4757b1..0000000000 --- a/drivers/hwmon/lm75.c +++ /dev/null @@ -1,139 +0,0 @@ -/* - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * On Semiconductor's LM75 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* ON Semi's LM75 device */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HYST 0x2 -#define DTT_TEMP_SET 0x3 - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - -#ifdef CONFIG_DTT_AD7414 - /* - * On AD7414 the first value upon bootup is not read correctly. - * This is most likely because of the 800ms update time of the - * temp register in normal update mode. To get current values - * each time we issue the "dtt" command including upon powerup - * we switch into one-short mode. - * - * Issue one-shot mode command - */ - dtt_write(sensor, DTT_CONFIG, 0x64); -#endif - - /* Validate 'reg' param */ - if((reg < 0) || (reg > 3)) - return -1; - - /* Calculate sensor address and register. */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Prepare to handle 2 byte result. */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) - dlen = 2; - else - dlen = 1; - - /* Now try to read the register. */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - /* Handle 2 byte result. */ - if (dlen == 2) - return ((int)((short)data[1] + (((short)data[0]) << 8))); - - return (int)data[0]; -} /* dtt_read() */ - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* Validate 'reg' param */ - if ((reg < 0) || (reg > 3)) - return 1; - - /* Calculate sensor address and register. */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Handle 2 byte values. */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) { - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - } else { - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* Write value to register. */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} /* dtt_write() */ - - -int dtt_init_one(int sensor) -{ - int val; - - /* Setup TSET ( trip point ) register */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ - if (dtt_write(sensor, DTT_TEMP_SET, val) != 0) - return 1; - - /* Setup THYST ( untrip point ) register - Hysteresis */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) - return 1; - - /* Setup configuraton register */ -#ifdef CONFIG_DTT_AD7414 - /* config = alert active low and disabled */ - val = 0x60; -#else - /* config = 6 sample integration, int mode, active low, and enable */ - val = 0x18; -#endif - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} /* dtt_init_one() */ - -int dtt_get_temp(int sensor) -{ - int const ret = dtt_read(sensor, DTT_READ_TEMP); - - if (ret < 0) { - printf("DTT temperature read failed.\n"); - return 0; - } - return (int)((int16_t) ret / 256); -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/lm81.c b/drivers/hwmon/lm81.c deleted file mode 100644 index bcc8d3293b..0000000000 --- a/drivers/hwmon/lm81.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * (C) Copyright 2006 - * Heiko Schocher, DENX Software Enginnering hs@denx.de - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * On Semiconductor's LM81 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x2c /* ON Semi's LM81 device */ -#define DTT_READ_TEMP 0x27 -#define DTT_CONFIG_TEMP 0x4b -#define DTT_TEMP_MAX 0x39 -#define DTT_TEMP_HYST 0x3a -#define DTT_CONFIG 0x40 - -int dtt_read(int sensor, int reg) -{ - int dlen = 1; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x03); /* calculate address of lm81 */ - - /* - * Now try to read the register. - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - return (int)data[0]; -} /* dtt_read() */ - - -int dtt_write(int sensor, int reg, int val) -{ - uchar data; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x03); /* calculate address of lm81 */ - - data = (char)(val & 0xff); - - /* - * Write value to register. - */ - if (i2c_write(sensor, reg, 1, &data, 1) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -#define DTT_MANU 0x3e -#define DTT_REV 0x3f -#define DTT_CONFIG 0x40 -#define DTT_ADR 0x48 - -int dtt_init_one(int sensor) -{ - int man; - int adr; - int rev; - - if (dtt_write (sensor, DTT_CONFIG, 0x01) < 0) - return 1; - /* The LM81 needs 400ms to get the correct values ... */ - udelay (400000); - man = dtt_read (sensor, DTT_MANU); - if (man != 0x01) - return 1; - adr = dtt_read (sensor, DTT_ADR); - if (adr < 0) - return 1; - rev = dtt_read (sensor, DTT_REV); - if (rev < 0) - return 1; - - debug ("DTT: Found LM81@%x Rev: %d\n", adr, rev); - return 0; -} /* dtt_init_one() */ - - -#define TEMP_FROM_REG(temp) \ - ((temp)<256?((((temp)&0x1fe) >> 1) * 10) + ((temp) & 1) * 5: \ - ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5) \ - -int dtt_get_temp(int sensor) -{ - int val = dtt_read (sensor, DTT_READ_TEMP); - int tmpcnf = dtt_read (sensor, DTT_CONFIG_TEMP); - - return (TEMP_FROM_REG((val << 1) + ((tmpcnf & 0x80) >> 7))) / 10; -} /* dtt_get_temp() */ diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index bc0bc2b6c8..95c05350cd 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +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 */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index b9599b5e3b..8628b7ed18 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,7 +238,6 @@

/* Partitions */

-#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index e3c2cca3c3..df6386c602 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,7 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index cd46db4f6f..8265f3c1ab 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. */ 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/canyonlands.h b/include/configs/canyonlands.h index ea440d6e16..b495d0645b 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -261,14 +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) /* RTC configuration */ #define CONFIG_RTC_M41T62 @@ -369,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/dlvision-10g.h b/include/configs/dlvision-10g.h index e32651f541..89f24e0980 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ

@@ -111,13 +110,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..ec21a8347a 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -55,7 +55,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 5411e5ff49..91976a75bc 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -46,8 +46,6 @@

/* Thermal Management Unit */ #define CONFIG_EXYNOS_TMU -#define CONFIG_CMD_DTT -#define CONFIG_TMU_CMD_DTT

/* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 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..dd195ffeed 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ

@@ -93,11 +92,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/katmai.h b/include/configs/katmai.h index 3143b631ce..c3b9da0d96 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 *----------------------------------------------------------------------*/ diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index b8c0d0d8f0..a91a6a9ee5 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -317,10 +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 } - /* RTC configuration */ #define CONFIG_RTC_DS1338 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 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/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/makalu.h b/include/configs/makalu.h index cdb02f3693..a92bc43538 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -189,10 +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 } - /* RTC configuration */ #define CONFIG_RTC_X1205 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x6f @@ -231,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/motionpro.h b/include/configs/motionpro.h index cb5c346807..aaa8962fd2 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_IDE #define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 @@ -268,6 +267,13 @@ #define LED_ON 0x00000010

/* +<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae +======= + * Temperature sensor + */ + +/* +>>>>>>> Drop digital thermometer and thermostat (DTT) drivers * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/neo.h b/include/configs/neo.h index 9115e251b1..29ce61c326 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ

@@ -100,13 +99,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/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/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/socrates.h b/include/configs/socrates.h index 76b4038d50..b37e796d33 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,7 +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/tqma6.h b/include/configs/tqma6.h index 738693c0c0..799c45e2d7 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -57,13 +57,6 @@ #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 @@ -371,8 +364,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/work_92105.h b/include/configs/work_92105.h index 82f4af9c93..458acf59af 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -85,14 +85,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 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index ea4b739d0b..c4efae67a7 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -28,7 +28,6 @@ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS -#undef CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM

/*Misc*/ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index bd1d0c75d9..97a9d71e8b 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -233,8 +233,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

/* 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 */ @@ -501,7 +499,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index a290cf3463..fa1971db20 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -230,8 +230,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);

/* 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 */ @@ -353,7 +351,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 diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index ad4247ab48..e3f0b939c3 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,7 +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 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/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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5a9eae3b69..ae3e0ec3fc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG CONFIG_CMD_EEPROM @@ -683,20 +682,6 @@ CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB CONFIG_DSP_CLUSTER_START -CONFIG_DTT -CONFIG_DTT_AD7414 -CONFIG_DTT_ADM1021 -CONFIG_DTT_DS1621 -CONFIG_DTT_DS1775 -CONFIG_DTT_DS620 -CONFIG_DTT_HYSTERESIS -CONFIG_DTT_LM63 -CONFIG_DTT_LM75 -CONFIG_DTT_MAX_TEMP -CONFIG_DTT_MIN_TEMP -CONFIG_DTT_PWM_LOOKUPTABLE -CONFIG_DTT_SENSORS -CONFIG_DTT_TACH_LIMIT CONFIG_DUOVERO CONFIG_DV_USBPHY_CTL CONFIG_DWC2_DFLT_SPEED_FULL @@ -3452,12 +3437,6 @@ CONFIG_SYS_DSPI_CTAR4 CONFIG_SYS_DSPI_CTAR5 CONFIG_SYS_DSPI_CTAR6 CONFIG_SYS_DSPI_CTAR7 -CONFIG_SYS_DTT_ADM1021 -CONFIG_SYS_DTT_BUS_NUM -CONFIG_SYS_DTT_HYSTERESIS -CONFIG_SYS_DTT_LOW_TEMP -CONFIG_SYS_DTT_MAX_TEMP -CONFIG_SYS_DTT_MIN_TEMP CONFIG_SYS_DUART_RST CONFIG_SYS_DV_CLKMODE CONFIG_SYS_DV_NOR_BOOT_CFG @@ -6117,7 +6096,6 @@ CONFIG_TIZEN CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP -CONFIG_TMU_CMD_DTT CONFIG_TMU_TIMER CONFIG_TOTAL5200 CONFIG_TPL_DRIVERS_MISC_SUPPORT

Now that dtt is gone, this is not used. Drop it.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

include/configs/xpedite517x.h | 12 ------------ include/configs/xpedite537x.h | 11 ----------- scripts/config_whitelist.txt | 1 - 3 files changed, 24 deletions(-)

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 97a9d71e8b..94aad2519e 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,7 +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_SYS_I2C_LM90_ADDR 0x4c

/* I2C EEPROM - AT24C128B */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index fa1971db20..826cd9aa5f 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,7 +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_SYS_I2C_LM90_ADDR 0x4c

/* I2C EEPROM - AT24C128B */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ae3e0ec3fc..237cff4ea4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4178,7 +4178,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS1621_ADDR CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR

This is only used by one board and always set to 0x51. Drop this option.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---

Changes in v2: None

drivers/misc/ds4510.c | 7 +------ include/configs/xpedite517x.h | 3 --- include/configs/xpedite537x.h | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 9ffdafc992..55f8936513 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -14,11 +14,6 @@ #include <command.h> #include "ds4510.h"

-/* Default to an address that hopefully won't corrupt other i2c devices */ -#ifndef CONFIG_SYS_I2C_DS4510_ADDR -#define CONFIG_SYS_I2C_DS4510_ADDR (~0) -#endif - enum { DS4510_CMD_INFO, DS4510_CMD_DEVICE, @@ -254,7 +249,7 @@ cmd_tbl_t cmd_ds4510[] = {

int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR; + static uint8_t chip = 0x51; cmd_tbl_t *c; ulong ul_arg2 = 0; ulong ul_arg3 = 0; diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 94aad2519e..cf84e1f99a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -234,9 +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_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 826cd9aa5f..d630f2a9c9 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -232,9 +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_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 237cff4ea4..c080f9e208 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4178,7 +4178,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR

This converts the following to Kconfig: CONFIG_CMD_EECONFIG

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

board/gateworks/gw_ventana/Kconfig | 5 +++++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/pcm058.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/board/gateworks/gw_ventana/Kconfig b/board/gateworks/gw_ventana/Kconfig index ccce98e2ed..c5779846da 100644 --- a/board/gateworks/gw_ventana/Kconfig +++ b/board/gateworks/gw_ventana/Kconfig @@ -9,4 +9,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gw_ventana"

+config CMD_EECONFIG + bool "Enable the 'econfig' command" + help + Provides access to EEPROM configuration on Gateworks Ventana + endif diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 061f15ed2a..289134e854 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 931572aa67..5e5f1f6d37 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 37d0e10569..eedccfc999 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 1c18a380fe..661d8c38c8 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -143,7 +143,6 @@ /* 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

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index f622be62b7..041d84018f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -88,7 +88,6 @@ /* 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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b294731057..6421988c59 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_EECONFIG CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT CONFIG_CMD_ENTERRCM

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Reword to indicate this option is being dropped

include/configs/ap_sh4a_4a.h | 1 - include/configs/calimain.h | 1 - include/configs/clearfog.h | 1 - include/configs/colibri_pxa270.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/da850evm.h | 2 -- include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/ds414.h | 1 - include/configs/ea20.h | 2 -- include/configs/ecovec.h | 1 - include/configs/espt.h | 1 - include/configs/goflexhome.h | 1 - include/configs/hikey.h | 1 - include/configs/iconnect.h | 1 - include/configs/ipam390.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/ls1012a_common.h | 1 - include/configs/ls1043a_common.h | 3 --- include/configs/ls1046a_common.h | 3 --- include/configs/ls2080a_common.h | 1 - include/configs/lsxl.h | 1 - include/configs/maxbcm.h | 1 - include/configs/meson-gxbb-common.h | 2 -- include/configs/mv-plug-common.h | 1 - include/configs/omapl138_lcdk.h | 2 -- include/configs/openrd.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/r0p7734.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/shmin.h | 1 - include/configs/spear-common.h | 1 - include/configs/theadorable.h | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/vme8349.h | 4 ---- include/configs/x600.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zipitz2.h | 1 - scripts/config_whitelist.txt | 1 - 44 files changed, 55 deletions(-)

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/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/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/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/controlcenterdc.h b/include/configs/controlcenterdc.h index add5f90cc2..710bae8519 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -33,7 +33,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_I2C #define CONFIG_CMD_PCI #define CONFIG_CMD_SCSI diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 9442c05943..c2a2cb1bdb 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,7 +301,6 @@ !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 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/dns325.h b/include/configs/dns325.h index 9450b62e4a..de682334eb 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 69429ed34e..2db31d3c11 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 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/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/goflexhome.h b/include/configs/goflexhome.h index f9bced3f8f..dbcd2b2dbe 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -43,7 +43,6 @@ * 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/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/iconnect.h b/include/configs/iconnect.h index 950a7195fd..46374f2c37 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -32,7 +32,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND

/* diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 5caf02e8d9..0beb31b5c0 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 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 0737a3e2ce..69c08c69da 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,7 +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 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/ls1043a_common.h b/include/configs/ls1043a_common.h index e26924877d..78c34eba3e 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 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 957ffd3634..c380fedf27 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 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 427f623e8c..53686e3412 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) diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index ce6d7c9998..59542a62e4 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -38,7 +38,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_IDE

/* 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/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/mv-plug-common.h b/include/configs/mv-plug-common.h index 83c559ed66..ce85e38875 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_IDE

/* diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 0cc0042bca..5995c662b6 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 */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 19660db080..6c17f3b24b 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE

diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 36f6e95ced..e62e21704c 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

/* 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/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/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/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/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/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/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/x600.h b/include/configs/x600.h index bf6fafce98..afbd837cb8 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -106,7 +106,6 @@ /* * Command support defines */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 3a6a4972e6..8a433691f4 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 */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 841cc6dbb2..8a745e5097 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -54,7 +54,6 @@ /* * Bootloader Components Configuration */ -#define CONFIG_CMD_ENV

/* * MMC Card Configuration diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bc85d7b1e9..c0a04bec70 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENV CONFIG_CMD_ENV_CALLBACK CONFIG_CMD_ENV_FLAGS CONFIG_CMD_ERRATA

This converts the following to Kconfig: CONFIG_CMD_ENV_FLAGS

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - cmd/Kconfig | 8 ++++++++ configs/ids8313_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + include/configs/ids8313.h | 1 - include/configs/sandbox.h | 2 -- scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README b/README index 74e1e5473f..9381510402 100644 --- a/README +++ b/README @@ -833,7 +833,6 @@ The following options need to be configured: CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_ELF * bootelf, bootvx - CONFIG_CMD_ENV_FLAGS * display details about env flags CONFIG_CMD_ENV_EXISTS * check existence of env variable CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_EXT2 * ext2 command support diff --git a/cmd/Kconfig b/cmd/Kconfig index 3ac876403c..ab09a9f528 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -322,6 +322,14 @@ config CMD_ENV_CALLBACK For example changing "baudrate" adjust the serial baud rate. This command lists the currently defined callbacks.

+config CMD_ENV_FLAGS + bool "env flags -print variables that have non-default flags" + help + Some environment variables have special flags that control their + behaviour. For example, serial# can only be written once and cannot + be deleted. This command shows the variables that have special + flags. + endmenu

menu "Memory commands" diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 165e2eb495..2accd31229 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -13,6 +13,7 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n" CONFIG_AUTOBOOT_DELAY_STR="ids" +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index b63da46c87..f8e1b3ad99 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index d86d9d2693..e8e035528a 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 79eb83719e..7f262dc327 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 7ffc9d1dd9..be96834c76 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -444,7 +444,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*/ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1743055f15..da547c5bb2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -109,8 +109,6 @@

#define CONFIG_CMD_SANDBOX

-#define CONFIG_CMD_ENV_FLAGS - #define CONFIG_BOOTARGS ""

#ifndef SANDBOX_NO_SDL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index de7da54bcf..8e491ff330 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENV_FLAGS CONFIG_CMD_ERRATA CONFIG_CMD_ESBC_VALIDATE CONFIG_CMD_ETHSW

This converts the following to Kconfig: CONFIG_CMD_FDC

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - cmd/Kconfig | 5 +++++ configs/PIP405_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/PIP405.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README b/README index 9381510402..1b5aabbeb6 100644 --- a/README +++ b/README @@ -841,7 +841,6 @@ The following options need to be configured: that work for multiple fs types CONFIG_CMD_FS_UUID * Look up a filesystem UUID CONFIG_CMD_SAVEENV saveenv - CONFIG_CMD_FDC * Floppy Disk Support CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support diff --git a/cmd/Kconfig b/cmd/Kconfig index cc959f6a4a..99082c14f2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -604,6 +604,11 @@ config CMD_GPIO help GPIO support.

+config CMD_FDC + bool "fdcboot - Boot from floppy device" + help + The 'fdtboot' command allows booting an image from a floppy disk. + endmenu

diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index bd421eab9c..e366ac1355 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -14,6 +14,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FDC=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index a824204913..9b3d88a1f8 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#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 */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 84b1a73033..eb1f0e26c5 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FDC #define CONFIG_SCSI #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d8fb9f712..86c26778ba 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FDC CONFIG_CMD_FDT_MAX_DUMP CONFIG_CMD_FPGAD CONFIG_CMD_FPGA_LOADBP

This converts the following to Kconfig: CONFIG_CMD_FPGAD

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

cmd/Kconfig | 8 ++++++++ configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/iocon_defconfig | 1 + configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + include/configs/hrcon.h | 1 - include/configs/iocon.h | 1 - include/configs/strider.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 99082c14f2..99e42e4b36 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -593,6 +593,14 @@ config CMD_FPGA help FPGA support.

+config CMD_FPGAD + bool "fpgad - dump FPGA registers" + help + (legacy, needs conversion to driver model) + Provides a way to dump FPGA registers by calling the board-specific + fpga_get_reg() function. This functions similarly to the 'md' + command. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index afb0154fcd..cf89ebe145 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -15,6 +15,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index ce8b7972a4..c5512e71c4 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -14,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig index c74df944a6..b3ee66d7f6 100644 --- a/configs/iocon_defconfig +++ b/configs/iocon_defconfig @@ -16,6 +16,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_LOOPW=y +CONFIG_CMD_FPGAD=y CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 51a50856a9..099d40714f 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 9524c9c6f2..754db3d2d8 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index 090d7e8efc..692e883e75 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index ec715f1180..18e33a2e6b 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 5574e7715a..cfebd2d26e 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,7 +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

/* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index e15adfcbb0..0d81ac1b2f 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_FPGAD #undef CONFIG_CMD_IRQ

/* diff --git a/include/configs/strider.h b/include/configs/strider.h index 1298808b13..539557d972 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -28,7 +28,6 @@

#define CONFIG_SYS_ALT_MEMTEST

-#define CONFIG_CMD_FPGAD #define CONFIG_CMD_IOLOOP

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9e62fef568..10760d6139 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FPGAD CONFIG_CMD_FPGA_LOADBP CONFIG_CMD_FPGA_LOADFS CONFIG_CMD_FPGA_LOADMK

This converts the following to Kconfig: CONFIG_CMD_FUSE

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - arch/arm/cpu/armv7/mx6/Kconfig | 1 + arch/arm/cpu/armv7/mx7/Kconfig | 2 ++ cmd/Kconfig | 8 ++++++++ configs/colibri_vf_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/sandbox_defconfig | 2 +- configs/usbarmory_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/ac14xx.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aria.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/mecp5123.h | 1 - include/configs/mpc5121ads.h | 2 -- include/configs/mx51evk.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/usbarmory.h | 1 - include/configs/vf610twr.h | 1 - scripts/config_whitelist.txt | 1 - 27 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/README b/README index 4758dff0d1..ba9691a895 100644 --- a/README +++ b/README @@ -844,7 +844,6 @@ The following options need to be configured: CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support - CONFIG_CMD_FUSE * Device fuse support CONFIG_CMD_GETTIME * Get time since boot CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index af6dad3aa9..5ecca47a98 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -7,6 +7,7 @@ config MX6 select ARM_ERRATA_751472 if !MX6UL select ARM_ERRATA_761320 if !MX6UL select ARM_ERRATA_794072 if !MX6UL + imply CMD_FUSE

config MX6D bool diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index 8dfb4c9646..80c129019a 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -6,10 +6,12 @@ config MX7 select CPU_V7_HAS_VIRT select CPU_V7_HAS_NONSEC select ARCH_SUPPORT_PSCI + imply CMD_FUSE default y

config MX7D select ROM_UNIFIED_SECTIONS + imply CMD_FUSE bool

choice diff --git a/cmd/Kconfig b/cmd/Kconfig index 16cf961f3e..495080fc01 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -627,6 +627,14 @@ config CMD_FPGAD fpga_get_reg() function. This functions similarly to the 'md' command.

+config CMD_FUSE + bool "fuse - support for the fuse subssystem" + help + (deprecated - needs conversion to driver model) + This allows reading, sensing, programming or overriding fuses + which control the behaviour of the device. The command uses the + fuse_...() API. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 8be632fb8e..3b510c3e6d 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index e84272d68c..8f09c04ceb 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_FUSE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 720f0ee9dc..a573d52b7f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -44,6 +44,7 @@ CONFIG_CMD_CDP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DNS=y CONFIG_CMD_LINK_LOCAL=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y @@ -186,4 +187,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_ETHSW=y diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig index 43256177be..a71a75751f 100644 --- a/configs/usbarmory_defconfig +++ b/configs/usbarmory_defconfig @@ -8,6 +8,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FUSE=y # CONFIG_CMD_SETEXPR is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 9198f65eaa..47193094dd 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index ba4e5965ca..f1dc19a543 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 9b3d88a1f8..7e9983e150 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#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 */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 2a46e9b864..3d3c216d61 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +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 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/apalis_imx6.h b/include/configs/apalis_imx6.h index c1c0f592d2..8eddb68d3b 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 diff --git a/include/configs/aria.h b/include/configs/aria.h index 4d946fc44a..3b5d56c6bb 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +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 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9c4085245a..6189a6191f 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 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/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/mecp5123.h b/include/configs/mecp5123.h index fe94e663c5..6e10cafe6e 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +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

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 7919320c88..bd7c4a64e2 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -382,8 +382,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

-#undef CONFIG_CMD_FUSE - #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif 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/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/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/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/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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 94dddbce54..7563bddd18 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FUSE CONFIG_CMD_GETTIME CONFIG_CMD_GSC CONFIG_CMD_HASH

This converts the following to Kconfig: CONFIG_CMD_GSC

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

board/gateworks/gw_ventana/Kconfig | 8 ++++++++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/pcm058.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/board/gateworks/gw_ventana/Kconfig b/board/gateworks/gw_ventana/Kconfig index c5779846da..5d1bae41ac 100644 --- a/board/gateworks/gw_ventana/Kconfig +++ b/board/gateworks/gw_ventana/Kconfig @@ -14,4 +14,12 @@ config CMD_EECONFIG help Provides access to EEPROM configuration on Gateworks Ventana

+config CMD_GSC + bool "Enable the 'gsc' command" + help + Provides access to the GSC configuration: + + gsc sleep - sleeps for a period of seconds + gsc wd - enables / disables the watchdog + endif diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 289134e854..12de448115 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 5e5f1f6d37..6d8cd6030c 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index eedccfc999..62b9b575ca 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 661d8c38c8..4dcff0347f 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -142,7 +142,6 @@

/* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 041d84018f..44b4ffdf99 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -87,7 +87,6 @@

/* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC #define CONFIG_RBTREE

/* Physical Memory Map */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e101ec6f75..28fd6ac141 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_GSC CONFIG_CMD_HASH CONFIG_CMD_HD44760 CONFIG_CMD_HD44780

At present CONFIG_CMD_HASH enables the 'hash' command which also brings in the hashing API. Some boards may wish to enable the API without the command. Add a separate CONFIG to permit this.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

cmd/Kconfig | 2 ++ common/Kconfig | 12 ++++++++++++ common/Makefile | 2 +- common/hash.c | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index b05e69a8b7..1e3cd02703 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -350,6 +350,7 @@ config CMD_MEMORY

config CMD_CRC32 bool "crc32" + select HASH default y help Compute CRC32. @@ -998,6 +999,7 @@ config CMD_BLOB

config CMD_HASH bool "Support 'hash' command" + select HASH help This provides a way to hash data in memory using various supported algorithms (such as SHA1, MD5, CRC32). The computed digest can be diff --git a/common/Kconfig b/common/Kconfig index 1879aefaf8..23bcf99a2c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -493,4 +493,16 @@ config BOARD_EARLY_INIT_F

endmenu

+menu "Security support" + +config HASH + bool "Support hashing API (SHA1, SHA256, etc.)" + help + This provides a way to hash data in memory using various supported + algorithms (such as SHA1, MD5, CRC32). The API is defined in hash.h + and the algorithms it supports are defined in common/hash.c. See + also CMD_HASH for command-line access. + +endmenu + source "common/spl/Kconfig" diff --git a/common/Makefile b/common/Makefile index 14d01844ad..b2d663530d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -10,7 +10,7 @@ ifndef CONFIG_SPL_BUILD obj-y += init/ obj-y += main.o obj-y += exports.o -obj-y += hash.o +obj-$(CONFIG_HASH) += hash.o obj-$(CONFIG_HUSH_PARSER) += cli_hush.o obj-$(CONFIG_AUTOBOOT) += autoboot.o

diff --git a/common/hash.c b/common/hash.c index b645298afc..a0eded98d0 100644 --- a/common/hash.c +++ b/common/hash.c @@ -473,5 +473,5 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,

return 0; } -#endif -#endif +#endif /* CONFIG_CMD_HASH || CONFIG_CMD_SHA1SUM || CONFIG_CMD_CRC32) */ +#endif /* !USE_HOSTCC */

This converts the following to Kconfig: CONFIG_CMD_HDMIDETECT

Note that we cannot do 'default y if VIDEO' because this option is only enabled for a small subset of mx6 boards. Also this command is is not a great implementation (it doesn't use driver model).

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Update commit message to explain why we can't 'default y if VIDEO'

README | 5 ----- arch/arm/imx-common/Kconfig | 6 ++++++ configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/wandboard_defconfig | 1 + include/configs/apalis_imx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/gw_ventana.h | 2 -- include/configs/mx6cuboxi.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/pcm058.h | 1 - include/configs/tbs2910.h | 1 - include/configs/wandboard.h | 1 - scripts/config_whitelist.txt | 2 -- 31 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/README b/README index d53607ac1e..3a4288d472 100644 --- a/README +++ b/README @@ -2731,11 +2731,6 @@ The following options need to be configured: be deprecated in favour of 'hash sha1'.

- Freescale i.MX specific commands: - CONFIG_CMD_HDMIDETECT - This enables 'hdmidet' command which returns true if an - HDMI monitor is detected. This command is i.MX 6 specific. - -- bootcount support: CONFIG_BOOTCOUNT_LIMIT

This enables the bootcounter support, see: diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index 25cbd12c89..cd8b8d2882 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -55,3 +55,9 @@ config CMD_DEKBLOB Freescale secure boot mechanism. This command encapsulates and creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for more information. + +config CMD_HDMIDETECT + bool "Support the 'hdmidet' command" + help + This enables the 'hdmidet' command which detects if an HDMI monitor + is connected. diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 90829b4949..f586773761 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_APALIS_IMX6=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig index ef9ca60b42..42abbbd49d 100644 --- a/configs/apalis_imx6_nospl_com_defconfig +++ b/configs/apalis_imx6_nospl_com_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_APALIS_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig index f48bd17c42..18f0d02e55 100644 --- a/configs/apalis_imx6_nospl_it_defconfig +++ b/configs/apalis_imx6_nospl_it_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_APALIS_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 47e8198e77..6c105767fc 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_COLIBRI_IMX6=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig index 52e0d50411..bd2ac24d4a 100644 --- a/configs/colibri_imx6_nospl_defconfig +++ b/configs/colibri_imx6_nospl_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_COLIBRI_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,MX6DL,DDR_MB=256" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 12de448115..5667aea188 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 6d8cd6030c..8cc212b55b 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 62b9b575ca..251e16a26c 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index f31d9bcc46..7530de1519 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y # CONFIG_CMD_BMODE is not set +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" # CONFIG_SYS_STDIO_DEREGISTER is not set diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index c4301e1f0a..a54279978f 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 9b16bf48b0..5744ede776 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 83bbf8e02f..dca89ec34e 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 69cf637eea..a19d093710 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 2e9ee2e293..edf4b6377a 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index f3dd324dce..0f7532062a 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 5a825d6e22..45a5acb96c 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index d14d36a477..888680f0e4 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_FAT_SUPPORT=y +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index c8219b5543..c55537c032 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index f4c9b6bc76..b4b3283829 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" # CONFIG_CONSOLE_MUX is not set diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 8eddb68d3b..9220d04e79 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -133,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/colibri_imx6.h b/include/configs/colibri_imx6.h index 6189a6191f..0882ef8f89 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -114,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/gw_ventana.h b/include/configs/gw_ventana.h index 4dcff0347f..ae98333b0c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -141,7 +141,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c

/* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE

@@ -174,7 +173,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/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/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 753b59f6ec..6cb1807a8e 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -156,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/pcm058.h b/include/configs/pcm058.h index 44b4ffdf99..39018ac62f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -86,7 +86,6 @@ #define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"

/* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_RBTREE

/* Physical Memory Map */ 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/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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0bc6fe14f1..53ed0d8b2e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,8 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_HD44780 -CONFIG_CMD_HDMIDETECT CONFIG_CMD_IDE CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP

This converts the following to Kconfig: CONFIG_CMD_IDE

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - cmd/Kconfig | 8 ++++++++ configs/CPCI4052_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5253EVBE_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/ap325rxa_defconfig | 1 + configs/charon_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/dbau1000_defconfig | 1 + configs/dbau1100_defconfig | 1 + configs/dbau1500_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/fo300_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/ms7720se_defconfig | 1 + configs/nas220_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/qemu_mips64_defconfig | 1 + configs/qemu_mips64el_defconfig | 1 + configs/qemu_mips_defconfig | 1 + configs/qemu_mipsel_defconfig | 1 + configs/r2dplus_defconfig | 1 + configs/r7780mp_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/v38b_defconfig | 1 + configs/wtk_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5253EVBE.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8349ITX.h | 4 ---- include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/TQM5200.h | 1 - include/configs/TQM823L.h | 1 - include/configs/TQM823M.h | 1 - include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 1 - include/configs/TQM855L.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM860L.h | 1 - include/configs/TQM860M.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/TQM885D.h | 1 - include/configs/a4m072.h | 1 - include/configs/ac14xx.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/aria.h | 1 - include/configs/dbau1x00.h | 6 ------ include/configs/digsy_mtc.h | 1 - include/configs/dns325.h | 1 - include/configs/edminiv2.h | 1 - include/configs/goflexhome.h | 1 - include/configs/ib62x0.h | 1 - include/configs/inka4x0.h | 1 - include/configs/ipek01.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/lsxl.h | 1 - include/configs/malta.h | 1 - include/configs/mecp5123.h | 1 - include/configs/motionpro.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/ms7720se.h | 1 - include/configs/mv-plug-common.h | 1 - include/configs/nas220.h | 1 - include/configs/nsa310s.h | 1 - include/configs/openrd.h | 1 - include/configs/pb1x00.h | 2 -- include/configs/qemu-mips.h | 2 -- include/configs/qemu-mips64.h | 2 -- include/configs/qemu-x86.h | 1 - include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - include/configs/sandbox.h | 1 - include/configs/v38b.h | 1 - scripts/config_whitelist.txt | 1 - 150 files changed, 102 insertions(+), 66 deletions(-)

diff --git a/README b/README index 3a4288d472..e5d5e48018 100644 --- a/README +++ b/README @@ -847,7 +847,6 @@ The following options need to be configured: CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment CONFIG_CMD_I2C * I2C serial bus support - CONFIG_CMD_IDE * IDE harddisk support CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash diff --git a/cmd/Kconfig b/cmd/Kconfig index 1e3cd02703..2c89a773d0 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -484,6 +484,14 @@ config CMD_DEMO option is to use sandbox and pass the -d point to sandbox's u-boot.dtb file.

+config CMD_IDE + bool "ide - Support for IDE drivers" + help + Provides an 'ide' command which allows accessing the IDE drive, + reseting the IDE interface, printing the partition table and + geting device info. It also enables the 'diskboot' command which + permits booting from an IDE drive. + config CMD_LOADB bool "loadb" default y diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig index 630598111d..550db77a17 100644 --- a/configs/CPCI4052_defconfig +++ b/configs/CPCI4052_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index 789dddb901..09640de1ec 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5253DEMO=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig index 5b3a2fe742..79941a1253 100644 --- a/configs/M5253EVBE_defconfig +++ b/configs/M5253EVBE_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5253EVBE=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index 3aed04e813..d681d32140 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x04000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index 6f624e6a00..e57323d594 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 CONFIG_SYS_PROMPT="-> " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index ecc610b74b..2a5da64a3a 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 93756b2e27..97024333db 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index f10027693d..1f5fb14402 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x4FE00000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 65a4dea66b..743b74b40b 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 76ba77cfe3..254cd41224 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index 4a7ff1b9eb..9cec452cd5 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000" CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig index 7c67d8c01e..9145ada7c7 100644 --- a/configs/MPC8349ITX_defconfig +++ b/configs/MPC8349ITX_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX" CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 02ca577e28..5d88a27180 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index e366ac1355..07f1b54ae9 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_FDC=y diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig index ffad41fae8..e30a720688 100644 --- a/configs/PLU405_defconfig +++ b/configs/PLU405_defconfig @@ -10,6 +10,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig index d07596add0..1b3e91f9d5 100644 --- a/configs/TQM5200S_HIGHBOOT_defconfig +++ b/configs/TQM5200S_HIGHBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig index af3225554b..4ed119dbe7 100644 --- a/configs/TQM5200S_defconfig +++ b/configs/TQM5200S_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig index 37d6767f28..2e6b4dd272 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index 5e0cf9ea47..8eb3d4099e 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 7b4b030d74..146c3bf514 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index 4792639653..c7bc5383ba 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 89f2ecb104..61601a5a41 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index e2681ad715..89d1df4c72 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index 829942ef62..b7c6462436 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 2c24844683..75ecade55b 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index a6882aab4d..be45efd00e 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index 8be81ae2a4..b3e9325253 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index 37e740ff45..bf1186a6cd 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index e65b01fc36..978540bb1a 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index 5c69085fdb..8daee064da 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index f3d077c4bd..9b7c8b8903 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index 3069dcbadd..ffb23d3364 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index a2f0f00b61..db70ca121e 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig index fc9319696a..48421e3cfe 100644 --- a/configs/TQM885D_defconfig +++ b/configs/TQM885D_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index e0493a12fb..5b4000e266 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig index 0054d4cddb..4fbffb6edc 100644 --- a/configs/a4m072_defconfig +++ b/configs/a4m072_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="asdfg" +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index fd30665753..ebefd126a8 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set diff --git a/configs/charon_defconfig b/configs/charon_defconfig index 8a1429037a..89a5d08541 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 90cf139a79..8b51073030 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 58af17c5c8..a0b5c752cc 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="d2v2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig index 703f1a5c72..bb65369aaa 100644 --- a/configs/dbau1000_defconfig +++ b/configs/dbau1000_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig index 3fb0967e67..98b0d40c7b 100644 --- a/configs/dbau1100_defconfig +++ b/configs/dbau1100_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig index ad095cfdbe..cdf5477407 100644 --- a/configs/dbau1500_defconfig +++ b/configs/dbau1500_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig index 86b2b0d804..cda75d6e03 100644 --- a/configs/digsy_mtc_RAMBOOT_defconfig +++ b/configs/digsy_mtc_RAMBOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig index 85b7f850f7..da9cec81a3 100644 --- a/configs/digsy_mtc_defconfig +++ b/configs/digsy_mtc_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig index 7ec8650aca..1bba630083 100644 --- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig +++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig index b4b8533063..3491fdd5f1 100644 --- a/configs/digsy_mtc_rev5_defconfig +++ b/configs/digsy_mtc_rev5_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 87ef896591..53be09aede 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -7,6 +7,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index e30ba0dace..8f3ffcf5ba 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_USB=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index e9f67ae455..46ac56797f 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_TARGET_DS109=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 51c9ba5f0e..03c30ec0c4 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="EDMiniV2> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig index 00418153be..d51e31d8ed 100644 --- a/configs/fo300_defconfig +++ b/configs/fo300_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 046435a995..07d88b1a36 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -7,6 +7,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="GoFlexHome> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index f2c22bfd54..090ff03dc5 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index f454277678..bcdf6f8dac 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -8,6 +8,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ib62x0 => " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index ba468bd494..8daf4332ca 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig index 9b30244e3c..c263cf61c5 100644 --- a/configs/inka4x0_defconfig +++ b/configs/inka4x0_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y CONFIG_TARGET_INKA4X0=y CONFIG_BOOTDELAY=1 CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig index 690bc0f461..e424d47bf2 100644 --- a/configs/ipek01_defconfig +++ b/configs/ipek01_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 124bf24c4b..1d55003d67 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 398c6b59ec..75fe55d819 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index a7f14bde19..a342bec808 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -6,6 +6,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 9b04e0be31..ac560460eb 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -7,6 +7,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 237b3ab333..e4e21d0f0f 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -5,6 +5,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index fe5e00c259..0b9f665f10 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -6,6 +6,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index 5040ea5742..ab9ea81021 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -8,6 +8,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press "<Esc><Esc>" to stop\n" CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index a6bfc71f5e..a6f65d8bac 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index 61c366a294..022e67b249 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index b31962a8f8..30e52692d0 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 8e9c13a37c..abf71a5914 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="nas220> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index ff222a1176..ab8eb958ca 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="2big2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index cec9389b6c..66db6447ac 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index fd4525e30f..04abc9405b 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index d6e70db41e..5f79e6f0e2 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 3ccbf657a4..a81ad0b1e8 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 3269b85e88..74bb72ad83 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="nsa310s => " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index 84d3f89850..cd3991ad15 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index 57cbb3a0b9..db034b6ba8 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index 4bc2dcee4e..bf3ac8111a 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 02e6af1342..36d0185268 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 73ee7b69ba..b648326041 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 4f6803d448..e092dbdef6 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index b354ba1c7c..f8f6295617 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig index e748f02c1d..45513be56f 100644 --- a/configs/qemu_mips64_defconfig +++ b/configs/qemu_mips64_defconfig @@ -4,6 +4,7 @@ CONFIG_CPU_MIPS64_R1=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips64 # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig index b2d2a0bc76..5f6ea3e2e7 100644 --- a/configs/qemu_mips64el_defconfig +++ b/configs/qemu_mips64el_defconfig @@ -5,6 +5,7 @@ CONFIG_CPU_MIPS64_R1=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips64el # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig index 3ef02a40c9..b87b0c571c 100644 --- a/configs/qemu_mips_defconfig +++ b/configs/qemu_mips_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_QEMU_MIPS=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig index 08415958e2..281cf667da 100644 --- a/configs/qemu_mipsel_defconfig +++ b/configs/qemu_mipsel_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mipsel # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 3bd3d213bf..ba68b504d0 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_R2DPLUS=y CONFIG_BOOTDELAY=-1 +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig index 999470c26c..2a37db824d 100644 --- a/configs/r7780mp_defconfig +++ b/configs/r7780mp_defconfig @@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a573d52b7f..56903a3f83 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index e8e035528a..4f44b137fe 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 7f262dc327..d80e78901b 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index fa99d51505..80cc62ebd6 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig index 18dc039d93..3d0065ea84 100644 --- a/configs/v38b_defconfig +++ b/configs/v38b_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y CONFIG_TARGET_V38B=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index ad9100e0f5..ce3745a221 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 3c238d929f..b00f96ef6e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#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 */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 43bf127a2a..c444198778 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -62,7 +62,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE

#define CONFIG_SUPPORT_VFAT

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index b1a49b07c3..e7c6f8b558 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -37,7 +37,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE

#ifdef CONFIG_CMD_IDE /* ATA */ 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/M54455EVB.h b/include/configs/M54455EVB.h index 806f00555f..9b6bd1025d 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME

/* Command line configuration */ -#define CONFIG_CMD_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 64c6ed100f..e758f1947b 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 6d35d705ec..7cf27fa96d 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -486,10 +486,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/PIP405.h b/include/configs/PIP405.h index eb1f0e26c5..029de2a1a9 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -37,7 +37,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 74cb8abafb..ef20eee201 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -56,7 +56,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE #define CONFIG_CMD_NAND

#define CONFIG_SUPPORT_VFAT diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 19e0b1be1b..8d165290eb 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -153,7 +153,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..685cb5146e 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,7 +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..88ee42fe00 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index c2b35fd196..621a4b1def 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +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..34e9520c3c 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +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..bf96d0989b 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,7 +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 ffb514bb85..f47b0baba0 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#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..4617740336 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,7 +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..9c445fdadc 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,7 +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..7f384cda97 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,7 +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..31392e0561 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,7 +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 f11e23a6a3..baa65c0dec 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index e91070ae30..184cb62e19 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,7 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE

/* * Miscellaneous configurable options 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 3d3c216d61..8b55dee498 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1

-#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

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/aria.h b/include/configs/aria.h index 3b5d56c6bb..1564b40832 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1

-#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

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/digsy_mtc.h b/include/configs/digsy_mtc.h index ab546c50cd..7800e81116 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,7 +85,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/dns325.h b/include/configs/dns325.h index de682334eb..470e26256a 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS

#define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index d1c7b937e3..2f2e930b4e 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -120,7 +120,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE

/* * Network diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index dbcd2b2dbe..d1635b098e 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -44,7 +44,6 @@ */

#define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */

/* diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 2cf0027d9c..36a66bb463 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 3bdab3310b..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 */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index ece72c6aa1..485b989b4a 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,7 +88,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 69c08c69da..66e65c878c 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,7 +43,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #endif

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 59542a62e4..d2c210119b 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -38,7 +38,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE

/* * mv-common.h should be defined after CMD configs since it used them 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/mecp5123.h b/include/configs/mecp5123.h index 6e10cafe6e..fcc1c68236 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

#define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2

/* diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index aaa8962fd2..02ac7b3089 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#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 bd7c4a64e2..14cf2e8cb9 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -378,7 +378,6 @@ #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

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/mv-plug-common.h b/include/configs/mv-plug-common.h index ce85e38875..90ad0a654b 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE

/* * Extra file system diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 7004176c4a..9ecc28811b 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 diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index eba31c4abf..b988d3d7f9 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -25,7 +25,6 @@

/* commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 6c17f3b24b..89e963d524 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -27,7 +27,6 @@ */ #define CONFIG_SYS_MVFS #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/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/qemu-mips.h b/include/configs/qemu-mips.h index 59a793babe..aeaf88a686 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 diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 28b791acdd..d201c848ff 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 diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 687befdad3..b751ad5e14 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -27,7 +27,6 @@ * Default configuraion is to support the QEMU default x86 target * Undefine CONFIG_CMD_IDE to support q35 target */ -#define CONFIG_CMD_IDE #ifdef CONFIG_CMD_IDE #define CONFIG_SYS_IDE_MAXBUS 2 #define CONFIG_SYS_IDE_MAXDEVICE 4 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..26c5f0feeb 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 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index cd7a82630e..dccfaf6a0d 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -160,7 +160,6 @@ #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/v38b.h b/include/configs/v38b.h index 0bc0ae517a..8b2f39c910 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,7 +73,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 53ed0d8b2e..bf8e9d5024 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IDE CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE

This converts the following to Kconfig: CONFIG_CMD_IMMAP

Also move this command out of the cmd/ directory since it is PowerPC-specific.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - arch/powerpc/Kconfig | 2 ++ arch/powerpc/lib/Kconfig | 8 ++++++++ arch/powerpc/lib/Makefile | 1 + {cmd => arch/powerpc/lib}/immap.c | 0 cmd/Makefile | 1 - configs/canmb_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/munices_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/canmb.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/motionpro.h | 1 - include/configs/munices.h | 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 arch/powerpc/lib/Kconfig rename {cmd => arch/powerpc/lib}/immap.c (100%)

diff --git a/README b/README index 2dafe21f0d..5f3ccbe112 100644 --- a/README +++ b/README @@ -850,7 +850,6 @@ The following options need to be configured: CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash - CONFIG_CMD_IMMAP * IMMR dump support CONFIG_CMD_IOTRACE * I/O tracing for debugging CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3d2c1319c9..eae94c8fd5 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -49,6 +49,8 @@ config 4xx

endchoice

+source "arch/powerpc/lib/Kconfig" + source "arch/powerpc/cpu/mpc512x/Kconfig" source "arch/powerpc/cpu/mpc5xx/Kconfig" source "arch/powerpc/cpu/mpc5xxx/Kconfig" diff --git a/arch/powerpc/lib/Kconfig b/arch/powerpc/lib/Kconfig new file mode 100644 index 0000000000..987cec99cb --- /dev/null +++ b/arch/powerpc/lib/Kconfig @@ -0,0 +1,8 @@ +config CMD_IMMAP + bool "Enable various commands to dump IMMR information" + help + This enables various commands such as: + + siuinfo - print System Interface Unit (SIU) registers + memcinfo - print Memory Controller registers + sitinfo - print System Integration Timers (SIT) registers diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 88adb26e2e..e09bd9a88a 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_BAT_RW) += bat_rw.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += cache.o obj-y += extable.o +obj-$(CONFIG_CMD_IMMAP) += immap.o obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o obj-$(CONFIG_IDE) += ide.o diff --git a/cmd/immap.c b/arch/powerpc/lib/immap.c similarity index 100% rename from cmd/immap.c rename to arch/powerpc/lib/immap.c diff --git a/cmd/Makefile b/cmd/Makefile index f043407656..1293d24e39 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -68,7 +68,6 @@ obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_IOTRACE) += iotrace.o obj-$(CONFIG_CMD_HASH) += hash.o obj-$(CONFIG_CMD_IDE) += ide.o disk.o -obj-$(CONFIG_CMD_IMMAP) += immap.o obj-$(CONFIG_CMD_INI) += ini.o obj-$(CONFIG_CMD_IRQ) += irq.o obj-$(CONFIG_CMD_ITEST) += itest.o diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig index 1f6f18d601..87eb205d0c 100644 --- a/configs/canmb_defconfig +++ b/configs/canmb_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_CANMB=y CONFIG_BOOTDELAY=5 CONFIG_CMD_ASKENV=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 4d6718dd31..63ad7edf48 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 233943c0d7..31cad022ef 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index d92e6b2934..bb8a0fe292 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 13f5c1e304..e5b7ba67a4 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 0b112ffb48..9e9c0b9843 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index ba02124ccb..5235530725 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 16b7b18062..464a125c39 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 3f73346208..ca64a6e99e 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 8b9180b6a6..04a3e48d53 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index d66fffe47e..0d4a1e102d 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index c9f07d11a4..f4f8ae5452 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index ab9ea81021..5521e6d01b 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MOTIONPRO=y CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/munices_defconfig b/configs/munices_defconfig index ddd5c43de2..0e2b188a51 100644 --- a/configs/munices_defconfig +++ b/configs/munices_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MUNICES=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 68fee8ce79..68cfe65a5e 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index a5579e4f33..3cb1404c92 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 519472f247..18b124a58c 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index b00f96ef6e..8ab46ca47e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#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 */ 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/km/keymile-common.h b/include/configs/km/keymile-common.h index 506ce51236..08ccaa200c 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 02ac7b3089..035f1dc5f9 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bf8e9d5024..3d5e45da73 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

include/configs/apf27.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-)

diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 3450751054..073f3b4fef 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,7 +54,6 @@ /* * U-Boot Commands */ -#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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f4f3308e9b..4773292c6c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO CONFIG_CMD_IOLOOP CONFIG_CMD_IOTRACE

This converts the following to Kconfig: CONFIG_CMD_IOLOOP

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

board/gdsys/mpc8308/Kconfig | 5 +++++ configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + include/configs/hrcon.h | 2 -- include/configs/strider.h | 2 -- scripts/config_whitelist.txt | 1 - 10 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/board/gdsys/mpc8308/Kconfig b/board/gdsys/mpc8308/Kconfig index 9a1a3a2f28..cb29c25c65 100644 --- a/board/gdsys/mpc8308/Kconfig +++ b/board/gdsys/mpc8308/Kconfig @@ -23,3 +23,8 @@ config SYS_CONFIG_NAME default "strider"

endif + +config CMD_IOLOOP + bool "Enable 'ioloop' and 'ioreflect' commands" + help + These commands provide FPGA tests. diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index cf89ebe145..aea06769f4 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" hrcon 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_HRCON=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index c5512e71c4..8e911d49a0 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" hrcon dh 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_HRCON=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 099d40714f..d293d39d7b 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider con 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 754db3d2d8..e0040e9e38 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider con dp 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index 692e883e75..7d372ffac7 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider cpu 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index 18e33a2e6b..5d304b3f8b 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider cpu dp 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index cfebd2d26e..405129b7e2 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,8 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR

-#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 539557d972..994ac73e13 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -28,8 +28,6 @@

#define CONFIG_SYS_ALT_MEMTEST

-#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d81f87c990..0d7e130a80 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IOLOOP CONFIG_CMD_IOTRACE CONFIG_CMD_IRQ CONFIG_CMD_JFFS2

This converts the following to Kconfig: CONFIG_CMD_JFFS2

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - cmd/Kconfig | 8 ++++++++ configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/aria_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/charon_defconfig | 1 + configs/cm5200_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/ds414_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/ethernut5_defconfig | 1 + configs/fo300_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/grasshopper_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/ms7722se_defconfig | 1 + configs/nas220_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/sh7763rdp_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/v38b_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinum_onenand_small_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/vct_premium_onenand_small_defconfig | 1 + configs/wtk_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/TQM5200.h | 1 - include/configs/TQM823L.h | 1 - include/configs/TQM823M.h | 1 - include/configs/TQM834x.h | 1 - include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 1 - include/configs/TQM855L.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM860L.h | 1 - include/configs/TQM860M.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/ac14xx.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/aria.h | 1 - include/configs/astro_mcf5373l.h | 3 --- include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/cm5200.h | 1 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dockstar.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/grasshopper.h | 1 - include/configs/iconnect.h | 1 - include/configs/ids8313.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/mcx.h | 1 - include/configs/mecp5123.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/motionpro.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/ms7722se.h | 1 - include/configs/mv-common.h | 1 - include/configs/nas220.h | 1 - include/configs/omap3_evm.h | 2 -- include/configs/pcm030.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/sh7763rdp.h | 1 - include/configs/tricorder.h | 2 -- include/configs/v38b.h | 1 - include/configs/vct.h | 1 - include/configs/xilinx-ppc.h | 2 -- include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 176 files changed, 121 insertions(+), 68 deletions(-)

diff --git a/README b/README index f0020fbf33..c493d72fad 100644 --- a/README +++ b/README @@ -854,7 +854,6 @@ The following options need to be configured: CONFIG_CMD_INI * import data from an ini file into the env CONFIG_CMD_IRQ * irqinfo CONFIG_CMD_ITEST Integer/string test of 2 values - CONFIG_CMD_JFFS2 * JFFS2 Support CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration diff --git a/cmd/Kconfig b/cmd/Kconfig index c1e271d329..e4cb6c92b0 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1145,6 +1145,14 @@ config CMD_FS_UUID help Enables fsuuid command for filesystem UUID.

+config CMD_JFFS2 + bool "jffs2 command" + help + Enables commands to support the JFFS2 (Journalling Flash File System + version 2) filesystem. This enables fsload, ls and fsinfo which + provide the ability to load files, list directories and obtain + filesystem information. + config CMD_MTDPARTS depends on ARCH_SUNXI bool "MTD partition support" diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index e756401162..903eef536c 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig index 4f9d97ee55..d657f863d0 100644 --- a/configs/M52277EVB_stmicro_defconfig +++ b/configs/M52277EVB_stmicro_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index d681d32140..221c70750b 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index e57323d594..557b87b78c 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index 2a5da64a3a..9ad0564788 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 97024333db..dc7af6cb19 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index 1f5fb14402..eed2eabe68 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 743b74b40b..da3bbaeb14 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BSP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 254cd41224..461416773c 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BSP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 5d88a27180..b9cbafc887 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig index 1b3e91f9d5..5e6f9c951f 100644 --- a/configs/TQM5200S_HIGHBOOT_defconfig +++ b/configs/TQM5200S_HIGHBOOT_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig index 4ed119dbe7..d0c352faa1 100644 --- a/configs/TQM5200S_defconfig +++ b/configs/TQM5200S_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig index 2e6b4dd272..ed74408b98 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index 8eb3d4099e..cc9968cacb 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 146c3bf514..35d486033b 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index c7bc5383ba..783c39a052 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 61601a5a41..ccb68b24c5 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index 89d1df4c72..c588948e11 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index b7c6462436..0490828504 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index c4b9091586..ef73ed40c8 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 75ecade55b..0e42d8c4fe 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index be45efd00e..a464fe507a 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index b3e9325253..aa370012f5 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index bf1186a6cd..faab826a24 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index 978540bb1a..b18cf31ddd 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index 8daee064da..fe2fe6d38c 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index 9b7c8b8903..6f5f772d32 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index ffb23d3364..44307760ee 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index db70ca121e..d8922900d4 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_IDE=y CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index 5b4000e266..9d26e94615 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig index 930ec8acf2..6855331860 100644 --- a/configs/ac14xx_defconfig +++ b/configs/ac14xx_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 81fec1e082..2a0987e555 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/aria_defconfig b/configs/aria_defconfig index 0f1432f9a8..0613dd16fb 100644 --- a/configs/aria_defconfig +++ b/configs/aria_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index c35222b244..888bb334bf 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -11,4 +11,5 @@ CONFIG_CMD_FPGA_LOADMK=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 1e85f0af33..17db763867 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index 2fa5b6954d..887c5fb8d7 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig index 49182e33c4..0fa7969e47 100644 --- a/configs/atstk1002_defconfig +++ b/configs/atstk1002_defconfig @@ -17,5 +17,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig index 46a24f56ab..d8a419cda2 100644 --- a/configs/cam5200_defconfig +++ b/configs/cam5200_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig index 6b9877ff21..d7577a44ff 100644 --- a/configs/cam5200_niosflash_defconfig +++ b/configs/cam5200_niosflash_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/charon_defconfig b/configs/charon_defconfig index 89a5d08541..2e4ad658e0 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig index d3369f4455..860d23e553 100644 --- a/configs/cm5200_defconfig +++ b/configs/cm5200_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 074be13c04..79623e1be5 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_GPIO=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 7edcb08324..617228f91f 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 53be09aede..abe6a6379f 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index 14eee484e0..a70458872d 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index b637483720..4e17bb91a3 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SPL_OF_TRANSLATE=y diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig index e7b4810b5a..bb67881a25 100644 --- a/configs/edb9315a_defconfig +++ b/configs/edb9315a_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y # CONFIG_DOS_PARTITION is not set CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index d5e08889d0..197052dba6 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig index d51e31d8ed..24470f311a 100644 --- a/configs/fo300_defconfig +++ b/configs/fo300_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 07d88b1a36..4dfb895351 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig index 2944d73af5..024231dbc6 100644 --- a/configs/grasshopper_defconfig +++ b/configs/grasshopper_defconfig @@ -14,4 +14,5 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 090ff03dc5..361293af53 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index bcdf6f8dac..a8107e264d 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 7e0b444b54..32994ec0cb 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index a6dbe029a7..8b4b7a27a7 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_HASH=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 0884688f49..df7dac8c37 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index d34174db08..4b9cdb7f47 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 83e9d04c4a..79952774ae 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 63ad7edf48..a6ec1d8ee0 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 31cad022ef..0a22f8d204 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index d41fae022c..af0df7ef22 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index bb8a0fe292..6cbecf600f 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index e5b7ba67a4..fdb6cf63c4 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index cb06ba0cbf..eb70cd600a 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 9e9c0b9843..6874e02315 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index 40b5f9628c..ed90f9d5b6 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index 5235530725..ecd297d8c6 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 242fc1a904..c5edce8e4f 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 464a125c39..9e20c026fa 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index ca64a6e99e..2c6e00e296 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 04a3e48d53..a0a723861f 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 349df80f05..09dbc781c6 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig index db52077e1a..3937fe8b44 100644 --- a/configs/mecp5123_defconfig +++ b/configs/mecp5123_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index 0d4a1e102d..58d6656df3 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 1fba301af8..2add8828b8 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index f4f8ae5452..c4f39b38c7 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 131d6f5862..bcb0e88054 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index 5521e6d01b..c4006bca5f 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_BEDBUG=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index a6f65d8bac..5bb78076ad 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index 022e67b249..e28fa19227 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index cb50b46148..92f3158dae 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -20,5 +20,6 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index abf71a5914..a57cc9724c 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 74bb72ad83..2ba87642b3 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1b61d1d8b9..227f1d1ca3 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index cd3991ad15..1471872833 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index db034b6ba8..b62852a10c 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index bf3ac8111a..d57b6962d5 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/pcm030_LOWBOOT_defconfig b/configs/pcm030_LOWBOOT_defconfig index 2933326e5d..0ef8750d66 100644 --- a/configs/pcm030_LOWBOOT_defconfig +++ b/configs/pcm030_LOWBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig index ff9f4e9f4f..3869991f9e 100644 --- a/configs/pcm030_defconfig +++ b/configs/pcm030_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_PROMPT="uboot> " # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 92441b3c23..7cf2722740 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 7235922a94..954908e9aa 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 7699e0c5e6..57ebc0694c 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 0d15fb8a0c..a0faba50ff 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index ec0275ee55..028616666c 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -21,5 +21,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 80cc62ebd6..19acc7de3c 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 68cfe65a5e..e5e100a950 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 3cb1404c92..c3e5a9eace 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 18b124a58c..515656de1c 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig index 3d0065ea84..6876f6585a 100644 --- a/configs/v38b_defconfig +++ b/configs/v38b_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 707ede5901..5d4cccccba 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 0e4964b5b3..5a5edd8260 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index 979c554d22..1f0a3f8b49 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NET is not set CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index 5b443cfbb5..9e2fcbf6d0 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index 2a4a0552fc..ac9cf36f68 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 8eca0a5597..6e649ec0d7 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index ce3745a221..2b81535c29 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 6aa049c450..1f90e3db26 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -18,6 +18,7 @@ CONFIG_LOOPW=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_OF_EMBED=y # CONFIG_MMC is not set diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c9a1e2b087..f1f723490f 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig index 54b74ff65f..b89e2471db 100644 --- a/configs/xpedite1000_defconfig +++ b/configs/xpedite1000_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 6457d1952b..848d27ea81 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig index b6cebe9146..0fec4cf00d 100644 --- a/configs/xpedite520x_defconfig +++ b/configs/xpedite520x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index c575cc4121..2f3fec217c 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_SYS_FSL_DDR2=y CONFIG_DS4510=y # CONFIG_MMC is not set diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig index 785eeef875..6c478ce5ee 100644 --- a/configs/xpedite550x_defconfig +++ b/configs/xpedite550x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 27fcc5e28d..34f9167cfe 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -14,7 +14,6 @@ */

#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 */ 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/M54418TWR.h b/include/configs/M54418TWR.h index 7b162cccef..cb7ea8639d 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

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 9b6bd1025d..39ba94065a 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME

/* Command line configuration */ -#define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index e758f1947b..efab6457b3 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -47,7 +47,6 @@ * Command line configuration. */ #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/TQM5200.h b/include/configs/TQM5200.h index 8d165290eb..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 diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 685cb5146e..74636b9162 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,7 +91,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 88ee42fe00..6b345c427c 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index a90e2ac8d9..a79dabef61 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -273,7 +273,6 @@ /* * Command line configuration. */ -#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 621a4b1def..b4ed561544 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 34e9520c3c..1dc13295ff 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index bf96d0989b..b4c3a79387 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index f47b0baba0..14b76a66bc 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 4617740336..f55fe56abb 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 9c445fdadc..52c4d68693 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 7f384cda97..06981c9861 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 31392e0561..3f87d8aa11 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index baa65c0dec..975f4b76dc 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2

#define CONFIG_NETCONSOLE

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 8b55dee498..4eb8f39aaf 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1

-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

#if defined(CONFIG_PCI) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 5de39cf740..2230c48d75 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 */

diff --git a/include/configs/aria.h b/include/configs/aria.h index 1564b40832..0a7ef9919e 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1

-#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 084b78c1e3..61989d6bab 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -59,9 +59,6 @@

/* 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_CMDLINE_EDITING

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/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/devkit3250.h b/include/configs/devkit3250.h index 6e95064fe1..d2133130bc 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

/* 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/dockstar.h b/include/configs/dockstar.h index 2db31d3c11..3b56fd6739 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -79,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/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/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/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/iconnect.h b/include/configs/iconnect.h index 46374f2c37..bb4eb7be7b 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -87,7 +87,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 5e85cc6d4c..aa3123ad82 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 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/km/keymile-common.h b/include/configs/km/keymile-common.h index 08ccaa200c..c2b38d8af6 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS

#undef CONFIG_WATCHDOG /* disable platform specific watchdog */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index c70e68c5b0..bccfb9bcf5 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 diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index fcc1c68236..17a97dfc3a 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

#define CONFIG_CMD_REGINFO -#define CONFIG_CMD_JFFS2

/* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e8fe2f673c..5ae3af9e38 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -172,7 +172,6 @@ #define CONFIG_CMD_MFSL

#if defined(FLASH) -# define CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS

# if !defined(RAMENV) @@ -186,7 +185,6 @@ # define CONFIG_CMD_SAVES # endif #else -# undef CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS #endif #endif diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 035f1dc5f9..88d660d1a4 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

/* diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 5c9a2d939b..e11a0e628a 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -378,7 +378,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO

#if defined(CONFIG_PCI) 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/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/nas220.h b/include/configs/nas220.h index 9ecc28811b..dfa81223c4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -101,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/omap3_evm.h b/include/configs/omap3_evm.h index d8ca6225d6..23f081273f 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

/* ---------------------------------------------------------------------------- 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/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 e62e21704c..f94e74f0fc 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -77,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/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/tricorder.h b/include/configs/tricorder.h index 9bce1ac1a0..5d8f079a7a 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -104,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 */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 8b2f39c910..c5c78bf54c 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -74,7 +74,6 @@ * Command line configuration. */ #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 e4ae9cdb2e..07a5d49f3b 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -234,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 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index efb3038d9a..68ae44bfa1 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -26,7 +26,6 @@ /*Cmd*/ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS

/*Misc*/ @@ -76,7 +75,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/xpedite1000.h b/include/configs/xpedite1000.h index 6d9500619e..8294001730 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -176,7 +176,6 @@ extern void out32(unsigned int, unsigned long); * Command configuration */ #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 4ecceb2a9f..b604019621 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -485,7 +485,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Command configuration. */ #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 3e21c96bc2..2645006b37 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#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 526bff6cff..abbaeaad10 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#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 ee033ef01d..254fc12cf6 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 481a7d3144..ce77046bd2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_IRQ -CONFIG_CMD_JFFS2 CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC

This converts the following to Kconfig: CONFIG_CMD_IRQ

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Add depends on !ARM && !MIPS && !SH - Enable for all PPC boards, and explicitly disable those that don't want it - Enable for microblaze

README | 1 - arch/Kconfig | 3 +++ cmd/Kconfig | 8 ++++++++ configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/aria_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/wtk_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8349ITX.h | 1 - include/configs/MPC8536DS.h | 2 -- include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/PATI.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 2 -- include/configs/VOM405.h | 1 - include/configs/amcc-common.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 1 - include/configs/dlvision.h | 1 - include/configs/io.h | 1 - include/configs/iocon.h | 1 - include/configs/ipek01.h | 1 - include/configs/lwmon5.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/neo.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/t4qds.h | 1 - include/configs/v38b.h | 1 - include/configs/vct.h | 1 - include/configs/x86-common.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - scripts/config_whitelist.txt | 1 - 83 files changed, 32 insertions(+), 62 deletions(-)

diff --git a/README b/README index c493d72fad..8ced3abda2 100644 --- a/README +++ b/README @@ -852,7 +852,6 @@ The following options need to be configured: CONFIG_CMD_IMLS_NAND * List all images found in NAND flash CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env - CONFIG_CMD_IRQ * irqinfo CONFIG_CMD_ITEST Integer/string test of 2 values CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) diff --git a/arch/Kconfig b/arch/Kconfig index 2b194b3049..069f0f5f2c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -34,6 +34,7 @@ config M68K config MICROBLAZE bool "MicroBlaze architecture" select SUPPORT_OF_CONTROL + imply CMD_IRQ

config MIPS bool "MIPS architecture" @@ -55,6 +56,7 @@ config PPC bool "PowerPC architecture" select HAVE_PRIVATE_LIBGCC select SUPPORT_OF_CONTROL + imply CMD_IRQ

config SANDBOX bool "Sandbox" @@ -91,6 +93,7 @@ config X86 imply CMD_FPGA_LOADMK imply CMD_GETTIME imply CMD_IO + imply CMD_IRQ

config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index be6b314c26..d875f9cf36 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1192,6 +1192,14 @@ config CMD_DIAG available tests and running either all the tests, or specific tests identified by name.

+config CMD_IRQ + bool "irq - Show information about interrupts" + depends on !ARM && !MIPS && !SH + help + This enables two commands: + + interrupts - enable or disable interrupts + irqinfo - print device-specific interrupt information endmenu

config CMD_UBI diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index ccb68b24c5..5c3fc9b83d 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index c588948e11..8c4c28ef54 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index 0490828504..d1a3a15c99 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 0e42d8c4fe..e3026bd374 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index a464fe507a..eda7e69fc9 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index aa370012f5..203dd7cc27 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index faab826a24..f787a2768f 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index b18cf31ddd..fffdd08a3b 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index fe2fe6d38c..6003b8842a 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index 6f5f772d32..a2abe6e487 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index 44307760ee..8cdeb0ec85 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index d8922900d4..088cc3b33f 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig index 48421e3cfe..e4d98a3d36 100644 --- a/configs/TQM885D_defconfig +++ b/configs/TQM885D_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index 9d26e94615..caaaa5bcae 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig index 6855331860..092c38ca36 100644 --- a/configs/ac14xx_defconfig +++ b/configs/ac14xx_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/aria_defconfig b/configs/aria_defconfig index 0613dd16fb..39dc563a83 100644 --- a/configs/aria_defconfig +++ b/configs/aria_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig index 3937fe8b44..919c75080b 100644 --- a/configs/mecp5123_defconfig +++ b/configs/mecp5123_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index 5bb78076ad..41bc5a4144 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index e28fa19227..6af4d46d7c 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig index 4ef0df1aa8..1ed47d2da8 100644 --- a/configs/pdm360ng_defconfig +++ b/configs/pdm360ng_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index 2b81535c29..bea85df807 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 34f9167cfe..df21c1a483 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_KGDB /* kgdb */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 377b8998a4..6085724a65 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 65d8f126b2..5e81d18e8e 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -293,7 +293,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 59da85d0c9..9254442874 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -520,7 +520,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index eaa42545fc..f539cde5ba 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -436,7 +436,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 561ff894b3..6d2919ff55 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -46,7 +46,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ

#undef CONFIG_WATCHDOG /* watchdog disabled */

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index c444198778..ab4b060906 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -61,7 +61,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ

#define CONFIG_SUPPORT_VFAT

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index efab6457b3..b13809f88a 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 7cf27fa96d..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) \ 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 59f1cc7c8d..79e11bb6f8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,7 +547,6 @@ /* * Command line configuration. */ -#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 9c12c5d21a..0333ff9e08 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -724,7 +724,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 2d1564a835..3d12c84ce9 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#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 92dcd2c418..17d8b228b4 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -580,7 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 1b2cb3dd22..1f26ac4c2d 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,7 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_IRQ

#define CONFIG_BOOTCOMMAND "" /* autoboot command */

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 029de2a1a9..393a02dd78 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -38,7 +38,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_SCSI #define CONFIG_CMD_SDRAM diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index ef20eee201..78ce91d089 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -55,7 +55,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ #define CONFIG_CMD_NAND

#define CONFIG_SUPPORT_VFAT diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 2f05a5a176..a94e790b95 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,7 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI

#undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index d97ec0ef95..5449d2e5d7 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 99537d58e6..21c6dbbbcb 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 977b7b6d63..5ec1e23337 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -658,7 +658,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index fa691b5883..e8338ccfa6 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -771,7 +771,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 1ca13b595d..105e905960 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,7 +744,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index e2f1863bdc..38973cbdf3 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -272,7 +272,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 9cede19d4f..b2feccfd39 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -421,8 +421,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 5255b6d688..a180b381cf 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -53,7 +53,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ

#undef CONFIG_WATCHDOG /* watchdog disabled */

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index eca90cf750..450a2ebc11 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,7 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 40117b9a7f..3d59e98ea2 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -343,7 +343,6 @@

#ifndef CONFIG_TRAILBLAZER

-#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

/* diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 64ae67e592..e88d09255f 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 9210770d7b..a23da191ab 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -411,7 +411,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 7800e81116..6710507a8d 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,7 +85,6 @@ /* * Command line configuration. */ -#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 5597e27516..aa91bf5513 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ

/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index e5a8b3232d..ac0cd2c0db 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -55,7 +55,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ

/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/io.h b/include/configs/io.h index 767acf2773..98d2fb551d 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ

/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 0d81ac1b2f..e95cd70d71 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ

/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 485b989b4a..c6390dbdbe 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,7 +88,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */

#define CONFIG_SYS_LOWBOOT 1 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index f36ec3d3f8..8971096a98 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,7 +381,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 5ae3af9e38..9aa4945f49 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -168,7 +168,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL

#if defined(FLASH) diff --git a/include/configs/neo.h b/include/configs/neo.h index 609f7e17ee..345ee0c68a 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ

/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 24f751c839..71b4f40921 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -813,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 a6501520f5..fd644f22da 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -384,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/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/t4qds.h b/include/configs/t4qds.h index f4f9a38b2c..260cdee001 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -241,7 +241,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/v38b.h b/include/configs/v38b.h index c5c78bf54c..2bd6cc11ae 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,7 +73,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #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 07a5d49f3b..c5b96540ae 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -252,7 +252,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_IRQ #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_STRINGS diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d8b3f1ad67..b5ef8b5c56 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,7 +70,6 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_SCSI

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 68ae44bfa1..e8a0c1c33d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)

/*Cmd*/ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_MTDPARTS

diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 8294001730..93afb2062f 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,7 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI

/* diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index b604019621..07f26544fd 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ce77046bd2..017f90b367 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IRQ CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC

This converts the following to Kconfig: CONFIG_CMD_KGDB

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 1 - cmd/Kconfig | 9 +++++++++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README b/README index 8ced3abda2..879ae8b33b 100644 --- a/README +++ b/README @@ -853,7 +853,6 @@ The following options need to be configured: CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env CONFIG_CMD_ITEST Integer/string test of 2 values - CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration (169.254.*.*) diff --git a/cmd/Kconfig b/cmd/Kconfig index d875f9cf36..d691142c82 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1200,6 +1200,15 @@ config CMD_IRQ

interrupts - enable or disable interrupts irqinfo - print device-specific interrupt information + +config CMD_KGDB + bool "kgdb - Allow debugging of U-Boot with gdb" + help + This enables a 'kgdb' command which allows gdb to connect to U-Boot + over a serial link for debugging purposes. This allows + single-stepping, inspecting variables, etc. This is supported only + on PowerPC at present. + endmenu

config CMD_UBI diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index df21c1a483..b1f41abf4f 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */

-#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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 017f90b367..bff0c18fd1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957

This converts the following to Kconfig: CONFIG_LZMA

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: None

README | 23 ----------------------- arch/Kconfig | 1 + configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/qemu_mips64_defconfig | 1 + configs/qemu_mips64el_defconfig | 1 + configs/qemu_mips_defconfig | 1 + configs/qemu_mipsel_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/tplink_wdr4300_defconfig | 1 + configs/zipitz2_defconfig | 1 + include/configs/ap121.h | 1 - include/configs/ap143.h | 1 - include/configs/ib62x0.h | 1 - include/configs/iconnect.h | 1 - include/configs/mv-plug-common.h | 1 - include/configs/nsa310s.h | 1 - include/configs/qemu-mips.h | 2 -- include/configs/qemu-mips64.h | 2 -- include/configs/sandbox.h | 1 - include/configs/tplink_wdr4300.h | 1 - include/configs/zipitz2.h | 1 - lib/Kconfig | 8 ++++++++ scripts/config_whitelist.txt | 1 - 28 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/README b/README index 879ae8b33b..3e4ec984b7 100644 --- a/README +++ b/README @@ -1723,29 +1723,6 @@ The following options need to be configured: the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should be at least 4MB.

- CONFIG_LZMA - - If this option is set, support for lzma compressed - images is included. - - Note: The LZMA algorithm adds between 2 and 4KB of code and it - requires an amount of dynamic memory that is given by the - formula: - - (1846 + 768 << (lc + lp)) * sizeof(uint16) - - Where lc and lp stand for, respectively, Literal context bits - and Literal pos bits. - - This value is upper-bounded by 14MB in the worst case. Anyway, - for a ~4MB large kernel image, we have lc=3 and lp=0 for a - total amount of (1846 + 768 << (3 + 0)) * 2 = ~41KB... that is - a very small buffer. - - Use the lzmainfo tool to determinate the lc and lp values and - then calculate the amount of needed dynamic memory (ensuring - the appropriate CONFIG_SYS_MALLOC_LEN value). - CONFIG_LZO

If this option is set, support for LZO compressed images diff --git a/arch/Kconfig b/arch/Kconfig index 069f0f5f2c..92bb53acf8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -73,6 +73,7 @@ config SANDBOX imply CMD_HASH imply CMD_IO imply CMD_IOTRACE + imply LZMA

config SH bool "SuperH architecture" diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index 2550aeecb7..40055f04d8 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -50,3 +50,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_AR933X_UART=y CONFIG_DM_SPI=y CONFIG_ATH79_SPI=y +CONFIG_LZMA=y diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index 0753221d7f..05f1699748 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -46,3 +46,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_ATH79_SPI=y +CONFIG_LZMA=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 361293af53..570819d3e5 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index a8107e264d..cc9011d05c 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 32994ec0cb..3e48380bc7 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -21,4 +21,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 2ba87642b3..ae39818e4b 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -25,4 +25,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig index 45513be56f..6835cf1c5c 100644 --- a/configs/qemu_mips64_defconfig +++ b/configs/qemu_mips64_defconfig @@ -15,3 +15,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig index 5f6ea3e2e7..60bd6164fc 100644 --- a/configs/qemu_mips64el_defconfig +++ b/configs/qemu_mips64el_defconfig @@ -16,3 +16,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig index b87b0c571c..c6f08b4efb 100644 --- a/configs/qemu_mips_defconfig +++ b/configs/qemu_mips_defconfig @@ -13,3 +13,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig index 281cf667da..b8c206971d 100644 --- a/configs/qemu_mipsel_defconfig +++ b/configs/qemu_mipsel_defconfig @@ -14,3 +14,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 19acc7de3c..ac7217dcba 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index 3c7e6ff4ba..65314df133 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -45,3 +45,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 06e915c1dc..0b38f2b1af 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -19,5 +19,6 @@ CONFIG_PXA_SERIAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_LCD=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set 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/ib62x0.h b/include/configs/ib62x0.h index 0b92d7b2ca..a5782f3300 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -23,7 +23,6 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA

/* * Commands configuration diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index bb4eb7be7b..63e50606d7 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -25,7 +25,6 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA #define CONFIG_LZO

/* diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 90ad0a654b..a2f68ad70a 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -22,7 +22,6 @@ */ #ifdef CONFIG_SYS_MVFS #define CONFIG_BZIP2 -#define CONFIG_LZMA #endif /* CONFIG_SYS_MVFS */

/* diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 9b99b0e44f..bc67270af7 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -21,7 +21,6 @@

/* compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA

/* commands configuration */ #define CONFIG_SYS_MVFS diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index aeaf88a686..abdc93c7d2 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -121,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 d201c848ff..f1e096fddd 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -121,6 +121,4 @@

#define MEM_SIZE 128

-#define CONFIG_LZMA - #endif /* __CONFIG_H */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index d640949dd9..5a04ce98e7 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -153,7 +153,6 @@ #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2 #define CONFIG_LZO -#define CONFIG_LZMA

#define CONFIG_CMD_LZMADEC

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/zipitz2.h b/include/configs/zipitz2.h index 8a745e5097..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 diff --git a/lib/Kconfig b/lib/Kconfig index db0915153c..09670f031c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -148,6 +148,14 @@ config LZ4 frame format currently (2015) implemented in the Linux kernel (generated by 'lz4 -l'). The two formats are incompatible.

+config LZMA + bool "Enable LZMA decompression support" + help + This enables support for LZMA (Lempel-Ziv-Markov chain algorithm), + a dictionary compression algorithm that provides a high compression + ratio and fairly fast decompression speed. See also + CONFIG_CMD_LZMADEC which provides a decode command. + config LZO bool endmenu diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 60836b7001..fb1944978b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1577,7 +1577,6 @@ CONFIG_LUAN CONFIG_LWMON5 CONFIG_LXT971_NO_SLEEP CONFIG_LYNXKDI -CONFIG_LZMA CONFIG_M41T94_SPI_CS CONFIG_M520x CONFIG_M52277EVB

Enable this option by default on sandbox to increase build coverage.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Add new patch to enable CMD_GETTIME on sandbox

arch/Kconfig | 1 + 1 file changed, 1 insertion(+)

diff --git a/arch/Kconfig b/arch/Kconfig index dfc4659648..12fa614e81 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -70,6 +70,7 @@ config SANDBOX select DM_SPI select DM_GPIO select DM_MMC + imply CMD_GETTIME imply CMD_HASH imply CMD_IO imply CMD_IOTRACE