From d1819537c548532cfee0978491d23d19778502c5 Mon Sep 17 00:00:00 2001
From: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Date: Fri, 23 Nov 2018 12:02:02 +0100
Subject: [PATCH] x230: add a second image to the release package

We already have a config for a more free version using SeaVGABIOS. From now
on we build, test and release that too. The image filename should just
contail _free_ which is probably enough.

Closes #32
---
 x230/README.md  |  6 ++++--
 x230/release.sh | 28 ++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/x230/README.md b/x230/README.md
index f5e4f95..6d6e275 100644
--- a/x230/README.md
+++ b/x230/README.md
@@ -8,7 +8,6 @@ Get it from our [release page](https://github.com/merge/coreboot-x230/releases)
 * __coreboot__: We take coreboot's master branch at the time we build a release image.
 * __microcode update__: revision `20` from 2018-04-10 (includes mitigations for Spectre Variant 3a and 4)
 * __SeaBIOS__: version [1.12.0](https://seabios.org/Releases) from 2018-11-17
-* The only proprietary binary, the VGA BIOS is executed in "secure" mode ([PCI_OPTION_ROM_RUN_YABEL](https://www.coreboot.org/Coreboot_Options))
 
 ## table of contents
 * [TL;DR](#tldr)
@@ -200,7 +199,10 @@ Our scripts do this for you.
 	sudo ./external_install_top.sh -k <backup-file-to-create>
 
 
-Select the image to flash and that's it. Keep the backup safe, assemble and
+Select the image to flash and that's it. The image named "free" includes
+[SeaVGABIOS](https://www.seabios.org/SeaVGABIOS) instead of
+[Intel's VGA Bios](https://www.intel.com/content/www/us/en/intelligent-systems/intel-embedded-graphics-drivers/faq-bios-firmware.html).
+Keep the backup safe, assemble and
 turn on the X230. coreboot will do hardware init and start SeaBIOS.
 
 ## Updating
diff --git a/x230/release.sh b/x230/release.sh
index e22638b..30d1bd2 100755
--- a/x230/release.sh
+++ b/x230/release.sh
@@ -7,13 +7,14 @@
 set -e
 have_version=0
 have_image=0
+have_image_2=0
 
 usage()
 {
-        echo "Usage: $0 -v version -i release_image"
+        echo "Usage: $0 -v version -i release_image -f second_release_image"
 }
 
-args=$(getopt -o v:i: -- "$@")
+args=$(getopt -o v:i:f: -- "$@")
 if [ $? -ne 0 ] ; then
         usage
         exit 1
@@ -27,6 +28,11 @@ do
 		have_image=1
 		shift
 		;;
+	-f)
+		RELEASE_IMAGE_2=$2
+		have_image_2=1
+		shift
+		;;
         -v)
                 version=$2
                 have_version=1
@@ -46,7 +52,12 @@ do
 done
 
 if [ ! "$have_image" -gt 0 ] ; then
-	echo "please provide a release image"
+	echo "we currently need 2 release images"
+	usage
+	exit 1
+fi
+if [ ! "$have_image_2" -gt 0 ] ; then
+	echo "we currently need 2 release images"
 	usage
 	exit 1
 fi
@@ -97,16 +108,25 @@ if [ ! "$filesize" -eq "$reference_filesize" ] ; then
 	echo "filesize of release image is wrong"
 	exit 1
 fi
+filesize=$(wc -c <"${RELEASE_IMAGE_2}")
+reference_filesize=4194304
+if [ ! "$filesize" -eq "$reference_filesize" ] ; then
+	echo "filesize of release image is wrong"
+	exit 1
+fi
 
 RELEASE_DIR="skulls-x230-${version}"
 rm -rf "$RELEASE_DIR"
 mkdir -p "$RELEASE_DIR"
 
-# copy-in the ROM
+# copy-in the ROMs
 cp "${RELEASE_IMAGE}" "$RELEASE_DIR"
+cp "${RELEASE_IMAGE_2}" "$RELEASE_DIR"
 
 RELEASE_IMAGE_FILE=$(basename "${RELEASE_IMAGE}")
 sha256sum ${RELEASE_DIR}/${RELEASE_IMAGE_FILE} > "${RELEASE_DIR}/${RELEASE_IMAGE_FILE}.sha256"
+RELEASE_IMAGE_FILE_2=$(basename "${RELEASE_IMAGE_2}")
+sha256sum ${RELEASE_DIR}/${RELEASE_IMAGE_FILE_2} > "${RELEASE_DIR}/${RELEASE_IMAGE_FILE_2}.sha256"
 
 # copy in device independent stuff
 cp ../SOURCE.md "$RELEASE_DIR"