eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd, disk: convert CONFIG_PARTITION_UUIDS, CMD_PART and CMD_GPT

Browse Source 
We convert CONFIG_PARTITION_UUIDS to Kconfig first.  But in order to cleanly
update all of the config files we must also update CMD_PART and CMD_GPT to also
be in Kconfig in order to avoid complex logic elsewhere to update all of the
config files.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Patrick Delaunay
2017-01-27 11:00:42 +01:00
committed by Tom Rini
parent 4ac96345b2
commit b331cd6204
256 changed files with 501 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/config_distro_bootcmd.h
View File

@@ -26,10 +26,6 @@
* message that includes some other pre-processor symbols in the text.
*/
/* We need the part command */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#define BOOTENV_SHARED_BLKDEV_BODY(devtypel) \
"if " #devtypel " dev ${devnum}; then " \
"setenv devtype " #devtypel "; " \

2
include/config_fallbacks.h
View File

@@ -55,7 +55,7 @@
#define HAVE_BLOCK_DEVICE
#endif
#if (defined(CONFIG_PARTITION_UUIDS) || \
#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \
CONFIG_IS_ENABLED(EFI_PARTITION) || \
defined(CONFIG_RANDOM_UUID) || \
defined(CONFIG_CMD_UUID) || \

4
include/configs/am335x_evm.h
View File

@@ -39,9 +39,6 @@
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#ifdef CONFIG_NAND
#define NANDARGS \
"mtdids=" MTDIDS_DEFAULT "\0" \
@@ -299,7 +296,6 @@
#undef CONFIG_ENV_IS_IN_NAND
/* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS
#endif
/* USB Device Firmware Update support */

2
include/configs/am335x_shc.h
View File

@@ -80,8 +80,6 @@
#define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#ifndef CONFIG_SHC_ICT
/*
* In builds other than ICT, reset to retry after timeout

4
include/configs/am335x_sl50.h
View File

@@ -27,9 +27,6 @@
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD
@@ -97,7 +94,6 @@
/* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST
/* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS
#endif
#if defined(CONFIG_EMMC_BOOT)

2
include/configs/am3517_evm.h
View File

@@ -109,7 +109,6 @@
/* commands to include */
#define CONFIG_CMD_NAND
#define CONFIG_CMD_PART
#define CONFIG_CMD_MTDPARTS
/* I2C */
@@ -258,7 +257,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

3
include/configs/am43xx_evm.h
View File

@@ -164,9 +164,6 @@
#define CONFIG_QSPI_QUAD_SUPPORT
#define CONFIG_TI_EDMA3
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \

1
include/configs/am57xx_evm.h
View File

@@ -68,7 +68,6 @@
#include <configs/ti_omap5_common.h>
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_RANDOM_UUID
#define CONFIG_HSMMC2_8BIT

6
include/configs/baltos.h
View File

@@ -32,11 +32,6 @@
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
/* FIT support */
#define CONFIG_SYS_BOOTM_LEN SZ_64M
@@ -308,7 +303,6 @@
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS
/*
* Disable CPSW SPL support so we fit within the 101KiB limit.
*/

4
include/configs/bav335x.h
View File

@@ -42,9 +42,6 @@
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#ifdef CONFIG_NAND
#define NANDARGS \
"mtdids=" MTDIDS_DEFAULT "\0" \
@@ -454,7 +451,6 @@ DEFAULT_LINUX_BOOT_ENV \
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS
#endif
/* USB Device Firmware Update support */

3
include/configs/cl-som-am57x.h
View File

@@ -85,9 +85,6 @@
#define CONFIG_SYS_I2C_PCA953X_ADDR 0x20
#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }
/* GPT */
#define CONFIG_CMD_GPT
/* USB xHCI HOST */
#define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

3
include/configs/cm_t43.h
View File

@@ -105,9 +105,6 @@
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
"fdtaddr=0x81200000\0" \

1
include/configs/dra7xx_evm.h
View File

@@ -100,7 +100,6 @@
#include <configs/ti_omap5_common.h>
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_RANDOM_UUID
#define CONFIG_HSMMC2_8BIT

3
include/configs/dragonboard410c.h
View File

@@ -54,19 +54,16 @@
/* Extra Commands */
#define CONFIG_CMD_ENV
#define CONFIG_CMD_GPT
#define CONFIG_CMD_MD5SUM
/* Enable that for switching of boot partitions */
/* Disabled by default as some sub-commands can brick eMMC */
/*#define CONFIG_SUPPORT_EMMC_BOOT */
#define CONFIG_CMD_PART
#define CONFIG_CMD_REGINFO /* Register dump */
#define CONFIG_CMD_TFTP
#define CONFIG_CMD_UNZIP
/* Partition table support */
#define HAVE_BLOCK_DEVICE /* Needed for partition commands */
#define CONFIG_PARTITION_UUIDS
#include <config_distro_defaults.h>

3
include/configs/exynos-common.h
View File

@@ -46,9 +46,6 @@
/* Command definition*/
#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 */
#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */

1
include/configs/exynos4-common.h
View File

@@ -22,7 +22,6 @@
#undef CONFIG_CMD_ONENAND
#undef CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_GPT
/* TIZEN THOR downloader support */
#define CONFIG_CMD_THOR_DOWNLOAD

7
include/configs/kc1.h
View File

@@ -102,13 +102,6 @@
#define CONFIG_TWL6030_INPUT
/*
* Partitions
*/
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
/*
* SPL
*/

3
include/configs/ls1012afrdm.h
View File

@@ -42,9 +42,6 @@
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
#define CONFIG_CMD_MEMINFO
#define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_MEMTEST_START 0x80000000

2
include/configs/ls1012aqds.h
View File

@@ -150,8 +150,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_PARTITION_UUIDS
#define CONFIG_CMD_GPT
#define CONFIG_PCIE1 /* PCIE controller 1 */

2
include/configs/ls1012ardb.h
View File

@@ -63,8 +63,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_PARTITION_UUIDS
#define CONFIG_CMD_GPT
#define CONFIG_PCIE1 /* PCIE controller 1 */

2
include/configs/ls1021aiot.h
View File

@@ -175,8 +175,6 @@
CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_CMD_FAT
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* SPI */
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)

3
include/configs/ls1021aqds.h
View File

@@ -395,9 +395,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* SPI */
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
/* QSPI */

3
include/configs/ls1021atwr.h
View File

@@ -296,9 +296,6 @@
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* SPI */
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
/* QSPI */

3
include/configs/ls1043aqds.h
View File

@@ -98,9 +98,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SCSI
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* EEPROM */
#define CONFIG_ID_EEPROM
#define CONFIG_SYS_I2C_EEPROM_NXID

3
include/configs/ls1043ardb.h
View File

@@ -298,9 +298,6 @@
#define SCSI_DEV_ID 0x9170
#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
#include <asm/fsl_secure_boot.h>
#endif /* __LS1043ARDB_H__ */

3
include/configs/ls1046aqds.h
View File

@@ -141,9 +141,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SCSI
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* EEPROM */
#define CONFIG_ID_EEPROM
#define CONFIG_SYS_I2C_EEPROM_NXID

2
include/configs/ls1046ardb.h
View File

@@ -230,8 +230,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_PARTITION_UUIDS
#define CONFIG_CMD_GPT
#define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \
"$kernel_start $kernel_size;" \

2
include/configs/ls2080aqds.h
View File

@@ -59,8 +59,6 @@ unsigned long get_board_ddr_clk(void);
#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_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */

2
include/configs/ls2080ardb.h
View File

@@ -68,8 +68,6 @@ unsigned long get_board_sys_clk(void);
#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_PARTITION_UUIDS
#define CONFIG_CMD_GPT
/* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */

5
include/configs/mvebu_armada-8k.h
View File

@@ -119,11 +119,6 @@
#define CONFIG_SUPPORT_VFAT
/* DISK Partition support */
#define CONFIG_CMD_PART
#define CONFIG_PARTITION_UUIDS
/*
* PCI configuration
*/

5
include/configs/mvebu_db-88f3720.h
View File

@@ -131,9 +131,4 @@
#define CONFIG_SUPPORT_VFAT
/* DISK Partition support */
#define CONFIG_CMD_PART
#define CONFIG_PARTITION_UUIDS
#endif /* _CONFIG_MVEBU_DB_88F3720_H */

1
include/configs/omap5_uevm.h
View File

@@ -43,7 +43,6 @@
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/* Enhance our eMMC support / experience. */
#define CONFIG_CMD_GPT
#define CONFIG_HSMMC2_8BIT
#define CONFIG_SUPPORT_EMMC_BOOT

2
include/configs/pic32mzdask.h
View File

@@ -102,11 +102,9 @@
* File System Configuration
*/
/* FAT FS */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_SUPPORT_VFAT
#define CONFIG_FS_FAT
#define CONFIG_FAT_WRITE
#define CONFIG_CMD_PART
/* EXT4 FS */
#define CONFIG_FS_EXT4

2
include/configs/rk3036_common.h
View File

@@ -41,8 +41,6 @@
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#define CONFIG_SYS_SDRAM_BASE 0x60000000
#define CONFIG_NR_DRAM_BANKS 1

2
include/configs/rk3288_common.h
View File

@@ -44,8 +44,6 @@
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)

1
include/configs/rk3399_common.h
View File

@@ -35,7 +35,6 @@
#define CONFIG_FS_FAT
#define CONFIG_FAT_WRITE
#define CONFIG_FS_EXT4
#define CONFIG_CMD_PART
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)

3
include/configs/rockchip-common.h
View File

@@ -18,10 +18,7 @@
func(PXE, pxe, na) \
func(DHCP, dchp, na)
/* 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};" \

4
include/configs/rpi.h
View File

@@ -112,10 +112,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_COMMAND_HISTORY
/* Commands */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
/* ATAGs support for bootm/bootz */
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG

2
include/configs/s5p_goni.h
View File

@@ -57,7 +57,6 @@
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_ONENAND
#define CONFIG_CMD_GPT
/* USB Composite download gadget - g_dnl */
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
@@ -219,7 +218,6 @@
#define CONFIG_EXT4_WRITE
/* GPT */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)

4
include/configs/sandbox.h
View File

@@ -43,13 +43,9 @@
#define CONFIG_EXT4_WRITE
#define CONFIG_CMD_CBFS
#define CONFIG_CMD_CRAMFS
#define CONFIG_CMD_PART
#define CONFIG_HOST_MAX_DEVICES 4
#define CONFIG_CMD_MD5SUM
#define CONFIG_CMD_GPT
#define CONFIG_PARTITION_UUIDS
/*
* Size of malloc() pool, before and after relocation
*/

2
include/configs/snapper9g45.h
View File

@@ -65,7 +65,6 @@
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_ATMEL
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#define CONFIG_PARTITION_UUIDS
/* MMC */
#define CONFIG_GENERIC_MMC
@@ -141,6 +140,5 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_PART
#endif /* __CONFIG_H */

7
include/configs/sniper.h
View File

@@ -109,13 +109,6 @@
#define CONFIG_TWL4030_INPUT
/*
* Partitions
*/
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
/*
* SPL
*/

2
include/configs/tbs2910.h
View File

@@ -48,10 +48,8 @@
/* *** Command definition *** */
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_PART
/* Filesystems / image support */
#define CONFIG_PARTITION_UUIDS
/* MMC */
#define CONFIG_SYS_FSL_USDHC_NUM 3

9
include/configs/tegra-common-post.h
View File

@@ -139,15 +139,6 @@
#ifdef CONFIG_CMD_USB
#endif
/* remove part command support */
#ifdef CONFIG_PARTITION_UUIDS
#undef CONFIG_PARTITION_UUIDS
#endif
#ifdef CONFIG_CMD_PART
#undef CONFIG_CMD_PART
#endif
#endif /* CONFIG_SPL_BUILD */
#endif /* __TEGRA_COMMON_POST_H */

4
include/configs/tegra-common.h
View File

@@ -54,10 +54,6 @@
/* turn on command-line edit/hist/auto */
#define CONFIG_COMMAND_HISTORY
/* turn on commonly used storage-related commands */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#define CONFIG_SYS_NO_FLASH
/*

2
include/configs/ti_armv7_common.h
View File

@@ -222,8 +222,6 @@
*/
#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
#define CONFIG_FAT_WRITE
#define CONFIG_PARTITION_UUIDS
#define CONFIG_CMD_PART
#endif
/*

2
include/configs/vinco.h
View File

@@ -63,9 +63,7 @@
#define CONFIG_SYS_MMC_CLK_OD 500000
/* For generating MMC partitions */
#define CONFIG_PARTITION_UUIDS
#define CONFIG_RANDOM_UUID
#define CONFIG_CMD_GPT
#endif

3
include/configs/warp7.h
View File

@@ -24,9 +24,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 \
"dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \

6
include/configs/x86-common.h
View File

@@ -67,15 +67,9 @@
#define CONFIG_SUPPORT_VFAT
/************************************************************
* DISK Partition support
************************************************************/
#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

2
include/configs/xilinx_zynqmp.h
View File

@@ -132,8 +132,6 @@
# ifdef CONFIG_ZYNQ_SDHCI
# define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
# endif
# define CONFIG_PARTITION_UUIDS
# define CONFIG_CMD_GPT
# define CONFIG_RANDOM_UUID
# define PARTS_DEFAULT \

2
include/part.h
View File

@@ -53,7 +53,7 @@ typedef struct disk_partition {
uchar name[32]; /* partition name */
uchar type[32]; /* string type description */
int bootable; /* Active/Bootable flag is set */
#ifdef CONFIG_PARTITION_UUIDS
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
char uuid[37]; /* filesystem UUID as string, if exists */
#endif
#ifdef CONFIG_PARTITION_TYPE_GUID