summaryrefslogtreecommitdiff
path: root/configs/rpi_2_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-03-27 22:19:57 +0300
committerTom Rini <trini@konsulko.com>2023-03-27 22:19:57 +0300
commit605bc145f91d2a28ba2e517cae4e53e255e34b6f (patch)
treea8df36d6569d441bc013399ff7dafff07cd36657 /configs/rpi_2_defconfig
parentfde439219ff53a46bdd5dff69e049ccd4be57310 (diff)
parent41a88ad529b3943b1e465846eb24fe2c29203e35 (diff)
downloadu-boot-605bc145f91d2a28ba2e517cae4e53e255e34b6f.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'configs/rpi_2_defconfig')
-rw-r--r--configs/rpi_2_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 154284765f..1c462f36b4 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
CONFIG_SYS_PROMPT="U-Boot> "
CONFIG_SYS_LOAD_ADDR=0x1000000
-CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set