Sync

.circleci/config.yml

@@ -2,88 +2,61 @@ version: 2
 jobs:
   build:
     docker:
-      - image: osresearch/heads-ubuntu:16.04
+      - image: osresearch/musl-cross:38e52db
     steps:
-      - run:
-          name: Install dependencies
-          command: |
-            apt update
-            apt install -y \
-              build-essential \
-              zlib1g-dev \
-              uuid-dev \
-              libdigest-sha-perl \
-              libelf-dev \
-              bc \
-              bzip2 \
-              bison \
-              flex \
-              git \
-              gnupg \
-              iasl \
-              m4 \
-              nasm \
-              patch \
-              python \
-              wget \
-              gnat \
-              cpio \
-              ccache \
-              lzma \
-
       - checkout
 
       - run:
           name: Bootstrap make
           command: |
             make -j4 bootstrap
 
-      - run:
-          name: Bootstrap coreboot-gcc
-          command: |
-            ./build/make-4.2.1/make \
-                TOOLCHAIN=/home/builder/heads \
-                V=1 \
-                BOARD=qemu-coreboot \
-                coreboot-gcc
+# linuxboot steps need something to pass in the kernel header path
+# skipping for now
+#      - run:
+#          name: qemu-linuxboot-edk2
+#          command: |
+#            ./build/make-4.2.1/make \
+#                CROSS=/cross/bin/x86_64-linux-musl- \
+#                BOARD=qemu-linuxboot \
+#                `/bin/pwd`/build/linuxboot-git/build/qemu/.configured \
+#                # Run first to avoid too many processes
+#
+#      - run:
+#          name: qemu-linuxboot
+#          command: |
+#            ./build/make-4.2.1/make \
+#                CROSS=/cross/bin/x86_64-linux-musl- \
+#                --load 2 \
+#                V=1 \
+#                BOARD=qemu-linuxboot \
+#
+#      - store-artifacts:
+#          path: build/qemu-linuxboot/linuxboot.rom
+#      - store-artifacts:
+#          path: build/qemu-linuxboot/hashes.txt
 
 
       - run:
           name: qemu-coreboot
           command: |
             ./build/make-4.2.1/make \
-                TOOLCHAIN=/home/builder/heads \
+                CROSS=/cross/bin/x86_64-linux-musl- \
+                --load 2 \
                 V=1 \
-                -j4 \
                 BOARD=qemu-coreboot \
 
       - store-artifacts:
           path: build/qemu-coreboot/coreboot.rom
       - store-artifacts:
           path: build/qemu-coreboot/hashes.txt
 
-
-      - run:
-          name: qemu-linuxboot
-          command: |
-            ./build/make-4.2.1/make \
-                TOOLCHAIN=/home/builder/heads \
-                V=1 \
-                -j4 \
-                BOARD=qemu-linuxboot \
-
-      - store-artifacts:
-          path: build/qemu-linuxboot/linuxboot.rom
-      - store-artifacts:
-          path: build/qemu-linuxboot/hashes.txt
-
-
       - run:
           name: x230
           command: |
             ./build/make-4.2.1/make \
-                TOOLCHAIN=/home/builder/heads \
-                -j4 \
+                CROSS=/cross/bin/x86_64-linux-musl- \
+                --load 2 \
                 V=1 \
                 BOARD=x230 \
 

Makefile

@@ -106,11 +106,13 @@ SHELL := /bin/bash
 # be defined prior to any other module.
 include modules/musl-cross
 
-musl_dep	:= musl
-heads_cc	:= $(INSTALL)/bin/musl-gcc \
+musl_dep	:= musl-cross
+heads_cc	:= $(CROSS)gcc \
 	-fdebug-prefix-map=$(pwd)=heads \
 	-gno-record-gcc-switches \
 	-D__MUSL__ \
+	-I$(INSTALL)/include \
+	-L$(INSTALL)/lib \
 
 CROSS_TOOLS_NOCC := \
 	AR="$(CROSS)ar" \
@@ -145,8 +147,9 @@ all:
 FORCE:
 
 # Make helpers to operate on lists of things
+# Prefix is "smart" and doesn't add the prefix for absolute file paths
 define prefix =
-$(foreach _, $2, $1$_)
+$(foreach _, $2, $(if $(patsubst /%,,$_),$1$_,$_))
 endef
 define map =
 $(foreach _,$2,$(eval $(call $1,$_)))
@@ -264,17 +267,18 @@ define define_module =
     # Unpack the tar file and touch the canary so that we know
     # that the files are all present
     $(build)/$($1_base_dir)/.canary: $(packages)/.$1-$($1_version)_verify
-	tar -xf "$(packages)/$($1_tar)" -C "$(build)"
+	mkdir -p "$$(dir $$@)"
+	tar -xf "$(packages)/$($1_tar)" $(or $($1_tar_opt),--strip 1) -C "$$(dir $$@)"
 	if [ -r patches/$1-$($1_version).patch ]; then \
-		( cd $(build)/$($1_base_dir) ; patch -p1 ) \
+		( cd $$(dir $$@) ; patch -p1 ) \
 			< patches/$1-$($1_version).patch \
 			|| exit 1 ; \
 	fi
 	if [ -d patches/$1-$($1_version) ] && \
 	   [ -r patches/$1-$($1_version) ] ; then \
 		for patch in patches/$1-$($1_version)/*.patch ; do \
 			echo "Applying patch file : $$$$patch " ;  \
-			( cd $(build)/$($1_base_dir) ; patch -p1 ) \
+			( cd $$(dir $$@) ; patch -p1 ) \
 				< $$$$patch \
 				|| exit 1 ; \
 		done ; \
@@ -409,6 +413,7 @@ endef
 
 # Only some modules have binaries that we install
 # Shouldn't this be specified in the module file?
+#bin_modules-$(CONFIG_MUSL) += musl-cross
 bin_modules-$(CONFIG_KEXEC) += kexec
 bin_modules-$(CONFIG_TPMTOTP) += tpmtotp
 bin_modules-$(CONFIG_PCIUTILS) += pciutils
@@ -450,8 +455,7 @@ endif
 $(COREBOOT_UTIL_DIR)/cbmem/cbmem \
 $(COREBOOT_UTIL_DIR)/superiotool/superiotool \
 $(COREBOOT_UTIL_DIR)/inteltool/inteltool \
-: $(build)/$(coreboot_base_dir)/.canary \
-	$(build)/$(musl_dir)/.build
+: $(build)/$(coreboot_base_dir)/.canary
 	+$(call do,MAKE,$(notdir $@),\
 		$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
 	)
@@ -563,7 +567,6 @@ modules.clean:
 real.clean:
 	for dir in \
 		$(module_dirs) \
-		$(musl_dir) \
 		$(kernel_headers) \
 	; do \
 		if [ ! -z "$$dir" ]; then \

blobs/librem_kbl/get_blobs.sh

@@ -2,15 +2,16 @@
 # depends on : wget sha256sum gunzip
 
 # Purism source
-PURISM_SOURCE="https://source.puri.sm/coreboot/releases/raw/master"
+RELEASES_GIT_HASH="9828ffc0fbe7e0da65f10fe5e14f68f0ef061d5d"
+PURISM_SOURCE="https://source.puri.sm/coreboot/releases/raw/${RELEASES_GIT_HASH}"
 
 # Librem 13 v4 and Librem 15 v4 binary blob hashes
-KBL_UCODE_SHA="a420274eecca369fcca465cc46725d61c0ae8ca2e18f201b1751faf9e081fb2e"
+KBL_UCODE_SHA="bb07f0f77abe08e553f85b99d18fa129f991bf3613cf73d77c4f0ece87dd251e"
 KBL_DESCRIPTOR_SHA="642ca36f52aabb5198b82e013bf64a73a5148693a58376fffce322a4d438b524"
 KBL_ME_SHA="0eec2e1135193941edd39d0ec0f463e353d0c6c9068867a2f32a72b64334fb34"
-KBL_FSPM_SHA="5da3ad7718eb3f6700fb9d97be988d9c8bdd2d8b5910273a80928c49122d5b2d"
-KBL_FSPS_SHA="c81ffa40df0b6cd6cfde4f476d452a1f6f2217bc96a3b98a4fa4a037ee7039cf"
-KBL_VBT_SHA="0ba40c1b8c0fb030a0e1a789eda8b2a7369339a410ad8c4620719e451ea69b98"
+KBL_FSPM_SHA="b285fc2240df7fee4fa069444cc2be2ebf5ea70af21b722b0e3dd102321b4877"
+KBL_FSPS_SHA="223d0f3d3ff28c46a3ac33442385ffedefe2d3063774784d4fef432013568019"
+KBL_VBT_SHA="45135459f7cbc06675fec5688479c2e2f4335d77c61bb58e4016d32ba7daa9d0"
 
 # cbfstool, ifdtool, coreboot image from Purism repo
 CBFSTOOL_FILE="cbfstool.gz"
@@ -26,7 +27,7 @@ IFDTOOL_BIN="./ifdtool"
 COREBOOT_IMAGE="coreboot-l13v4.rom"
 COREBOOT_IMAGE_FILE="$COREBOOT_IMAGE.gz"
 COREBOOT_IMAGE_URL="$PURISM_SOURCE/librem_13v4/$COREBOOT_IMAGE_FILE"
-COREBOOT_IMAGE_SHA="4491efd0a8b2de5a88fd7491a5d2605884ed956c3d271d7761906269b4cfb601"
+COREBOOT_IMAGE_SHA="5a7548e2742289fa66339f817f4247599d51bc7a5a6a9e887efd39fcf7f9e831"
 
 die () {
     local msg=$1
@@ -121,4 +122,4 @@ rm -f $COREBOOT_IMAGE >/dev/null 2>&1
 rm -f *.gz >/dev/null 2>&1
 
 echo ""
-echo "All blobs have been verified and are ready for use"
+echo "All blobs have been verified and are ready for use"

blobs/librem_skl/get_blobs.sh

@@ -2,15 +2,16 @@
 # depends on : wget sha256sum gunzip
 
 # Purism source
-PURISM_SOURCE="https://source.puri.sm/coreboot/releases/raw/master"
+RELEASES_GIT_HASH="9828ffc0fbe7e0da65f10fe5e14f68f0ef061d5d"
+PURISM_SOURCE="https://source.puri.sm/coreboot/releases/raw/${RELEASES_GIT_HASH}"
 
 # Librem 13 v2/v3 and Librem 15 v3 binary blob hashes
-SKL_UCODE_SHA="9c84936df700d74612a99e6ab581640ecf423d25a0b74a1ea23a6d9872349213"
+SKL_UCODE_SHA="e528d2ccc5d76cd04bfabb556a3fbb70b93d9aca43e291e0f0104fbaae5720fd"
 SKL_DESCRIPTOR_SHA="642ca36f52aabb5198b82e013bf64a73a5148693a58376fffce322a4d438b524"
 SKL_ME_SHA="cf06d3eb8b24490a1ab46fd988b6cef822e5347cd6a2e92bc332cb4a376eb8bc"
-SKL_FSPM_SHA="5da3ad7718eb3f6700fb9d97be988d9c8bdd2d8b5910273a80928c49122d5b2d"
-SKL_FSPS_SHA="c81ffa40df0b6cd6cfde4f476d452a1f6f2217bc96a3b98a4fa4a037ee7039cf"
-SKL_VBT_SHA="0ba40c1b8c0fb030a0e1a789eda8b2a7369339a410ad8c4620719e451ea69b98"
+SKL_FSPM_SHA="5f402416894c324b6cbf8cba85068ac2c3de9be8dd4f37fae3af6cfed7acc38e"
+SKL_FSPS_SHA="223d0f3d3ff28c46a3ac33442385ffedefe2d3063774784d4fef432013568019"
+SKL_VBT_SHA="45135459f7cbc06675fec5688479c2e2f4335d77c61bb58e4016d32ba7daa9d0"
 
 # cbfstool, ifdtool, coreboot image from Purism repo
 CBFSTOOL_FILE="cbfstool.gz"
@@ -23,10 +24,10 @@ IFDTOOL_URL="$PURISM_SOURCE/tools/$IFDTOOL_FILE"
 IFDTOOL_SHA="08228ece4968794499ebd49a851f7d3f7f1b81352da8cd6e0c7916ac931a7d72"
 IFDTOOL_BIN="./ifdtool"
 
-COREBOOT_IMAGE="coreboot-l13v3.rom"
+COREBOOT_IMAGE="coreboot-l13v2.rom"
 COREBOOT_IMAGE_FILE="$COREBOOT_IMAGE.gz"
-COREBOOT_IMAGE_URL="$PURISM_SOURCE/librem_13v3/$COREBOOT_IMAGE_FILE"
-COREBOOT_IMAGE_SHA="34276a7b82624cfb29aed688df7f2b4e747a9e951196e376732e972c8575ece6"
+COREBOOT_IMAGE_URL="$PURISM_SOURCE/librem_13v2/$COREBOOT_IMAGE_FILE"
+COREBOOT_IMAGE_SHA="c703e0e705554bc7eb90814ae933d4372c0042927a6bbd7f27024cb99a8993d6"
 
 die () {
     local msg=$1
@@ -121,4 +122,4 @@ rm -f $COREBOOT_IMAGE >/dev/null 2>&1
 rm -f *.gz >/dev/null 2>&1
 
 echo ""
-echo "All blobs have been verified and are ready for use"
+echo "All blobs have been verified and are ready for use"

blobs/t420/extract.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+function printusage {
+  echo "Usage: $0 -f <romdump> -m <me_cleaner>(optional) -i <ifdtool>(optional)"
+  exit 0
+}
+
+BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ "$#" -eq 0 ]; then printusage; fi
+
+while getopts ":f:m:i:" opt; do
+  case $opt in
+    f)
+      FILE="$OPTARG"
+      ;;
+    m)
+      if [ -x "$OPTARG" ]; then
+        MECLEAN="$OPTARG"
+      fi
+      ;;
+    i)
+      if [ -x "$OPTARG" ]; then
+        IFDTOOL="$OPTARG"
+      fi
+      ;;
+  esac
+done
+
+if [ -z "$MECLEAN" ]; then
+  MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1`
+  if [ -z "$MECLEAN" ]; then
+    echo "me_cleaner.py required but not found or specified with -m. Aborting."
+    exit 1;
+  fi
+fi
+
+if [ -z "$IFDTOOL" ]; then
+  IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1`
+  if [ -z "$IFDTOOL" ]; then
+    echo "ifdtool required but not found or specified with -m. Aborting."
+    exit 1;
+  fi
+fi
+
+echo "FILE: $FILE"
+echo "ME: $MECLEAN"
+echo "IFD: $IFDTOOL"
+
+bioscopy=$(mktemp)
+extractdir=$(mktemp -d)
+
+cp "$FILE" $bioscopy
+
+cd "$extractdir"
+$IFDTOOL -x $bioscopy
+cp "$extractdir/flashregion_3_gbe.bin" "$BLOBDIR/gbe.bin"
+$MECLEAN -O "$BLOBDIR/me.bin" -r -t "$extractdir/flashregion_2_intel_me.bin"
+$IFDTOOL -n "$BLOBDIR/layout.txt" $bioscopy
+$IFDTOOL -x $bioscopy.new
+cp "$extractdir/flashregion_0_flashdescriptor.bin" "$BLOBDIR/ifd.bin"
+
+rm "$bioscopy"
+rm "$bioscopy.new"
+rm -r "$extractdir"

blobs/t420/layout.txt

@@ -0,0 +1,4 @@
+00000000:00000fff fd
+00018000:007fffff bios
+00003000:00017fff me
+00001000:00002fff gbe

blobs/t420/readme.md

@@ -0,0 +1,29 @@
+To build for T420, we need to have the following files in this folder:
+* `me.bin` - ME binary that has been stripped and truncated with me_cleaner
+* `gbe.bin` - Network card blob from the original firmware
+* `ifd.bin` - Flash layout file has been provided as text
+
+To get the binaries, start with a copy of the original Lenovo firmware image.
+If you do not have one already, you can read one out from the laptops SPI flash with flashrom
+
+```
+flashrom -p <programmer> -r original.bin
+```
+
+Set `<programmer>` to the flashrom programmer type that you will use (for example, `linux_spi:dev=/dev/spidev0.0` on a Raspberry Pi).
+
+Once you have the image, the provided extraction script will extract the files needed.
+
+```
+./extract.sh -f <romdump>
+```
+
+Use the options '-m' and '-i' to provide me_cleaner and ifdtool if they can not be located automatically.
+
+The flash layout will be automatically adjusted and the ME image cleaned and truncated.
+
+You can now compile the image with:
+
+```
+make BOARD=t420
+```