Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2d0cf3b2ae241a2ecc58d6bc7c5cb97732ff0751

Authored by Paul Barker
Committed by Tom Rini
1 parent eab44c93eb
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 4 changed files with 4 additions and 0 deletions Side-by-side Diff

configs/rpi_2_defconfig
Diff comments   View file @ 2d0cf3b
... ... @@ -16,6 +16,7 @@
16 16 CONFIG_ENV_FAT_INTERFACE="mmc"
17 17 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
18 18 CONFIG_DM_KEYBOARD=y
  19 +CONFIG_OF_EMBED=y
19 20 CONFIG_DM_MMC=y
20 21 CONFIG_MMC_SDHCI=y
21 22 CONFIG_MMC_SDHCI_BCM2835=y
configs/rpi_3_32b_defconfig
Diff comments   View file @ 2d0cf3b
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_ENV_FAT_INTERFACE="mmc"
18 18 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
19 19 CONFIG_DM_KEYBOARD=y
  20 +CONFIG_OF_EMBED=y
20 21 CONFIG_DM_MMC=y
21 22 CONFIG_MMC_SDHCI=y
22 23 CONFIG_MMC_SDHCI_BCM2835=y
configs/rpi_3_defconfig
Diff comments   View file @ 2d0cf3b
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_ENV_FAT_INTERFACE="mmc"
18 18 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
19 19 CONFIG_DM_KEYBOARD=y
  20 +CONFIG_OF_EMBED=y
20 21 CONFIG_DM_MMC=y
21 22 CONFIG_MMC_SDHCI=y
22 23 CONFIG_MMC_SDHCI_BCM2835=y
configs/rpi_defconfig
Diff comments   View file @ 2d0cf3b
... ... @@ -16,6 +16,7 @@
16 16 CONFIG_ENV_FAT_INTERFACE="mmc"
17 17 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
18 18 CONFIG_DM_KEYBOARD=y
  19 +CONFIG_OF_EMBED=y
19 20 CONFIG_DM_MMC=y
20 21 CONFIG_MMC_SDHCI=y
21 22 CONFIG_MMC_SDHCI_BCM2835=y