mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
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 <eugen.hristev@microchip.com>
This commit is contained in:
parent
3fbdd485fd
commit
6669291700
6 changed files with 0 additions and 52 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue