d/patches: Revert RPi from bootstd to distroboot booting

The RPi support has shifted to bootstd and using a text env, however we need the older distroboot for our rollback strategy. Revert the config changes as far as possible that changed the boot methods. The environment variables that would normally be added to the u-Boot env when distroboot is enabled won't be as that process requires the env to be in the include files (rather than stored as a text file). We don't want to revert all the changes from moving to the text env, so add the environment variables that were previously added in the defines to the relevant text env file.

Signed-off-by: Martyn Welch martyn.welch@collabora.com

debian/patches/apertis/rpi/0078-Revert-rpi-Disable-DISTRO_DEFAULTS.patch

+From: Martyn Welch <martyn.welch@collabora.com>
+Date: Mon, 16 Sep 2024 16:18:38 +0100
+Subject: Revert "rpi: Disable DISTRO_DEFAULTS"
+
+This reverts commit 90f626a5d8603dc3bffe30d8be19de284853b5d6.
+---
+ 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_4_32b_defconfig    | 1 +
+ configs/rpi_4_defconfig        | 1 +
+ configs/rpi_arm64_defconfig    | 1 +
+ configs/rpi_defconfig          | 1 +
+ 9 files changed, 9 insertions(+)
+
+diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
+index ac3b40c..2eaa914 100644
+--- a/configs/rpi_0_w_defconfig
++++ b/configs/rpi_0_w_defconfig
+@@ -14,6 +14,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
+diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
+index b6e06cf..7df2e92 100644
+--- a/configs/rpi_2_defconfig
++++ b/configs/rpi_2_defconfig
+@@ -15,6 +15,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
+diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
+index eadc418..9e10412 100644
+--- a/configs/rpi_3_32b_defconfig
++++ b/configs/rpi_3_32b_defconfig
+@@ -14,6 +14,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
+diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
+index 0e2faee..f0283ce 100644
+--- a/configs/rpi_3_b_plus_defconfig
++++ b/configs/rpi_3_b_plus_defconfig
+@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
+diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
+index 6890af4..3938e61 100644
+--- a/configs/rpi_3_defconfig
++++ b/configs/rpi_3_defconfig
+@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
+diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
+index 734335c..2a58a67 100644
+--- a/configs/rpi_4_32b_defconfig
++++ b/configs/rpi_4_32b_defconfig
+@@ -13,6 +13,7 @@ CONFIG_PCI=y
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="pci enum; usb start;"
+ # CONFIG_DISPLAY_CPUINFO is not set
+diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
+index 2541b83..281ef75 100644
+--- a/configs/rpi_4_defconfig
++++ b/configs/rpi_4_defconfig
+@@ -13,6 +13,7 @@ CONFIG_PCI=y
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="pci enum; usb start;"
+ # CONFIG_DISPLAY_CPUINFO is not set
+diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
+index b5ec077..5a677c5 100644
+--- a/configs/rpi_arm64_defconfig
++++ b/configs/rpi_arm64_defconfig
+@@ -13,6 +13,7 @@ CONFIG_PCI=y
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="pci enum; usb start;"
+ # CONFIG_DISPLAY_CPUINFO is not set
+diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
+index 29c1006..44df40d 100644
+--- a/configs/rpi_defconfig
++++ b/configs/rpi_defconfig
+@@ -14,6 +14,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_BOOTSTD_DEFAULTS=y
+ CONFIG_OF_BOARD_SETUP=y
+ CONFIG_FDT_SIMPLEFB=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set