From 15520e81705f72aca2483f16ca647a836a81941f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 15 Aug 2023 10:00:51 -0500
Subject: [PATCH] linux: enable CONFIG_EEPROM_AT24 and builtin
 CONFIG_POLARFIRE_SOC_GENERIC_SERVICE, use bmaptool to geneate quick flashign
 image

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 04_build_linux.sh            |  2 ++
 07_create_sdcard_img.sh      | 11 +++++++++++
 patches/linux/mpfs_defconfig |  6 ++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/04_build_linux.sh b/04_build_linux.sh
index 20fa39c..7231fa4 100755
--- a/04_build_linux.sh
+++ b/04_build_linux.sh
@@ -22,9 +22,11 @@ cp -v ../patches/linux/Makefile arch/riscv/boot/dts/microchip/
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
 
+./scripts/config --enable CONFIG_EEPROM_AT24
 ./scripts/config --enable CONFIG_OF_OVERLAY
 ./scripts/config --enable CONFIG_GPIO_MICROCHIP_CORE
 ./scripts/config --enable CONFIG_MCP356X
+./scripts/config --enable CONFIG_POLARFIRE_SOC_GENERIC_SERVICE
 
 echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs"
 make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs
diff --git a/07_create_sdcard_img.sh b/07_create_sdcard_img.sh
index 1522d12..4a227b6 100755
--- a/07_create_sdcard_img.sh
+++ b/07_create_sdcard_img.sh
@@ -15,10 +15,21 @@ if [ -d ./tmp ] ; then
 	rm -rf ./tmp || true
 fi
 
+if [ -f ./images/sdcard.img ] ; then
+	rm -rf ./images/sdcard.img || true
+fi
+
 genimage --config genimage.cfg
 
 if [ -d ./tmp ] ; then
 	rm -rf ./tmp || true
 fi
 
+if [ -f /usr/bin/bmaptool ] ; then
+	if [ -f ./images/sdcard.bmap ] ; then
+		rm -rf ./images/sdcard.bmap || true
+	fi
+	/usr/bin/bmaptool -d create -o ./images/sdcard.bmap ./images/sdcard.img
+fi
+
 #
diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig
index 83c0ccc..c9e9a52 100644
--- a/patches/linux/mpfs_defconfig
+++ b/patches/linux/mpfs_defconfig
@@ -808,6 +808,8 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -1035,7 +1037,7 @@ CONFIG_MPFS_DMA_PROXY=y
 #
 # EEPROM support
 #
-# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
@@ -3335,7 +3337,7 @@ CONFIG_RPMSG_VIRTIO=y
 # end of Enable LiteX SoC Builder specific drivers
 
 CONFIG_POLARFIRE_SOC_SYS_CTRL=y
-CONFIG_POLARFIRE_SOC_GENERIC_SERVICE=m
+CONFIG_POLARFIRE_SOC_GENERIC_SERVICE=y
 
 #
 # Qualcomm SoC drivers