spl: move FDT_FIXUP_PARTITIONS to Kconfig

Move FDT_FIXUP_PARTITIONS to Kconfig and cleanup existing
uses.

Signed-off-by: Heiko Schocher <hs@denx.de>
master
Heiko Schocher 8 years ago committed by Tom Rini
parent 29d3bc793c
commit ebf7fff20a
  1. 1
      configs/BSC9131RDB_NAND_SYSCLK100_defconfig
  2. 1
      configs/BSC9131RDB_NAND_defconfig
  3. 1
      configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
  4. 1
      configs/BSC9131RDB_SPIFLASH_defconfig
  5. 1
      configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
  6. 1
      configs/BSC9132QDS_NAND_DDRCLK100_defconfig
  7. 1
      configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
  8. 1
      configs/BSC9132QDS_NAND_DDRCLK133_defconfig
  9. 1
      configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
  10. 1
      configs/BSC9132QDS_NOR_DDRCLK100_defconfig
  11. 1
      configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
  12. 1
      configs/BSC9132QDS_NOR_DDRCLK133_defconfig
  13. 1
      configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
  14. 1
      configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
  15. 1
      configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
  16. 1
      configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
  17. 1
      configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
  18. 1
      configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
  19. 1
      configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
  20. 1
      configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
  21. 1
      configs/cm_fx6_defconfig
  22. 1
      configs/gwventana_defconfig
  23. 1
      configs/pdm360ng_defconfig
  24. 7
      include/configs/BSC9131RDB.h
  25. 8
      include/configs/BSC9132QDS.h
  26. 1
      include/configs/cm_fx6.h
  27. 3
      include/configs/gw_ventana.h
  28. 8
      include/configs/pdm360ng.h
  29. 9
      lib/Kconfig

@ -28,3 +28,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -28,3 +28,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -25,3 +25,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -25,3 +25,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -29,3 +29,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -29,3 +29,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -53,3 +53,4 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -55,3 +55,4 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -13,3 +13,4 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y

@ -367,13 +367,6 @@ extern unsigned long get_sdram_size(void);
#define MTDIDS_DEFAULT "nand0=ff800000.flash,"
#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
"8m(kernel),512k(dtb),-(fs)"
/*
* Override partitions in device tree using info
* in "mtdparts" environment variable
*/
#ifdef CONFIG_CMD_MTDPARTS
#define CONFIG_FDT_FIXUP_PARTITIONS
#endif
/*
* Environment Configuration

@ -605,14 +605,6 @@ combinations. this should be removed later
"8m(kernel),512k(dtb),-(fs)"
#endif
/*
* Override partitions in device tree using info
* in "mtdparts" environment variable
*/
#ifdef CONFIG_CMD_MTDPARTS
#define CONFIG_FDT_FIXUP_PARTITIONS
#endif
/*
* Environment Configuration
*/

@ -56,7 +56,6 @@
/* MTD support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_FDT_FIXUP_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_SPI_FLASH_MTD

@ -420,7 +420,4 @@
"if run ${btype}_boot; then; fi; " \
"done"
/* Device Tree Support */
#define CONFIG_FDT_FIXUP_PARTITIONS
#endif /* __CONFIG_H */

@ -249,14 +249,6 @@
"f8000000.flash:-(unused);" \
"MPC5121 NAND:1024m(extended-userfs)"
/*
* Override partitions in device tree using info
* in "mtdparts" environment variable
*/
#ifdef CONFIG_CMD_MTDPARTS
#define CONFIG_FDT_FIXUP_PARTITIONS
#endif
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of monitor */
#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* 512 kB for monitor */
#ifdef CONFIG_FSL_DIU_FB

@ -154,6 +154,15 @@ config SPL_OF_LIBFDT
particular compatible nodes. The library operates on a flattened
version of the device tree.
config FDT_FIXUP_PARTITIONS
bool "overwrite MTD partitions in DTS through defined in 'mtdparts'"
depends on OF_LIBFDT
default n
help
Allow overwriting defined partitions in the device tree blob
using partition info defined in the 'mtdparts' environment
variable.
source lib/efi/Kconfig
source lib/efi_loader/Kconfig

Loading…
Cancel
Save