From e409d4a825350ed1dc74de3bfc9326fb510ad399 Mon Sep 17 00:00:00 2001
From: PartialVolume <nick.craig.law@gmail.com>
Date: Sun, 24 Jan 2021 19:12:48 +0000
Subject: [PATCH] 1. Added vendor specific USB host controller drivers
 uhci_hcd. 2. The banner and final .img file name now obtain their version
 information from ../board/shredos/version.txt. This file contains the version
 number in the form 2020.05.008_x86-64_0.30.001, where 2020.05 is the
 buildroot version, 008 is the Shredos minor version, x86-64 is the
 architecture, 0.30.001 is the nwipe version.

---
 board/shredos/doimg.sh                    | 5 +++--
 board/shredos/kernel-5.6-defconfig.config | 9 +++++++++
 board/shredos/version.txt                 | 2 ++
 package/nwipe/002-nwipe-banner-patch.sh   | 3 +++
 package/nwipe/nwipe.mk                    | 2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 board/shredos/version.txt
 create mode 100755 package/nwipe/002-nwipe-banner-patch.sh

diff --git a/board/shredos/doimg.sh b/board/shredos/doimg.sh
index fa623fc8c0..ab2cef9df7 100755
--- a/board/shredos/doimg.sh
+++ b/board/shredos/doimg.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+version=`cat board/shredos/version.txt`
+
 cp "board/shredos/grub.cfg"                "${BINARIES_DIR}/grub.cfg"    || exit 1
 cp "board/shredos/bootx64.efi"             "${BINARIES_DIR}/bootx64.efi" || exit 1
 cp "${HOST_DIR}/lib/grub/i386-pc/boot.img" "${BINARIES_DIR}/boot.img"    || exit 1
@@ -14,8 +16,7 @@ rm -rf "${BUILD_DIR}/genimage.tmp"                                       || exit
 genimage --rootpath="${TARGET_DIR}" --inputpath="${BINARIES_DIR}" --outputpath="${BINARIES_DIR}" --config="board/shredos/genimage.cfg" --tmppath="${BUILD_DIR}/genimage.tmp" || exit 1
 
 # renaming
-SUFFIXIMG=2020.05.007_x86_64-0.30.001_$(date +%Y%m%d)
-#SUFFIXIMG=$(date +%Y%m%d)
+SUFFIXIMG="${version}_$(date +%Y%m%d)"
 FINAL_IMAGE_PATH="${BINARIES_DIR}/shredos-${SUFFIXIMG}.img"
 mv "${BINARIES_DIR}/shredos.img" "${FINAL_IMAGE_PATH}" || exit 1
 
diff --git a/board/shredos/kernel-5.6-defconfig.config b/board/shredos/kernel-5.6-defconfig.config
index 94ea69c58e..7b99185ac3 100644
--- a/board/shredos/kernel-5.6-defconfig.config
+++ b/board/shredos/kernel-5.6-defconfig.config
@@ -448,11 +448,20 @@ CONFIG_HID_PID=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE_REALTEK=y
 CONFIG_USB_STORAGE_DATAFAB=y
diff --git a/board/shredos/version.txt b/board/shredos/version.txt
new file mode 100644
index 0000000000..f8373975f5
--- /dev/null
+++ b/board/shredos/version.txt
@@ -0,0 +1,2 @@
+2020.05.008_x86-64_0.30.001
+
diff --git a/package/nwipe/002-nwipe-banner-patch.sh b/package/nwipe/002-nwipe-banner-patch.sh
new file mode 100755
index 0000000000..939c67c58e
--- /dev/null
+++ b/package/nwipe/002-nwipe-banner-patch.sh
@@ -0,0 +1,3 @@
+version=`cat ../../../board/shredos/version.txt`
+sed -i "/banner/c\const char* banner = \"ShredOS v$version\";" ./src/version.c
+
diff --git a/package/nwipe/nwipe.mk b/package/nwipe/nwipe.mk
index 48d481e86a..18fc2af08a 100644
--- a/package/nwipe/nwipe.mk
+++ b/package/nwipe/nwipe.mk
@@ -9,7 +9,7 @@ NWIPE_SITE = $(call github,PartialVolume,nwipe,$(NWIPE_VERSION))
 NWIPE_DEPENDENCIES = ncurses parted dmidecode coreutils
 
 define NWIPE_INITSH
-	(cd $(@D) && ./autogen.sh);
+	(cd $(@D) && cp ../../../package/nwipe/002-nwipe-banner-patch.sh $(@D) && ./002-nwipe-banner-patch.sh  && ./autogen.sh);
 endef
 
 NWIPE_POST_PATCH_HOOKS += NWIPE_INITSH