Remove unused preprocessor definitions and comments of already eliminated code.
The Ethernet driver configuration is already declared in arch/arm/mach-kirkwood/include/mach/config.h and, therefore, superfluous.
Signed-off-by: Pascal Linder pascal.linder@edu.hefr.ch Signed-off-by: Holger Brunck holger.brunck@ch.abb.com --- include/configs/km/keymile-common.h | 2 -- include/configs/km/km_arm.h | 22 ---------------------- scripts/config_whitelist.txt | 1 - 3 files changed, 25 deletions(-)
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 3106ef1d8c..8433d8e568 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_KEYMILE_H #define __CONFIG_KEYMILE_H
-#undef CONFIG_WATCHDOG /* disable platform specific watchdog */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index d4a6a6357c..b257c384dc 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -30,8 +30,6 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h"
-/* SPI NOR Flash default params, used by sf commands */ - /* Reserve 4 MB for malloc */ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
@@ -69,18 +67,11 @@ #define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE #define CONFIG_SYS_NS16550_COM2 KW_UART1_BASE
-/* - * Serial Port configuration - * The following definitions let you select what serial you want to use - * for your console driver. - */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is * the maximum mapped by the Linux kernel during initialization. */ -#define CONFIG_BOOTMAPSZ (8 << 20) /* Initial Memmap for Linux */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_INITRD_TAG /* enable INITRD tag */ #define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ @@ -90,22 +81,16 @@ */ #define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define BOOTFLASH_START 0x0 - /* * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
/* * Ethernet Driver configuration */ -#define CONFIG_NETCONSOLE /* include NetConsole support */ -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */
/* * I2C related stuff @@ -219,13 +204,8 @@ int get_scl(void); "arch=arm\0" \ ""
-#if !defined(CONFIG_MTD_NOR_FLASH) -#undef CONFIG_JFFS2_CMDLINE -#endif - /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -/* Do early setups now in board_init_f() */
/* address for the bootcount (taken from end of RAM) */ #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM) @@ -235,6 +215,4 @@ int get_scl(void); #define CONFIG_POST_SKIP_ENV_FLAGS #define CONFIG_POST_EXTERNAL_WORD_FUNCS
-/* we do the whole PCIe FPGA config stuff here */ - #endif /* _CONFIG_KM_ARM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5d54f12375..fab6bbae3a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -129,7 +129,6 @@ CONFIG_BOARD_SIZE_LIMIT CONFIG_BOOGER CONFIG_BOOTBLOCK CONFIG_BOOTFILE -CONFIG_BOOTMAPSZ CONFIG_BOOTMODE CONFIG_BOOTM_LINUX CONFIG_BOOTM_NETBSD