po 31. 5. 2021 v 9:52 odesílatel Michal Simek michal.simek@xilinx.com napsal:

K26 has EMMC and SD and default 0 is not working when system is booting out of SD which is controller 1. Add controller autodetection via mmc_get_env_dev(). The same code is used for distro_boot selection done in board_late_init(). bootseq variable can't be reused because this is called so late.

Signed-off-by: Michal Simek michal.simek@xilinx.com

board/xilinx/zynqmp/zynqmp.c | 35 ++++++++++++++++++++++++++++ configs/xilinx_zynqmp_virt_defconfig | 1 + 2 files changed, 36 insertions(+)

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 6e353e3b0a57..46dee80470fa 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -709,6 +709,41 @@ int checkboard(void) return 0; }

+int mmc_get_env_dev(void) +{

•   struct udevice *dev;
  

•   int bootseq = 0;
  

•   switch (zynqmp_get_bootmode()) {
  

•   case EMMC_MODE:
  

•   case SD_MODE:
  

•           if (uclass_get_device_by_name(UCLASS_MMC,
  

•                                         "mmc@ff160000", &dev) &&
  

•               uclass_get_device_by_name(UCLASS_MMC,
  

•                                         "sdhci@ff160000", &dev)) {
  

•                   return -1;
  

•           }
  

•           bootseq = dev_seq(dev);
  

•           break;
  

•   case SD1_LSHFT_MODE:
  

•   case SD_MODE1:
  

•           if (uclass_get_device_by_name(UCLASS_MMC,
  

•                                         "mmc@ff170000", &dev) &&
  

•               uclass_get_device_by_name(UCLASS_MMC,
  

•                                         "sdhci@ff170000", &dev)) {
  

•                   return -1;
  

•           }
  

•           bootseq = dev_seq(dev);
  

•           break;
  

•   default:
  

•           break;
  

•   }
  

•   debug("bootseq %d\n", bootseq);
  

•   return bootseq;
  

+}

enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = zynqmp_get_bootmode(); diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index ece527e07468..1df0ef66c22c 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -76,6 +76,7 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_FAT_DEVICE_AND_PART=":auto" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y -- 2.31.1

Applied. M