Dasharo google celes/rel v0.1.0

.gitmodules

@@ -1,63 +1,69 @@
 [submodule "3rdparty/blobs"]
 	path = 3rdparty/blobs
-	url = ../blobs.git
+	url = https://github.com/MrChromebox/blobs.git
 	update = none
 	ignore = dirty
 [submodule "util/nvidia-cbootimage"]
 	path = util/nvidia/cbootimage
-	url = ../nvidia-cbootimage.git
+	url = https://review.coreboot.org/nvidia-cbootimage.git
 [submodule "vboot"]
 	path = 3rdparty/vboot
-	url = ../vboot.git
+	url = https://review.coreboot.org/vboot.git
 	branch = main
 [submodule "arm-trusted-firmware"]
 	path = 3rdparty/arm-trusted-firmware
-	url = ../arm-trusted-firmware.git
+	url = https://review.coreboot.org/arm-trusted-firmware.git
 [submodule "3rdparty/chromeec"]
 	path = 3rdparty/chromeec
-	url = ../chrome-ec.git
+	url = https://review.coreboot.org/chrome-ec.git
 [submodule "libhwbase"]
 	path = 3rdparty/libhwbase
-	url = ../libhwbase.git
+	url = https://review.coreboot.org/libhwbase.git
 [submodule "libgfxinit"]
 	path = 3rdparty/libgfxinit
-	url = ../libgfxinit.git
+	url = https://review.coreboot.org/libgfxinit.git
 [submodule "3rdparty/fsp"]
 	path = 3rdparty/fsp
-	url = ../fsp.git
+	url = https://review.coreboot.org/fsp.git
 	update = none
 	ignore = dirty
 [submodule "opensbi"]
 	path = 3rdparty/opensbi
-	url = ../opensbi.git
+	url = https://review.coreboot.org/opensbi.git
 [submodule "intel-microcode"]
 	path = 3rdparty/intel-microcode
-	url = ../intel-microcode.git
+	url = https://review.coreboot.org/intel-microcode.git
 	update = none
 	ignore = dirty
 	branch = main
 [submodule "3rdparty/ffs"]
 	path = 3rdparty/ffs
-	url = ../ffs.git
+	url = https://review.coreboot.org/ffs.git
 [submodule "3rdparty/amd_blobs"]
 	path = 3rdparty/amd_blobs
-	url = ../amd_blobs
+	url = https://review.coreboot.org/amd_blobs
 	update = none
 	ignore = dirty
 [submodule "3rdparty/cmocka"]
 	path = 3rdparty/cmocka
-	url = ../cmocka.git
+	url = https://review.coreboot.org/cmocka.git
 	update = none
 	branch = stable-1.1
 [submodule "3rdparty/qc_blobs"]
 	path = 3rdparty/qc_blobs
-	url = ../qc_blobs.git
+	url = https://review.coreboot.org/qc_blobs.git
 	update = none
 	ignore = dirty
 [submodule "3rdparty/intel-sec-tools"]
 	path = 3rdparty/intel-sec-tools
-	url = ../9esec-security-tooling.git
+	url = https://review.coreboot.org/9esec-security-tooling.git
 [submodule "3rdparty/stm"]
 	path = 3rdparty/stm
-	url = ../STM
+	url = https://review.coreboot.org/STM.git
 	branch = stmpe
+[submodule "3rdparty/purism-blobs"]
+	path = 3rdparty/purism-blobs
+	url = https://source.puri.sm/coreboot/purism-blobs.git
+[submodule "3rdparty/dasharo-blobs"]
+	path = 3rdparty/dasharo-blobs
+	url = [email protected]:Dasharo/dasharo-blobs.git

Makefile.inc

@@ -407,9 +407,20 @@ ifeq ($(CONFIG_COMPRESS_PRERAM_STAGES),y)
 CBFS_PRERAM_COMPRESS_FLAG:=LZ4
 endif
 
+strip_version = $(strip $(subst v,,$(subst ., ,$(1))))
+
 ifneq ($(CONFIG_LOCALVERSION),"")
 COREBOOT_EXTRA_VERSION := -$(call strip_quotes,$(CONFIG_LOCALVERSION))
+DASHARO_VERSION := $(call strip_quotes,$(CONFIG_LOCALVERSION))
+DASHARO_MAJOR_VERSION := $(word 1,$(call strip_version,$(DASHARO_VERSION)))
+DASHARO_MINOR_VERSION := $(word 2,$(call strip_version,$(DASHARO_VERSION)))
+DASHARO_PATCH_VERSION := $(word 3,$(call strip_version,$(DASHARO_VERSION)))
+
 COREBOOT_EXPORTS += COREBOOT_EXTRA_VERSION
+COREBOOT_EXPORTS += DASHARO_VERSION
+COREBOOT_EXPORTS += DASHARO_MAJOR_VERSION
+COREBOOT_EXPORTS += DASHARO_MINOR_VERSION
+COREBOOT_EXPORTS += DASHARO_PATCH_VERSION
 endif
 
 CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -Isrc/commonlib/bsd/include -I$(obj)
@@ -531,7 +542,9 @@ build_h := $(obj)/build.h
 # when we call it through the `$(shell)` function. This is fragile
 # but as variables newly added to `genbuild_h.sh` would just not
 # work, we'd notice that instantly at least.
-build_h_exports := BUILD_TIMELESS KERNELVERSION COREBOOT_EXTRA_VERSION
+build_h_exports := BUILD_TIMELESS KERNELVERSION COREBOOT_EXTRA_VERSION \
+				   DASHARO_VERSION DASHARO_MAJOR_VERSION DASHARO_MINOR_VERSION \
+				   DASHARO_PATCH_VERSION
 
 # Report new `build.ht` as dependency if `build.h` differs.
 build_h_check := \

build-uefi.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+
+set -e
+
+platforms=('snb_ivb' 'hsw' 'byt' 'bdw' 'bsw' 'skl' 'apl' 'kbl' 'whl' 'glk' \
+           'cml' 'jsl' 'tgl' 'str')
+build_targets=()
+
+json_file=cbmodels.json
+rom_path=https://www.mrchromebox.tech/files/firmware/full_rom/
+echo -e "{" > $json_file
+
+if [ -z "$1" ]; then
+	for subdir in "${platforms[@]}"; do
+		for cfg in configs/$subdir/config*.*; do
+			build_targets+=("$(basename $cfg | cut -f2 -d'.')")
+		done
+	done
+else
+	build_targets=($@)
+fi
+
+for device in "${build_targets[@]}"; do
+	filename="coreboot_tiano-${device}-mrchromebox_$(date +"%Y%m%d").rom"
+	rm -f ~/dev/firmware/${filename}*
+	rm -rf ./build
+	cfg_file=$(find ./configs -name "config.$device.uefi")
+	cp "$cfg_file" .config
+	make clean
+	make olddefconfig
+	make -j$(nproc)
+	cp ./build/coreboot.rom ./${filename}
+	sha1sum ${filename} > ${filename}.sha1
+	echo -e "\t\"${device}\": {" >> $json_file
+	echo -e "\t\t\"url\": \"${rom_path}${filename}\"," >> $json_file
+	echo -e "\t\t\"sha1\": \"$(cat ${filename}.sha1 | awk 'NR==1{print $1}')\"" >> $json_file
+	echo -e "\t}," >> $json_file
+	mv ${filename}* ~/dev/firmware/
+done
+echo -e "}" >> $json_file

cbfs/bootorder.emmc

@@ -0,0 +1,7 @@
+/rom@etc/sdcard0
+/rom@etc/sdcard1
+/rom@etc/sdcard2
+/rom@etc/sdcard3
+/rom@etc/sdcard4
+/rom@etc/sdcard5
+/rom@etc/sdcard6

cbfs/bootorder.emmc.apl

@@ -0,0 +1 @@
+/pci@i0cf8/*@1c

cbfs/bootorder.ssd

@@ -0,0 +1 @@
+/pci@i0cf8/*@1f,2/drive@0/disk@0

cbfs/bootorder.usb

@@ -0,0 +1,48 @@
+/pci@i0cf8/usb@14/usb-*@0
+/pci@i0cf8/usb@14/usb-*@1
+/pci@i0cf8/usb@14/usb-*@2
+/pci@i0cf8/usb@14/usb-*@3
+/pci@i0cf8/usb@14/usb-*@4
+/pci@i0cf8/usb@14/usb-*@5
+/pci@i0cf8/usb@14/usb-*@6
+/pci@i0cf8/usb@14/usb-*@7
+/pci@i0cf8/usb@14/usb-*@8
+/pci@i0cf8/usb@14/usb-*@9
+/pci@i0cf8/usb@14/usb-*@a
+/pci@i0cf8/usb@14/usb-*@b
+/pci@i0cf8/usb@14/usb-*@c
+/pci@i0cf8/usb@14/usb-*@d
+/pci@i0cf8/usb@14/usb-*@e
+/pci@i0cf8/usb@14/usb-*@f
+/pci@i0cf8/usb@14/hub@1/usb-*@0
+/pci@i0cf8/usb@14/hub@1/usb-*@1
+/pci@i0cf8/usb@14/hub@1/usb-*@2
+/pci@i0cf8/usb@14/hub@1/usb-*@3
+/pci@i0cf8/usb@14/hub@1/usb-*@4
+/pci@i0cf8/usb@14/hub@1/usb-*@5
+/pci@i0cf8/usb@14/hub@1/usb-*@6
+/pci@i0cf8/usb@14/hub@1/usb-*@7
+/pci@i0cf8/usb@14/hub@1/usb-*@8
+/pci@i0cf8/usb@14/hub@1/usb-*@9
+/pci@i0cf8/usb@14/hub@1/usb-*@a
+/pci@i0cf8/usb@14/hub@1/usb-*@b
+/pci@i0cf8/usb@14/hub@1/usb-*@c
+/pci@i0cf8/usb@14/hub@1/usb-*@d
+/pci@i0cf8/usb@14/hub@1/usb-*@e
+/pci@i0cf8/usb@14/hub@1/usb-*@f
+/pci@i0cf8/usb@1d/hub@1/*@0
+/pci@i0cf8/usb@1d/hub@1/*@1
+/pci@i0cf8/usb@1d/hub@1/*@2
+/pci@i0cf8/usb@1d/hub@1/*@3
+/pci@i0cf8/usb@1d/hub@1/*@4
+/pci@i0cf8/usb@1d/hub@1/*@5
+/pci@i0cf8/usb@1d/hub@1/*@6
+/pci@i0cf8/usb@1d/hub@1/*@7
+/pci@i0cf8/usb@1d/hub@1/usb-*@0
+/pci@i0cf8/usb@1d/hub@1/usb-*@1
+/pci@i0cf8/usb@1d/hub@1/usb-*@2
+/pci@i0cf8/usb@1d/hub@1/usb-*@3
+/pci@i0cf8/usb@1d/hub@1/usb-*@4
+/pci@i0cf8/usb@1d/hub@1/usb-*@5
+/pci@i0cf8/usb@1d/hub@1/usb-*@6
+/pci@i0cf8/usb@1d/hub@1/usb-*@7

cbfs/links.apl

@@ -0,0 +1,2 @@
+pci8086,5a84.rom seavgabios.rom
+pci8086,5a85.rom seavgabios.rom

cbfs/links.bsw

@@ -0,0 +1,2 @@
+pci8086,22b0.rom pci8086,22b0.rom
+pci8086,22b1.rom pci8086,22b0.rom

cbfs/links.hswbdw

@@ -0,0 +1,6 @@
+pci8086,0a06.rom pci8086,0406.rom # HSW U GT1
+pci8086,0a16.rom pci8086,0406.rom # HSW U GT2
+pci8086,0a26.rom pci8086,0406.rom # HSW U GT3
+pci8086,1606.rom pci8086,0406.rom # BDW U GT1
+pci8086,1616.rom pci8086,0406.rom # BDW U GT2
+pci8086,1626.rom pci8086,0406.rom # BDW U GT3

cbfs/links.kbl

@@ -0,0 +1,5 @@
+pci8086,5906.rom seavgabios.rom # Kabylake GT1 SULTM
+pci8086,591e.rom seavgabios.rom # Kabylake GT2 SULXM
+pci8086,5916.rom seavgabios.rom # Kabylake GT2 SULTM
+pci8086,5917.rom seavgabios.rom # Kabylake GT2 SULTMR
+pci8086,591b.rom seavgabios.rom # Kabylake GT2 SHALM

cbfs/links.sbib

@@ -0,0 +1,10 @@
+pci8086,0106.rom pci8086,0106.rom
+pci8086,0116.rom pci8086,0106.rom
+pci8086,0126.rom pci8086,0106.rom
+pci8086,0136.rom pci8086,0106.rom
+pci8086,0146.rom pci8086,0106.rom
+pci8086,0156.rom pci8086,0106.rom
+pci8086,0166.rom pci8086,0106.rom
+pci8086,0176.rom pci8086,0106.rom
+pci8086,0186.rom pci8086,0106.rom
+pci8086,0196.rom pci8086,0106.rom

cbfs/links.skl

@@ -0,0 +1,3 @@
+pci8086,1906.rom pci8086,0406.rom # SKL GT1 ULT
+pci8086,1916.rom pci8086,0406.rom # SKL GT2 ULT
+pci8086,191e.rom pci8086,0406.rom # SKL GT2 ULX

configs/apl/config.astronaut.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Astronaut"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.babymega.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Babymega"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.babytiger.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Babytiger"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.blacktip.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Blacktip"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.blue.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Blue"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.bruce.uefi

@@ -0,0 +1,17 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Bruce"
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y

configs/apl/config.coral.uefi

@@ -0,0 +1,16 @@
+CONFIG_LOCALVERSION="MrChromebox-4.17.2"
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_NO_POST=y
+CONFIG_INCLUDE_NHLT_BLOBS=y
+CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/google/reef/flashdescriptor.bin"
+CONFIG_BOARD_GOOGLE_CORAL=y
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_NEED_IFWI=y
+CONFIG_IFWI_FILE_NAME="3rdparty/blobs/mainboard/google/reef/coral/ifwi.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/soc/intel/apl/cpu_microcode_blob.bin"
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL=y
+CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE="3rdparty/blobs/mainboard/google/reef/coral/ec.RW.flat"
+CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+CONFIG_PAYLOAD_TIANOCORE=y