diff options
Diffstat (limited to 'include/configs/xilinx_zynqmp.h')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9646ddd..4759373 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 */ @@ -80,8 +75,7 @@ #endif #define CONFIG_AUTO_COMPLETE -#if defined(CONFIG_ZYNQ_SDHCI) -# define CONFIG_GENERIC_MMC +#if defined(CONFIG_MMC_SDHCI_ZYNQ) # define CONFIG_SUPPORT_EMMC_BOOT # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 @@ -92,7 +86,7 @@ # define FAT_ENV_INTERFACE "mmc" #endif -#if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQMP_USB) +#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQMP_USB) # define CONFIG_FAT_WRITE #endif @@ -134,11 +128,9 @@ # define CONFIG_FASTBOOT_BUF_ADDR 0x100000 # define CONFIG_FASTBOOT_BUF_SIZE 0x6000000 # define CONFIG_FASTBOOT_FLASH -# ifdef CONFIG_ZYNQ_SDHCI +# ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 # endif -# define CONFIG_PARTITION_UUIDS -# define CONFIG_CMD_GPT # define CONFIG_RANDOM_UUID # define PARTS_DEFAULT \ @@ -229,7 +221,7 @@ "scriptaddr=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ -#if defined(CONFIG_ZYNQ_SDHCI) +#if defined(CONFIG_MMC_SDHCI_ZYNQ) # define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) #else # define BOOT_TARGET_DEVICES_MMC(func) @@ -297,7 +289,7 @@ #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000 /* MMC support */ -#ifdef CONFIG_ZYNQ_SDHCI +#ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ |