From 39828c439deaec820b275d1ff9e83a98328bf35b Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@sifive.com>
Date: Fri, 30 Aug 2019 10:08:31 -0700
Subject: [PATCH] Remove CONFIG_PREBOOT for SiFive FU540

fdtcontroladdr points to a wrong location for FDT and 5.3 kernel fails
to boot.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 fix-extlinux-kconfig-preboot.patch       | 33 ------------------------
 sifive-fu540-remove-CONFIG_PREBOOT.patch | 13 ++++++++++
 uboot-tools.spec                         |  7 +++--
 3 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 fix-extlinux-kconfig-preboot.patch
 create mode 100644 sifive-fu540-remove-CONFIG_PREBOOT.patch

diff --git a/fix-extlinux-kconfig-preboot.patch b/fix-extlinux-kconfig-preboot.patch
deleted file mode 100644
index 015a4de..0000000
--- a/fix-extlinux-kconfig-preboot.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
-index 74743a5e..2e1f7fa9 100644
---- a/configs/qemu-riscv64_smode_defconfig
-+++ b/configs/qemu-riscv64_smode_defconfig
-@@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y
- CONFIG_DISPLAY_BOARDINFO=y
- # CONFIG_CMD_MII is not set
- CONFIG_OF_PRIOR_STAGE=y
-+CONFIG_USE_PREBOOT=y
-+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
-diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
-index 48865e5f..a8525793 100644
---- a/configs/sifive_fu540_defconfig
-+++ b/configs/sifive_fu540_defconfig
-@@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y
- CONFIG_DISPLAY_CPUINFO=y
- CONFIG_DISPLAY_BOARDINFO=y
- CONFIG_OF_PRIOR_STAGE=y
-+CONFIG_USE_PREBOOT=y
-+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
-diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
-index 858b7a7d..ba4aa065 100644
---- a/include/configs/sifive-fu540.h
-+++ b/include/configs/sifive-fu540.h
-@@ -40,8 +40,4 @@
- 	"ramdisk_addr_r=0x88300000\0" \
- 	BOOTENV
- 
--#define CONFIG_PREBOOT \
--	"setenv fdt_addr ${fdtcontroladdr};" \
--	"fdt addr ${fdtcontroladdr};"
--
- #endif /* __CONFIG_H */
diff --git a/sifive-fu540-remove-CONFIG_PREBOOT.patch b/sifive-fu540-remove-CONFIG_PREBOOT.patch
new file mode 100644
index 0000000..a7b941d
--- /dev/null
+++ b/sifive-fu540-remove-CONFIG_PREBOOT.patch
@@ -0,0 +1,13 @@
+diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
+index 676db59..7eedc76 100644
+--- a/include/configs/sifive-fu540.h
++++ b/include/configs/sifive-fu540.h
+@@ -42,8 +42,4 @@
+ 	"ramdisk_addr_r=0x88300000\0" \
+ 	BOOTENV
+ 
+-#define CONFIG_PREBOOT \
+-	"setenv fdt_addr ${fdtcontroladdr};" \
+-	"fdt addr ${fdtcontroladdr};"
+-
+ #endif /* __CONFIG_H */
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 7b38e4b..86efda1 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,7 +2,7 @@
 
 Name:      uboot-tools
 Version:   2019.10
-Release:   0.1%{?candidate:.%{candidate}}.0.riscv64%{?dist}
+Release:   0.1%{?candidate:.%{candidate}}.1.riscv64%{?dist}
 Summary:   U-Boot utilities
 License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:       http://www.denx.de/wiki/U-Boot
@@ -28,7 +28,7 @@ Patch7:    dragonboard-fixes.patch
 Patch8:    ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
 Patch9:    arm-tegra-defaine-fdtfile-for-all-devices.patch
 
-Patch20:   fix-extlinux-kconfig-preboot.patch
+Patch20:   sifive-fu540-remove-CONFIG_PREBOOT.patch
 Patch21:   env-fix-build-error-for-envtools.patch
 Patch22:   fu540-boot-mmc-pxe.patch
 
@@ -294,6 +294,9 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Fri Aug 30 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> 2019.10-0.1-rc3.1.riscv64
+- Remove CONFIG_PREBOOT for SiFive FU540
+
 * Mon Aug 26 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> 2019.10-0.1-rc3.0.riscv64
 - 2019.10 RC3