[U-Boot] [PATCH v3] disk: convert to Kconfig

Patrick Delaunay patrick.delaunay73 at gmail.com
Mon Dec 5 13:01:05 CET 2016


From: Patrick Delaunay <patrick.delaunay at st.com>

This converts the following to Kconfig:
           CONFIG_PARTITIONS
           CONFIG_MAC_PARTITION
           CONFIG_DOS_PARTITION
           CONFIG_ISO_PARTITION
           CONFIG_AMIGA_PARTITION
           CONFIG_EFI_PARTITION
           CONFIG_PARTITION_UUIDS
           CONFIG_PARTITION_TYPE_GUID

Specific SPL config are added to reduce SPL size
for some target and solve compilation issues

           CONFIG_SPL_MAC_PARTITION
           CONFIG_SPL_DOS_PARTITION
           CONFIG_SPL_ISO_PARTITION
           CONFIG_SPL_AMIGA_PARTITION
           CONFIG_SPL_EFI_PARTITION

Associated test are updated to the correct CONFIG (SPL or not)
by using macro CONFIG_IS_ENABLED

To update the U-Boot code I use :
0- Resync with savedefconfig
   /tools/moveconfig.py -s -Cy

1- update defconfig for new SPL option
   ./tools/moveconfig.py --spl --commit \
           PARTITIONS MAC_PARTITION DOS_PARTITION \
           ISO_PARTITION AMIGA_PARTITION EFI_PARTITION \
           PARTITION_UUIDS PARTITION_TYPE_GUID

       then replace CONFIG by CONFIG_SPL in defconfig
       sed -i "s/CONFIG_\(DOS\|EFI\|ISO\|MAC\|AMIGA\)_PARTITION/CONFIG_SPL_\1_PARTITION/" \
           configs/*

2- update defconfig for existing option
   ./tools/moveconfig.py --commit --yes \
           PARTITIONS MAC_PARTITION DOS_PARTITION \
           ISO_PARTITION AMIGA_PARTITION EFI_PARTITION \
           PARTITION_UUIDS PARTITION_TYPE_GUID

    => squash the 2 modifications


Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73 at gmail.com>
---
    move disk to Kconfig as proposed by Simon Glass in thread
    [Resend RFC PATCH v1 1/3] add support of GPT partitioning over MTD

    NB: I create _SPL_ config because I have issue
        with size of SPL for some platform

    => list of supported partition type is not the same between SPL
       and U-Boot, that allow size reduction for SPL build
       (CONFIG are under compilation flag CONFIG_SPL_BUILD in .h)

    I compile this patch on v2016.11 without issue linked to this code
    on all platform and this commit is rebased on master


Changes in v3:
	change Kconfig to reduce impact in platform defconfig
        after Tom Rini review
        - default y for all SPL config
	- MAC DOS ISO and EFI enable by default for some platforms
        - DOS enable with command FAT or USB storage

Changes in v2:
    	- solve compilation issue for config_fallback.h
              (CONFIG_IS_ENABLED unknown)
	- rebase on master branch
	- default y for DOS partition as proposed by Tom Rini
	- removed not related changes in defconfig files

 Kconfig                                            |  6 ++
 arch/arm/include/asm/arch-ls102xa/config.h         |  1 -
 cmd/bootefi.c                                      |  4 +-
 cmd/reiser.c                                       |  2 +-
 cmd/zfs.c                                          |  2 +-
 common/fb_mmc.c                                    |  4 +-
 configs/M5253DEMO_defconfig                        |  1 +
 configs/M5253EVBE_defconfig                        |  1 +
 configs/am335x_baltos_defconfig                    |  2 +
 configs/am335x_boneblack_defconfig                 |  2 +
 configs/am335x_boneblack_vboot_defconfig           |  2 +
 configs/am335x_evm_defconfig                       |  2 +
 configs/am335x_evm_nor_defconfig                   |  2 +
 configs/am335x_evm_norboot_defconfig               |  2 +
 configs/am335x_evm_spiboot_defconfig               |  2 +
 configs/am335x_evm_usbspl_defconfig                |  2 +
 configs/am335x_igep0033_defconfig                  |  2 +
 configs/am335x_shc_defconfig                       |  3 +
 configs/am335x_shc_ict_defconfig                   |  3 +
 configs/am335x_shc_netboot_defconfig               |  3 +
 configs/am335x_shc_prompt_defconfig                |  3 +
 configs/am335x_shc_sdboot_defconfig                |  3 +
 configs/am335x_shc_sdboot_prompt_defconfig         |  3 +
 configs/am335x_sl50_defconfig                      |  2 +
 configs/am3517_evm_defconfig                       |  1 +
 configs/am43xx_evm_defconfig                       |  2 +
 configs/am43xx_evm_ethboot_defconfig               |  2 +
 configs/am43xx_evm_qspiboot_defconfig              |  2 +
 configs/am43xx_evm_usbhost_boot_defconfig          |  2 +
 configs/am43xx_hs_evm_defconfig                    |  2 +
 configs/am57xx_evm_defconfig                       |  2 +
 configs/am57xx_evm_nodt_defconfig                  |  2 +
 configs/am57xx_hs_evm_defconfig                    |  2 +
 configs/ap325rxa_defconfig                         |  1 +
 configs/arndale_defconfig                          |  2 +
 configs/bayleybay_defconfig                        |  3 +
 configs/bcm11130_defconfig                         |  2 +
 configs/bcm11130_nand_defconfig                    |  2 +
 configs/bcm23550_w1d_defconfig                     |  2 +
 configs/bcm28155_ap_defconfig                      |  2 +
 configs/bcm28155_w1d_defconfig                     |  2 +
 configs/bg0900_defconfig                           |  1 +
 configs/birdland_bav335a_defconfig                 |  2 +
 configs/birdland_bav335b_defconfig                 |  2 +
 configs/cairo_defconfig                            |  2 +
 configs/chromebit_mickey_defconfig                 |  2 +
 configs/chromebook_jerry_defconfig                 |  2 +
 configs/chromebook_link_defconfig                  |  3 +
 configs/chromebook_minnie_defconfig                |  2 +
 configs/chromebook_samus_defconfig                 |  3 +
 configs/chromebox_panther_defconfig                |  3 +
 configs/clearfog_defconfig                         |  2 +
 configs/cm_t335_defconfig                          |  2 +
 configs/cm_t43_defconfig                           |  2 +
 configs/cm_t54_defconfig                           |  2 +
 ...conga-qeval20-qa3-e3845-internal-uart_defconfig |  3 +
 configs/conga-qeval20-qa3-e3845_defconfig          |  3 +
 configs/coreboot-x86_defconfig                     |  3 +
 configs/cougarcanyon2_defconfig                    |  3 +
 configs/crownbay_defconfig                         |  3 +
 configs/d2net_v2_defconfig                         |  3 +
 configs/db-88f6820-amc_defconfig                   |  2 +
 configs/db-88f6820-gp_defconfig                    |  2 +
 configs/db-mv784mp-gp_defconfig                    |  2 +
 configs/dbau1000_defconfig                         |  1 +
 configs/dbau1100_defconfig                         |  1 +
 configs/dbau1500_defconfig                         |  1 +
 configs/devkit8000_defconfig                       |  2 +
 configs/dfi-bt700-q7x-151_defconfig                |  3 +
 configs/dns325_defconfig                           |  1 +
 configs/dockstar_defconfig                         |  1 +
 configs/dra7xx_evm_defconfig                       |  2 +
 configs/dra7xx_hs_evm_defconfig                    |  2 +
 configs/draco_defconfig                            |  1 +
 configs/dragonboard410c_defconfig                  |  2 +
 configs/dreamplug_defconfig                        |  1 +
 configs/ds109_defconfig                            |  2 +
 configs/ds414_defconfig                            |  1 +
 configs/duovero_defconfig                          |  2 +
 configs/edminiv2_defconfig                         |  1 +
 configs/efi-x86_defconfig                          |  3 +
 configs/etamin_defconfig                           |  1 +
 configs/evb-rk3036_defconfig                       |  2 +
 configs/evb-rk3288_defconfig                       |  2 +
 configs/evb-rk3399_defconfig                       |  2 +
 configs/fennec-rk3288_defconfig                    |  2 +
 configs/firefly-rk3288_defconfig                   |  2 +
 configs/galileo_defconfig                          |  3 +
 configs/ge_b450v3_defconfig                        |  1 +
 configs/ge_b650v3_defconfig                        |  1 +
 configs/ge_b850v3_defconfig                        |  1 +
 configs/goflexhome_defconfig                       |  1 +
 configs/gplugd_defconfig                           |  1 +
 configs/gurnard_defconfig                          |  1 +
 configs/guruplug_defconfig                         |  1 +
 configs/highbank_defconfig                         |  3 +
 configs/hikey_defconfig                            |  2 +
 configs/ib62x0_defconfig                           |  1 +
 configs/iconnect_defconfig                         |  1 +
 configs/igep0020_defconfig                         |  2 +
 configs/igep0030_defconfig                         |  2 +
 configs/igep0032_defconfig                         |  2 +
 configs/imx6qdl_icore_nand_defconfig               |  1 +
 configs/inetspace_v2_defconfig                     |  3 +
 configs/k2e_evm_defconfig                          |  2 +
 configs/k2g_evm_defconfig                          |  2 +
 configs/k2hk_evm_defconfig                         |  2 +
 configs/k2l_evm_defconfig                          |  2 +
 configs/kc1_defconfig                              |  2 +
 configs/kylin-rk3036_defconfig                     |  2 +
 configs/ls1021aiot_qspi_defconfig                  |  1 +
 configs/ls1021aiot_sdcard_defconfig                |  1 +
 configs/lschlv2_defconfig                          |  3 +
 configs/lsxhl_defconfig                            |  3 +
 configs/marsboard_defconfig                        |  2 +
 configs/miniarm-rk3288_defconfig                   |  2 +
 configs/minnowmax_defconfig                        |  3 +
 configs/ms7720se_defconfig                         |  1 +
 configs/mvebu_db-88f3720_defconfig                 |  3 +
 configs/mvebu_db-88f7040_defconfig                 |  3 +
 configs/mx35pdk_defconfig                          |  2 +
 configs/mx6cuboxi_defconfig                        |  2 +
 configs/nas220_defconfig                           |  3 +
 configs/net2big_v2_defconfig                       |  3 +
 configs/netspace_lite_v2_defconfig                 |  3 +
 configs/netspace_max_v2_defconfig                  |  3 +
 configs/netspace_mini_v2_defconfig                 |  2 +
 configs/netspace_v2_defconfig                      |  3 +
 configs/novena_defconfig                           |  2 +
 configs/nsa310s_defconfig                          |  1 +
 configs/odroid-c2_defconfig                        |  4 +
 configs/odroid-xu3_defconfig                       |  2 +
 configs/odroid_defconfig                           |  2 +
 configs/omap3_beagle_defconfig                     |  2 +
 configs/omap3_evm_defconfig                        |  2 +
 configs/omap3_logic_defconfig                      |  2 +
 configs/omap3_overo_defconfig                      |  2 +
 configs/omap3_pandora_defconfig                    |  2 +
 configs/omap3_zoom1_defconfig                      |  2 +
 configs/omap4_panda_defconfig                      |  2 +
 configs/omap4_sdp4430_defconfig                    |  2 +
 configs/omap5_uevm_defconfig                       |  2 +
 configs/openrd_base_defconfig                      |  1 +
 configs/openrd_client_defconfig                    |  1 +
 configs/openrd_ultimate_defconfig                  |  1 +
 configs/origen_defconfig                           |  2 +
 configs/pcm051_rev1_defconfig                      |  2 +
 configs/pcm051_rev3_defconfig                      |  2 +
 configs/pcm058_defconfig                           |  3 +
 configs/peach-pi_defconfig                         |  2 +
 configs/peach-pit_defconfig                        |  2 +
 configs/pengwyn_defconfig                          |  2 +
 configs/pepper_defconfig                           |  2 +
 configs/pic32mzdask_defconfig                      |  1 +
 configs/pogo_e02_defconfig                         |  1 +
 configs/popmetal-rk3288_defconfig                  |  2 +
 configs/qemu-x86_defconfig                         |  3 +
 configs/qemu-x86_efi_payload32_defconfig           |  3 +
 configs/qemu-x86_efi_payload64_defconfig           |  3 +
 configs/r2dplus_defconfig                          |  1 +
 configs/r7780mp_defconfig                          |  1 +
 configs/rastaban_defconfig                         |  1 +
 configs/riotboard_defconfig                        |  2 +
 configs/rock2_defconfig                            |  2 +
 configs/rpi_2_defconfig                            |  2 +
 configs/rpi_3_32b_defconfig                        |  2 +
 configs/rpi_3_defconfig                            |  2 +
 configs/rpi_defconfig                              |  2 +
 configs/s32v234evb_defconfig                       |  3 +
 configs/s5p_goni_defconfig                         |  1 +
 configs/s5pc210_universal_defconfig                |  2 +
 configs/salvator-x_defconfig                       |  1 +
 configs/sandbox_defconfig                          |  4 +
 configs/sandbox_noblk_defconfig                    |  4 +
 configs/sandbox_spl_defconfig                      |  4 +
 configs/sh7752evb_defconfig                        |  1 +
 configs/sh7753evb_defconfig                        |  1 +
 configs/sh7757lcr_defconfig                        |  1 +
 configs/sheevaplug_defconfig                       |  1 +
 configs/smdk5250_defconfig                         |  2 +
 configs/smdk5420_defconfig                         |  2 +
 configs/smdkv310_defconfig                         |  2 +
 configs/sniper_defconfig                           |  2 +
 configs/snow_defconfig                             |  2 +
 configs/som-db5800-som-6867_defconfig              |  3 +
 configs/spring_defconfig                           |  2 +
 configs/tbs2910_defconfig                          |  1 +
 configs/theadorable-x86-dfi-bt700_defconfig        |  3 +
 configs/theadorable_debug_defconfig                |  2 +
 configs/theadorable_defconfig                      |  2 +
 configs/thuban_defconfig                           |  1 +
 configs/trats2_defconfig                           |  2 +
 configs/trats_defconfig                            |  2 +
 configs/udoo_neo_defconfig                         |  2 +
 configs/usbarmory_defconfig                        |  2 +
 configs/vexpress_ca15_tc2_defconfig                |  2 +
 configs/vexpress_ca5x2_defconfig                   |  2 +
 configs/vexpress_ca9x4_defconfig                   |  2 +
 configs/vinco_defconfig                            |  1 +
 configs/vining_2000_defconfig                      |  1 +
 configs/wandboard_defconfig                        |  2 +
 configs/warp7_defconfig                            |  1 +
 configs/warp7_secure_defconfig                     |  1 +
 configs/woodburn_defconfig                         |  2 +
 configs/woodburn_sd_defconfig                      |  2 +
 configs/work_92105_defconfig                       |  1 +
 configs/xilinx_zynqmp_ep_defconfig                 |  2 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig   |  2 +
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig   |  2 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig   |  2 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig   |  2 +
 configs/xilinx_zynqmp_zcu102_defconfig             |  2 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig        |  2 +
 configs/zc5202_defconfig                           |  2 +
 configs/zc5601_defconfig                           |  2 +
 disk/Kconfig                                       | 97 ++++++++++++++++++++++
 disk/Makefile                                      | 12 +--
 disk/part.c                                        | 10 +--
 disk/part_amiga.h                                  |  2 +-
 disk/part_efi.c                                    |  2 +-
 disk/part_mac.h                                    |  2 +-
 include/config_defaults.h                          |  1 -
 include/config_distro_bootcmd.h                    |  1 -
 include/config_distro_defaults.h                   |  3 -
 include/config_fallbacks.h                         |  1 +
 include/configs/B4860QDS.h                         |  1 -
 include/configs/BSC9131RDB.h                       |  1 -
 include/configs/BSC9132QDS.h                       |  6 --
 include/configs/C29XPCIE.h                         |  1 -
 include/configs/CPCI4052.h                         |  3 -
 include/configs/M52277EVB.h                        |  3 -
 include/configs/M5253DEMO.h                        |  2 -
 include/configs/M5253EVBE.h                        |  2 -
 include/configs/M54455EVB.h                        |  2 -
 include/configs/M5475EVB.h                         |  1 -
 include/configs/M5485EVB.h                         |  1 -
 include/configs/MIP405.h                           |  3 -
 include/configs/MPC8308RDB.h                       |  1 -
 include/configs/MPC8315ERDB.h                      |  1 -
 include/configs/MPC8349ITX.h                       |  1 -
 include/configs/MPC837XEMDS.h                      |  2 -
 include/configs/MPC837XERDB.h                      |  2 -
 include/configs/MPC8536DS.h                        |  5 --
 include/configs/MPC8544DS.h                        |  1 -
 include/configs/MPC8569MDS.h                       |  1 -
 include/configs/MPC8572DS.h                        |  1 -
 include/configs/MPC8610HPCD.h                      |  1 -
 include/configs/MPC8641HPCN.h                      |  1 -
 include/configs/P1010RDB.h                         |  3 -
 include/configs/P1022DS.h                          |  5 --
 include/configs/P1023RDB.h                         |  1 -
 include/configs/P2041RDB.h                         |  3 -
 include/configs/PIP405.h                           |  3 -
 include/configs/PLU405.h                           |  3 -
 include/configs/PMC440.h                           |  3 -
 include/configs/T102xQDS.h                         |  3 -
 include/configs/T102xRDB.h                         |  2 -
 include/configs/T1040QDS.h                         |  3 -
 include/configs/T104xRDB.h                         |  3 -
 include/configs/T208xQDS.h                         |  3 -
 include/configs/T208xRDB.h                         |  3 -
 include/configs/T4240QDS.h                         |  2 -
 include/configs/T4240RDB.h                         |  4 -
 include/configs/TQM5200.h                          |  3 -
 include/configs/TQM823L.h                          |  3 -
 include/configs/TQM823M.h                          |  3 -
 include/configs/TQM850L.h                          |  3 -
 include/configs/TQM850M.h                          |  3 -
 include/configs/TQM855L.h                          |  3 -
 include/configs/TQM855M.h                          |  3 -
 include/configs/TQM860L.h                          |  3 -
 include/configs/TQM860M.h                          |  3 -
 include/configs/TQM862L.h                          |  3 -
 include/configs/TQM862M.h                          |  3 -
 include/configs/TQM866M.h                          |  3 -
 include/configs/TQM885D.h                          |  3 -
 include/configs/UCP1020.h                          |  5 --
 include/configs/VCMA9.h                            |  1 -
 include/configs/a4m072.h                           |  2 -
 include/configs/ac14xx.h                           |  6 --
 include/configs/acadia.h                           |  3 -
 include/configs/adp-ag101p.h                       |  1 -
 include/configs/advantech_dms-ba16.h               |  1 -
 include/configs/am335x_evm.h                       |  3 -
 include/configs/am335x_shc.h                       |  4 -
 include/configs/am335x_sl50.h                      |  3 -
 include/configs/am3517_crane.h                     |  1 -
 include/configs/am3517_evm.h                       |  2 -
 include/configs/am43xx_evm.h                       |  1 -
 include/configs/am57xx_evm.h                       |  1 -
 include/configs/ap325rxa.h                         |  1 -
 include/configs/apf27.h                            |  1 -
 include/configs/apx4devkit.h                       |  1 -
 include/configs/aria.h                             |  6 --
 include/configs/at91rm9200ek.h                     |  1 -
 include/configs/at91sam9260ek.h                    |  3 -
 include/configs/at91sam9261ek.h                    |  1 -
 include/configs/at91sam9263ek.h                    |  1 -
 include/configs/at91sam9m10g45ek.h                 |  4 -
 include/configs/at91sam9n12ek.h                    |  3 -
 include/configs/at91sam9rlek.h                     |  1 -
 include/configs/at91sam9x5ek.h                     |  3 -
 include/configs/atngw100.h                         |  1 -
 include/configs/atngw100mkii.h                     |  1 -
 include/configs/atstk1002.h                        |  1 -
 include/configs/axs10x.h                           |  1 -
 include/configs/baltos.h                           |  4 -
 include/configs/bamboo.h                           |  3 -
 include/configs/bav335x.h                          |  3 -
 include/configs/bcm23550_w1d.h                     |  2 -
 include/configs/bcm28155_ap.h                      |  2 -
 include/configs/bcm_ep_board.h                     |  1 -
 include/configs/bf533-stamp.h                      |  1 -
 include/configs/bf537-stamp.h                      |  1 -
 include/configs/bfin_adi_common.h                  |  3 -
 include/configs/bg0900.h                           |  1 -
 include/configs/brppt1.h                           |  1 -
 include/configs/brxre1.h                           |  1 -
 include/configs/canyonlands.h                      |  3 -
 include/configs/clearfog.h                         |  2 -
 include/configs/cm5200.h                           |  3 -
 include/configs/cm_t35.h                           |  1 -
 include/configs/cm_t3517.h                         |  1 -
 include/configs/cm_t43.h                           |  1 -
 include/configs/colibri_vf.h                       |  1 -
 include/configs/controlcenterd.h                   |  1 -
 include/configs/corenet_ds.h                       |  3 -
 include/configs/corvus.h                           |  1 -
 include/configs/cyrus.h                            |  3 -
 include/configs/da850evm.h                         |  3 -
 include/configs/db-88f6820-amc.h                   |  2 -
 include/configs/db-88f6820-gp.h                    |  2 -
 include/configs/db-mv784mp-gp.h                    |  2 -
 include/configs/dbau1x00.h                         |  1 -
 include/configs/devkit3250.h                       |  1 -
 include/configs/digsy_mtc.h                        |  1 -
 include/configs/dra7xx_evm.h                       |  1 -
 include/configs/draco.h                            |  2 -
 include/configs/dragonboard410c.h                  |  1 -
 include/configs/ds414.h                            |  2 -
 include/configs/duovero.h                          |  2 -
 include/configs/ecovec.h                           |  2 -
 include/configs/edminiv2.h                         |  3 -
 include/configs/etamin.h                           |  1 -
 include/configs/ethernut5.h                        |  1 -
 include/configs/exynos-common.h                    |  1 -
 include/configs/ge_bx50v3.h                        |  1 -
 include/configs/gplugd.h                           |  2 -
 include/configs/gr_cpci_ax2000.h                   |  3 -
 include/configs/gr_ep2s60.h                        |  3 -
 include/configs/gr_xc3s_1500.h                     |  3 -
 include/configs/grsim.h                            |  3 -
 include/configs/grsim_leon2.h                      |  3 -
 include/configs/hrcon.h                            |  1 -
 include/configs/ib62x0.h                           |  1 -
 include/configs/icon.h                             |  1 -
 include/configs/imx27lite-common.h                 |  1 -
 include/configs/inka4x0.h                          |  3 -
 include/configs/intip.h                            |  3 -
 include/configs/ipek01.h                           |  1 -
 include/configs/jupiter.h                          |  3 -
 include/configs/katmai.h                           |  1 -
 include/configs/kc1.h                              |  1 -
 include/configs/km/kmp204x-common.h                |  1 -
 include/configs/kzm9g.h                            |  1 -
 include/configs/lacie_kw.h                         |  2 -
 include/configs/legoev3.h                          |  3 -
 include/configs/ls1012aqds.h                       |  2 -
 include/configs/ls1012ardb.h                       |  2 -
 include/configs/ls1021aiot.h                       |  1 -
 include/configs/ls1021aqds.h                       |  2 -
 include/configs/ls1021atwr.h                       |  2 -
 include/configs/ls1043a_common.h                   |  1 -
 include/configs/ls1043aqds.h                       |  1 -
 include/configs/ls1043ardb.h                       |  1 -
 include/configs/ls1046a_common.h                   |  1 -
 include/configs/ls1046aqds.h                       |  1 -
 include/configs/ls1046ardb.h                       |  1 -
 include/configs/ls2080a_simu.h                     |  1 -
 include/configs/ls2080aqds.h                       |  2 -
 include/configs/ls2080ardb.h                       |  2 -
 include/configs/lsxl.h                             |  3 -
 include/configs/lwmon5.h                           |  3 -
 include/configs/m28evk.h                           |  1 -
 include/configs/m53evk.h                           |  1 -
 include/configs/ma5d4evk.h                         |  1 -
 include/configs/manroland/common.h                 |  1 -
 include/configs/mcx.h                              |  1 -
 include/configs/mecp5123.h                         |  1 -
 include/configs/motionpro.h                        |  1 -
 include/configs/mpc5121ads.h                       |  5 --
 include/configs/ms7720se.h                         |  1 -
 include/configs/mv-common.h                        |  2 -
 include/configs/mvebu_db-88f3720.h                 |  5 --
 include/configs/mvebu_db-88f7040.h                 |  5 --
 include/configs/mx23_olinuxino.h                   |  1 -
 include/configs/mx23evk.h                          |  1 -
 include/configs/mx25pdk.h                          |  2 -
 include/configs/mx28evk.h                          |  1 -
 include/configs/mx35pdk.h                          |  3 -
 include/configs/mx51evk.h                          |  1 -
 include/configs/mx53ard.h                          |  1 -
 include/configs/mx53evk.h                          |  1 -
 include/configs/mx53loco.h                         |  1 -
 include/configs/mx53smd.h                          |  1 -
 include/configs/mx6_common.h                       |  1 -
 include/configs/mx7_common.h                       |  1 -
 include/configs/nas220.h                           |  2 -
 include/configs/nokia_rx51.h                       |  1 -
 include/configs/nsa310s.h                          |  1 -
 include/configs/o2dnt-common.h                     |  3 -
 include/configs/omap3_evm.h                        |  2 -
 include/configs/omap5_uevm.h                       |  1 -
 include/configs/omapl138_lcdk.h                    |  1 -
 include/configs/p1_p2_rdb_pc.h                     |  2 -
 include/configs/p1_twr.h                           |  2 -
 include/configs/pb1x00.h                           |  2 -
 include/configs/pcm030.h                           |  1 -
 include/configs/pcm052.h                           |  1 -
 include/configs/pic32mzdask.h                      |  2 -
 include/configs/pico-imx6ul.h                      |  1 -
 include/configs/picosam9g45.h                      |  4 -
 include/configs/pm9261.h                           |  1 -
 include/configs/pm9263.h                           |  1 -
 include/configs/pm9g45.h                           |  1 -
 include/configs/pxa-common.h                       |  1 -
 include/configs/qemu-mips.h                        |  1 -
 include/configs/qemu-mips64.h                      |  1 -
 include/configs/qemu-ppce500.h                     |  2 -
 include/configs/r2dplus.h                          |  1 -
 include/configs/r7780mp.h                          |  1 -
 include/configs/rastaban.h                         |  2 -
 include/configs/rcar-gen2-common.h                 |  1 -
 include/configs/rcar-gen3-common.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/s32v234evb.h                       |  1 -
 include/configs/s5p_goni.h                         |  4 -
 include/configs/sama5d2_ptc.h                      |  1 -
 include/configs/sama5d2_xplained.h                 |  4 -
 include/configs/sama5d3_xplained.h                 |  1 -
 include/configs/sama5d3xek.h                       |  1 -
 include/configs/sama5d4_xplained.h                 |  4 -
 include/configs/sama5d4ek.h                        |  4 -
 include/configs/sandbox.h                          |  7 --
 include/configs/sansa_fuze_plus.h                  |  1 -
 include/configs/sbc8641d.h                         |  1 -
 include/configs/sc_sps_1.h                         |  1 -
 include/configs/sequoia.h                          |  3 -
 include/configs/sh7752evb.h                        |  2 -
 include/configs/sh7753evb.h                        |  2 -
 include/configs/sh7757lcr.h                        |  2 -
 include/configs/sh7785lcr.h                        |  3 -
 include/configs/sheevaplug.h                       |  1 -
 include/configs/siemens-am33x-common.h             |  1 -
 include/configs/smdk2410.h                         |  1 -
 include/configs/smdkc100.h                         |  2 -
 include/configs/snapper9260.h                      |  1 -
 include/configs/snapper9g45.h                      |  2 -
 include/configs/sniper.h                           |  1 -
 include/configs/socfpga_arria5_socdk.h             |  1 -
 include/configs/socfpga_cyclone5_socdk.h           |  1 -
 include/configs/socfpga_de0_nano_soc.h             |  1 -
 include/configs/socfpga_is1.h                      |  1 -
 include/configs/socfpga_mcvevk.h                   |  1 -
 include/configs/socfpga_sockit.h                   |  1 -
 include/configs/socfpga_socrates.h                 |  1 -
 include/configs/socfpga_sr1500.h                   |  1 -
 include/configs/socfpga_vining_fpga.h              |  1 -
 include/configs/socrates.h                         |  1 -
 include/configs/strider.h                          |  1 -
 include/configs/sunxi-common.h                     |  1 -
 include/configs/t4qds.h                            |  2 -
 include/configs/tam3517-common.h                   |  1 -
 include/configs/tao3530.h                          |  1 -
 include/configs/tbs2910.h                          |  2 -
 include/configs/tegra-common-post.h                |  9 --
 include/configs/tegra-common.h                     |  1 -
 include/configs/theadorable.h                      |  2 -
 include/configs/thuban.h                           |  2 -
 include/configs/ti814x_evm.h                       |  1 -
 include/configs/ti816x_evm.h                       |  1 -
 include/configs/ti_armv7_common.h                  |  2 -
 include/configs/ti_armv7_keystone2.h               |  1 -
 include/configs/tplink_wdr4300.h                   |  2 -
 include/configs/tricorder.h                        |  1 -
 include/configs/ts4600.h                           |  1 -
 include/configs/ts4800.h                           |  1 -
 include/configs/uniphier.h                         |  1 -
 include/configs/usb_a9263.h                        |  1 -
 include/configs/v38b.h                             |  2 -
 include/configs/vct.h                              |  3 -
 include/configs/vexpress_aemv8a.h                  |  1 -
 include/configs/vf610twr.h                         |  1 -
 include/configs/vinco.h                            |  6 --
 include/configs/vining_2000.h                      |  2 -
 include/configs/warp7.h                            |  1 -
 include/configs/woodburn_common.h                  |  3 -
 include/configs/work_92105.h                       |  1 -
 include/configs/x600.h                             |  1 -
 include/configs/x86-common.h                       |  5 --
 include/configs/xfi3.h                             |  1 -
 include/configs/xilinx_zynqmp.h                    |  5 --
 include/configs/xpedite550x.h                      |  1 -
 include/configs/yosemite.h                         |  3 -
 include/configs/zipitz2.h                          |  1 -
 include/configs/zmx25.h                            |  1 -
 include/configs/zynq-common.h                      |  1 -
 include/part.h                                     |  4 +-
 lib/efi_loader/efi_disk.c                          |  2 +-
 scripts/config_whitelist.txt                       |  8 --
 513 files changed, 541 insertions(+), 583 deletions(-)
 create mode 100644 disk/Kconfig

diff --git a/Kconfig b/Kconfig
index 529858a..46c373e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -68,6 +68,10 @@ config DISTRO_DEFAULTS
 	select CMD_MII
 	select CMD_PING
 	select HUSH_PARSER
+	select DOS_PARTITION
+	select EFI_PARTITION
+	select ISO_PARTITION
+	select PARTITION_UUIDS
 	help
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
@@ -313,6 +317,8 @@ source "common/Kconfig"
 
 source "cmd/Kconfig"
 
+source "disk/Kconfig"
+
 source "dts/Kconfig"
 
 source "net/Kconfig"
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index ec65cc0..21cfb50 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -90,7 +90,6 @@
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 						CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_FSL_ERRATUM_A008407
 
 #ifdef CONFIG_DDR_SPD
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 97a0fc9..91c56b0 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -321,7 +321,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
 	char devname[32] = { 0 }; /* dp->str is u16[32] long */
 	char *colon;
 
-#if defined(CONFIG_BLK) || defined(CONFIG_ISO_PARTITION)
+#if defined(CONFIG_BLK) || CONFIG_IS_ENABLED(ISO_PARTITION)
 	desc = blk_get_dev(dev, simple_strtol(devnr, NULL, 10));
 #endif
 
@@ -338,7 +338,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
 
 	colon = strchr(devname, ':');
 
-#ifdef CONFIG_ISO_PARTITION
+#if CONFIG_IS_ENABLED(ISO_PARTITION)
 	/* For ISOs we create partition block devices */
 	if (desc && (desc->type != DEV_TYPE_UNKNOWN) &&
 	    (desc->part_type == PART_TYPE_ISO)) {
diff --git a/cmd/reiser.c b/cmd/reiser.c
index cbdad36..9c3e9e9 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -18,7 +18,7 @@
 #include <reiserfs.h>
 #include <part.h>
 
-#ifndef CONFIG_DOS_PARTITION
+#if !CONFIG_IS_ENABLED(DOS_PARTITION)
 #error DOS partition support must be selected
 #endif
 
diff --git a/cmd/zfs.c b/cmd/zfs.c
index 93067a9..3ed9912 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -24,7 +24,7 @@
 #include <usb.h>
 #endif
 
-#if !defined(CONFIG_DOS_PARTITION) && !defined(CONFIG_EFI_PARTITION)
+#if !CONFIG_IS_ENABLED(DOS_PARTITION) && !CONFIG_IS_ENABLED(EFI_PARTITION)
 #error DOS or EFI partition support must be selected
 #endif
 
diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 81a3bd0..6cc113d 100644
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -112,7 +112,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
 		return;
 	}
 
-#ifdef CONFIG_EFI_PARTITION
+#if CONFIG_IS_ENABLED(EFI_PARTITION)
 	if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) {
 		printf("%s: updating MBR, Primary and Backup GPT(s)\n",
 		       __func__);
@@ -133,7 +133,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
 	}
 #endif
 
-#ifdef CONFIG_DOS_PARTITION
+#if CONFIG_IS_ENABLED(DOS_PARTITION)
 	if (strcmp(cmd, CONFIG_FASTBOOT_MBR_NAME) == 0) {
 		printf("%s: updating MBR\n", __func__);
 		if (is_valid_dos_buf(download_buffer)) {
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 621cb8f..e17ba1a 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -8,3 +8,4 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MAC_PARTITION=y
diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig
index 4b81ba4..2be75d6 100644
--- a/configs/M5253EVBE_defconfig
+++ b/configs/M5253EVBE_defconfig
@@ -8,3 +8,4 @@ CONFIG_BOOTDELAY=5
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MAC_PARTITION=y
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index afef344..15e30ef 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -44,6 +44,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 2e5e047..492a6b4 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 07e73fe..7636b74 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -39,6 +39,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index e5a1696..92711da 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
 # CONFIG_BLK is not set
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 484286b..ad5359a 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 7b6d63b..cbeb155 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index b239209..0b39939 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index e7dd0a7..532f613 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 6149beb..1130e2c 100644
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -38,5 +38,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index 9b73f46..76aba8a 100644
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -32,5 +32,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index ff70580..24cfd9b 100644
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -32,5 +32,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index 520d17c..18203f7 100644
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -33,5 +33,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig
index d6cc315..3c79241 100644
--- a/configs/am335x_shc_prompt_defconfig
+++ b/configs/am335x_shc_prompt_defconfig
@@ -30,5 +30,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index b4e36b5..c6ade19 100644
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -32,5 +32,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig
index b4e36b5..c6ade19 100644
--- a/configs/am335x_shc_sdboot_prompt_defconfig
+++ b/configs/am335x_shc_sdboot_prompt_defconfig
@@ -32,5 +32,8 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index f49407e..0d4e91c 100644
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -41,5 +41,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 291f570..8e7c255 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_PARTITION_UUIDS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 443e1fb..cd767e2 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
 CONFIG_DM=y
diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index 7090fd1..1095af5 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index a3f3abd..1251b99 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 6a881dd..08b7bcd 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
 CONFIG_DM=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index 1c53877..7fb697a 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 12d9a14..9f17f89 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -46,6 +46,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am57xx-beagle-x15 am572x-idk"
 CONFIG_DM=y
diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
index 7e08b0a..ab46152 100644
--- a/configs/am57xx_evm_nodt_defconfig
+++ b/configs/am57xx_evm_nodt_defconfig
@@ -38,6 +38,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index c508b8e..cd20057 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -46,6 +46,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig
index 818eb41..8256eca 100644
--- a/configs/ap325rxa_defconfig
+++ b/configs/ap325rxa_defconfig
@@ -19,4 +19,5 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 5dd6fda..2dc8804 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SOUND=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 1eb6142..3f135b4 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -36,6 +36,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
index dd37b7e..c3584c3 100644
--- a/configs/bcm11130_defconfig
+++ b/configs/bcm11130_defconfig
@@ -18,6 +18,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig
index a013098..60198b9 100644
--- a/configs/bcm11130_nand_defconfig
+++ b/configs/bcm11130_nand_defconfig
@@ -18,6 +18,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig
index 8d6d28c..f152418 100644
--- a/configs/bcm23550_w1d_defconfig
+++ b/configs/bcm23550_w1d_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
index 1ceaeda..1295ab9 100644
--- a/configs/bcm28155_ap_defconfig
+++ b/configs/bcm28155_ap_defconfig
@@ -25,6 +25,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig
index 06539fd..06107ea 100644
--- a/configs/bcm28155_w1d_defconfig
+++ b/configs/bcm28155_w1d_defconfig
@@ -19,6 +19,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 6c14965..9282e1e 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 5e1af1c..84237ee 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -43,6 +43,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index f3771bb..38e059c 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -43,6 +43,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index 67d6b61..e9ffb52 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -28,5 +28,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index 9203f73..836083a 100644
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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 95e5f57..e70aca5 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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_link_defconfig b/configs/chromebook_link_defconfig
index 8407731..06642fd 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -32,6 +32,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 49cd640..a02aa23 100644
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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_samus_defconfig b/configs/chromebook_samus_defconfig
index e08dffc..d9ad68c 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -32,6 +32,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index f8cf92b..5400cc1 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -29,6 +29,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index d06b75c..e5a3762 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT2=y
 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_OF_TRANSLATE=y
 CONFIG_SPI_FLASH=y
 CONFIG_PCI=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 36905fd..84891c0 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -35,5 +35,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 2d78841..dd3d8cc 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -41,6 +41,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index e002e1c..5717e6e 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 28f69e4..782333e 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -37,6 +37,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 2528db9..eb7bcae 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -36,6 +36,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 2195fc6..2bbd041 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -24,6 +24,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 233fe09..0a1f9c4 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -21,6 +21,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 5aa7234..77775cb 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -28,6 +28,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index eeea7e5..3b0dea3 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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 90cbd48..3ba16fc 100644
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT2=y
 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_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 3547d84..e672cd8 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 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_OF_TRANSLATE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index b3e2e1d..9c4dd28 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 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_OF_TRANSLATE=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 996e2f7..2962bf5 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_MAC_PARTITION=y
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index 2b3ccd8..67b36e8 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_MAC_PARTITION=y
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 7459c63..f447aa6 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_MAC_PARTITION=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index e603310..63d43de 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -18,5 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index f657ef6..b617f92 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -35,6 +35,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 2ab31fa..681692e 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index e263c5b..b453ed4 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 18a5e7a..307e5d1 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -46,6 +46,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc"
 CONFIG_DM=y
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index 838de5c..6087e0a 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -48,6 +48,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="dra7-evm dra72-evm"
 CONFIG_DM=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 0cb4412..2ab9359 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_UBI=y
+# CONFIG_DOS_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DFU_NAND=y
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index 34250c3..5c78628 100644
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -21,6 +21,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_CLK=y
 CONFIG_MSM_GPIO=y
 CONFIG_PM8916_GPIO=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index ec9ab9b..9743d14 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 34a4673..606f337 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -10,6 +10,8 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index 3950782..027d5ad 100644
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index 4fb5ed6..63e1cf8 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -28,6 +28,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_PARTITION_UUIDS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 036935e..44a4fc1 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT2=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 1fe6142..962e021 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -21,6 +21,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_PCI=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 8fb6ebd..9a18909 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_UBI=y
+# CONFIG_DOS_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DFU_NAND=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 6546db9..70b7e85 100644
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -23,6 +23,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index e5e550c..9f1e723 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index 95029d7..b6507af 100644
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -16,6 +16,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index eff5e15..3af0df2 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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 4910c80..41a53dd 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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/galileo_defconfig b/configs/galileo_defconfig
index 0220357..b629c37 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -31,6 +31,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y
diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index 6550c9e..03e60a3 100644
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index 7cf1899..974745c 100644
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 63025bc..4a13b34 100644
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 46527e5..53efe4b 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 59c9fdf..c9d9db2 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_MACRONIX=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/guruplug_defconfig b/configs/guruplug_defconfig
index 43127de..7783986 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index b4f3975..4b8eeda 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -19,4 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 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/hikey_defconfig b/configs/hikey_defconfig
index 95790bf..851b20f 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -17,5 +17,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 4260245..1341753 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 5b570b7..13beedf 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index c25b6b8..ab6dfde 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index edc7520..ba299c3 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 81d05d4..5a5fd35 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
index c7843c1..2260b92 100644
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_DOS_PARTITION=y
 # CONFIG_BLK is not set
 # CONFIG_DM_MMC_OPS is not set
 CONFIG_NAND_MXS=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index ba7f959..59870d0 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index ffa1c4a..196e507 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index 97f7187..7ffa225 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 8b0e00f..4b44bb8 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 6424ec7..8a94fee 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
index 76226e9..1fa61a5 100644
--- a/configs/kc1_defconfig
+++ b/configs/kc1_defconfig
@@ -23,6 +23,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index a4281c9..c2ca37c 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig
index 21464cb..dcc683e 100644
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021AIOT=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
+CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig
index 1369fe6..6531aee 100644
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
+CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 6a8e690..a83b750 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -21,6 +21,9 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 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 e64325a..8d87b4f 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -21,6 +21,9 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 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/marsboard_defconfig b/configs/marsboard_defconfig
index 863fd7e..93a4c8b 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
index 1e273a6..17df565 100644
--- a/configs/miniarm-rk3288_defconfig
+++ b/configs/miniarm-rk3288_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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/minnowmax_defconfig b/configs/minnowmax_defconfig
index 45d8a87..de126d1 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -36,6 +36,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index a02760a..c19c56b 100644
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@@ -23,4 +23,5 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index b7a1645..acdb395 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -26,6 +26,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
diff --git a/configs/mvebu_db-88f7040_defconfig b/configs/mvebu_db-88f7040_defconfig
index 81152cd..ae8c903 100644
--- a/configs/mvebu_db-88f7040_defconfig
+++ b/configs/mvebu_db-88f7040_defconfig
@@ -26,6 +26,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index c44681f..a65fd7a 100644
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -15,6 +15,8 @@ CONFIG_CMD_PING=y
 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 d10c2ca..28f8682 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 3000d72..f5db6d4 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -17,6 +17,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 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 802879b..ec8521e 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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 f42c49a..79f6fea 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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 3ec5e63..a21606f 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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 11e453c..c941c97 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -18,6 +18,8 @@ CONFIG_CMD_MII=y
 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 b8ccecd..25b59e2 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -19,6 +19,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 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 4a3e266..e7b389f 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_PCI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index add5e07..dc8a265 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 9db718c..296ecad 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -14,6 +14,10 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+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/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 1b67495..1af848b 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index f3ddc74..07d5f95 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_I2C=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 7a1fd44..6631736 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 6ca7e2c..e4e3a08 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=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/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index ac1a6a3..d8e8d2d 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index b902283..877b851 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index 70a9299..43f9aec 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -29,5 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index e7f8fd0..436a28e 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -24,5 +24,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index a5fbf9a..6abd709 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index 92cc9f0..6807c52 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -28,5 +28,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 3005ffd..dd91d0d 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 0168579..067ddbc 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 84fa149..b90ead1 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 026204d..2bc8ace 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 0d91ec1..9037d4c 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
 CONFIG_USB=y
diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index bc6e92d..3ffbbb3 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -42,6 +42,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index acdf192..7721509 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -42,6 +42,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
index b2f70ea..8a268d4 100644
--- a/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@ -36,6 +36,9 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_PARTITION_UUIDS is not set
 CONFIG_DM=y
 CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index adecb40..44cccc9 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index f8e987f..ec94100 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 2da2126..e3d249c 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -42,6 +42,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index 0592ed9..fa139ea 100644
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -34,5 +34,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig
index 68eee4d..76346d6 100644
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_PARTITION_UUIDS=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 # CONFIG_BLK is not set
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 1882995..df58361 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 663724e..e2b7eb4 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 4566d37..db88be3 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -28,6 +28,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index f580d45..a96a0ad 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -25,6 +25,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index 975714b..6bfc479 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -26,6 +26,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index f4dc68e..9a5ebde 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -5,5 +5,6 @@ CONFIG_BOOTDELAY=-1
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_PCI=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index 77d9c06..fccaf05 100644
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@@ -20,5 +20,6 @@ CONFIG_BOOTDELAY=3
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_PCI=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index d3ac645..76e84b7 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_UBI=y
+# CONFIG_DOS_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DFU_NAND=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index a29c238..9d36480 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 9e332bc..986a970 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=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/rpi_2_defconfig b/configs/rpi_2_defconfig
index 9287bec..90d44f2 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -21,6 +21,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_EMBED=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index e6fe836..8e3eb19 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -22,6 +22,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_EMBED=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 446f044..1396f7b 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -21,6 +21,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_EMBED=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index dfd0cc7..54fd03b 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -21,6 +21,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_EMBED=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig
index dfedf82..f549efd 100644
--- a/configs/s32v234evb_defconfig
+++ b/configs/s32v234evb_defconfig
@@ -4,4 +4,7 @@ CONFIG_SYS_MALLOC_F=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 4cbf022..a0ab1dc 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index f1bbdd9..ba16b6a 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
 CONFIG_USB=y
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 9df4867..78da265 100644
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -11,3 +11,4 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
+CONFIG_DOS_PARTITION=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 380d4fe..1ea211c 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -58,6 +58,10 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_NETCONSOLE=y
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 833caf1..1192e54 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -56,6 +56,10 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_NETCONSOLE=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 84c32e9..c5609a6 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -65,6 +65,10 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index 73b1ac6..61b34fb 100644
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index e0037a6..5625409 100644
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index a80c10c..3a683b7 100644
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
+CONFIG_DOS_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index e15355d..63973eb 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_ISO_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 4189475..c3b59e9 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 8715ec3..588ca53 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index c8c182b..9bbef7a 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -22,5 +22,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index 6f55503..37569da 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index d654311..1176daf 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index a3ba8c1..24a60eb 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -34,6 +34,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 2a2b071..53903b1 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 9fefa5f..2b3edd1 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_PCI=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 135c904..95e757d 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -35,6 +35,9 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index e642475..0dc6146 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_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 a063047..8e79ba6 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT2=y
 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_OF_TRANSLATE=y
 CONFIG_DM_GPIO=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 7e1b63b..bffa231 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_UBI=y
+# CONFIG_DOS_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DFU_NAND=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index db1ebe9..4a14358 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
 CONFIG_USB=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index b25c1c4..1ac7e12 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
 CONFIG_USB=y
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
index 98679cf..1bf96c9 100644
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -26,4 +26,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index 16f4293..709161b 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -16,6 +16,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig
index d795279..ec49026 100644
--- a/configs/vexpress_ca15_tc2_defconfig
+++ b/configs/vexpress_ca15_tc2_defconfig
@@ -26,4 +26,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig
index 38d691e..3b0e02f 100644
--- a/configs/vexpress_ca5x2_defconfig
+++ b/configs/vexpress_ca5x2_defconfig
@@ -25,4 +25,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index ebca526..3064a81 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -25,4 +25,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index 34a02bd..f8e605d 100644
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index 9410703..95415a8 100644
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_EFI_PARTITION=y
 CONFIG_PCI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index d338ffc..72744aa 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 0f0ec99..beca3df 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -23,6 +23,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/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 aa5d587..55370cc 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -15,3 +15,5 @@ CONFIG_CMD_PING=y
 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 085c2df..23bba19 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -25,3 +25,5 @@ CONFIG_CMD_PING=y
 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/work_92105_defconfig b/configs/work_92105_defconfig
index ca3b731..27d5ffb 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index f3cdf90..d9bd41e 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -44,6 +44,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 049db51..97137d9 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index e8a587f..4d72f7f 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -38,6 +38,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
index 62e3814..206fe01 100644
--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index ef92932..1ac5501 100644
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SPL_DM=y
diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index fa6d669..5699ae3 100644
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index a4af802..22cf4da 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig
index ee1da69..cd6bde1 100644
--- a/configs/zc5202_defconfig
+++ b/configs/zc5202_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PCI=y
diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
index 746ec70..20170d6 100644
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
diff --git a/disk/Kconfig b/disk/Kconfig
new file mode 100644
index 0000000..3070945
--- /dev/null
+++ b/disk/Kconfig
@@ -0,0 +1,97 @@
+
+menu "Partition Types"
+
+config PARTITIONS
+	bool "Enable Partition Labels (disklabels) support"
+	default y
+	help
+	  Partition Labels (disklabels) Supported:
+	  Zero or more of the following:
+	  - CONFIG_MAC_PARTITION   Apple's MacOS partition table.
+	  - CONFIG_DOS_PARTITION   MS Dos partition table, traditional on the
+	                           Intel architecture, USB sticks, etc.
+	  - CONFIG_ISO_PARTITION   ISO partition table, used on CDROM etc.
+	  - CONFIG_EFI_PARTITION   GPT partition table, common when EFI is the
+	                           bootloader.  Note 2TB partition limit; see
+	                           disk/part_efi.c
+	  - CONFIG_MTD_PARTITIONS  Memory Technology Device partition table.
+	  If IDE or SCSI support is enabled (CONFIG_CMD_IDE or CONFIG_SCSI)
+	  you must configure support for at least one non-MTD partition type
+	  as well.
+
+config MAC_PARTITION
+	bool "Enable Apple's MacOS partition table"
+	depends on PARTITIONS
+	default y if PPC || x86 || SPARC || SH
+	help
+	  Say Y here if you would like to use device under U-Boot which
+	  were partitioned on a Macintosh.
+
+config SPL_MAC_PARTITION
+	bool "Enable Apple's MacOS partition table for SPL"
+	depends on SPL && PARTITIONS
+	default y if MAC_PARTITION
+
+config DOS_PARTITION
+	bool "Enable MS Dos partition table"
+	depends on PARTITIONS
+	default y if PPC || x86 || SPARC || CMD_FAT || USB_STORAGE
+	help
+	  traditional on the Intel architecture, USB sticks, etc.
+
+config SPL_DOS_PARTITION
+	bool "Enable MS Dos partition table for SPL"
+	depends on SPL && PARTITIONS
+	default y if DOS_PARTITION
+
+config ISO_PARTITION
+	bool "Enable ISO partition table"
+	default y if M68K || PPC || SPARC || MIPS || TEGRA
+	depends on PARTITIONS
+
+config SPL_ISO_PARTITION
+	bool "Enable ISO partition table for SPL"
+	depends on SPL && PARTITIONS
+	default y if ISO_PARTITION
+
+config AMIGA_PARTITION
+	bool "Enable AMIGA partition table"
+	depends on PARTITIONS
+	help
+	  Say Y here if you would like to use device under U-Boot which
+	  were partitioned under AmigaOS.
+
+config SPL_AMIGA_PARTITION
+	bool "Enable AMIGA partition table for SPL"
+	depends on SPL && PARTITIONS
+	default y if AMIGA_PARTITION
+
+config EFI_PARTITION
+	bool "Enable EFI GPT partition table"
+	depends on PARTITIONS
+	default y if TEGRA
+	help
+	  Say Y here if you would like to use device under U-Boot which
+	  were partitioned using EFI GPT.
+	  common when EFI is the bootloader.  Note 2TB partition limit;
+	  see disk/part_efi.c
+
+config SPL_EFI_PARTITION
+	bool "Enable EFI GPT partition table for SPL"
+	depends on PARTITIONS
+	default y if EFI_PARTITION
+
+config PARTITION_UUIDS
+	bool "Enable support of UUID for partition"
+	default y if EFI_PARTITION
+	help
+	  Activate the configuration of UUID for partition
+
+config PARTITION_TYPE_GUID
+	bool "Enable support of GUID for partition type"
+	depends on EFI_PARTITION
+	help
+	  Activate the configuration of GUID type
+	  for EFI partition
+
+endmenu
diff --git a/disk/Makefile b/disk/Makefile
index 6970cec..523e34d 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -7,9 +7,9 @@
 
 #ccflags-y += -DET_DEBUG -DDEBUG
 
-obj-$(CONFIG_PARTITIONS) 	+= part.o
-obj-$(CONFIG_MAC_PARTITION)   += part_mac.o
-obj-$(CONFIG_DOS_PARTITION)   += part_dos.o
-obj-$(CONFIG_ISO_PARTITION)   += part_iso.o
-obj-$(CONFIG_AMIGA_PARTITION) += part_amiga.o
-obj-$(CONFIG_EFI_PARTITION)   += part_efi.o
+obj-$(CONFIG_PARTITIONS)             += part.o
+obj-$(CONFIG_$(SPL_)MAC_PARTITION)   += part_mac.o
+obj-$(CONFIG_$(SPL_)DOS_PARTITION)   += part_dos.o
+obj-$(CONFIG_$(SPL_)ISO_PARTITION)   += part_iso.o
+obj-$(CONFIG_$(SPL_)AMIGA_PARTITION) += part_amiga.o
+obj-$(CONFIG_$(SPL_)EFI_PARTITION)   += part_efi.o
diff --git a/disk/part.c b/disk/part.c
index 9f51a07..f0ac1c3 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -234,11 +234,11 @@ void part_init(struct blk_desc *dev_desc)
 
 static void print_part_header(const char *type, struct blk_desc *dev_desc)
 {
-#if defined(CONFIG_MAC_PARTITION) || \
-	defined(CONFIG_DOS_PARTITION) || \
-	defined(CONFIG_ISO_PARTITION) || \
-	defined(CONFIG_AMIGA_PARTITION) || \
-	defined(CONFIG_EFI_PARTITION)
+#if CONFIG_IS_ENABLED(MAC_PARTITION) || \
+	CONFIG_IS_ENABLED(DOS_PARTITION) || \
+	CONFIG_IS_ENABLED(ISO_PARTITION) || \
+	CONFIG_IS_ENABLED(AMIGA_PARTITION) || \
+	CONFIG_IS_ENABLED(EFI_PARTITION)
 	puts ("\nPartition Map for ");
 	switch (dev_desc->if_type) {
 	case IF_TYPE_IDE:
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index 0f04e97..a3fe1a9 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -10,7 +10,7 @@
 #define _DISK_PART_AMIGA_H
 #include <common.h>
 
-#ifdef CONFIG_ISO_PARTITION
+#if CONFIG_IS_ENABLED(ISO_PARTITION)
 /* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
    have 2048 byte blocks */
 #define DEFAULT_SECTOR_SIZE   2048
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 1924338..f1b7116 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -171,7 +171,7 @@ static void prepare_backup_gpt_header(gpt_header *gpt_h)
 	gpt_h->header_crc32 = cpu_to_le32(calc_crc32);
 }
 
-#ifdef CONFIG_EFI_PARTITION
+#if CONFIG_IS_ENABLED(EFI_PARTITION)
 /*
  * Public Functions (include/part.h)
  */
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 7b754e1..6735144 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -73,7 +73,7 @@ typedef struct mac_partition {
 	__u32	boot_cksum;	/* boot code checksum			*/
 	uchar	processor[16];	/* Type of Processor			*/
 	__u16	part_pad[188];	/* reserved				*/
-#ifdef CONFIG_ISO_PARTITION
+#if CONFIG_IS_ENABLED(ISO_PARTITION)
 	uchar   iso_dummy[2048];/* Reservere enough room for an ISO partition block to fit */
 #endif
 } mac_partition_t;
diff --git a/include/config_defaults.h b/include/config_defaults.h
index ad08c1d..7ef928b 100644
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -18,6 +18,5 @@
 
 #define CONFIG_GZIP 1
 #define CONFIG_ZLIB 1
-#define CONFIG_PARTITIONS 1
 
 #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_distro_defaults.h b/include/config_distro_defaults.h
index b5efab5..84f030d 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -26,9 +26,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_MENU
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_ISO_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 2ad54b7..91327a7 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -57,6 +57,7 @@
 
 #if (defined(CONFIG_PARTITION_UUIDS) || \
 	defined(CONFIG_EFI_PARTITION) || \
+	defined(CONFIG_SPL_EFI_PARTITION) || \
 	defined(CONFIG_RANDOM_UUID) || \
 	defined(CONFIG_CMD_UUID) || \
 	defined(CONFIG_BOOTP_PXE)) && \
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index cd4333f..3d42165 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -683,7 +683,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 #ifdef CONFIG_FMAN_ENET
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index aaf7106..d7be40a 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -306,7 +306,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_IRQ
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_REGINFO
 
 /*
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 8eee738..fc13eac 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -100,7 +100,6 @@
 #define CONFIG_SYS_PCIE1_IO_PHYS	0xC0010000
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_FSL_LAW			/* Use common FSL init code */
@@ -485,7 +484,6 @@ combinations. this should be removed later
 
 #define CONFIG_MMC
 #ifdef CONFIG_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FSL_ESDHC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
@@ -542,10 +540,6 @@ combinations. this should be removed later
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
-#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 39eefb4..d74dfea 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -99,7 +99,6 @@
 #define CONFIG_SYS_PCIE1_IO_PHYS	0xfffc00000ull
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_FSL_LAW			/* Use common FSL init code */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index fb6e0ef..e9ca80f 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -70,9 +70,6 @@
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define CONFIG_SUPPORT_VFAT
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 6230948..98ccbe3 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -92,9 +92,6 @@
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 #define CONFIG_SYS_USB_EHCI_REGS_BASE	0xFC0B0000
 #define CONFIG_SYS_USB_EHCI_CPU_INIT
 #endif
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 6c90700..2733457 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -42,8 +42,6 @@
 
 #ifdef CONFIG_CMD_IDE
 /* ATA */
-#	define CONFIG_DOS_PARTITION
-#	define CONFIG_MAC_PARTITION
 #	define CONFIG_IDE_RESET		1
 #	define CONFIG_IDE_PREINIT	1
 #	define CONFIG_ATAPI
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index faad970..5cba541 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -50,8 +50,6 @@
 #define CONFIG_CMD_IDE
 
 /* ATA */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
 #define CONFIG_IDE_RESET	1
 #define CONFIG_IDE_PREINIT	1
 #define CONFIG_ATAPI
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index abec373..0eed59e 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -119,8 +119,6 @@
 #endif
 
 /* ATA configuration */
-#define CONFIG_ISO_PARTITION
-#define CONFIG_DOS_PARTITION
 #define CONFIG_IDE_RESET	1
 #define CONFIG_IDE_PREINIT	1
 #define CONFIG_ATAPI
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 3b40cd0..f10c3f0 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -75,7 +75,6 @@
 #		define CONFIG_CMD_PCI
 #	endif
 #	define CONFIG_PCI_OHCI
-#	define CONFIG_DOS_PARTITION
 
 #	undef CONFIG_SYS_USB_OHCI_BOARD_INIT
 #	undef CONFIG_SYS_USB_OHCI_CPU_INIT
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 2c18e98..2ae8d25 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -69,7 +69,6 @@
 #endif
 
 #ifdef CONFIG_CMD_USB
-#	define CONFIG_DOS_PARTITION
 #	define CONFIG_USB_OHCI_NEW
 #	ifndef CONFIG_CMD_PCI
 #		define CONFIG_CMD_PCI
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index f7fc652..952ee4a 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -327,9 +327,6 @@
 /************************************************************
  * DISK Partition support
  ************************************************************/
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION /* Experimental */
 
 /************************************************************
  * Video support
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 6335c55..a5cdcb6 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_FSL_ESDHC_USE_PIO
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index bd25c0b..1d6be41 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -418,7 +418,6 @@
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 5f7eca0..fcc1a73 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -487,7 +487,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \
 				|| defined(CONFIG_USB_STORAGE)
-	#define CONFIG_DOS_PARTITION
 	#define CONFIG_SUPPORT_VFAT
 #endif
 
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index adc3193..2a66fa0 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -439,7 +439,6 @@ extern int board_pci_host_broken(void);
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -490,7 +489,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC83xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 48e06af..6ad065d 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -451,7 +451,6 @@
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -502,7 +501,6 @@
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC83xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 446303d..24290b5 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -533,7 +533,6 @@
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #if defined(CONFIG_TSEC_ENET)
@@ -631,10 +630,6 @@
 #endif
 #endif
 
-#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 6c17a3b..01df469 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -290,7 +290,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 91f0104..c537805 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -474,7 +474,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index e134560..638dea8 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -477,7 +477,6 @@
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 75693a0..fd1dd16 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -290,7 +290,6 @@
 #define PCI_IDSEL_NUMBER	0x0c	/* slot0->3(IDSEL)=12->15 */
 #endif
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index c94b329..f2ffb63 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -378,7 +378,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 3ced88d..6573ae1 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -198,7 +198,6 @@
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_FSL_LAW			/* Use common FSL init code */
@@ -678,7 +677,6 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_MMC
 #ifdef CONFIG_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FSL_ESDHC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
@@ -753,7 +751,6 @@ extern unsigned long get_sdram_size(void);
 
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
 		 || defined(CONFIG_FSL_SATA)
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Hash command with SHA acceleration supported in hardware */
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 6f07080..1c7e759 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -509,7 +509,6 @@
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_MMC
@@ -519,10 +518,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif
 
-#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
-#define CONFIG_DOS_PARTITION
-#endif
-
 #define CONFIG_TSEC_ENET
 #ifdef CONFIG_TSEC_ENET
 
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 5061286..279fcc4 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -264,7 +264,6 @@ extern unsigned long get_clock_freq(void);
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
-#define CONFIG_DOS_PARTITION
 #endif
 #endif
 
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 417bfd3..f16175d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -540,7 +540,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -560,7 +559,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -618,7 +616,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Hash command with SHA acceleration supported in hardware */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 3dcb6ac..f14ab47 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -287,9 +287,6 @@
 /************************************************************
  * DISK Partition support
  ************************************************************/
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION /* Experimental */
 
 /************************************************************
  * Video support
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 0967577..6797f18 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -64,9 +64,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_EEPROM
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define CONFIG_SUPPORT_VFAT
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 2e7f6e4..731560f 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -259,9 +259,6 @@
 #define USB_2_0_DEVICE
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 3c0a0c9..0ce28e0 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -631,7 +631,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /*
@@ -647,7 +646,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_SATA1_FLAGS		FLAGS_DMA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -669,7 +667,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Qman/Bman */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e2aea8b..5de79d6 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -649,7 +649,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /*
@@ -671,7 +670,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Qman/Bman */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index ba1c38b..ff98c05 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -517,7 +517,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -536,7 +535,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -560,7 +558,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
 #endif
 
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index ed568f3..2585d1d 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -631,7 +631,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -647,7 +646,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -670,7 +668,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Qman/Bman */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 17176f4..8d95fc2 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -600,7 +600,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET	   /* need PCIe reset errata */
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Qman/Bman */
@@ -711,7 +710,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_SATA2_FLAGS		FLAGS_DMA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -733,7 +731,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
 #endif
 
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index bca6a5b..a26913c 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -537,7 +537,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET           /* need PCIe reset errata LSZ ADD */
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Qman/Bman */
@@ -660,7 +659,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_SATA2_FLAGS		FLAGS_DMA
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -681,7 +679,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 1d18316..da07e26 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -494,7 +494,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -524,7 +523,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_ESDHC_DETECT_QUIRK \
 	(!(readb(QIXIS_BASE + QIXIS_BRDCFG5) & QIXIS_MUX_SDHC) || \
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 6c743e3..98e0e2e 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -249,7 +249,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -267,7 +266,6 @@
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -689,7 +687,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -713,7 +710,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 708eb76..6d30268 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -108,9 +108,6 @@
 #endif /* #ifndef CONFIG_TQM5200S */
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /* USB */
 #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 2fd5fa3..5f21338 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -93,9 +93,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 11bba09..46518a1 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -91,9 +91,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 548f1bc..114b63a 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -82,9 +82,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 582b934..e51f145 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -82,9 +82,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 814290f..04a58d5 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -84,9 +84,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 4a657ff..e121052 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -113,9 +113,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index bdfe509..3af079f 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -84,9 +84,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index ce6b404..3f566a6 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -84,9 +84,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 66dbcb6..3e40107 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -87,9 +87,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 478f16b..b66b7f0 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -87,9 +87,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
 
 /*
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 5501622..89e109c 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -125,9 +125,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #undef CONFIG_RTC_MPC8xx		/* MPC866 does not support RTC	*/
 
 #define	CONFIG_TIMESTAMP		/* but print image timestmps	*/
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index b246926..f12b4bf 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -121,9 +121,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
 #undef CONFIG_RTC_MPC8xx		/* MPC885 does not support RTC	*/
 
 #define	CONFIG_TIMESTAMP		/* but print image timestmps	*/
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 1163b0d..c61c3c8 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -391,7 +391,6 @@
 #define CONFIG_CMD_PCI
 
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif /* CONFIG_PCI */
 
 /*
@@ -490,10 +489,6 @@
 #define CONFIG_GENERIC_MMC
 #endif
 
-#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) || defined(CONFIG_FSL_SATA)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Misc Extra Settings */
 #undef CONFIG_WATCHDOG	/* watchdog disabled */
 
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index bb26261..aff33ae 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -100,7 +100,6 @@
 /* USB support (currently only works with D-cache off) */
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_DOS_PARTITION
 
 /* Enable needed helper functions */
 
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index b41ebe0..bf848c6 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -61,8 +61,6 @@
 #undef CONFIG_EEPRO100
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 2d1c099..a7a6bfe 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -396,12 +396,6 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
-#endif /* defined(CONFIG_CMD_IDE) */
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index c10c646..39121ed 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -155,9 +155,6 @@
 #define CONFIG_USB_OHCI
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #define CONFIG_SUPPORT_VFAT
 
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 5cb79f1..7f62825 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -102,7 +102,6 @@
  */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FTSDC010
 #define CONFIG_FTSDC010_NUMBER		1
 #define CONFIG_FTSDC010_SDIO
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 3626636..03e5833 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -58,7 +58,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_DOS_PARTITION
 
 /* USB Configs */
 #define CONFIG_USB_EHCI
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 8fa8e39..125fdec 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 \
@@ -324,8 +323,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
-#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 48353e9..5986f13 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -86,10 +86,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_ISO_PARTITION
-#endif
 #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 ca5bb1a..14238cc 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,7 +30,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
@@ -99,8 +98,6 @@
 /* disable host part of MUSB in SPL */
 #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/am3517_crane.h b/include/configs/am3517_crane.h
index 07ef9e9..970b956 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -78,7 +78,6 @@
 #define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
 #define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
 
 /*
  * USB configuration
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index ad56d24..5d5357d 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -80,7 +80,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * USB configuration
@@ -261,7 +260,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/am43xx_evm.h b/include/configs/am43xx_evm.h
index 0a6c06a..73d7f86 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -200,7 +200,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 d009900..fef2047 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -63,7 +63,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/ap325rxa.h b/include/configs/ap325rxa.h
index 9a4d2c9..b2749a9 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -16,7 +16,6 @@
 
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_BOOTARGS		"console=ttySC2,38400"
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index b903ba5..13cb7c9 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -241,7 +241,6 @@
  */
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 
 /*
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index babaf26..3252aea 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -21,7 +21,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_NAND
diff --git a/include/configs/aria.h b/include/configs/aria.h
index f385852..d408d54 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -403,12 +403,6 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
-#endif /* defined(CONFIG_CMD_IDE) */
-
 /*
  * Dynamic MTD partition support
  */
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index ed0daf5..a02e9cc 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -144,7 +144,6 @@
 #define CONFIG_USB_ATMEL			1
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_DOS_PARTITION			1
 
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_USB_HOST_BASE
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e1f934c..e6a2303 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -152,9 +152,6 @@
 #endif
 
 /* FAT */
-#ifdef CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
-#endif
 
 /* NOR flash - no real flash on this board */
 #define CONFIG_SYS_NO_FLASH			1
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index cc37236..67a721b 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -127,7 +127,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
 #ifdef CONFIG_AT91SAM9G10EK
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index cc1695e..fdaa599 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -268,7 +268,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_DOS_PARTITION		1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index fd0504d..1501729 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -104,10 +104,6 @@
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index b825464..566e3a3 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -129,9 +129,6 @@
 #endif
 
 /* FAT */
-#ifdef CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
-#endif
 
 /* Ethernet */
 #define CONFIG_KS8851_MLL
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 23184ce..5789197 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -109,7 +109,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Ethernet - not present */
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 843f03a..1048145 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -117,9 +117,6 @@
 #endif
 
 /* FAT */
-#ifdef CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
-#endif
 
 /* Ethernet */
 #define CONFIG_MACB
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index a0f451b..fcb1cfd 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -48,7 +48,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_USART1
 #define CONFIG_USART_ID			1
 /* User serviceable stuff */
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 4d9282a..204b0c4 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -67,7 +67,6 @@
 #define CONFIG_USART_ID			1
 
 /* User serviceable stuff */
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 9ddfff2..a8e2398 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -64,7 +64,6 @@
 #define CONFIG_USART_ID			1
 
 /* User serviceable stuff */
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index b99248e..9e68001 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -88,7 +88,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DWMMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * Ethernet PHY configuration
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 8efd513..6f34558 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -35,8 +35,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
 /* FIT support */
@@ -278,8 +276,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
-#undef CONFIG_EFI_PARTITION
 /*
  * Disable CPSW SPL support so we fit within the 101KiB limit.
  */
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 1b22a37..8d31a97 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -194,9 +194,6 @@
 #define CONFIG_SUPPORT_VFAT
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*-----------------------------------------------------------------------
  * PCI stuff
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 2f51e2c..cd844df 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -45,7 +45,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
 
 #ifdef CONFIG_NAND
 #define NANDARGS \
@@ -457,8 +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
-#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 eb4c497..d824e83 100644
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -109,8 +109,6 @@
  * This is necessary for the fatls command to work on an SD card
  * for example.
  */
-#define CONFIG_DOS_PARTITION
-#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 7a75fdb..4c06527 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -108,8 +108,6 @@
  * This is necessary for the fatls command to work on an SD card
  * for example.
  */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 
 /* version string, parser, etc */
 #define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index b68fa1e..c830e37 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -65,7 +65,6 @@
  * This is necessary for the fatls command to work on an SD card
  * for example.
  */
-#define CONFIG_DOS_PARTITION
 
 /* version string, parser, etc */
 #define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index ec4d93c..28041a9 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -152,7 +152,6 @@
 /* #define CONFIG_STAMP_CF */
 #if defined(CONFIG_STAMP_CF)
 #define CONFIG_MISC_INIT_R
-#define CONFIG_DOS_PARTITION	1
 #undef  CONFIG_IDE_8xx_DIRECT		/* no pcmcia interface required */
 #undef  CONFIG_IDE_LED			/* no led for ide supported */
 #undef  CONFIG_IDE_RESET		/* no reset for ide supported */
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 4f861aa..ceac805 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -185,7 +185,6 @@
 
 #if defined(CONFIG_BFIN_IDE)
 
-#define CONFIG_DOS_PARTITION	1
 /*
  * IDE/ATA stuff
  */
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index c401b73..72099bf 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -21,10 +21,8 @@
 # endif
 # ifdef CONFIG_LIBATA
 #  define CONFIG_CMD_SATA
-#  define CONFIG_DOS_PARTITION
 # endif
 # ifdef CONFIG_MMC
-#  define CONFIG_DOS_PARTITION
 #  define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
 # endif
 # ifdef CONFIG_MMC_SPI
@@ -32,7 +30,6 @@
 # endif
 # ifdef CONFIG_USB
 #  define CONFIG_CMD_USB_STORAGE
-#  define CONFIG_DOS_PARTITION
 # endif
 # if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN)
 #  define CONFIG_CMD_NAND
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 57a6985..fdb044d 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index a5fdbbb..1bd52a4 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -284,7 +284,6 @@ MMCARGS
  * enabled a number of useful commands and support.
  */
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_FS_EXT4
 #define CONFIG_EXT4_WRITE
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index a6369d6..e90b906 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -130,7 +130,6 @@ BUR_COMMON_ENV \
  * enabled a number of useful commands and support.
  */
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #endif /* CONFIG_MMC, ... */
 
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 1d189d2..42946b6 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -396,9 +396,6 @@
 #endif
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*-----------------------------------------------------------------------
  * PCI stuff
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index c976ec8..fbb6214 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -51,8 +51,6 @@
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
 /* Partition support */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 
 /* Additional FS support/configuration */
 #define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index b65ca3e..b3a98df 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -225,9 +225,6 @@
 #define CONFIG_USB_CLOCK	0x0001BBBB
 #define CONFIG_USB_CONFIG	0x00001000
 /* Partitions (for USB) */
-#define CONFIG_MAC_PARTITION	1
-#define CONFIG_DOS_PARTITION	1
-#define CONFIG_ISO_PARTITION	1
 
 /*
  * Invoke our last_stage_init function - needed by fwupdate
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index da5a4b3..dca4e37 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -83,7 +83,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /* USB */
 #define CONFIG_USB_OMAP3
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 1e2a477..3d05f64 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -90,7 +90,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /* USB */
 #define CONFIG_USB_MUSB_AM35X
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/colibri_vf.h b/include/configs/colibri_vf.h
index d58145e..3accec5 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -66,7 +66,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_RBTREE
 #define CONFIG_LZO
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index b824e3b..18f6598 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -382,7 +382,6 @@
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_LOADS_ECHO
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
-#define CONFIG_DOS_PARTITION
 
 /*
  * For booting Linux, the board info and command line data
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 67a5034..fff34e7 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -556,7 +556,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -574,7 +573,6 @@
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -630,7 +628,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Hash command with SHA acceleration supported in hardware */
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index e6a52d8..c9059e4 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -103,7 +103,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
-#define CONFIG_DOS_PARTITION
 
 /* USB DFU support */
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 13e4690..fa76969 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -388,7 +388,6 @@
 #define CONFIG_NET_MULTI
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -406,7 +405,6 @@
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
@@ -453,7 +451,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 3560115..6847489 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -325,9 +325,6 @@
  * Enable MMC commands only when
  * MMC support is present
  */
-#ifdef CONFIG_MMC
-#define CONFIG_DOS_PARTITION
-#endif
 
 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 4834828..6d05776 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -41,8 +41,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Partition support */
-#define CONFIG_DOS_PARTITION
-#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 b8c5232..e29139d 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -62,8 +62,6 @@
 					 CONFIG_SYS_SCSI_MAX_LUN)
 
 /* Partition support */
-#define CONFIG_DOS_PARTITION
-#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 26508c2..656c8c3 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -62,8 +62,6 @@
 #define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
 
 /* Additional FS support/configuration */
 #define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 182e8ab..ad7667e 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -173,7 +173,6 @@
 #define CONFIG_PCMCIA_SLOT_A
 
 #define CONFIG_ATAPI 1
-#define CONFIG_MAC_PARTITION 1
 
 /* We run CF in "true ide" mode or a harddrive via pcmcia */
 #define CONFIG_IDE_PCMCIA 1
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index a71f67c..e0df470 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -137,7 +137,6 @@
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_DOS_PARTITION
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index b2120b9..3ebb47e 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -64,7 +64,6 @@
 /*
  *  Partitions
  */
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BZIP2
 
 /*
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 75a7854..2506e6f 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -149,7 +149,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/draco.h b/include/configs/draco.h
index 7c4179d..bc85cf3 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -31,8 +31,6 @@
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
 
-#undef CONFIG_DOS_PARTITION
-
 #define CONFIG_BOARD_LATE_INIT
 
  /* Physical Memory Map */
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 1b440ea..4438d4e 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -68,7 +68,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/ds414.h b/include/configs/ds414.h
index 0be8800..9d5a5f7 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -81,8 +81,6 @@
 #endif
 
 /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_SYS_MVFS
 
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/ecovec.h b/include/configs/ecovec.h
index e1e3c78..308a179 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -33,8 +33,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_ENV
 
-#define CONFIG_DOS_PARTITION
-
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
 
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index af7b470..71f416c 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -145,7 +145,6 @@
 #ifdef CONFIG_CMD_IDE
 #define __io
 #define CONFIG_IDE_PREINIT
-#define CONFIG_DOS_PARTITION
 /* ED Mini V has an IDE-compatible SATA connector for port 1 */
 #define CONFIG_MVSATA_IDE
 #define CONFIG_MVSATA_IDE_USE_PORT1
@@ -176,8 +175,6 @@
 #define CONFIG_USB_EHCI		/* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_MARVELL
 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index eb17d68..7c1ddb9 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -88,7 +88,6 @@
 	"led4=60,0,1\0" \
 	"led5=63,0,1\0"
 
-#undef CONFIG_DOS_PARTITION
 #undef CONFIG_CMD_FAT
 
 #define CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index b4a0388..69ff99e 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -196,7 +196,6 @@
 #endif
 #if defined(CONFIG_CMD_REISER) || defined(CONFIG_CMD_EXT2) || \
 	defined(CONFIG_CMD_USB) || defined(CONFIG_MMC)
-#define CONFIG_DOS_PARTITION
 #endif
 #define CONFIG_LZO
 #define CONFIG_RBTREE
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 3b61a41..04c38ef 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -56,7 +56,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/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 2560c88..30c0291 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -70,7 +70,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_DOS_PARTITION
 
 /* USB Configs */
 #ifdef CONFIG_USB
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index c1b43fd..559e48d 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -106,8 +106,6 @@
 #define CONFIG_EHCI_IS_TDI
 #endif /* CONFIG_CMD_USB */
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_VFAT
 
 #endif	/* __CONFIG_GPLUGD_H */
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 211dc38..7f6586f 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -49,9 +49,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Supported commands
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ad0c126..4d28a97 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -43,9 +43,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Supported commands
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index b0e9001..b91ab85 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -30,9 +30,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Supported commands
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 17cac5a..8c1c8b4 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -41,9 +41,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Supported commands
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 1642793..3651017 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -36,9 +36,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Supported commands
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 9677aab..aa56d55 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_FPGAD
 #define CONFIG_CMD_IOLOOP
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index f686c7f..ec209a1 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -92,7 +92,6 @@
 #ifdef CONFIG_CMD_IDE
 #define __io
 #define CONFIG_IDE_PREINIT
-#define CONFIG_DOS_PARTITION
 #define CONFIG_MVSATA_IDE_USE_PORT0
 #define CONFIG_MVSATA_IDE_USE_PORT1
 #define CONFIG_SYS_ATA_IDE0_OFFSET	MV_SATA_PORT0_OFFSET
diff --git a/include/configs/icon.h b/include/configs/icon.h
index b15016b..3bf7383 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -224,7 +224,6 @@
 #define CONFIG_SYSTEMACE		/* Enable SystemACE support	*/
 #define CONFIG_SYS_SYSTEMACE_WIDTH	16	/* Data bus width is 16	*/
 #define CONFIG_SYS_SYSTEMACE_BASE	CONFIG_SYS_ACE_BASE
-#define CONFIG_DOS_PARTITION
 
 /*
  * External Bus Controller (EBC) Setup
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 14c43b8..ebc1a88 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -140,7 +140,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MXC_MMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * GPIO
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 79a716e..b2131e8 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -61,9 +61,6 @@
 #define CONFIG_SYS_XLB_PIPELINING	1
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * BOOTP options
diff --git a/include/configs/intip.h b/include/configs/intip.h
index e61005b..4db067f 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -280,9 +280,6 @@
 #define CONFIG_CMD_SDRAM
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * PCI stuff
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 3bd938e..a790271 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -78,7 +78,6 @@
 #define CONFIG_SYS_RX_ETH_BUFFER	8  /* use 8 rx buffer on eepro100  */
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e073528..4b7ea6d 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -64,9 +64,6 @@
 #define CONFIG_SYS_RX_ETH_BUFFER	8  /* use 8 rx buffer on eepro100  */
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index a41c127..f531381 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -238,7 +238,6 @@
 #define CONFIG_SYSTEMACE	1	/* Enable SystemACE support	*/
 #define CONFIG_SYS_SYSTEMACE_WIDTH	16	/* Data bus width is 16		*/
 #define CONFIG_SYS_SYSTEMACE_BASE	CONFIG_SYS_ACE_BASE
-#define CONFIG_DOS_PARTITION	1
 
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 76f2b8b..9a55fa1 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -108,7 +108,6 @@
  * Partitions
  */
 
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
 /*
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index fad8865..b88d113 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -352,7 +352,6 @@ int get_scl(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 
 /* RGMII (FM1 at DTESC5) is used as debug itf, it's the only one configured */
 #define CONFIG_SYS_FM1_DTSEC5_PHY_ADDR	0x11
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 9402aca..06cf308 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -23,7 +23,6 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"root=/dev/null console=ttySC4,115200"
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 4804fe0..1d9224c 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -135,8 +135,6 @@
 /*
  * Partition support
  */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 
 /*
  * File systems support
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index d91e75d..c5ae0c6 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -226,9 +226,6 @@
  * Enable MMC commands only when
  * MMC support is present
  */
-#ifdef CONFIG_MMC
-#define CONFIG_DOS_PARTITION
-#endif
 
 /* additions for new relocation code, must added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		0xc0000000
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 0cc1791..c3e1668 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -136,7 +136,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* SATA */
@@ -145,7 +144,6 @@
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_CMD_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 15410dd..a0c35dd 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -49,7 +49,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* SATA */
@@ -58,7 +57,6 @@
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_CMD_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 7af4bc4..13fa6d9 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -179,7 +179,6 @@
 		CONFIG_SYS_SCSI_MAX_LUN)
 
 #define CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
 
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 128da8a..2e4b7ca 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -397,8 +397,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_DOS_PARTITION
-
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 /* QSPI */
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 1458332..8ee2057 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -298,8 +298,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_DOS_PARTITION
-
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 /* QSPI */
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 7a407aa..e198819 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -154,7 +154,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*  DSPI  */
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 561a05a..374bcf2 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -97,7 +97,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 /* EEPROM */
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 849a6cb..04f6efd 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -301,7 +301,6 @@
 #ifndef CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT2
 #endif
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID		2
 #define CONFIG_SYS_SCSI_MAX_LUN			2
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 3887faa..479ff02 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -120,7 +120,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_FSL_CAAM			/* Enable SEC/CAAM */
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 29e0aa5..538e724 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -140,7 +140,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 /* EEPROM */
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 2fe8fc1..68065b0 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -216,7 +216,6 @@
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index f0ec6c4..b7b0257 100644
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -138,7 +138,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Debug Server firmware */
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 838568f..f8e6018 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -53,7 +53,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
@@ -360,7 +359,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Initial environment variables */
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 31df781..c245b84 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -61,7 +61,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SCSI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
@@ -304,7 +303,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #endif
 
 #define CONFIG_MISC_INIT_R
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 0caca4c..7ec82cd 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -48,9 +48,6 @@
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_IDE
 
-#define CONFIG_DOS_PARTITION
-#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/lwmon5.h b/include/configs/lwmon5.h
index 638682f..8f38e47 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -372,9 +372,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * BOOTP options
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 25884b4..51825f2 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -16,7 +16,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 
 #define CONFIG_CMD_BMP
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 7e05bfd..cd27012 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -23,7 +23,6 @@
 /*
  * U-Boot Commands
  */
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 
 #define CONFIG_CMD_BMP
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 91037d6..68eca5d 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -19,7 +19,6 @@
 /*
  * U-Boot Commands
  */
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 
 /*
diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h
index 937febe..d97d938 100644
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -16,7 +16,6 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 
 /* Partitions */
-#define CONFIG_DOS_PARTITION
 
 /*
  * Command line configuration.
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0c6b1e8..b895ae6 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -84,7 +84,6 @@
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* EHCI */
 #define CONFIG_OMAP3_GPIO_2
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 4f90c34..7f88b79 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -295,7 +295,6 @@
 #undef CONFIG_CMD_FUSE
 #undef CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_DOS_PARTITION
 
 /*
  * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock.
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 917350f..6217015 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -257,7 +257,6 @@
 #define CONFIG_SYS_ATA_DATA_OFFSET	0x0060
 #define CONFIG_SYS_ATA_REG_OFFSET	CONFIG_SYS_ATA_DATA_OFFSET
 #define CONFIG_SYS_ATA_STRIDE		4
-#define CONFIG_DOS_PARTITION
 
 /*
  * I2C configuration
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index c36141a..77f1850 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -438,11 +438,6 @@
 					"mpc5121.nand:-(data)"
 
 #if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB)
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
-
 #define CONFIG_SUPPORT_VFAT
 
 #endif /* defined(CONFIG_CMD_IDE) */
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index d136726..8b79f5d 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -91,7 +91,6 @@
 
 #define CONFIG_SYS_PIO_MODE		1
 #define CONFIG_SYS_IDE_MAXBUS		1
-#define CONFIG_DOS_PARTITION	1
 #define CONFIG_SYS_ATA_BASE_ADDR	CONFIG_SYS_MARUBUN_IO	/* base address */
 #define CONFIG_SYS_ATA_IDE0_OFFSET	0x01F0		/* ide0 offste */
 #define CONFIG_SYS_ATA_DATA_OFFSET	0		/* data reg offset */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index b28030c..e239eb0 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -125,8 +125,6 @@
  */
 #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
 #define CONFIG_USB_EHCI		/* Enable EHCI USB support */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index 7ddde8c..917233f 100644
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -131,12 +131,7 @@
 #define CONFIG_SUPPORT_VFAT
 
 /* DISK Partition support */
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION		/* Experimental */
 
 #define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
 
 #endif /* _CONFIG_MVEBU_DB_88F3720_H */
diff --git a/include/configs/mvebu_db-88f7040.h b/include/configs/mvebu_db-88f7040.h
index 6feb8d7..f761a29 100644
--- a/include/configs/mvebu_db-88f7040.h
+++ b/include/configs/mvebu_db-88f7040.h
@@ -120,12 +120,7 @@
 #define CONFIG_SUPPORT_VFAT
 
 /* DISK Partition support */
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION		/* Experimental */
 
 #define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
 
 #endif /* _CONFIG_MVEBU_DB_88F7040_H */
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 36ff7ce..a04f7f3 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -12,7 +12,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_LED
 
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index ecb6e4d..4494bf6 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -15,7 +15,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 81826ea..67a93fa 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -100,8 +100,6 @@
 #define CONFIG_POWER_FSL_MC34704
 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x54
 
-#define CONFIG_DOS_PARTITION
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 5963d39..85ea54a 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -17,7 +17,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_NAND
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 3f064fd..7d7a52e 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -86,9 +86,6 @@
 #define CONFIG_NET_RETRY_COUNT	100
 #define CONFIG_CMD_DATE
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 
 #define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
 
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3c1d53f..b17b4d0 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -70,7 +70,6 @@
 #define CONFIG_MMC
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * Eth Configs
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 27e7738..109c82a 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -55,7 +55,6 @@
 
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 7a896c7..ce012e9 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -54,7 +54,6 @@
 
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* Eth Configs */
 #define CONFIG_MII
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 6cc5d9c..b65d219 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -40,7 +40,6 @@
 
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* Eth Configs */
 #define CONFIG_MII
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 262a913..15f624b 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -45,7 +45,6 @@
 
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index d28654b..f1388ca 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -64,7 +64,6 @@
 
 /* Filesystems and image support */
 #define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_DOS_PARTITION
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 0645228..50bfc99 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -40,7 +40,6 @@
 #define CONFIG_BAUDRATE                 115200
 
 /* Filesystems and image support */
-#define CONFIG_DOS_PARTITION
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 7cfdacd..6ec83da 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -100,7 +100,6 @@
 #define CONFIG_USB_EHCI			/* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_KIRKWOOD	/* on Kirkwood platform	*/
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
@@ -128,7 +127,6 @@
 /*
  * EFI partition
  */
-#define CONFIG_EFI_PARTITION
 
 /*
  *  Date Time
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 4d5265f..3ecbd49 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -96,7 +96,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /* USB */
 #define CONFIG_USB_MUSB_UDC
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 1987164..366ee55 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -84,7 +84,6 @@
 #ifdef CONFIG_CMD_IDE
 #define __io
 #define CONFIG_IDE_PREINIT
-#define CONFIG_DOS_PARTITION
 #define CONFIG_MVSATA_IDE_USE_PORT0
 #define CONFIG_SYS_ATA_IDE0_OFFSET	MV_SATA_PORT0_OFFSET
 #endif /* CONFIG_CMD_IDE */
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index c51ea3d..8a414c3 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -61,9 +61,6 @@
 #define CONFIG_SYS_XLB_PIPELINING	1
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #define CONFIG_TIMESTAMP	/* Print image info with timestamp */
 
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 6388a9c..7b01ffb 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -56,8 +56,6 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME	"u-boot.img"
 
 /* Partition tables */
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
 
 /* USB
  *
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 22614fb..d98d8c4 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -77,7 +77,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/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 854fc47..6433b7c 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -244,7 +244,6 @@
 #define CONFIG_DAVINCI_MMC
 
 #ifdef CONFIG_MMC
-#define CONFIG_DOS_PARTITION
 #undef CONFIG_ENV_IS_IN_MMC
 #endif
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 77f3d81..f2e1169 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -707,7 +707,6 @@
 #define CONFIG_CMD_PCI
 
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif /* CONFIG_PCI */
 
 #if defined(CONFIG_TSEC_ENET)
@@ -859,7 +858,6 @@
 
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
 		 || defined(CONFIG_FSL_SATA)
-#define CONFIG_DOS_PARTITION
 #endif
 
 #undef CONFIG_WATCHDOG	/* watchdog disabled */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index c122f8e..875a159 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -281,7 +281,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_PCI
 
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif /* CONFIG_PCI */
 
 #if defined(CONFIG_TSEC_ENET)
@@ -423,7 +422,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
 		 || defined(CONFIG_FSL_SATA)
-#define CONFIG_DOS_PARTITION
 #endif
 
 #undef CONFIG_WATCHDOG	/* watchdog disabled */
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index c92948f..10d39e0 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -104,7 +104,6 @@
 /*---USB -------------------------------------------*/
 #if 0
 #define CONFIG_USB_OHCI
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*---ATA PCMCIA ------------------------------------*/
@@ -114,7 +113,6 @@
 #define CONFIG_PCMCIA_SLOT_A
 
 #define CONFIG_ATAPI 1
-#define CONFIG_MAC_PARTITION 1
 
 /* We run CF in "true ide" mode or a harddrive via pcmcia */
 #define CONFIG_IDE_PCMCIA 1
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 4fb9966..bd0203d 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -397,7 +397,6 @@ RTC configuration
 #define CONFIG_ATAPI			1
 
 /* we enable IDE and FAT support, so we also need partition support */
-#define CONFIG_DOS_PARTITION 1
 
 /* USB */
 #define CONFIG_USB_OHCI
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index eb1944a..dd8f0fc 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -77,7 +77,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 52b7a2a..4fa7dfb 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -104,8 +104,6 @@
  * File System Configuration
  */
 /* FAT FS */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_FS_FAT
 #define CONFIG_FAT_WRITE
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index a214c4d..76cb314 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -39,7 +39,6 @@
 
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 9051c1c..31f65a2 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -97,10 +97,6 @@
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index c19e7dc..54b0d7a 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -226,7 +226,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_DOS_PARTITION			1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9261"
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index eddc81a..07f1e52 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -255,7 +255,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_DOS_PARTITION			1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 28690c2..3263f26 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -111,7 +111,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_UPLL
 #define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_DOS_PARTITION		1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT	1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	0x00700000 /* _UHP_OHCI_BASE */
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9g45"
diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 3fa7739..09a800b 100644
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -25,7 +25,6 @@
 #define	CONFIG_MMC
 #define	CONFIG_GENERIC_MMC
 #define	CONFIG_PXA_MMC_GENERIC
-#define	CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index a6abba7..6fdf50b 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -54,7 +54,6 @@
 #define CONFIG_CONS_INDEX		1
 
 #define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
 
 #ifdef CONFIG_SYS_BIG_ENDIAN
 #define CONFIG_IDE_SWAP_IO
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 7297a81..4ad230c 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -54,7 +54,6 @@
 #define CONFIG_CONS_INDEX		1
 
 #define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
 
 #ifdef CONFIG_SYS_BIG_ENDIAN
 #define CONFIG_IDE_SWAP_IO
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 2c85f65..8cfb8fa 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -118,11 +118,9 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 #define CONFIG_LBA48
-#define CONFIG_DOS_PARTITION
 
 /*
  * Environment
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 477f035..6b2b6d2 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -13,7 +13,6 @@
  */
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
 /* SCIF */
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index d4f200a..867d5b7 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -22,7 +22,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index d6fead2..64f305f 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -34,8 +34,6 @@
 	"led4=60,0,1\0" \
 	"led5=63,0,1\0"
 
-#undef CONFIG_DOS_PARTITION
-
 #define CONFIG_BOARD_LATE_INIT
 
  /* Physical Memory Map */
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 459b077..120ea9b 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -18,7 +18,6 @@
 
 /* Support File sytems */
 #define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_FS_EXT4
 #define CONFIG_EXT4_WRITE
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index ec4d54e..99097e8 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -27,7 +27,6 @@
 
 /* Support File sytems */
 #define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_FS_EXT4
 #define CONFIG_EXT4_WRITE
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 92be29e..be2d4ac 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -43,7 +43,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 5358372..cda23e9 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -46,7 +46,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 4406366..4fd4fd6 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -132,7 +132,6 @@
 #define CONFIG_COMMAND_HISTORY
 
 /* Commands */
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
 /* ATAGs support for bootm/bootz */
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 533fde4..7afbe99 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -89,7 +89,6 @@
 #define CONFIG_GENERIC_MMC
 /* #define CONFIG_CMD_EXT2 EXT2 Support */
 #define CONFIG_CMD_FAT		/* FAT support */
-#define CONFIG_DOS_PARTITION
 
 #if 0
 
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 124cca3..516949d 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -217,15 +217,11 @@
 #define CONFIG_SAMSUNG_ONENAND		1
 #define CONFIG_SYS_ONENAND_BASE		0xB0000000
 
-#define CONFIG_DOS_PARTITION		1
-
 /* write support for filesystems */
 #define CONFIG_FAT_WRITE
 #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/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index 7a049d4..6fbd053 100644
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -84,7 +84,6 @@
 
 #if defined(CONFIG_CMD_USB)
 #define CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Ethernet Hardware */
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 61e3376..2bcef15 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -54,10 +54,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "Atmel SAMA5D2 XPlained"
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* I2C */
 #define AT24MAC_ADDR		0x5c
 #define AT24MAC_REG		0x9a
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index f48559e..2c18528 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"SAMA5D3 Xplained"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
-#define CONFIG_DOS_PARTITION
 #endif
 
 #if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index ed91bdc..cae287e 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -129,7 +129,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"sama5d3"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	3
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* USB device */
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 5d78847..b1e5b1d 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -83,10 +83,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "Atmel SAMA5D4EK"
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet Hardware */
 #define CONFIG_MACB
 #define CONFIG_RMII
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 498b32b..5184af5 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -83,10 +83,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "Atmel SAMA5D4EK"
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet Hardware */
 #define CONFIG_MACB
 #define CONFIG_RMII
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 2daf02d..bcc13a4 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -44,17 +44,10 @@
 #define CONFIG_CMD_CBFS
 #define CONFIG_CMD_CRAMFS
 #define CONFIG_CMD_PART
-#define CONFIG_DOS_PARTITION
 #define CONFIG_HOST_MAX_DEVICES 4
 #define CONFIG_CMD_MD5SUM
 
 #define CONFIG_CMD_GPT
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_AMIGA_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_ISO_PARTITION
-#define CONFIG_MAC_PARTITION
 
 /*
  * Size of malloc() pool, before and after relocation
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 0b2821d..d97b15f 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 2bd89f4..a9ebebb 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -306,7 +306,6 @@
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#define CONFIG_DOS_PARTITION
 #undef CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 56a23a6..b79ba49 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -16,7 +16,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index ed8a51c..86a7eb4 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -219,9 +219,6 @@
 #endif /* CONFIG_440EPX */
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Commands additional to the ones defined in amcc-common.h
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 38bf408..a63e788 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -20,8 +20,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC2,115200 root=/dev/nfs ip=dhcp"
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 3718bc5..cf1101a 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -20,8 +20,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC2,115200 root=/dev/nfs ip=dhcp"
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 8820e15..7ca77fa 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -20,8 +20,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC2,115200 root=/dev/nfs ip=dhcp"
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index a49e839..93b8dcf 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -17,9 +17,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC1,115200 root=/dev/nfs ip=dhcp"
 
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 748a2ea..86ba168 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -95,7 +95,6 @@
 #ifdef CONFIG_CMD_IDE
 #define __io
 #define CONFIG_IDE_PREINIT
-#define CONFIG_DOS_PARTITION
 #define CONFIG_MVSATA_IDE_USE_PORT0
 #define CONFIG_MVSATA_IDE_USE_PORT1
 #define CONFIG_SYS_ATA_IDE0_OFFSET	MV_SATA_PORT0_OFFSET
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 4564296..66091a1 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -80,7 +80,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 1578310..9c2bef1 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -50,7 +50,6 @@
  ************************************************************/
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_DOS_PARTITION
 
 /************************************************************
  * RTC
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 4292566..f605f10 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -187,8 +187,6 @@
 #define CONFIG_SAMSUNG_ONENAND		1
 #define CONFIG_SYS_ONENAND_BASE		0xE7100000
 
-#define CONFIG_DOS_PARTITION		1
-
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
 /*
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 8bd5806..0e079b0 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -64,7 +64,6 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9260"
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index c76c55f..fc1cb4c 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -67,8 +67,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
-#define CONFIG_DOS_PARTITION
-#define CONFIG_PARTITION_UUIDS
 
 /* MMC */
 #define CONFIG_MMC
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index e12b101..7a8c16d 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -115,7 +115,6 @@
  * Partitions
  */
 
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
 /*
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 3b0b416..bc4d3cd 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 7ced6a6..5e317bb 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 6b9546e..361019c 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index cc07253..f102a18 100644
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index d1b31c4..d36fac6 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 3fceb31..16a85ae 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index c9473df..0c8da60 100644
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 0407f03..8624bb3 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -11,7 +11,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 
 #define CONFIG_HW_WATCHDOG
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index c5555e6..205b10b 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -10,7 +10,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c697f63..5a78abc 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -409,6 +409,5 @@
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"ohci_pci"
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS	1
-#define CONFIG_DOS_PARTITION		1
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 6604cec..94dc9b7 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_SYS_ALT_MEMTEST
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index b0bfc0d..508d8d5 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -337,7 +337,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/t4qds.h b/include/configs/t4qds.h
index 0aba18b..3a4aced 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -215,7 +215,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
 
 /* SATA */
@@ -233,7 +232,6 @@
 
 #define CONFIG_LBA48
 #define CONFIG_CMD_SATA
-#define CONFIG_DOS_PARTITION
 #endif
 
 #ifdef CONFIG_FMAN_ENET
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index ff0c60d..770117b 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -76,7 +76,6 @@
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* EHCI */
 #define CONFIG_OMAP3_GPIO_5
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index a873e7b..114efb8 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -73,7 +73,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /* GPIO banks */
 #define CONFIG_OMAP3_GPIO_2		/* GPIO32 ..63  is in GPIO bank 2 */
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 0dc4a28..0ef5a8e 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -53,8 +53,6 @@
 #define CONFIG_CMD_PART
 
 /* Filesystems / image support */
-#define CONFIG_EFI_PARTITION
-#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 a9990b7..fb005e9 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -128,12 +128,6 @@
 #endif
 
 /* remove partitions/filesystems */
-#ifdef CONFIG_DOS_PARTITION
-#undef CONFIG_DOS_PARTITION
-#endif
-#ifdef CONFIG_EFI_PARTITION
-#undef CONFIG_EFI_PARTITION
-#endif
 #ifdef CONFIG_FS_EXT4
 #undef CONFIG_FS_EXT4
 #endif
@@ -152,9 +146,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 63b711b..1df3f4e 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/theadorable.h b/include/configs/theadorable.h
index 281593a..5db0b8c 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -76,8 +76,6 @@
 #define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
 
 /* Additional FS support/configuration */
 #define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index a235253..fc0fa63 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -27,8 +27,6 @@
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
 
-#undef CONFIG_DOS_PARTITION
-
 #define CONFIG_BOARD_LATE_INIT
 
  /* Physical Memory Map */
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 6a5ed19..3b4676f 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -116,7 +116,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /**
  * Physical Memory Map
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 5db4c60..8473aad 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -55,7 +55,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_FS_FAT
 
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1be8137..fd0a305 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -184,9 +184,7 @@
  * enabled a number of useful commands and support.
  */
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 #endif
 
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cfb4b30..9881407 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -194,7 +194,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/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index fefc902..6a10f12 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -64,8 +64,6 @@
 #define CONFIG_EHCI_DESC_BIG_ENDIAN
 #define CONFIG_EHCI_IS_TDI
 
-#define CONFIG_DOS_PARTITION
-
 /*
  * Diagnostics
  */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 07a92eb..f257c7e 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -91,7 +91,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h
index 9b7bd1b..2219a53 100644
--- a/include/configs/ts4600.h
+++ b/include/configs/ts4600.h
@@ -19,7 +19,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH			/* No NOR Flash */
-#define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 2e5f38d..88d0b7b 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -64,7 +64,6 @@
 #define CONFIG_MMC
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * Eth Configs
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index f9c9f82..ffe5ed0 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -128,7 +128,6 @@
 /* USB */
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	4
 #define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
 
 /* SD/MMC */
 #define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 075d9c9..a1ba428 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -104,7 +104,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_OHCI_NEW
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 229c242..eabdd62 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -60,8 +60,6 @@
 /*
  * Partitions
  */
-#define CONFIG_MAC_PARTITION	1
-#define CONFIG_DOS_PARTITION	1
 
 /*
  * USB
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 6ff22c2..22f170c 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -97,9 +97,6 @@
 #endif
 
 #if defined(CONFIG_CMD_USB)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
-
 #define CONFIG_SUPPORT_VFAT
 
 /*
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 48834c2..51e22ea 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -131,7 +131,6 @@
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_PXE
 #define CONFIG_CMD_ENV
-#define CONFIG_DOS_PARTITION
 
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index af5ba61..3564eb2 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -73,7 +73,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 0f3fc8f..ec3fbbc 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -64,9 +64,7 @@
 #define CONFIG_SYS_MMC_CLK_OD		500000
 
 /* For generating MMC partitions */
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_RANDOM_UUID
-#define CONFIG_EFI_PARTITION
 #define CONFIG_CMD_GPT
 
 #endif
@@ -84,10 +82,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "L+G VInCo"
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet Hardware */
 #define CONFIG_PHY_SMSC
 #define CONFIG_MACB
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 235574d..57cf9f5 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -112,8 +112,6 @@
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_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/warp7.h b/include/configs/warp7.h
index d3b0c5e..27c1241 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/woodburn_common.h b/include/configs/woodburn_common.h
index 50495bf..cd8115e 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -87,9 +87,6 @@
 
 #define CONFIG_CMD_NAND
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 #define CONFIG_MXC_GPIO
 
 #define CONFIG_NET_RETRY_COUNT	100
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index b08641f..cf9976b 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -108,7 +108,6 @@
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_DOS_PARTITION
 
 /*
  * No NOR
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 5e51f65..45bcf49 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -120,7 +120,6 @@
 
 /* Filesystem support (for USB key) */
 #define CONFIG_SUPPORT_VFAT
-#define CONFIG_DOS_PARTITION
 
 
 /*
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 04d151b..52ff4b0 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -70,16 +70,11 @@
 /************************************************************
  * DISK Partition support
  ************************************************************/
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION		/* Experimental */
 
 #define CONFIG_CMD_PART
 #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/configs/xfi3.h b/include/configs/xfi3.h
index ae9ab71..8e9b5d7 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index cbdef6e..866d082 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -56,11 +56,6 @@
 
 /* Command line configuration */
 #define CONFIG_CMD_ENV
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_ISO_PARTITION
-#endif
 #define CONFIG_MP
 
 /* BOOTP options */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index f12f8fe..9f3eb52 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -342,7 +342,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_DOS_PARTITION
 
 /*
  * Command configuration.
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index a355112..55dd365 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -158,9 +158,6 @@
 #define CONFIG_PHY1_ADDR        3
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #ifdef CONFIG_440EP
 /* USB */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 97dfc0e..3b5c8ae 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -66,7 +66,6 @@
 #define	CONFIG_GENERIC_MMC
 #define	CONFIG_PXA_MMC_GENERIC
 #define	CONFIG_SYS_MMC_BASE		0xF0000000
-#define	CONFIG_DOS_PARTITION
 #endif
 
 /*
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 7038e6b..6df4761 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -91,7 +91,6 @@
 #define CONFIG_MXC_USB_PORTSC	MXC_EHCI_MODE_SERIAL
 #define CONFIG_MXC_USB_FLAGS	(MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN)
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 8524b28..012754e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -136,7 +136,6 @@
 #if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB)
 # define CONFIG_SUPPORT_VFAT
 # define CONFIG_FAT_WRITE
-# define CONFIG_DOS_PARTITION
 #endif
 
 #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
diff --git a/include/part.h b/include/part.h
index 0979005..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 */
 /**
@@ -365,7 +365,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
 			  gpt_header *gpt_head, gpt_entry **gpt_pte);
 #endif
 
-#ifdef CONFIG_DOS_PARTITION
+#if CONFIG_IS_ENABLED(DOS_PARTITION)
 /**
  * is_valid_dos_buf() - Ensure that a DOS MBR image is valid
  *
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 1e3dca4..39e602a 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -251,7 +251,7 @@ static int efi_disk_create_eltorito(struct blk_desc *desc,
 				    const char *pdevname)
 {
 	int disks = 0;
-#ifdef CONFIG_ISO_PARTITION
+#if CONFIG_IS_ENABLED(ISO_PARTITION)
 	char devname[32] = { 0 }; /* dp->str is u16[32] long */
 	disk_partition_t info;
 	int part = 1;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b3ed48b..ee21f4b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -95,7 +95,6 @@ CONFIG_AMCC_DEF_ENV_PPC
 CONFIG_AMCC_DEF_ENV_PPC_OLD
 CONFIG_AMCC_DEF_ENV_ROOTPATH
 CONFIG_AMCORE
-CONFIG_AMIGA_PARTITION
 CONFIG_ANDES_PCU
 CONFIG_ANDES_PCU_BASE
 CONFIG_AP325RXA
@@ -874,7 +873,6 @@ CONFIG_DMC_DDRTR1
 CONFIG_DMC_DDRTR2
 CONFIG_DNET_AUTONEG_TIMEOUT
 CONFIG_DNP5370_EXT_WD_DISABLE
-CONFIG_DOS_PARTITION
 CONFIG_DP_DDR_CTRL
 CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
 CONFIG_DP_DDR_NUM_CTRLS
@@ -1010,7 +1008,6 @@ CONFIG_EEPRO100_SROM_WRITE
 CONFIG_EEPROM_BUS_ADDRESS
 CONFIG_EEPROM_CHIP_ADDRESS
 CONFIG_EEPROM_LAYOUT_HELP_STRING
-CONFIG_EFI_PARTITION
 CONFIG_EFLASH_PROTSECTORS
 CONFIG_EHCI_DESC_BIG_ENDIAN
 CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@ -1704,7 +1701,6 @@ CONFIG_IRAM_SIZE
 CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
-CONFIG_ISO_PARTITION
 CONFIG_ISP1362_USB
 CONFIG_IS_BUILTIN
 CONFIG_IS_ENABLED
@@ -3009,7 +3005,6 @@ CONFIG_MACRESET_TIMEOUT
 CONFIG_MAC_ADDR_IN_EEPROM
 CONFIG_MAC_ADDR_IN_SPIFLASH
 CONFIG_MAC_OFFSET
-CONFIG_MAC_PARTITION
 CONFIG_MAKALU
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
@@ -3386,9 +3381,6 @@ CONFIG_PALMAS_SMPS7_FPWM
 CONFIG_PALMAS_USB_SS_PWR
 CONFIG_PANIC_HANG
 CONFIG_PARAVIRT
-CONFIG_PARTITIONS
-CONFIG_PARTITION_TYPE_GUID
-CONFIG_PARTITION_UUIDS
 CONFIG_PATA_BFIN
 CONFIG_PATI
 CONFIG_PB1000
-- 
1.9.1



More information about the U-Boot mailing list