From b996b7d426de6d52a9ee54045bb8fe65f1cb3f27 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 6 Mar 2018 01:46:39 +0200 Subject: [PATCH] ARM: Drop unreferenced CONFIG_* defines named after boards The following config symbols are only defined once and never referenced anywhere else: CONFIG_AT91SAM9263EK CONFIG_AT91SAM9RLEK CONFIG_BARIX_IPAM390 CONFIG_BOARD_H2200 CONFIG_EP9301 CONFIG_KZM_A9_GT CONFIG_PICOSAM CONFIG_PLATINUM_PICON CONFIG_PLATINUM_TITANIUM CONFIG_PM9261 CONFIG_PM9263 CONFIG_PM9G45 CONFIG_SIEMENS_DRACO CONFIG_SIEMENS_PXM2 CONFIG_SIEMENS_RUT CONFIG_SMDKC100 CONFIG_SMDKV310 CONFIG_STM32F4DISCOVERY Most of them are config symbols named after the respective boards which seems to have been a standard practice at some point. Signed-off-by: Tuomas Tynkkynen --- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9rlek.h | 2 -- include/configs/draco.h | 1 - include/configs/edb93xx.h | 1 - include/configs/h2200.h | 1 - include/configs/ipam390.h | 1 - include/configs/kzm9g.h | 1 - include/configs/picosam9g45.h | 2 -- include/configs/platinum_picon.h | 1 - include/configs/platinum_titanium.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/stm32f429-discovery.h | 2 -- include/configs/stm32f469-discovery.h | 2 -- scripts/config_whitelist.txt | 18 ------------------ 20 files changed, 42 deletions(-) diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b6691feb68..7fe51c2c0b 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_AT91SAM9263EK 1 /* It's an AT91SAM9263EK Board */ - #define CONFIG_ARCH_CPU_INIT #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 08c8f48bb5..6f8fd2a035 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -17,8 +17,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* main clock xtal */ -#define CONFIG_AT91SAM9RLEK 1 /* It's an AT91SAM9RLEK Board */ - #define CONFIG_ARCH_CPU_INIT #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/draco.h b/include/configs/draco.h index 3278196b3a..c1816409a9 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -13,7 +13,6 @@ #ifndef __CONFIG_DRACO_H #define __CONFIG_DRACO_H -#define CONFIG_SIEMENS_DRACO #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO #include "siemens-am33x-common.h" diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 6e024d1b2f..18ec6cb758 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds" #ifdef CONFIG_EDB9301 -#define CONFIG_EP9301 #define CONFIG_MACH_TYPE MACH_TYPE_EDB9301 #define CONFIG_ENV_SECT_SIZE 0x00020000 #elif defined(CONFIG_EDB9302) diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 608f5eec32..4b380beee2 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -12,7 +12,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_H2200 #define CONFIG_CPU_PXA25X 1 -#define CONFIG_BOARD_H2200 #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 82ab24c688..c8e99513f0 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -19,7 +19,6 @@ * Board */ #define CONFIG_DRIVER_TI_EMAC -#define CONFIG_BARIX_IPAM390 /* * SoC Configuration diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 0d8de370dd..82984f4d17 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_SH73A0 -#define CONFIG_KZM_A9_GT #define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 06ee8e7f9e..0d4fc119ac 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_PICOSAM - #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h index 3679530419..20315546aa 100644 --- a/include/configs/platinum_picon.h +++ b/include/configs/platinum_picon.h @@ -7,7 +7,6 @@ #ifndef __PLATINUM_PICON_CONFIG_H__ #define __PLATINUM_PICON_CONFIG_H__ -#define CONFIG_PLATINUM_PICON #define CONFIG_PLATINUM_BOARD "Barco Picon" #define CONFIG_PLATINUM_PROJECT "picon" #define CONFIG_PLATINUM_CPU "imx6dl" diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h index 69406a4b65..09b9bd38ff 100644 --- a/include/configs/platinum_titanium.h +++ b/include/configs/platinum_titanium.h @@ -7,7 +7,6 @@ #ifndef __PLATINUM_TITANIUM_CONFIG_H__ #define __PLATINUM_TITANIUM_CONFIG_H__ -#define CONFIG_PLATINUM_TITANIUM #define CONFIG_PLATINUM_BOARD "Barco Titanium" #define CONFIG_PLATINUM_PROJECT "titanium" #define CONFIG_PLATINUM_CPU "imx6q" diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index d2702b4f2d..e1e9af07ec 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261" -#define CONFIG_PM9261 1 /* on a Ronetix PM9261 Board */ #define CONFIG_ARCH_CPU_INIT #define CONFIG_MACH_TYPE MACH_TYPE_PM9261 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index c4990883af..880c3f118d 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263" -#define CONFIG_PM9263 1 /* on a Ronetix PM9263 Board */ #define CONFIG_ARCH_CPU_INIT #define CONFIG_MACH_TYPE MACH_TYPE_PM9263 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 21c31daadd..5612f5f358 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -22,7 +22,6 @@ */ #include -#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45" #define CONFIG_MACH_TYPE MACH_TYPE_PM9G45 diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 157b32a6a4..2ad0c3018e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -14,7 +14,6 @@ #ifndef __CONFIG_PXM2_H #define __CONFIG_PXM2_H -#define CONFIG_SIEMENS_PXM2 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2 #include "siemens-am33x-common.h" diff --git a/include/configs/rut.h b/include/configs/rut.h index 71078e9980..46f48009dd 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -14,7 +14,6 @@ #ifndef __CONFIG_RUT_H #define __CONFIG_RUT_H -#define CONFIG_SIEMENS_RUT #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT #include "siemens-am33x-common.h" diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 8a0718e3de..5b3be6d532 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -19,7 +19,6 @@ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_S5P 1 /* which is in a S5P Family */ #define CONFIG_S5PC100 1 /* which is in a S5PC100 */ -#define CONFIG_SMDKC100 1 /* working with SMDKC100 */ #include /* get chip and board defs */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index cce7cafdb4..d7e73c33e7 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -17,7 +17,6 @@ /* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ -#define CONFIG_SMDKV310 1 /* working with SMDKV310*/ /* Mach Type */ #define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310 diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 2f59f52ee1..4c4e72763e 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_STM32F4DISCOVERY - #define CONFIG_MISC_INIT_R #define CONFIG_SYS_FLASH_BASE 0x08000000 diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 3d4ca7ee55..990653beb8 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_STM32F4DISCOVERY - #define CONFIG_MISC_INIT_R #define CONFIG_SYS_FLASH_BASE 0x08000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6ea78bd14e..a364b60803 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -78,7 +78,6 @@ CONFIG_AT91RM9200 CONFIG_AT91RM9200EK CONFIG_AT91SAM9260EK CONFIG_AT91SAM9261EK -CONFIG_AT91SAM9263EK CONFIG_AT91SAM9G10 CONFIG_AT91SAM9G10EK CONFIG_AT91SAM9G20EK @@ -86,7 +85,6 @@ CONFIG_AT91SAM9G20EK_2MMC CONFIG_AT91SAM9G45EKES CONFIG_AT91SAM9G45_LCD_BASE CONFIG_AT91SAM9M10G45EK -CONFIG_AT91SAM9RLEK CONFIG_AT91SAM9_WATCHDOG CONFIG_AT91_CAN CONFIG_AT91_EFLASH @@ -109,7 +107,6 @@ CONFIG_ATMEL_SPI0 CONFIG_AT_TRANS CONFIG_AUTO_ZRELADDR CONFIG_BACKSIDE_L2_CACHE -CONFIG_BARIX_IPAM390 CONFIG_BAT_PAIR CONFIG_BAT_RW CONFIG_BCH_CONST_M @@ -132,7 +129,6 @@ CONFIG_BOARD_AXM CONFIG_BOARD_COMMON CONFIG_BOARD_EARLY_INIT_R CONFIG_BOARD_ECC_SUPPORT -CONFIG_BOARD_H2200 CONFIG_BOARD_IS_OPENRD_BASE CONFIG_BOARD_IS_OPENRD_CLIENT CONFIG_BOARD_IS_OPENRD_ULTIMATE @@ -544,7 +540,6 @@ CONFIG_ENV_UBI_MTD CONFIG_ENV_UBI_VOLUME_REDUND CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG CONFIG_ENV_VERSION -CONFIG_EP9301 CONFIG_EP9302 CONFIG_EP9307 CONFIG_EP9312 @@ -1165,7 +1160,6 @@ CONFIG_KVM_GUEST CONFIG_KW88F6192 CONFIG_KW88F6281 CONFIG_KW88F6702 -CONFIG_KZM_A9_GT CONFIG_L1_INIT_RAM CONFIG_L2_CACHE CONFIG_LAN91C96_USE_32_BIT @@ -1561,7 +1555,6 @@ CONFIG_PHY_MAX_ADDR CONFIG_PHY_MODE_NEED_CHANGE CONFIG_PHY_RESET CONFIG_PHY_RESET_DELAY -CONFIG_PICOSAM CONFIG_PIGGY_MAC_ADRESS_OFFSET CONFIG_PIXIS_BRDCFG0_SPI CONFIG_PIXIS_BRDCFG0_USB2 @@ -1578,15 +1571,10 @@ CONFIG_PL01x_PORTS CONFIG_PLATFORM_ENV_SETTINGS CONFIG_PLATINUM_BOARD CONFIG_PLATINUM_CPU -CONFIG_PLATINUM_PICON CONFIG_PLATINUM_PROJECT -CONFIG_PLATINUM_TITANIUM CONFIG_PLL1_CLK_FREQ CONFIG_PLL1_DIV2_CLK_FREQ CONFIG_PM -CONFIG_PM9261 -CONFIG_PM9263 -CONFIG_PM9G45 CONFIG_PMC_BR_PRELIM CONFIG_PMC_OR_PRELIM CONFIG_PMECC_CAP @@ -1865,10 +1853,7 @@ CONFIG_SH_SDHI_FREQ CONFIG_SH_SDRAM_OFFSET CONFIG_SH_SPI_BASE CONFIG_SH_TMU_CLK_FREQ -CONFIG_SIEMENS_DRACO CONFIG_SIEMENS_MACH_TYPE -CONFIG_SIEMENS_PXM2 -CONFIG_SIEMENS_RUT CONFIG_SIMU CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION CONFIG_SKIP_LOWLEVEL_INIT @@ -1883,8 +1868,6 @@ CONFIG_SMC_AUTONEG_TIMEOUT CONFIG_SMC_USE_32_BIT CONFIG_SMC_USE_IOFUNCS CONFIG_SMDK5420 -CONFIG_SMDKC100 -CONFIG_SMDKV310 CONFIG_SMP_PEN_ADDR CONFIG_SMSC_LPC47M CONFIG_SMSC_SIO1007 @@ -2072,7 +2055,6 @@ CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STATIC_BOARD_REV CONFIG_STD_DEVICES_SETTINGS -CONFIG_STM32F4DISCOVERY CONFIG_STM32_FLASH CONFIG_STM32_HZ CONFIG_STRIDER -- 2.39.2