From d20032b70596565f3ebbafcdffefb616777f3cc5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 15 Sep 2023 10:41:56 -0500
Subject: [PATCH] linux: config, just use ../patches/linux/mpfs_defconfig

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 build_linux_menuconfig.sh   | 125 ++++--------------------------------
 rebuild_linux.sh            |  13 +++-
 rebuild_linux_menuconfig.sh |  13 +++-
 3 files changed, 38 insertions(+), 113 deletions(-)

diff --git a/build_linux_menuconfig.sh b/build_linux_menuconfig.sh
index dbec789..aa3d740 100755
--- a/build_linux_menuconfig.sh
+++ b/build_linux_menuconfig.sh
@@ -33,119 +33,11 @@ echo "make ARCH=riscv CROSS_COMPILE=${CC} clean"
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 
 if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
+	cp -v ../patches/linux/mpfs_defconfig ./arch/riscv/configs/mpfs_defconfig
+
 	echo "make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
 
-	#
-	# Scheduler features
-	#
-	# end of Scheduler features
-
-	./scripts/config --enable CONFIG_MEMCG
-	./scripts/config --enable CONFIG_MEMCG_KMEM
-	./scripts/config --enable CONFIG_RT_GROUP_SCHED
-	./scripts/config --enable CONFIG_SCHED_MM_CID
-	./scripts/config --enable CONFIG_CGROUP_PIDS
-	./scripts/config --enable CONFIG_CGROUP_FREEZER
-	./scripts/config --enable CONFIG_CGROUP_HUGETLB
-	./scripts/config --enable CONFIG_CPUSETS
-	./scripts/config --enable CONFIG_PROC_PID_CPUSET
-	./scripts/config --enable CONFIG_CGROUP_DEVICE
-	./scripts/config --enable CONFIG_CGROUP_CPUACCT
-	./scripts/config --enable CONFIG_CGROUP_PERF
-	./scripts/config --enable CONFIG_NAMESPACES
-	./scripts/config --enable CONFIG_UTS_NS
-	./scripts/config --enable CONFIG_TIME_NS
-	./scripts/config --enable CONFIG_IPC_NS
-	./scripts/config --enable CONFIG_USER_NS
-	./scripts/config --enable CONFIG_PID_NS
-	./scripts/config --enable CONFIG_NET_NS
-	./scripts/config --enable CONFIG_CHECKPOINT_RESTORE
-
-	./scripts/config --set-str CONFIG_CMDLINE ""
-	./scripts/config --disable CONFIG_CMDLINE_FALLBACK
-	./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
-
-	#
-	# Networking options
-	#
-	./scripts/config --disable CONFIG_NETLABEL
-
-	#
-	# File systems
-	#
-	./scripts/config --enable CONFIG_EXT4_FS_SECURITY
-	./scripts/config --disable CONFIG_FANOTIFY
-	./scripts/config --enable CONFIG_AUTOFS_FS
-
-	#
-	# DOS/FAT/EXFAT/NT Filesystems
-	#
-	./scripts/config --enable CONFIG_FAT_FS
-	./scripts/config --enable CONFIG_MSDOS_FS
-	./scripts/config --enable CONFIG_VFAT_FS
-
-	#
-	# Pseudo filesystems
-	#
-	./scripts/config --enable CONFIG_PROC_CHILDREN
-	./scripts/config --enable CONFIG_HUGETLBFS
-	./scripts/config --enable CONFIG_NLS_CODEPAGE_437
-
-	#
-	# Security options
-	#
-	./scripts/config --enable CONFIG_SECURITY
-	./scripts/config --enable CONFIG_SECURITYFS
-	./scripts/config --enable CONFIG_SECURITY_NETWORK
-	./scripts/config --enable CONFIG_SECURITY_PATH
-	./scripts/config --set-val CONFIG_LSM_MMAP_MIN_ADDR 65536
-
-	./scripts/config --enable CONFIG_INTEGRITY
-
-	#./scripts/config --disable CONFIG_VMAP_STACK
-	#./scripts/config --disable CONFIG_SMP
-
-	./scripts/config --enable CONFIG_USB_MUSB_DUAL_ROLE
-
-	./scripts/config --enable CONFIG_USB_GADGET
-	./scripts/config --enable CONFIG_USB_CONFIGFS
-	./scripts/config --enable CONFIG_CONFIGFS_FS
-	./scripts/config --enable CONFIG_USB_CONFIGFS_SERIAL
-	./scripts/config --enable CONFIG_USB_CONFIGFS_ACM
-	./scripts/config --enable CONFIG_USB_CONFIGFS_OBEX
-	./scripts/config --enable CONFIG_USB_CONFIGFS_NCM
-	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM
-	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM_SUBSET
-	./scripts/config --enable CONFIG_USB_CONFIGFS_RNDIS
-	./scripts/config --enable CONFIG_USB_CONFIGFS_EEM
-	./scripts/config --enable CONFIG_USB_CONFIGFS_PHONET
-	./scripts/config --enable CONFIG_USB_CONFIGFS_MASS_STORAGE
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_LB_SS
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_FS
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC1
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC2
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_MIDI
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_HID
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UVC
-	./scripts/config --enable CONFIG_USB_CONFIGFS_F_PRINTER
-
-	./scripts/config --module CONFIG_MEDIA_SUPPORT
-	./scripts/config --enable CONFIG_MEDIA_SUPPORT_FILTER
-	./scripts/config --enable CONFIG_MEDIA_SUBDRV_AUTOSELECT
-	./scripts/config --enable CONFIG_MEDIA_CAMERA_SUPPORT
-	./scripts/config --module CONFIG_VIDEO_IMX219
-
-	#Optimize:
-	./scripts/config --enable CONFIG_IP_NF_IPTABLES
-	./scripts/config --enable CONFIG_NETFILTER_XTABLES
-	./scripts/config --enable CONFIG_NLS_ISO8859_1
-	./scripts/config --enable CONFIG_BLK_DEV_DM
-
 	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
 	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 else
@@ -232,7 +124,12 @@ echo "make ARCH=riscv CROSS_COMPILE=${CC} menuconfig"
 make ARCH=riscv CROSS_COMPILE=${CC} menuconfig
 
 echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs"
-make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs
+make -j${CORES} ARCH=riscv CROSS_COMPILE="ccache ${CC}" Image modules dtbs
+
+if [ ! -f ./arch/riscv/boot/Image ] ; then
+	echo "Build Failed"
+	exit 2
+fi
 
 KERNEL_UTS=$(cat "${wdir}/linux/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' )
 
@@ -270,4 +167,10 @@ cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/input/
 
 cd ../
 
+cp -v ./patches/linux/beaglev_fire.its ./deploy/input/
+cd ./deploy/input/
+gzip -9 Image -c > Image.gz
+if [ -f ../../u-boot/tools/mkimage ] ; then
+	../../u-boot/tools/mkimage -f beaglev_fire.its beaglev_fire.itb
+fi
 #
diff --git a/rebuild_linux.sh b/rebuild_linux.sh
index 646afa8..bb8adfb 100755
--- a/rebuild_linux.sh
+++ b/rebuild_linux.sh
@@ -7,7 +7,12 @@ CC=${CC:-"${wdir}/riscv-toolchain/bin/riscv64-linux-"}
 cd ./linux/
 
 echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs"
-make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs
+make -j${CORES} ARCH=riscv CROSS_COMPILE="ccache ${CC}" Image modules dtbs
+
+if [ ! -f ./arch/riscv/boot/Image ] ; then
+	echo "Build Failed"
+	exit 2
+fi
 
 KERNEL_UTS=$(cat "${wdir}/linux/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' )
 
@@ -45,4 +50,10 @@ cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/input/
 
 cd ../
 
+cp -v ./patches/linux/beaglev_fire.its ./deploy/input/
+cd ./deploy/input/
+gzip -9 Image -c > Image.gz
+if [ -f ../../u-boot/tools/mkimage ] ; then
+	../../u-boot/tools/mkimage -f beaglev_fire.its beaglev_fire.itb
+fi
 #
diff --git a/rebuild_linux_menuconfig.sh b/rebuild_linux_menuconfig.sh
index 0cd5a64..abbe5df 100755
--- a/rebuild_linux_menuconfig.sh
+++ b/rebuild_linux_menuconfig.sh
@@ -9,7 +9,12 @@ cd ./linux/
 make ARCH=riscv CROSS_COMPILE=${CC} menuconfig
 
 echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs"
-make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs
+make -j${CORES} ARCH=riscv CROSS_COMPILE="ccache ${CC}" Image modules dtbs
+
+if [ ! -f ./arch/riscv/boot/Image ] ; then
+	echo "Build Failed"
+	exit 2
+fi
 
 KERNEL_UTS=$(cat "${wdir}/linux/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' )
 
@@ -47,4 +52,10 @@ cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/input/
 
 cd ../
 
+cp -v ./patches/linux/beaglev_fire.its ./deploy/input/
+cd ./deploy/input/
+gzip -9 Image -c > Image.gz
+if [ -f ../../u-boot/tools/mkimage ] ; then
+	../../u-boot/tools/mkimage -f beaglev_fire.its beaglev_fire.itb
+fi
 #