configs: Remove empty #ifdef/#ifndef blocks from configs

Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
6 years ago · d673668964
parent 56419ea5f0
commit d673668964
19 changed files with 0 additions and 62 deletions
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@ -14,9 +14,6 @@
 #include <asm/config_mpc86xx.h>
 #endif

-#ifdef CONFIG_MPC83xx
-#endif
-
 #ifndef HWCONFIG_BUFFER_SIZE
  #define HWCONFIG_BUFFER_SIZE 256
 #endif
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@ -259,8 +259,6 @@
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

 #define CONFIG_ULI526X
-#ifdef CONFIG_ULI526X
-#endif

 /************************************************************
 * USB support
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@ -363,9 +363,6 @@
 #undef CONFIG_SYS_FLASH_EMPTY_INFO
 #endif

-#ifndef CONFIG_FSL_DIU_FB
-#endif
-
 #ifdef CONFIG_ATI
 #define VIDEO_IO_OFFSET		CONFIG_SYS_PCIE1_IO_VIRT
 #define CONFIG_BIOSEMU
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@ -515,8 +515,6 @@ unsigned long get_board_ddr_clk(void);
 /*
 * eSPI - Enhanced SPI
 */
-#ifndef CONFIG_SPL_BUILD
-#endif
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SF_DEFAULT_SPEED	 10000000
 #define CONFIG_SF_DEFAULT_MODE	  0
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@ -509,8 +509,6 @@ unsigned long get_board_ddr_clk(void);
 * eSPI - Enhanced SPI
 */
 #ifdef CONFIG_SPI_FLASH
-#ifndef CONFIG_SPL_BUILD
-#endif

 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SF_DEFAULT_SPEED	 10000000
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@ -38,8 +38,6 @@
 #define CONFIG_NETMASK		255.255.252.0
 #define CONFIG_ETHPRIME		"eTSEC3"

-#ifndef CONFIG_SPI_FLASH
-#endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT

 #define CONFIG_SYS_L2_SIZE	(256 << 10)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@ -225,9 +225,6 @@
 #define CONFIG_ENV_SPI_MODE             CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED

-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
 #define CONFIG_SYS_FSL_USDHC_NUM        3

 /* Framebuffer */
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@ -177,9 +177,6 @@
 #define CONFIG_SYS_FSL_I2C2_SLAVE	0x7F
 #define CONFIG_SYS_FSL_I2C2_OFFSET	0x3100

-#ifndef CONFIG_TRAILBLAZER
-#endif
-
 #define CONFIG_PCA9698			/* NXP PCA9698 */

 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@ -475,7 +475,4 @@

 #include <asm/fsl_secure_boot.h>

-#ifdef CONFIG_SECURE_BOOT
-#endif
-
 #endif	/* __CONFIG_H */
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@ -111,9 +111,6 @@
 #define CONFIG_CLOCKS
 #endif

-#ifndef CONFIG_DRIVER_TI_EMAC
-#endif
-
 /* NAND Setup */
 #ifdef CONFIG_SYS_USE_NAND
 #define CONFIG_MTD_DEVICE
@ -130,10 +127,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE	1 /* Max number of NAND devices */
 #endif

-/* SPI Flash */
-#ifdef CONFIG_USE_SPIFLASH
-#endif
-
 #if !defined(CONFIG_SYS_USE_NAND) && \
 	!defined(CONFIG_USE_NOR) && \
 	!defined(CONFIG_USE_SPIFLASH)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@ -58,9 +58,6 @@
 #define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
 #define CONFIG_ENV_SPI_MAX_HZ	15000000

-#ifndef MINIMAL_LOADER
-#endif
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@ -188,9 +188,6 @@
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED

-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
 #define CONFIG_SYS_FSL_USDHC_NUM	3

 /* Framebuffer */
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@ -212,9 +212,6 @@
 #define CONFIG_CLOCKS
 #endif

-#ifndef CONFIG_DRIVER_TI_EMAC
-#endif
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS

--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@ -40,12 +40,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */

 /*
- * Commands configuration
- */
-#ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */
-#endif
-
-/*
 * Core clock definition
 */
 #define CONFIG_SYS_TCLK			166000000 /* 166MHz */
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@ -166,9 +166,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		0	/* user area */
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"  /* USDHC2 */

-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@ -259,9 +259,6 @@
 #define CONFIG_CLOCKS
 #endif

-#ifndef CONFIG_DRIVER_TI_EMAC
-#endif
-
 #ifdef CONFIG_USE_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@ -301,9 +301,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif

-#ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
-#endif
-
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_PREBOOT
 #endif
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@ -109,15 +109,11 @@
 #ifdef CONFIG_SYS_I2C_TEGRA
 #undef CONFIG_SYS_I2C_TEGRA
 #endif
-#ifdef CONFIG_CMD_I2C
-#endif

 /* remove USB */
 #ifdef CONFIG_USB_EHCI_TEGRA
 #undef CONFIG_USB_EHCI_TEGRA
 #endif
-#ifdef CONFIG_CMD_USB
-#endif

 #endif /* CONFIG_SPL_BUILD */

--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@ -40,10 +40,6 @@
 # define CONFIG_BOOTP_MAY_FAIL
 #endif

-/* SPI */
-#ifdef CONFIG_ZYNQ_SPI
-#endif
-
 /* QSPI */
 #ifdef CONFIG_ZYNQ_QSPI
 # define CONFIG_SF_DEFAULT_SPEED	30000000