mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 15:40:29 +09:00
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>
This commit is contained in:
parent
29d3bc793c
commit
ebf7fff20a
@ -28,3 +28,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -28,3 +28,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -25,3 +25,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -25,3 +25,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -29,3 +29,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -29,3 +29,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -30,3 +30,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_RSA=y
|
CONFIG_RSA=y
|
||||||
CONFIG_SPL_RSA=y
|
CONFIG_SPL_RSA=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -26,3 +26,4 @@ CONFIG_FSL_ESPI=y
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_STORAGE=y
|
CONFIG_USB_STORAGE=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -53,3 +53,4 @@ CONFIG_USB_STORAGE=y
|
|||||||
CONFIG_USB_KEYBOARD=y
|
CONFIG_USB_KEYBOARD=y
|
||||||
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
||||||
CONFIG_OF_LIBFDT=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_VENDOR_NUM=0x0525
|
||||||
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
|
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
||||||
|
@ -13,3 +13,4 @@ CONFIG_CMD_DHCP=y
|
|||||||
CONFIG_CMD_MII=y
|
CONFIG_CMD_MII=y
|
||||||
CONFIG_CMD_PING=y
|
CONFIG_CMD_PING=y
|
||||||
CONFIG_OF_LIBFDT=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 MTDIDS_DEFAULT "nand0=ff800000.flash,"
|
||||||
#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
|
#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
|
||||||
"8m(kernel),512k(dtb),-(fs)"
|
"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
|
* Environment Configuration
|
||||||
|
@ -604,14 +604,6 @@ combinations. this should be removed later
|
|||||||
"55m(fs),1m(uboot);ff800000.flash:1m(uboot)," \
|
"55m(fs),1m(uboot);ff800000.flash:1m(uboot)," \
|
||||||
"8m(kernel),512k(dtb),-(fs)"
|
"8m(kernel),512k(dtb),-(fs)"
|
||||||
#endif
|
#endif
|
||||||
/*
|
|
||||||
* Override partitions in device tree using info
|
|
||||||
* in "mtdparts" environment variable
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_CMD_MTDPARTS
|
|
||||||
#define CONFIG_FDT_FIXUP_PARTITIONS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Environment Configuration
|
* Environment Configuration
|
||||||
*/
|
*/
|
||||||
|
@ -56,7 +56,6 @@
|
|||||||
|
|
||||||
/* MTD support */
|
/* MTD support */
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_FDT_FIXUP_PARTITIONS
|
|
||||||
#define CONFIG_MTD_DEVICE
|
#define CONFIG_MTD_DEVICE
|
||||||
#define CONFIG_MTD_PARTITIONS
|
#define CONFIG_MTD_PARTITIONS
|
||||||
#define CONFIG_SPI_FLASH_MTD
|
#define CONFIG_SPI_FLASH_MTD
|
||||||
|
@ -420,7 +420,4 @@
|
|||||||
"if run ${btype}_boot; then; fi; " \
|
"if run ${btype}_boot; then; fi; " \
|
||||||
"done"
|
"done"
|
||||||
|
|
||||||
/* Device Tree Support */
|
|
||||||
#define CONFIG_FDT_FIXUP_PARTITIONS
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
@ -249,14 +249,6 @@
|
|||||||
"f8000000.flash:-(unused);" \
|
"f8000000.flash:-(unused);" \
|
||||||
"MPC5121 NAND:1024m(extended-userfs)"
|
"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_BASE CONFIG_SYS_TEXT_BASE /* Start of monitor */
|
||||||
#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* 512 kB for monitor */
|
#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* 512 kB for monitor */
|
||||||
#ifdef CONFIG_FSL_DIU_FB
|
#ifdef CONFIG_FSL_DIU_FB
|
||||||
|
@ -154,6 +154,15 @@ config SPL_OF_LIBFDT
|
|||||||
particular compatible nodes. The library operates on a flattened
|
particular compatible nodes. The library operates on a flattened
|
||||||
version of the device tree.
|
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/Kconfig
|
||||||
source lib/efi_loader/Kconfig
|
source lib/efi_loader/Kconfig
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user