Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'rpi-2026.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

Browse Source 
Updates for RPi for 2026.07-rc4:

- mmc: bcmstb: Fix non-removable check in bcm2712 init
- mmc: bcm2835_sdhci: Parse generic MMC device tree properties
- rpi_arm64: Enable MBEDTLS/LWIP/WGET and WGET_HTTPS
- video: arm: rpi: Add brcm,bcm2712-hdmi0 compatible
This commit is contained in:
Tom Rini
2026-05-29 08:32:13 -06:00
parent 987907ae4b 8de24e226d
commit 2f87266d56
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configs/rpi_arm64_defconfig
View File

@@ -11,6 +11,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
CONFIG_EFI_HTTP_BOOT=y
CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_FDT_SIMPLEFB=y CONFIG_FDT_SIMPLEFB=y
@@ -26,11 +27,13 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_SNTP=y
CONFIG_WGET_HTTPS=y
CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y CONFIG_NET_LWIP=y
CONFIG_DM_DMA=y CONFIG_DM_DMA=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
@@ -64,4 +67,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_BCM2835=y CONFIG_VIDEO_BCM2835=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y CONFIG_PHYS_TO_BUS=y
CONFIG_MBEDTLS_LIB=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set

4
drivers/mmc/bcm2835_sdhci.c
View File

@@ -219,6 +219,10 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
host->mmc = &plat->mmc; host->mmc = &plat->mmc;
host->mmc->dev = dev; host->mmc->dev = dev;
ret = mmc_of_parse(dev, &plat->cfg);
if (ret)
return ret;
ret = sdhci_setup_cfg(&plat->cfg, host, emmc_freq, MIN_FREQ); ret = sdhci_setup_cfg(&plat->cfg, host, emmc_freq, MIN_FREQ);
if (ret) { if (ret) {
debug("%s: Failed to setup SDHCI (err=%d)\n", __func__, ret); debug("%s: Failed to setup SDHCI (err=%d)\n", __func__, ret);

6
drivers/mmc/bcmstb_sdhci.c
View File

@@ -56,7 +56,7 @@ struct sdhci_brcmstb_dev_priv {
static int sdhci_brcmstb_init_2712(struct udevice *dev) static int sdhci_brcmstb_init_2712(struct udevice *dev)
{ {
struct sdhci_host *host = dev_get_priv(dev); struct sdhci_bcmstb_plat *plat = dev_get_plat(dev);
void *cfg_regs; void *cfg_regs;
u32 reg; u32 reg;
@@ -65,8 +65,8 @@ static int sdhci_brcmstb_init_2712(struct udevice *dev)
if (!cfg_regs) if (!cfg_regs)
return -ENOENT; return -ENOENT;
if ((host->mmc->host_caps & MMC_CAP_NONREMOVABLE) || if ((plat->cfg.host_caps & MMC_CAP_NONREMOVABLE) ||
(host->mmc->host_caps & MMC_CAP_NEEDS_POLL)) { (plat->cfg.host_caps & MMC_CAP_NEEDS_POLL)) {
/* Force presence */ /* Force presence */
reg = readl(cfg_regs + SDIO_CFG_CTRL); reg = readl(cfg_regs + SDIO_CFG_CTRL);
reg &= ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV; reg &= ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV;

1
drivers/video/bcm2835.c
View File

@@ -66,6 +66,7 @@ static int bcm2835_video_probe(struct udevice *dev)
static const struct udevice_id bcm2835_video_ids[] = { static const struct udevice_id bcm2835_video_ids[] = {
{ .compatible = "brcm,bcm2835-hdmi" }, { .compatible = "brcm,bcm2835-hdmi" },
{ .compatible = "brcm,bcm2711-hdmi0" }, { .compatible = "brcm,bcm2711-hdmi0" },
{ .compatible = "brcm,bcm2712-hdmi0" },
{ .compatible = "brcm,bcm2708-fb" }, { .compatible = "brcm,bcm2708-fb" },
#if !IS_ENABLED(CONFIG_VIDEO_DT_SIMPLEFB) #if !IS_ENABLED(CONFIG_VIDEO_DT_SIMPLEFB)
{ .compatible = "simple-framebuffer" }, { .compatible = "simple-framebuffer" },