summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-09-06 08:35:19 +0100
committerTom Rini <trini@konsulko.com>2017-09-07 10:44:36 -0400
commit2d0cf3b2ae241a2ecc58d6bc7c5cb97732ff0751 (patch)
tree44621063c2a358272052e9ade514e8e19f2ea3f4
parenteab44c93ebffc17603a651501c32495ec96c13e5 (diff)
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 <pbarker@toganlabs.com> Cc: Simon Glass <sjg@chromium.org> Tested-by: Jonathan Gray <jsg@jsg.id.au> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/rpi_2_defconfig1
-rw-r--r--configs/rpi_3_32b_defconfig1
-rw-r--r--configs/rpi_3_defconfig1
-rw-r--r--configs/rpi_defconfig1
4 files changed, 4 insertions, 0 deletions
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