Revert "dm: arm: rpi: Drop CONFIG_OF_EMBED"

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 <[email protected]>
Cc: Simon Glass <[email protected]>
Tested-by: Jonathan Gray <[email protected]>
Reviewed-by: Simon Glass <[email protected]>

diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 10e83186c1c312182d545c5bf269d72c3403237a..848aeb73aa8719832fa80ee1dcbeeed707e43f03 100644 (file)
--- 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 d35a63963055b8303568dfbdf1e5b2e7a079bb5b..196b619bb78eb6933ff6d877945e268c3039b721 100644 (file)
--- 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 095a076249803f1b3d7871a8462f81cc0549b5f7..f23c1e7b1801b66085b0aa6d31c6a198e7e8fe08 100644 (file)
--- 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 9dfdad5c1d85994fcb80695bf5ac618e50dc97ab..939870637a84838806b2a45a61ed128d7897957e 100644 (file)
--- 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