mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 17:10:42 +09:00
moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 2
some boards have common headers for several individual build-targets where CONFIG_SYS_SPI_U_BOOT_OFFS is defined even it is not needed (only needed if CONFIG_SPL_SPI_LOAD is defined also). Take this define here under '#ifdef CONFIG_SPL_SPI_LOAD' for having a clean run of moveconfig.py Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
This commit is contained in:
parent
015287919f
commit
abf9e5d0f2
@ -153,7 +153,7 @@
|
|||||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||||
|
|
||||||
#elif CONFIG_SYS_USE_NANDFLASH
|
#elif CONFIG_SYS_USE_NANDFLASH
|
||||||
#elif CONFIG_SPI_BOOT
|
#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
|
||||||
|
|
||||||
#elif CONFIG_NAND_BOOT
|
#elif CONFIG_NAND_BOOT
|
||||||
|
@ -125,7 +125,7 @@
|
|||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||||
|
|
||||||
#elif CONFIG_SPI_BOOT
|
#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
|
||||||
|
|
||||||
#elif CONFIG_NAND_BOOT
|
#elif CONFIG_NAND_BOOT
|
||||||
|
@ -26,7 +26,9 @@
|
|||||||
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
|
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
|
||||||
|
|
||||||
/* RAW SD card / eMMC locations. */
|
/* RAW SD card / eMMC locations. */
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
#define CONFIG_SYS_SDRAM_BASE 0x60000000
|
#define CONFIG_SYS_SDRAM_BASE 0x60000000
|
||||||
|
@ -29,7 +29,9 @@
|
|||||||
#define CONFIG_IRAM_BASE 0xff700000
|
#define CONFIG_IRAM_BASE 0xff700000
|
||||||
|
|
||||||
/* RAW SD card / eMMC locations. */
|
/* RAW SD card / eMMC locations. */
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||||
|
#endif
|
||||||
|
|
||||||
/* FAT sd card locations. */
|
/* FAT sd card locations. */
|
||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
|
@ -24,7 +24,9 @@
|
|||||||
|
|
||||||
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
|
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
|
||||||
|
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||||
|
#endif
|
||||||
|
|
||||||
/* FAT sd card locations. */
|
/* FAT sd card locations. */
|
||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
|
@ -38,7 +38,9 @@
|
|||||||
#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
|
#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
|
||||||
|
|
||||||
/* RAW SD card / eMMC locations. */
|
/* RAW SD card / eMMC locations. */
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||||
|
#endif
|
||||||
|
|
||||||
/* FAT sd card locations. */
|
/* FAT sd card locations. */
|
||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_QSPI_BOOT
|
#if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL_SPI_LOAD)
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||||
|
|
||||||
#elif CONFIG_SPI_BOOT
|
#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
|
||||||
|
|
||||||
#elif CONFIG_NAND_BOOT
|
#elif CONFIG_NAND_BOOT
|
||||||
|
@ -214,9 +214,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
|
|||||||
|
|
||||||
/* SPL QSPI boot support */
|
/* SPL QSPI boot support */
|
||||||
#ifdef CONFIG_SPL_SPI_SUPPORT
|
#ifdef CONFIG_SPL_SPI_SUPPORT
|
||||||
#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
|
#if defined(CONFIG_TARGET_SOCFPGA_GEN5) && defined(CONFIG_SPL_SPI_LOAD)
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
||||||
#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
|
#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) && defined(CONFIG_SPL_SPI_LOAD)
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -118,7 +118,7 @@
|
|||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 8
|
#define CONFIG_SYS_MAX_NAND_DEVICE 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SPL_SPI_SUNXI
|
#if defined(CONFIG_SPL_SPI_SUNXI) && defined(CONFIG_SPL_SPI_LOAD)
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -129,7 +129,9 @@
|
|||||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||||
|
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||||
|
#endif
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000
|
#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -217,9 +217,10 @@
|
|||||||
# define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000
|
# define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000
|
||||||
# define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000
|
# define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000
|
||||||
# define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000
|
# define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x170000
|
# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x170000
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* u-boot is like dtb */
|
/* u-boot is like dtb */
|
||||||
#define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin"
|
#define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin"
|
||||||
|
@ -293,7 +293,9 @@
|
|||||||
|
|
||||||
/* qspi mode is working fine */
|
/* qspi mode is working fine */
|
||||||
#ifdef CONFIG_ZYNQ_QSPI
|
#ifdef CONFIG_ZYNQ_QSPI
|
||||||
|
#ifdef CONFIG_SPL_SPI_LOAD
|
||||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000
|
||||||
|
#endif
|
||||||
#define CONFIG_SYS_SPI_ARGS_OFFS 0x200000
|
#define CONFIG_SYS_SPI_ARGS_OFFS 0x200000
|
||||||
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
|
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
|
||||||
#define CONFIG_SYS_SPI_KERNEL_OFFS (CONFIG_SYS_SPI_ARGS_OFFS + \
|
#define CONFIG_SYS_SPI_KERNEL_OFFS (CONFIG_SYS_SPI_ARGS_OFFS + \
|
||||||
|
Loading…
Reference in New Issue
Block a user