From 71295431b870f53dcd6942320af7f34301aa4efa Mon Sep 17 00:00:00 2001
From: Gunjan Gupta <viraniac@gmail.com>
Date: Thu, 24 Aug 2023 00:45:58 +0530
Subject: [PATCH] Sunxi: fix boot issue on some boards introduced after u-boot
 bump

After we bumped u-boot to version v2022.10, a couple of boards
stopped booting because the CONFIG_SPL_STACK value used in our
u-boot config was too low for that SOC. This change drops explicit
CONFIG_SPL_STACK defination from the affected boards.

The boards confirmed to have the issues were Orange Pi 3 LTS and
NanoPi Neo Black2 but I suspect that NanoPi K1 plus is also affected
hence similar change is done for that as well
---
 .../board_nanopik1plus/add-xx-nanopi-k1-plus-emmc.patch      | 4 +---
 .../board_nanopineocore2/add-xx-nanopineocore2.patch         | 4 +---
 .../0001-add-orange-pi-3-lts-support.patch                   | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/patch/u-boot/u-boot-sunxi/board_nanopik1plus/add-xx-nanopi-k1-plus-emmc.patch b/patch/u-boot/u-boot-sunxi/board_nanopik1plus/add-xx-nanopi-k1-plus-emmc.patch
index bfb6c011d4..b0c292f8cd 100644
--- a/patch/u-boot/u-boot-sunxi/board_nanopik1plus/add-xx-nanopi-k1-plus-emmc.patch
+++ b/patch/u-boot/u-boot-sunxi/board_nanopik1plus/add-xx-nanopi-k1-plus-emmc.patch
@@ -146,7 +146,7 @@ new file mode 100644
 index 0000000..670c3c7
 --- /dev/null
 +++ b/configs/nanopi_k1_plus_defconfig
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,23 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_SYS_TEXT_BASE=0x4a000000
@@ -160,8 +160,6 @@ index 0000000..670c3c7
 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-k1-plus"
 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_SPL=y
-+CONFIG_SPL_STACK=0x8000
-+CONFIG_SYS_PBSIZE=1024
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
diff --git a/patch/u-boot/u-boot-sunxi/board_nanopineocore2/add-xx-nanopineocore2.patch b/patch/u-boot/u-boot-sunxi/board_nanopineocore2/add-xx-nanopineocore2.patch
index 7a2ee2adc0..039598ead5 100644
--- a/patch/u-boot/u-boot-sunxi/board_nanopineocore2/add-xx-nanopineocore2.patch
+++ b/patch/u-boot/u-boot-sunxi/board_nanopineocore2/add-xx-nanopineocore2.patch
@@ -134,7 +134,7 @@ new file mode 100644
 index 0000000..4624ec3
 --- /dev/null
 +++ b/configs/nanopi_neo_core2_defconfig
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,19 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_MACH_SUN50I_H5=y
@@ -144,8 +144,6 @@ index 0000000..4624ec3
 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-core2"
 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_SPL=y
-+CONFIG_SPL_STACK=0x8000
-+CONFIG_SYS_PBSIZE=1024
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
diff --git a/patch/u-boot/u-boot-sunxi/board_orangepi3-lts/0001-add-orange-pi-3-lts-support.patch b/patch/u-boot/u-boot-sunxi/board_orangepi3-lts/0001-add-orange-pi-3-lts-support.patch
index 660bbaa34f..c6b226fc97 100644
--- a/patch/u-boot/u-boot-sunxi/board_orangepi3-lts/0001-add-orange-pi-3-lts-support.patch
+++ b/patch/u-boot/u-boot-sunxi/board_orangepi3-lts/0001-add-orange-pi-3-lts-support.patch
@@ -218,14 +218,13 @@ new file mode 100644
 index 00000000..f119c349
 --- /dev/null
 +++ b/configs/orangepi_3_lts_defconfig
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,19 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_MACH_SUN50I_H6=y
 +CONFIG_SUNXI_DRAM_H6_LPDDR3=y
 +CONFIG_SUNXI_DRAM_DDR3=n
 +CONFIG_DRAM_ODT_EN=y
-+CONFIG_MMC0_CD_PIN="PF6"
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 +CONFIG_HDMI_DDC_EN="PH2"
 +# CONFIG_PSCI_RESET is not set
@@ -234,8 +233,6 @@ index 00000000..f119c349
 +CONFIG_SPL=y
 +CONFIG_SPL_I2C=y
 +CONFIG_R_I2C_ENABLE=y
-+CONFIG_SPL_STACK=0x8000
-+CONFIG_SYS_PBSIZE=1024
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
 +# CONFIG_SPL_DOS_PARTITION is not set