diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2017-01-27 10:00:41 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-28 13:47:42 (GMT) |
| commit | bd42a94268b165a6f298b9ab13be7003e8d96b02 (patch) | |
| tree | a1642404b9dd28ed4268c40584de8133a09171db /include | |
| parent | 863c5b6cdd49f0f0ce5ca0ae3bd0ed09b766121b (diff) | |
| download | u-boot-fsl-qoriq-bd42a94268b165a6f298b9ab13be7003e8d96b02.tar.xz | |
disk: convert CONFIG_EFI_PARTITION to Kconfig
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
Diffstat (limited to 'include')
52 files changed, 2 insertions, 62 deletions
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index c96d258..41bbfb9 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -23,7 +23,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_EFI_PARTITION #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_ENV_VARS_UBOOT_CONFIG diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 3800932..e1e5781 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -56,7 +56,7 @@ #endif #if (defined(CONFIG_PARTITION_UUIDS) || \ - defined(CONFIG_EFI_PARTITION) || \ + CONFIG_IS_ENABLED(EFI_PARTITION) || \ defined(CONFIG_RANDOM_UUID) || \ defined(CONFIG_CMD_UUID) || \ defined(CONFIG_BOOTP_PXE)) && \ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7e0aeff..7f3a30a 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -41,7 +41,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #ifdef CONFIG_NAND #define NANDARGS \ @@ -301,7 +300,6 @@ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif /* USB Device Firmware Update support */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index e4b4cea..f05717a 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -82,7 +82,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #ifndef CONFIG_SHC_ICT /* * In builds other than ICT, reset to retry after timeout diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index b17c00d..cf47ca4 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -29,7 +29,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -99,7 +98,6 @@ #undef CONFIG_MUSB_HOST /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif #if defined(CONFIG_EMMC_BOOT) diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 961ad0a..f0abd88 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -166,7 +166,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 840502c..9427f93 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -69,7 +69,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/baltos.h b/include/configs/baltos.h index b6a6e68..8dd0a58 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -34,7 +34,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART @@ -310,7 +309,6 @@ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION /* * Disable CPSW SPL support so we fit within the 101KiB limit. */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 72e11d2..b26d84b 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -44,7 +44,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #ifdef CONFIG_NAND #define NANDARGS \ @@ -456,7 +455,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif /* USB Device Firmware Update support */ diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 8670d87..ab26a25 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -105,7 +105,6 @@ * This is necessary for the fatls command to work on an SD card * for example. */ -#define CONFIG_EFI_PARTITION /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 15727a9..0c49563 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -104,7 +104,6 @@ * This is necessary for the fatls command to work on an SD card * for example. */ -#define CONFIG_EFI_PARTITION /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 9111cbd..ea583b4 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -87,7 +87,6 @@ /* GPT */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index a2ff69b..1ad0969 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE /* Partition support */ -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 9c24ba9..8bba58e 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -107,7 +107,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index e9fb45b..6d05776 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -41,7 +41,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Partition support */ -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 4c3d43f..beb14bc 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -58,7 +58,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* Partition support */ -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index c1c1416..656c8c3 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -62,7 +62,6 @@ #define CONFIG_SATA_MV #define CONFIG_LIBATA #define CONFIG_LBA48 -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index da458a4..b9ccbd6 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -101,7 +101,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/duovero.h b/include/configs/duovero.h index b5bd3ba..c0c8a41 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -21,8 +21,6 @@ #include <configs/ti_omap4_common.h> -#undef CONFIG_EFI_PARTITION - #undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index c034813..1d9224c 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -135,7 +135,6 @@ /* * Partition support */ -#define CONFIG_EFI_PARTITION /* * File systems support diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 3a2ae9c..5c56266 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -43,7 +43,6 @@ #endif #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #define CONFIG_CMD_MEMINFO diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index f562b4a..cf42587 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -151,7 +151,6 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 3c908bd..dc5684b 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 71e982e..5d7be22 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -176,7 +176,6 @@ #define CONFIG_CMD_FAT #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* SPI */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 1082b7b..03683bf 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -396,7 +396,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_GENERIC_MMC #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* SPI */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 4649c38..5249115 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -297,7 +297,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* SPI */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index e4a9b68..f9a0b40 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -99,7 +99,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* EEPROM */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 121ede6..f4fb250 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -299,7 +299,6 @@ #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #include <asm/fsl_secure_boot.h> diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index aa345b2..06ab0ca 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -142,7 +142,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* EEPROM */ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 3c545c3..fafe3ce 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -231,7 +231,6 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 145b257..49b68c8 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -60,7 +60,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a1f839c..7acef92 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -69,7 +69,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 44e09fa..7ec82cd 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -48,8 +48,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE -#define CONFIG_EFI_PARTITION - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 44395bf..6a157cc 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -120,7 +120,6 @@ #define CONFIG_SUPPORT_VFAT /* DISK Partition support */ -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_PART #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 868e63e..e0bac8a 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -132,7 +132,6 @@ #define CONFIG_SUPPORT_VFAT /* DISK Partition support */ -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_PART #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index fe660eb..1aaef23 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -83,8 +83,6 @@ #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DATE -#define CONFIG_EFI_PARTITION - #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index e12302e..6ec83da 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -127,7 +127,6 @@ /* * EFI partition */ -#define CONFIG_EFI_PARTITION /* * Date Time diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f86c752..297fd0e 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -54,7 +54,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" /* Partition tables */ -#define CONFIG_EFI_PARTITION /* USB * diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 736d804..3ab96d7 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -44,7 +44,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_HSMMC2_8BIT #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 7472176..69ed53f 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -219,7 +219,6 @@ #define CONFIG_EXT4_WRITE /* GPT */ -#define CONFIG_EFI_PARTITION #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 1cb8292..d4a9035 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -49,7 +49,6 @@ #define CONFIG_CMD_GPT #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION /* * Size of malloc() pool, before and after relocation diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d58e5ba..3ac96da 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -338,7 +338,6 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_MMC #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 -#define CONFIG_EFI_PARTITION #endif #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 3b56be8..53c0b08 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -51,7 +51,6 @@ #define CONFIG_CMD_PART /* Filesystems / image support */ -#define CONFIG_EFI_PARTITION #define CONFIG_PARTITION_UUIDS /* MMC */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index b363bf3..1beaa56 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -122,9 +122,6 @@ #endif /* remove partitions/filesystems */ -#ifdef CONFIG_EFI_PARTITION -#undef CONFIG_EFI_PARTITION -#endif #ifdef CONFIG_FS_EXT4 #undef CONFIG_FS_EXT4 #endif diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3196b6f..d3c94b0 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -76,7 +76,6 @@ #define CONFIG_SATA_MV #define CONFIG_LIBATA #define CONFIG_LBA48 -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index f885015..5782851 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -193,7 +193,6 @@ /* USB Configuration */ #define CONFIG_USB_XHCI_KEYSTONE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_EFI_PARTITION #define CONFIG_FS_FAT #define CONFIG_USB_SS_BASE KS2_USB_SS_BASE #define CONFIG_USB_HOST_XHCI_BASE KS2_USB_HOST_XHCI_BASE diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 6e5c52b..7a0f563 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -65,7 +65,6 @@ /* For generating MMC partitions */ #define CONFIG_PARTITION_UUIDS #define CONFIG_RANDOM_UUID -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_GPT #endif diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 6aaa7f5..ade5c27 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -109,7 +109,6 @@ #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_EFI_PARTITION #define CONFIG_SUPPORT_EMMC_RPMB #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC4 eMMC */ /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */ diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 34b8d0e..6b7af82 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -86,8 +86,6 @@ #define CONFIG_CMD_NAND -#define CONFIG_EFI_PARTITION - #define CONFIG_MXC_GPIO #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8db798d..b1e25e6 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,7 +70,6 @@ /************************************************************ * DISK Partition support ************************************************************/ -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_PART #ifdef CONFIG_SYS_COREBOOT diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 463e9a6..9a1ef9b 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -56,7 +56,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_EFI_PARTITION #define CONFIG_MP /* BOOTP options */ diff --git a/include/part.h b/include/part.h index 7139cdd..243bcfd 100644 --- a/include/part.h +++ b/include/part.h @@ -255,7 +255,7 @@ struct part_driver { #define U_BOOT_PART_TYPE(__name) \ ll_entry_declare(struct part_driver, __name, part_driver) -#ifdef CONFIG_EFI_PARTITION +#if CONFIG_IS_ENABLED(EFI_PARTITION) #include <part_efi.h> /* disk/part_efi.c */ /** |