| Message ID | 97434e122c6f8f042330b60d3e8de4c31f3e3f93.1652192580.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | 10c29fa1cc77bc4dbf620fa5a212ae78a1cb0a73 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | xilinx: zynqmp: Do not guard SPL_FS_LOAD_PAYLOAD_NAME by SDHCI driver | expand |
út 10. 5. 2022 v 16:23 odesílatel Michal Simek <monstr@monstr.eu> napsal: > > CONFIG_SPL_FS_LOAD_PAYLOAD_NAME is used by set_dfu_alt_info() for string > generation. It doesn't depend on SDHCI because the same file can be stored > to other non volatile memories like qspi. > > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > include/configs/xilinx_zynqmp.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h > index 8eb44b18d20c..f25d796a1e72 100644 > --- a/include/configs/xilinx_zynqmp.h > +++ b/include/configs/xilinx_zynqmp.h > @@ -226,7 +226,6 @@ > #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "atf-uboot.ub" > > /* MMC support */ > -#ifdef CONFIG_MMC_SDHCI_ZYNQ > # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ > # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ > # if defined(CONFIG_SPL_LOAD_FIT) > @@ -234,7 +233,6 @@ > # else > # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" > # endif > -#endif > > #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) > # define CONFIG_SPL_HASH > -- > 2.36.0 > Applied. M
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 8eb44b18d20c..f25d796a1e72 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -226,7 +226,6 @@ #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "atf-uboot.ub" /* MMC support */ -#ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ # if defined(CONFIG_SPL_LOAD_FIT) @@ -234,7 +233,6 @@ # else # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" # endif -#endif #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) # define CONFIG_SPL_HASH
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME is used by set_dfu_alt_info() for string generation. It doesn't depend on SDHCI because the same file can be stored to other non volatile memories like qspi. Signed-off-by: Michal Simek <michal.simek@amd.com> --- include/configs/xilinx_zynqmp.h | 2 -- 1 file changed, 2 deletions(-)