From db177d224089336d2012c01615a839d8581a6a0b Mon Sep 17 00:00:00 2001
From: Philip Smart <philip.smart@net2net.org>
Date: Tue, 14 Feb 2023 11:50:03 +0000
Subject: [PATCH] More updates to get git in-sync with dvlp env

---
 software/linux/Build_FusionX.sh               | 23 ++++++++++++-------
 software/linux/boot/include/ms_version.h      |  4 ++--
 .../8.2.1/spinand/include/generated/compile.h |  4 ++--
 .../i2m/drivers/sstar/include/ms_version.h    |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/software/linux/Build_FusionX.sh b/software/linux/Build_FusionX.sh
index 3dca22fd7..328ecbbf3 100755
--- a/software/linux/Build_FusionX.sh
+++ b/software/linux/Build_FusionX.sh
@@ -49,6 +49,9 @@ DATE=$(date +%m%d)
 BACKUPDIR=$(date +%m%d%H%M)
 #images will output in ${RELEASEDIR}/images/
 RELEASEDIR=`pwd`
+FUSIONXDIR=`pwd`\..\FusionX
+WEBSRVDIR=`pwd`\..\WebServer
+Z80EMUDIR=`pwd`\..\Z80emu
 #release source code
 #find ./boot/ | grep -v boot/.git | cpio -pdm ${RELEASEDIR}/
 #find ./project/ | grep -v project/.git | cpio -pdm ${RELEASEDIR}/
@@ -259,25 +262,25 @@ if [ -d ${RELEASEDIR}/project/image/output/customer -a "`ls ${RELEASEDIR}/projec
 fi
 # Setup the applications for FusionX.
 mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps
-if [ -d /srv/dvlp/Projects/tzpu/FusionX/software/FusionX ]; then
+if [ -d ${FUSIONXDIR} ]; then
     echo -n "FusionX "
-    cd /srv/dvlp/Projects/tzpu/FusionX/software/FusionX
+    cd ${FUSIONXDIR}
     mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/
     cp -r * ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/
     cp start_FusionX.sh ${RELEASEDIR}/project/image/output/sdrootfs/apps/
     chmod +x ${RELEASEDIR}/project/image/output/sdrootfs/apps/start_FusionX.sh
 fi
-if [ -d /srv/dvlp/Projects/tzpu/FusionX/software/WebServer/ ]; then
+if [ -d ${WEBSRVDIR} ]; then
     echo -n "WebServer "
-    cd /srv/dvlp/Projects/tzpu/FusionX/software/WebServer/
+    cd ${WEBSRVDIR}
     mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/WebServer/
     cp -r WebServer webfs/ conf/ ${RELEASEDIR}/project/image/output/sdrootfs/apps/WebServer/
     cp start_WebServer.sh ${RELEASEDIR}/project/image/output/sdrootfs/apps/
     chmod +x ${RELEASEDIR}/project/image/output/sdrootfs/apps/start_WebServer.sh
 fi
-if [ -d /srv/dvlp/Projects/tzpu/FusionX/software/Z80emu/Z80/ ]; then
+if [ -d ${Z80EMUDIR} ]; then
     echo -n "Z80 "
-    cd /srv/dvlp/Projects/tzpu/FusionX/software/Z80emu/
+    cd ${Z80EMUDIR}
     mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/Z80/
     cp -r Z80/* ${RELEASEDIR}/project/image/output/sdrootfs/apps/Z80/
 fi
@@ -291,10 +294,14 @@ fi
 # Copy any new files.
 for f in DSK MZF CPM BAS CAS Basic
 do
-    mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/disk/Sharp
-    cp -r /srv/dvlp/Projects/tzpu/FusionX/software/${f}/ ${RELEASEDIR}/project/image/output/sdrootfs/apps/disk/Sharp/${f}/
+    mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/disk/
+    cp -r /srv/dvlp/Projects/tzpu/FusionX/software/${f}/ ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/disk/${f}/
 done
 
+# Copy an new rom images.
+mkdir -p ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/roms/
+cp -r /srv/dvlp/Projects/tzpu/FusionX/software/roms/* ${RELEASEDIR}/project/image/output/sdrootfs/apps/FusionX/roms/
+
 # Make any manual setup changes.
 #echo "/dev/zram0     none swap sw 0 -1"         >> ${RELEASEDIR}/project/image/output/sdrootfs/etc/fstab
 #echo "/dev/mmcblk1p1 none swap sw 0 -2"         >> ${RELEASEDIR}/project/image/output/sdrootfs/etc/fstab
diff --git a/software/linux/boot/include/ms_version.h b/software/linux/boot/include/ms_version.h
index 88af49e45..228179ff9 100644
--- a/software/linux/boot/include/ms_version.h
+++ b/software/linux/boot/include/ms_version.h
@@ -1,7 +1,7 @@
-// $Change: ef9980d8e $
+// $Change: dfa3dd5a5 $
 #define MVXV_HEAD_VER   {'4'}
 #define MVXV_LIB_TYPE   {'#', '#'}
 #define MVXV_CHIP_ID    {'I', '2', 'M', '#'}
-#define MVXV_CHANGELIST {'g', 'e', 'f', '9', '9', '8', '0', 'd', '8', 'e'}
+#define MVXV_CHANGELIST {'g', 'd', 'f', 'a', '3', 'd', 'd', '5', 'a', '5'}
 #define MVXV_COMP_ID     {'C', 'M', '_', 'U', 'B', 'T', '1', '5', '0', '1'}
 
diff --git a/software/linux/project/kbuild/4.9.84/i2m/configs/nvr/011A/glibc/8.2.1/spinand/include/generated/compile.h b/software/linux/project/kbuild/4.9.84/i2m/configs/nvr/011A/glibc/8.2.1/spinand/include/generated/compile.h
index 2c88d1417..cb8d7950f 100644
--- a/software/linux/project/kbuild/4.9.84/i2m/configs/nvr/011A/glibc/8.2.1/spinand/include/generated/compile.h
+++ b/software/linux/project/kbuild/4.9.84/i2m/configs/nvr/011A/glibc/8.2.1/spinand/include/generated/compile.h
@@ -1,7 +1,7 @@
-/* This file is auto generated, version 22 */
+/* This file is auto generated, version 23 */
 /* SMP PREEMPT */
 #define UTS_MACHINE "arm"
-#define UTS_VERSION "#22 SMP PREEMPT Sun Feb 12 22:10:10 GMT 2023"
+#define UTS_VERSION "#23 SMP PREEMPT Tue Feb 14 11:48:10 GMT 2023"
 #define LINUX_COMPILE_BY "psmart"
 #define LINUX_COMPILE_HOST "gull"
 #define LINUX_COMPILER "gcc version 8.2.1 20180802 (GNU Toolchain for the A-profile Architecture 8.2-2018-08 (arm-rel-8.23)) "
diff --git a/software/linux/project/kbuild/4.9.84/i2m/drivers/sstar/include/ms_version.h b/software/linux/project/kbuild/4.9.84/i2m/drivers/sstar/include/ms_version.h
index 484ff9651..52ac7d573 100644
--- a/software/linux/project/kbuild/4.9.84/i2m/drivers/sstar/include/ms_version.h
+++ b/software/linux/project/kbuild/4.9.84/i2m/drivers/sstar/include/ms_version.h
@@ -5,6 +5,6 @@
 #define MVXV_HEAD_VER   "4"
 #define MVXV_LIB_TYPE   "##"
 #define MVXV_CHIP_ID    "I2M#"
-#define MVXV_CHANGELIST "gef9980d8e"
+#define MVXV_CHANGELIST "gdfa3dd5a5"
 #define MVXV_COMP_ID    "KL_LX409##"
 #define MVXV_EXT        "[BR:master]"