[U-Boot] [PATCH] Revert "dm: arm: rpi: Drop CONFIG_OF_EMBED"

Jonathan Gray jsg at jsg.id.au
Wed Sep 6 12:36:02 UTC 2017


On Wed, Sep 06, 2017 at 08:35:19AM +0100, Paul Barker wrote:
> This reverts commit 25877d4e4c45451c5398aec3de50e0d5befe0e9f.
> 
> This is a workaround for Raspberry Pi boot failures seen when passing on
> the device tree provided by the Raspberry Pi firmware at boot. Without
> CONFIG_OF_EMBED, we just get stuck at "Starting kernel ..." when we try
> to boot Linux with this device tree.
> 
> Signed-off-by: Paul Barker <pbarker at toganlabs.com>
> Cc: Simon Glass <sjg at chromium.org>

Same problem booting OpenBSD since 2017.07.  We've been building U-Boot
with CONFIG_OF_EMBED=y on rpi* since Mark Kettenis tracked it down
to that commit.

Tested-by: Jonathan Gray <jsg at jsg.id.au>

> ---
>  configs/rpi_2_defconfig     | 1 +
>  configs/rpi_3_32b_defconfig | 1 +
>  configs/rpi_3_defconfig     | 1 +
>  configs/rpi_defconfig       | 1 +
>  4 files changed, 4 insertions(+)
> 
> diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
> index 10e83186c1..848aeb73aa 100644
> --- a/configs/rpi_2_defconfig
> +++ b/configs/rpi_2_defconfig
> @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y
>  CONFIG_ENV_FAT_INTERFACE="mmc"
>  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
>  CONFIG_DM_KEYBOARD=y
> +CONFIG_OF_EMBED=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_BCM2835=y
> diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
> index d35a639630..196b619bb7 100644
> --- a/configs/rpi_3_32b_defconfig
> +++ b/configs/rpi_3_32b_defconfig
> @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
>  CONFIG_ENV_FAT_INTERFACE="mmc"
>  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
>  CONFIG_DM_KEYBOARD=y
> +CONFIG_OF_EMBED=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_BCM2835=y
> diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
> index 095a076249..f23c1e7b18 100644
> --- a/configs/rpi_3_defconfig
> +++ b/configs/rpi_3_defconfig
> @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
>  CONFIG_ENV_FAT_INTERFACE="mmc"
>  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
>  CONFIG_DM_KEYBOARD=y
> +CONFIG_OF_EMBED=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_BCM2835=y
> diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
> index 9dfdad5c1d..939870637a 100644
> --- a/configs/rpi_defconfig
> +++ b/configs/rpi_defconfig
> @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y
>  CONFIG_ENV_FAT_INTERFACE="mmc"
>  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
>  CONFIG_DM_KEYBOARD=y
> +CONFIG_OF_EMBED=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_BCM2835=y
> -- 
> 2.11.0
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot


More information about the U-Boot mailing list