vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: versal-net: Add mmc_get_env_dev() and deduplicate MMC handling

Browse Source 
The SD and eMMC cases in boot_targets_setup() duplicated the MMC device
lookup, and versal-net relied on the weak mmc_get_env_dev() default
instead of selecting the device matching the boot mode (unlike versal and
zynqmp).

Factor the lookup into mmc_get_bootseq(), mirroring spi_get_bootseq():
it maps the boot mode to the MMC node and returns the device sequence,
optionally handing back the mode banner so only boot_targets_setup()
prints it. mmc_get_env_dev() is now provided as a thin wrapper, and the
SD/eMMC cases call the helper instead of open-coding the lookups. The
local udevice pointer in boot_targets_setup() is no longer needed.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://patch.msgid.link/7750a79c17146c66adeb83ad6d1bfa78b22ec8fa.1782219202.git.michal.simek@amd.com
This commit is contained in:
Michal Simek
2026-07-08 08:55:52 +02:00
parent d18ebbf339
commit bbc71f8c28
1 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
board/xilinx/versal-net/board.c
+47 -33
View File
@@ -12,6 +12,7 @@
#include <env_internal.h>
#include <log.h>
#include <malloc.h>
#include <mmc.h>
#include <spi.h>
#include <time.h>
#include <asm/cache.h>
@@ -110,10 +111,48 @@ int spi_get_env_dev(void)
return spi_get_bootseq(versal_net_get_bootmode(), NULL);
}
static int mmc_get_bootseq(u8 bootmode, const char **modename)
{
struct udevice *dev;
const char *name;
switch (bootmode) {
case SD_MODE:
if (modename)
*modename = "SD_MODE\n";
name = "mmc@f1040000";
break;
case EMMC_MODE:
if (modename)
*modename = "EMMC_MODE\n";
name = "mmc@f1050000";
break;
case SD_MODE1:
case SD1_LSHFT_MODE:
if (modename)
*modename = "SD_MODE1\n";
name = "mmc@f1050000";
break;
default:
return -1;
}
if (uclass_get_device_by_name(UCLASS_MMC, name, &dev)) {
debug("MMC driver for %s is not present\n", name);
return -1;
}
return dev_seq(dev);
}
int mmc_get_env_dev(void)
{
return mmc_get_bootseq(versal_net_get_bootmode(), NULL);
}
static int boot_targets_setup(void)
{
u8 bootmode;
struct udevice *dev;
int bootseq = -1;
int bootseq_len = 0;
int env_targets_len = 0;
@@ -143,45 +182,20 @@ static int boot_targets_setup(void)
if (bootseq >= 0)
mode = "xspi";
break;
case EMMC_MODE:
puts("EMMC_MODE\n");
if (uclass_get_device_by_name(UCLASS_MMC,
"mmc@f1050000", &dev)) {
debug("eMMC driver for eMMC device is not present\n");
break;
}
mode = "mmc";
bootseq = dev_seq(dev);
break;
case SELECTMAP_MODE:
puts("SELECTMAP_MODE\n");
break;
case SD_MODE:
puts("SD_MODE\n");
if (uclass_get_device_by_name(UCLASS_MMC,
"mmc@f1040000", &dev)) {
debug("SD0 driver for SD0 device is not present\n");
break;
}
debug("mmc0 device found at %p, seq %d\n", dev, dev_seq(dev));
mode = "mmc";
bootseq = dev_seq(dev);
break;
case SD1_LSHFT_MODE:
puts("LVL_SHFT_");
fallthrough;
case SD_MODE:
case EMMC_MODE:
case SD_MODE1:
puts("SD_MODE1\n");
if (uclass_get_device_by_name(UCLASS_MMC,
"mmc@f1050000", &dev)) {
debug("SD1 driver for SD1 device is not present\n");
break;
}
debug("mmc1 device found at %p, seq %d\n", dev, dev_seq(dev));
mode = "mmc";
bootseq = dev_seq(dev);
bootseq = mmc_get_bootseq(bootmode, &modename);
if (modename)
puts(modename);
if (bootseq >= 0)
mode = "mmc";
break;
default:
printf("Invalid Boot Mode:0x%x\n", bootmode);