155 lines
5.0 KiB
Diff
155 lines
5.0 KiB
Diff
From 5aaa4c98be87eef370a0c50bf6d4ab7f9fcde886 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Mon, 8 Jan 2024 22:13:59 +0000
|
|
Subject: [PATCH] rpi: Switch to OF_HAS_PRIOR_STAGE by default
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
On all Raspberry Pi platforms, we're loaded by a prior stage firmware
|
|
that has assembled and passed on a device tree binary for us to use.
|
|
Switch to using this tree by default.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
Cc: Matthias Brugger <mbrugger@suse.com>
|
|
Cc: Simon Glass <sjg@chromium.org>
|
|
Cc: François Ozog <francois.ozog@linaro.org>
|
|
Signed-off-by: Tom Rini <trini@konsulko.com>
|
|
Tested-by: Simon Glass <sjg@chromium.org>
|
|
---
|
|
To be clear, this is on top of current -next where I've applied v8 of
|
|
Simon's series that introduces OF_HAS_PRIOR_STAGE.
|
|
|
|
I've only been able to test this on my Raspberry Pi 3 boards but this
|
|
should work everywhere. What may, or may not, be a problem is that
|
|
arch/arm/dts/bcm283x-u-boot.dtsi is never used now. On the other hand,
|
|
I believe this should stop the problems we have where changes made to
|
|
the device tree via config.txt or similar aren't reflected when booting
|
|
U-Boot or Linux since we will be using that tree for certain now.
|
|
---
|
|
arch/arm/Kconfig | 1 +
|
|
arch/arm/mach-bcm283x/Kconfig | 3 ---
|
|
configs/rpi_0_w_defconfig | 1 -
|
|
configs/rpi_2_defconfig | 1 -
|
|
configs/rpi_3_32b_defconfig | 1 -
|
|
configs/rpi_3_b_plus_defconfig | 1 -
|
|
configs/rpi_3_defconfig | 1 -
|
|
configs/rpi_defconfig | 1 -
|
|
8 files changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
index 1fd7aacc380..33bbe7b4898 100644
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -645,6 +645,7 @@ config ARCH_BCM283X
|
|
select SERIAL_SEARCH_ALL
|
|
imply CMD_DM
|
|
imply FAT_WRITE
|
|
+ imply OF_HAS_PRIOR_STAGE
|
|
|
|
config ARCH_BCMSTB
|
|
bool "Broadcom BCM7XXX family"
|
|
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
|
|
index 6ce278c6d29..b3287ce8bce 100644
|
|
--- a/arch/arm/mach-bcm283x/Kconfig
|
|
+++ b/arch/arm/mach-bcm283x/Kconfig
|
|
@@ -163,7 +163,6 @@ config TARGET_RPI_4_32B
|
|
|
|
This option creates a build targeting the ARMv7/AArch32 ISA.
|
|
select BCM2711_32B
|
|
- imply OF_HAS_PRIOR_STAGE
|
|
|
|
config TARGET_RPI_4
|
|
bool "Raspberry Pi 4 64-bit build"
|
|
@@ -189,7 +188,6 @@ config TARGET_RPI_4
|
|
|
|
This option creates a build targeting the ARMv8/AArch64 ISA.
|
|
select BCM2711_64B
|
|
- imply OF_HAS_PRIOR_STAGE
|
|
|
|
config TARGET_RPI_ARM64
|
|
bool "Raspberry Pi one binary 64-bit build"
|
|
@@ -197,7 +195,6 @@ config TARGET_RPI_ARM64
|
|
Support for all armv8 based Raspberry Pi variants, such as
|
|
the RPi 4 model B, in AArch64 (64-bit) mode.
|
|
select ARM64
|
|
- imply OF_HAS_PRIOR_STAGE
|
|
|
|
endchoice
|
|
|
|
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
|
index bed143d64d6..98f8904c918 100644
|
|
--- a/configs/rpi_0_w_defconfig
|
|
+++ b/configs/rpi_0_w_defconfig
|
|
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
|
index e4e4843e8cd..1b8676e1d10 100644
|
|
--- a/configs/rpi_2_defconfig
|
|
+++ b/configs/rpi_2_defconfig
|
|
@@ -25,7 +25,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
|
index 215396599e4..abc10a79ada 100644
|
|
--- a/configs/rpi_3_32b_defconfig
|
|
+++ b/configs/rpi_3_32b_defconfig
|
|
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
|
|
index d1ec55e558a..3c8f8fc1bb7 100644
|
|
--- a/configs/rpi_3_b_plus_defconfig
|
|
+++ b/configs/rpi_3_b_plus_defconfig
|
|
@@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
|
index 8e9c35b3cef..9853c448809 100644
|
|
--- a/configs/rpi_3_defconfig
|
|
+++ b/configs/rpi_3_defconfig
|
|
@@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
|
index 89d6372c1de..060a8809506 100644
|
|
--- a/configs/rpi_defconfig
|
|
+++ b/configs/rpi_defconfig
|
|
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
--
|
|
2.43.0
|
|
|