include: configs: at91/sam: remove stray #ifdef/#else
PATCH v2 1/1 include: configs: at91/sam: remove stray #ifdef/#else
With the commit that moves the BOOTCOMMAND to Kconfig:
970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
some stray ifdefs have been left in the header files which are now useless.
Clean up the include files to remove these lines.
Fixes 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
Signed-off-by Eugen Hristev <[email protected]>
---
Changes in v2:
- rebased on latest to accomodate Tom's patch
include/configs/at91-sama5_common.h | 11 ----------- include/configs/at91sam9m10g45ek.h | 6 ------ include/configs/at91sam9n12ek.h | 9 --------- include/configs/sam9x60ek.h | 10 ---------- include/configs/sama5d27_som1_ek.h | 4 ---- include/configs/sama5d2_xplained.h | 12 ------------ 6 files changed, 52 deletions(-)
include/configs/at91-sama5_common.h +0 -11
@@ -15,15 +15,4 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -#ifdef CONFIG_SD_BOOT -#else - -#ifdef CONFIG_NAND_BOOT -/* u-boot env in nand flash */ -#elif CONFIG_SPI_BOOT -/* u-boot env in serial flash, by default is bus 0 and cs 0 */ -#endif - -#endif -#endif
include/configs/at91sam9m10g45ek.h +0 -6
@@ -40,12 +40,6 @@#endif -#ifdef CONFIG_NAND_BOOT -/* bootstrap + u-boot + env in nandflash */ -#elif CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in mmc */ -#endif -/* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE 0x010000#define CONFIG_SPL_STACK 0x310000
include/configs/at91sam9n12ek.h +0 -9
@@ -59,15 +59,6 @@#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1#endif -#ifdef CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif defined(CONFIG_NAND_BOOT ) - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif -/* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000#define CONFIG_SPL_STACK 0x308000
include/configs/sam9x60ek.h +0 -10
@@ -40,14 +40,4 @@#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5#endif -#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in sd card */ - -#elif defined(CONFIG_NAND_BOOT ) -/* bootstrap + u-boot + env + linux in nandflash */ - -#elif defined(CONFIG_QSPI_BOOT ) -/* bootstrap + u-boot + env + linux in SPI NOR flash */ -#endif -#endif
include/configs/sama5d27_som1_ek.h +0 -4
@@ -21,10 +21,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)#endif -#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env in sd card */ -#endif -/* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000#define CONFIG_SPL_BSS_START_ADDR 0x20000000
include/configs/sama5d2_xplained.h +0 -12
@@ -18,18 +18,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)#endif -/* SerialFlash */ - -#ifdef CONFIG_SD_BOOT - -/* bootstrap + u-boot + env in sd card */ - -#elif CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env in sd card, but kernel + dtb in eMMC */ - -#endif -/* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000#define CONFIG_SPL_BSS_START_ADDR 0x20000000
Signature · 1 line
2.25.1
Quoted 8 lines · Eugen Hristev
With the commit that moves the BOOTCOMMAND to
Kconfig:
970bf8603b("ConvertCONFIG_USE_BOOTCOMMANDet al toKconfig")some stray ifdefs have been left in the header files which are now useless.
Clean up the include files to remove these lines.
Quoted 6 lines
Fixes 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")Signed-off-by Eugen Hristev <[email protected]>---
Changes in v2:
- rebased on latest to accomodate Tom's patch
Applied to u-boot-at91/master