From: Lothar Waßmann Date: Thu, 18 May 2017 15:26:58 +0000 (+0200) Subject: ColdFire: Remove rogue 'CONFIG_SYS_NO_FLASH' embedded within another CONFIG_ name X-Git-Tag: v2017.07-rc1~196 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e34b913a942d9c3977985999853e5e224fd5597d;p=oweals%2Fu-boot.git ColdFire: Remove rogue 'CONFIG_SYS_NO_FLASH' embedded within another CONFIG_ name The original commit for the MCF54418TWR ColdFire development board support defined a 'CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN' which obviously has a rogue 'CONFIG_SYS_NO_FLASH' embedded in the intended 'CONFIG_SYS_FAULT_ECHO_LINK_DOWN' define. Signed-off-by: Lothar Waßmann --- diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index cb7ea8639d..f4d970d0d8 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -59,7 +59,7 @@ #define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY #define CONFIG_SYS_RX_ETH_BUFFER 2 -#define CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN +#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN #define CONFIG_SYS_TX_ETH_BUFFER 2 #define CONFIG_HAS_ETH1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1055caf19a..8c8e4d2078 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3450,7 +3450,6 @@ CONFIG_SYS_EXTBDINFO CONFIG_SYS_EXTRA_ENV_RELOC CONFIG_SYS_EXT_SERIAL_CLOCK CONFIG_SYS_FAST_CLK -CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN CONFIG_SYS_FAULT_ECHO_LINK_DOWN CONFIG_SYS_FAULT_MII_ADDR CONFIG_SYS_FCC_PSMR