From 279bc06f609aef8c201eac0b87c17946c3802f31 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 14 Aug 2023 20:18:18 -0500
Subject: [PATCH] working u-boot

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 build_u-boot.sh                                     |  9 +++++++--
 ...de_defconfig => microchip_mpfs_icicle_defconfig} | 13 +++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename patches/u-boot/{uboot_smode_defconfig => microchip_mpfs_icicle_defconfig} (52%)

diff --git a/build_u-boot.sh b/build_u-boot.sh
index 44ee5ce..683e403 100755
--- a/build_u-boot.sh
+++ b/build_u-boot.sh
@@ -10,7 +10,7 @@ cd ./u-boot/
 #patch -p1 < ../patches/u-boot/0001-Use-MMUART0-for-stdout.patch
 #exit 2
 cp -v ../patches/u-boot/microchip-mpfs-icicle-kit.dts arch/riscv/dts/
-cp -v ../patches/u-boot/uboot_smode_defconfig .config
+cp -v ../patches/u-boot/microchip_mpfs_icicle_defconfig .config
 cd ../
 
 #make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} microchip_mpfs_icicle
@@ -20,9 +20,14 @@ cd ../
 #cp -v ./u-boot/defconfig ./u-boot/configs/microchip_mpfs_icicle_defconfig
 #make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} distclean
 
-make -C u-boot -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
+#make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} microchip_mpfs_icicle_defconfig
+#make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} menuconfig
+
+make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
+
 make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} savedefconfig
 cp -v ./u-boot/defconfig ./u-boot/configs/microchip_mpfs_icicle_defconfig
+cp -v ./u-boot/defconfig ./patches/u-boot/microchip_mpfs_icicle_defconfig
 
 echo "make -C u-boot -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} all"
 make -C u-boot -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} all
diff --git a/patches/u-boot/uboot_smode_defconfig b/patches/u-boot/microchip_mpfs_icicle_defconfig
similarity index 52%
rename from patches/u-boot/uboot_smode_defconfig
rename to patches/u-boot/microchip_mpfs_icicle_defconfig
index c14624b..24fd071 100644
--- a/patches/u-boot/uboot_smode_defconfig
+++ b/patches/u-boot/microchip_mpfs_icicle_defconfig
@@ -1,4 +1,5 @@
 CONFIG_RISCV=y
+CONFIG_SYS_MALLOC_LEN=0x800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="microchip-mpfs-icicle-kit"
@@ -6,18 +7,14 @@ CONFIG_TARGET_MICROCHIP_ICICLE=y
 CONFIG_ARCH_RV64I=y
 CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SYS_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_PROMPT="RISC-V # "
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-nand0:2m(payload),128k(env),119m(rootfs)"
+CONFIG_CMD_UBI=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM_MTD=y
-CONFIG_BOOTCOMMAND="setenv fileaddr 0x1030000000; setenv mmcbootpart 2; setenv scriptname boot.scr; run mmcbootenv;"
-CONFIG_SYS_BOOT_RAMDISK_HIGH=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MICROCHIP=y
-CONFIG_CMD_I2C=y
-CONFIG_SYS_I2C_SPEED=100000
-CONFIG_SYS_LOAD_ADDR=0x100200000
-CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-nand0:8m(payload),128k(env),48m(fitimage)"
+CONFIG_OF_LIBFDT_OVERLAY=y