From: Patrick Delaunay patrick.delaunay@st.com
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com Signed-off-by: Patrick Delaunay patrick.delaunay73@gmail.com ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
cmd/gpt.c | 2 +- cmd/part.c | 2 +- configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime2_defconfig | 1 + configs/Cubietruck_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/am3517_evm_defconfig | 2 ++ configs/bcm11130_defconfig | 1 + configs/bcm11130_nand_defconfig | 1 + configs/bcm23550_w1d_defconfig | 1 + configs/bcm28155_ap_defconfig | 1 + configs/bcm28155_w1d_defconfig | 1 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/clearfog_defconfig | 2 ++ configs/d2net_v2_defconfig | 1 + configs/db-88f6820-amc_defconfig | 2 ++ configs/db-88f6820-gp_defconfig | 2 ++ configs/db-mv784mp-gp_defconfig | 2 ++ configs/duovero_defconfig | 1 + configs/evb-rk3036_defconfig | 1 + configs/evb-rk3288_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/highbank_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/ls2080a_emu_defconfig | 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/miniarm-rk3288_defconfig | 1 + configs/mx35pdk_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/nas220_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/novena_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/omap3_evm_defconfig | 2 ++ configs/parrot_r16_defconfig | 1 + configs/pcm058_defconfig | 2 ++ configs/popmetal-rk3288_defconfig | 1 + configs/rock2_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/theadorable_debug_defconfig | 2 ++ configs/theadorable_defconfig | 2 ++ configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/warp7_defconfig | 1 + configs/warp7_secure_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 2 ++ disk/Kconfig | 13 +++++++++++++ disk/part.c | 8 ++++---- disk/part_dos.c | 6 +++--- disk/part_efi.c | 6 +++--- fs/fat/fat.c | 2 +- include/config_distro_bootcmd.h | 1 - include/config_fallbacks.h | 2 +- include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/exynos-common.h | 1 - include/configs/kc1.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mvebu_db-88f3720.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rockchip-common.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sandbox.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tegra-common-post.h | 3 --- include/configs/tegra-common.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/vinco.h | 1 - include/configs/warp7.h | 1 - include/configs/x86-common.h | 1 - include/part.h | 2 +- scripts/config_whitelist.txt | 1 - 99 files changed, 100 insertions(+), 46 deletions(-)
diff --git a/cmd/gpt.c b/cmd/gpt.c index 897596a..a5a0e19 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -20,7 +20,7 @@ #include <div64.h> #include <memalign.h>
-#ifndef CONFIG_PARTITION_UUIDS +#if !CONFIG_IS_ENABLED(PARTITION_UUIDS) #error CONFIG_PARTITION_UUIDS must be enabled for CONFIG_CMD_GPT to be enabled #endif
diff --git a/cmd/part.c b/cmd/part.c index 414031e..8464833 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -22,7 +22,7 @@ #include <part.h> #include <vsprintf.h>
-#ifndef CONFIG_PARTITION_UUIDS +#if !CONFIG_IS_ENABLED(PARTITION_UUIDS) #error CONFIG_PARTITION_UUIDS must be enabled for CONFIG_CMD_PART to be enabled #endif
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 4050578..3c4ce19 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DFU_RAM=y CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_USB_EHCI_HCD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 8db638e..0d38f65 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DFU_RAM=y CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index dc46e2f..4ac1285 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DFU_RAM=y CONFIG_ETH_DESIGNWARE=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 12b8f47..8a51bf3 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_DFU=y # CONFIG_CMD_FPGA is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DFU_RAM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 291f570..a6699c2 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -31,6 +31,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_PARTITION_UUIDS=y +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 9050153..28e399e 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index a8a43ac..61caa9b 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index e003422..73c238e 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 0e6e735..e3cdf98 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index a1d2576..aa5216e 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 841b42d..fd9dc76 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -36,6 +36,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 4cd9bc7..405deab 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -37,6 +37,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 1a03a40..f3e6a8e 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -37,6 +37,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 2a339aa..8370065 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index c330f93..421e286 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 52fe9d7..ff834c9 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 995835d..1347550 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index 1f3e344..a5b1ab7 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 3d9f597..6db7849 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 48fc1fb..712562a 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -28,6 +28,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index cfa5197..f90c5a0 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -36,6 +36,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_REGMAP=y diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index 092caf5..cae3f4f 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -36,6 +36,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_REGMAP=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 59c4b83..daeac9f 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -34,6 +34,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index 765f4e7..ce1e2f6 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index a79d4c9..5300fa3 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -22,4 +22,5 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_LIBFDT=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index 4510adf..5af916e 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 94787bb..4b402dd 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -29,6 +29,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y diff --git a/configs/ls2080a_emu_defconfig b/configs/ls2080a_emu_defconfig index 69fcb09..a515569 100644 --- a/configs/ls2080a_emu_defconfig +++ b/configs/ls2080a_emu_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y # CONFIG_DOS_PARTITION is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/ls2080a_simu_defconfig b/configs/ls2080a_simu_defconfig index d464fd7..1729981 100644 --- a/configs/ls2080a_simu_defconfig +++ b/configs/ls2080a_simu_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index f5b7a67..06abc65 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index 75bf864..3f97544 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 184158a..c3651a1 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index b5926f7..6010255 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 0be5906..2d94a82 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 1da81b9..75bd46d 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig index ac2c80b..917121f 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/miniarm-rk3288_defconfig @@ -36,6 +36,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_REGMAP=y diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig index 105a825..a65fd7a 100644 --- a/configs/mx35pdk_defconfig +++ b/configs/mx35pdk_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index a1c3dac..b47787e 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_DM_THERMAL=y CONFIG_USB=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 539b9b0..249a884 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 7918246..f022ff6 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 5b9a973..e9a8132 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 9027708..2251894 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index 5fb65f6..b33e929 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 4a81ed5..7ce4b62 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index dd1f36f..04ab782 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_PCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 61b7fa9..b146733 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_ETH=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 5b3d6fa..4c9e423 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -20,6 +20,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index 616992d..76e4e34 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -17,6 +17,7 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 63d7897..544ee65 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_MTD=y CONFIG_SPI_FLASH=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index d00d9d1..84ddd69 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -36,6 +36,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_REGMAP=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index eb78ae9..7808da6 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -35,6 +35,7 @@ CONFIG_ISO_PARTITION=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent" CONFIG_REGMAP=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 95c7995..38d459f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_OF_HOSTFILE=y CONFIG_NETCONSOLE=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 68b3997..eab902b 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -59,6 +59,7 @@ CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_HOSTFILE=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 6343a56..b75c255 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -39,6 +39,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_DM_GPIO=y diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig index be5d444..20aba02 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y CONFIG_DM_GPIO=y CONFIG_SPI_FLASH=y diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig index d9d4099..c899be0 100644 --- a/configs/vexpress_aemv8a_dram_defconfig +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index 34bafa8..2267362 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index e8b8ba0..02740a4 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 66c1f16..cde769a 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_PARTITION_UUIDS=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y CONFIG_USB=y diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig index c12fc01..06972de 100644 --- a/configs/warp7_secure_defconfig +++ b/configs/warp7_secure_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_PARTITION_UUIDS=y CONFIG_DFU_MMC=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig index f31d390..55370cc 100644 --- a/configs/woodburn_defconfig +++ b/configs/woodburn_defconfig @@ -16,3 +16,4 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig index 0bc1476..c69f9e0 100644 --- a/configs/woodburn_sd_defconfig +++ b/configs/woodburn_sd_defconfig @@ -26,3 +26,5 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y +# CONFIG_PARTITION_UUIDS is not set +# CONFIG_SPL_PARTITION_UUIDS is not set diff --git a/disk/Kconfig b/disk/Kconfig index 03bf05d..268fb83 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -84,4 +84,17 @@ config SPL_EFI_PARTITION depends on SPL && PARTITIONS default y if EFI_PARTITION
+config PARTITION_UUIDS + bool "Enable support of UUID for partition" + depends on PARTITIONS + default y if DISTRO_DEFAULTS + default y if EFI_PARTITION + help + Activate the configuration of UUID for partition + +config SPL_PARTITION_UUIDS + bool "Enable support of UUID for partition in SPL" + depends on SPL && PARTITIONS + default y if SPL_EFI_PARTITION + endmenu diff --git a/disk/part.c b/disk/part.c index cd14e98..cd44702 100644 --- a/disk/part.c +++ b/disk/part.c @@ -299,7 +299,7 @@ int part_get_info(struct blk_desc *dev_desc, int part, #ifdef HAVE_BLOCK_DEVICE struct part_driver *drv;
-#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) /* The common case is no UUID support */ info->uuid[0] = 0; #endif @@ -416,7 +416,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, info->bootable = 0; strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "Sandbox host"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif #ifdef CONFIG_PARTITION_TYPE_GUID @@ -442,7 +442,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, memset(info, 0, sizeof(*info)); strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "UBI"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif return 0; @@ -526,7 +526,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, info->bootable = 0; strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "Whole Disk"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif #ifdef CONFIG_PARTITION_TYPE_GUID diff --git a/disk/part_dos.c b/disk/part_dos.c index ed78334..c77d881 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -189,7 +189,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, return -1; }
-#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) if (!ext_part_sector) disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]); #endif @@ -214,7 +214,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, /* sprintf(info->type, "%d, pt->sys_ind); */ strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(pt); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) sprintf(info->uuid, "%08x-%02x", disksig, part_num); #endif return 0; @@ -249,7 +249,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, info->blksz = DOS_PART_DEFAULT_SECTOR; info->bootable = 0; strcpy((char *)info->type, "U-Boot"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif return 0; diff --git a/disk/part_efi.c b/disk/part_efi.c index f1b7116..b5928e5 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -279,7 +279,7 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, print_efiname(&gpt_pte[part - 1])); strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(&gpt_pte[part - 1]); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) uuid_bin_to_str(gpt_pte[part - 1].unique_partition_guid.b, info->uuid, UUID_STR_FORMAT_GUID); #endif @@ -397,7 +397,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, le64_to_cpu(gpt_h->last_usable_lba); int i, k; size_t efiname_len, dosname_len; -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) char *str_uuid; unsigned char *bin_uuid; #endif @@ -452,7 +452,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, &PARTITION_BASIC_DATA_GUID, 16); #endif
-#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) str_uuid = partitions[i].uuid; bin_uuid = gpt_e[i].unique_partition_guid.b;
diff --git a/fs/fat/fat.c b/fs/fat/fat.c index fe899d0..244ee09 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -110,7 +110,7 @@ int fat_register_device(struct blk_desc *dev_desc, int part_no) info.name[0] = 0; info.type[0] = 0; info.bootable = 0; -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info.uuid[0] = 0; #endif } diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 9ecaf38..e946d10 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -27,7 +27,6 @@ */
/* We need the part command */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
#define BOOTENV_SHARED_BLKDEV_BODY(devtypel) \ diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index e1e5781..3169175 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -55,7 +55,7 @@ #define HAVE_BLOCK_DEVICE #endif
-#if (defined(CONFIG_PARTITION_UUIDS) || \ +#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \ CONFIG_IS_ENABLED(EFI_PARTITION) || \ defined(CONFIG_RANDOM_UUID) || \ defined(CONFIG_CMD_UUID) || \ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ae977d1..229dd02 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -304,7 +304,6 @@ #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif
/* USB Device Firmware Update support */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 62e1199..14238cc 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -98,7 +98,6 @@ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif
#if defined(CONFIG_EMMC_BOOT) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index f0290ad..37f3e24 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -259,7 +259,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP -#define CONFIG_PARTITION_UUIDS
/* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 7dd2a68..86913fe 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -35,7 +35,6 @@
/* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
/* FIT support */ @@ -310,7 +309,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS /* * Disable CPSW SPL support so we fit within the 101KiB limit. */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 5da0805..cd844df 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -456,7 +456,6 @@ DEFAULT_LINUX_BOOT_ENV \ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif
/* USB Device Firmware Update support */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index e6bb919..9fa814c 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -66,7 +66,6 @@
/* Partition table support */ #define HAVE_BLOCK_DEVICE /* Needed for partition commands */ -#define CONFIG_PARTITION_UUIDS
#include <config_distro_defaults.h>
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 9328a22..7e050db 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -50,7 +50,6 @@ #define CONFIG_FAT_WRITE
#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS
/* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 7a4ba09..bb9477d 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -107,7 +107,6 @@ * Partitions */
-#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
/* diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 9433550..eece1cc 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -122,7 +122,6 @@ /* DISK Partition support */
#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS
/* * PCI configuration diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 670a357..917233f 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -133,6 +133,5 @@ /* DISK Partition support */
#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS
#endif /* _CONFIG_MVEBU_DB_88F3720_H */ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 05d7d79..78c216a 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -102,7 +102,6 @@ * File System Configuration */ /* FAT FS */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 27dfbce..a088ad2 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -42,7 +42,6 @@ #define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
#define CONFIG_SYS_SDRAM_BASE 0x60000000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 535797a..b830fbc 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -45,7 +45,6 @@ #define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
/* RAW SD card / eMMC locations. */ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9ec71c4..a7341dc 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -19,7 +19,6 @@ /* Enable gpt partition table */ #define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID -#define CONFIG_PARTITION_UUIDS #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 45d8824..5b4b03c 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -128,7 +128,6 @@ #define CONFIG_COMMAND_HISTORY
/* Commands */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
/* ATAGs support for bootm/bootz */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 69ed53f..788e44d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -219,7 +219,6 @@ #define CONFIG_EXT4_WRITE
/* GPT */ -#define CONFIG_PARTITION_UUIDS
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 08a3b3b..bcc13a4 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -48,7 +48,6 @@ #define CONFIG_CMD_MD5SUM
#define CONFIG_CMD_GPT -#define CONFIG_PARTITION_UUIDS
/* * Size of malloc() pool, before and after relocation diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 38b3c12..d084fc5 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -67,7 +67,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_PARTITION_UUIDS
/* MMC */ #define CONFIG_GENERIC_MMC diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 0a3d242..4fbcee6 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -114,7 +114,6 @@ * Partitions */
-#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
/* diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index c9176a4..0ef5a8e 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -53,7 +53,6 @@ #define CONFIG_CMD_PART
/* Filesystems / image support */ -#define CONFIG_PARTITION_UUIDS
/* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index ff5afe0..ac33c2f 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -143,9 +143,6 @@ #endif
/* remove part command support */ -#ifdef CONFIG_PARTITION_UUIDS -#undef CONFIG_PARTITION_UUIDS -#endif
#ifdef CONFIG_CMD_PART #undef CONFIG_CMD_PART diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 23a0e78..11c75b2 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -55,7 +55,6 @@ #define CONFIG_COMMAND_HISTORY
/* turn on commonly used storage-related commands */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
#define CONFIG_SYS_NO_FLASH diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 82ca401..b31b776 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -223,7 +223,6 @@ */ #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART #endif
diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 7a0f563..ae4b2ec 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_MMC_CLK_OD 500000
/* For generating MMC partitions */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_RANDOM_UUID #define CONFIG_CMD_GPT
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index f4a9231..83285f5 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART
#define CONFIG_DFU_ENV_SETTINGS \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b1e25e6..52ff4b0 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -75,7 +75,6 @@ #ifdef CONFIG_SYS_COREBOOT #define CONFIG_CMD_CBFS #endif -#define CONFIG_PARTITION_UUIDS
/* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO diff --git a/include/part.h b/include/part.h index 243bcfd..9d0e20d 100644 --- a/include/part.h +++ b/include/part.h @@ -53,7 +53,7 @@ typedef struct disk_partition { uchar name[32]; /* partition name */ uchar type[32]; /* string type description */ int bootable; /* Active/Bootable flag is set */ -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) char uuid[37]; /* filesystem UUID as string, if exists */ #endif #ifdef CONFIG_PARTITION_TYPE_GUID diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d1623e4..53d89f4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3329,7 +3329,6 @@ CONFIG_PALMAS_USB_SS_PWR CONFIG_PANIC_HANG CONFIG_PARAVIRT CONFIG_PARTITION_TYPE_GUID -CONFIG_PARTITION_UUIDS CONFIG_PATA_BFIN CONFIG_PATI CONFIG_PB1000