WIP: Pcengines trenchboot 4.11.x

.gitignore

@@ -24,6 +24,8 @@ payloads/external/U-Boot/u-boot/
 payloads/external/Memtest86Plus/memtest86plus/
 payloads/external/iPXE/ipxe/
 payloads/external/sortbootorder/sortbootorder
+payloads/external/linux/linux/
+payloads/external/u-root/uroot/
 util/crossgcc/acpica-unix-*/
 util/crossgcc/binutils-*/
 util/crossgcc/build-*BINUTILS/

.gitmodules

@@ -42,3 +42,7 @@
 	url = https://review.coreboot.org/amd_blobs.git
 	update = none
 	ignore = dirty
+[submodule "payloads/external/landing-zone"]
+	path = payloads/external/landing-zone
+	url = https://github.com/TrenchBoot/landing-zone.git
+

configs/config.pcengines_apu2.tb

@@ -0,0 +1,14 @@
+CONFIG_LOCALVERSION="v4.10.0.2"
+CONFIG_VENDOR_PCENGINES=y
+CONFIG_FMDFILE="$(top)/src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
+CONFIG_VBOOT=y
+CONFIG_BOARD_PCENGINES_APU2=y
+CONFIG_NO_GFX_INIT=y
+CONFIG_VBOOT_MEASURED_BOOT=y
+CONFIG_USER_TPM2=y
+CONFIG_PAYLOAD_GRUB2=y
+CONFIG_GRUB2_REVISION=y
+CONFIG_GRUB2_INCLUDE_RUNTIME_CONFIG_FILE=y
+CONFIG_GRUB2_TRENCHBOOT_DRTM=y
+CONFIG_GRUB2_INCLUDE_UROOT=y
+CONFIG_GRUB2_REVISION_ID="origin/trenchboot_support_2.04"

configs/config.pcengines_apu2_tb_ipxe

@@ -0,0 +1,23 @@
+CONFIG_LOCALVERSION="v4.11.0.1"
+CONFIG_VENDOR_PCENGINES=y
+CONFIG_PAYLOAD_CONFIGFILE="$(top)/src/mainboard/$(MAINBOARDDIR)/seabios_config"
+CONFIG_BOARD_PCENGINES_APU2=y
+CONFIG_PXE_ROM_ID="8086,157b"
+CONFIG_NO_GFX_INIT=y
+CONFIG_USER_TPM2=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
+CONFIG_SEABIOS_REVISION=y
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder"
+CONFIG_SEABIOS_DEBUG_LEVEL=0
+CONFIG_PXE=y
+CONFIG_BUILD_IPXE=y
+CONFIG_IPXE_LZ=y
+# CONFIG_PXE_SERIAL_CONSOLE is not set
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
+CONFIG_PXE_ADD_SCRIPT=y
+CONFIG_PXE_SCRIPT="payloads/external/iPXE/menu.ipxe"
+CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
+CONFIG_SORTBOOTORDER_SECONDARY_PAYLOAD=y
+CONFIG_MEMTEST_REVISION=y
+CONFIG_MEMTEST_REVISION_ID="0bd34c22604660e4283316331f3e7bf8a3863753"

grub.cfg

@@ -0,0 +1,10 @@
+set debug=linux
+serial --speed=115200 --word=8 --parity=no --stop=1
+terminal_input --append  serial
+terminal_output --append serial
+
+linux (cbfsdisk)/bzImage console=ttyS0,115200 earlyprintk=serial,ttyS0,115200
+initrd (cbfsdisk)/initrd
+slaunch skinit
+slaunch_module (cbfsdisk)/lz_header
+boot

payloads/Makefile.inc

@@ -38,6 +38,8 @@ payloads/external/tianocore \
 payloads/external/GRUB2 \
 payloads/external/LinuxBoot \
 payloads/external/Yabits \
+payloads/external/linux \
+payloads/external/u-root \
 
 payloads/coreinfo/build/coreinfo.elf coreinfo:
 	$(MAKE) -C payloads/coreinfo defaultbuild

payloads/external/GRUB2/Kconfig

@@ -28,12 +28,14 @@ endchoice
 config GRUB2_REVISION_ID
 	string "Insert a commit's SHA-1 or a branch name"
 	depends on GRUB2_REVISION
+	default "origin/move_header" if GRUB2_TRENCHBOOT_DRTM
 	default "origin/master"
 	help
 	   The commit's SHA-1 or branch name of the revision to use.
 
 config GRUB2_EXTRA_MODULES
 	string "Extra modules to include in GRUB image"
+	default "slaunch" if GRUB2_TRENCHBOOT_DRTM
 	help
 	  Space-separated list of additional modules to include. Few common
 	  ones:
@@ -71,4 +73,18 @@ config GRUB2_RUNTIME_CONFIG_FILE
 	help
 	  The path of the GRUB2 runtime configuration file to be added to CBFS.
 
+config GRUB2_TRENCHBOOT_DRTM
+	bool "Add TrenchBoot DRTM support"
+	depends on PAYLOAD_GRUB2
+	default n
+	help
+	  Enable Trenchboot DRTM extensions in GRUB2 and build LandingZone binary that will be included in CBFS.
+
+config GRUB2_INCLUDE_UROOT
+	bool "Include u-root binaries"
+	depends on GRUB2_TRENCHBOOT_DRTM
+	default no
+	help
+	  Include Linux kernel with u-root initrd.
+
 endif

payloads/external/GRUB2/Makefile

@@ -5,31 +5,41 @@ NAME-$(CONFIG_GRUB2_MASTER)=HEAD
 NAME-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID)
 NAME-$(CONFIG_GRUB2_STABLE)=2.04
 
-project_git_repo=https://git.savannah.gnu.org/git/grub.git/
+project_git_repo=https://github.com/3mdeb/grub.git
 project_dir=grub2
 
 unexport HOSTCC CC LD OBJCOPY STRIP
 MAKEOVERRIDES :=
 
 all: grub2
 
-checkout:
-	echo "    GIT        GRUB2 $(NAME-y)"
-	test -d $(project_dir) || git clone $(project_git_repo) $(project_dir)
-	git -C $(project_dir) fetch
-ifeq ("$(shell test -d $(project_dir) && \
-	(git -C $(project_dir) status --ignored=no --untracked-files=no --porcelain))",)
-	git -C $(project_dir) checkout -f $(TAG-y)
-else
-	echo "WARNING: index/tree not clean, skipping update / force checkout."
-	echo "         Checkout manually with `git -C $(project_dir) checkout -f`."
+clone:
+	echo "    Cloning GRUB2 from Git"
+	git clone $(project_git_repo) $(project_dir)
+
+fetch: clone
+ifeq ($(TAG-y),)
+	echo "Error: The specified tag is invalid"
+ifeq ($(CONFIG_GRUB2_REVISION),y)
+	echo "Error: There is no revision specified for GRUB2"
+	false
+endif
+	false
 endif
+	cd grub2; git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ] || \
+		[ "$(TAG-y)" = "origin/master" ]; then \
+		echo "    Fetching new commits from the GRUB2 git repo"; \
+		git fetch; fi
+
+checkout: fetch
+	echo "    Checking out GRUB2 revision $(TAG-y)"
+	cd grub2; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
 
 grub2/build/config.h: $(CONFIG_DEP) | checkout
 	echo "    CONFIG     GRUB2 $(NAME-y)"
 	rm -rf grub2/build
 	mkdir grub2/build
-	cd grub2 && ./bootstrap ; ./autogen.sh
+	cd grub2 && ./bootstrap && ./autogen.sh
 	cd grub2/build && ../configure CC="$(HOSTCC)" LD="$(LD)" \
 	FREETYPE="pkg-config freetype2" BUILD_FREETYPE="pkg-config freetype2" \
 	TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \

payloads/external/Makefile.inc

@@ -223,8 +223,40 @@ grub2: $(obj)/config.h
 			CONFIG_GRUB2_REVISION_ID=$(CONFIG_GRUB2_REVISION_ID) \
 			CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES)
 
+lzheader:
+	$(MAKE) -C payloads/external/landing-zone \
+			CC="$(HOSTCC)"
+
+linux:
+	$(MAKE) -C payloads/external/linux
+
+uroot:
+	$(MAKE) -C payloads/external/u-root
+
 payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
 
+ifneq ($(CONFIG_GRUB2_TRENCHBOOT_DRTM),)
+payloads/external/landing-zone/lz_header.bin: lzheader 
+cbfs-files-y += lz_header
+lz_header-file := payloads/external/landing-zone/lz_header.bin
+lz_header-type := raw
+endif
+
+ifneq ($(CONFIG_GRUB2_INCLUDE_UROOT),)
+payloads/external/linux/linux/bzImage: linux
+payloads/external/u-root/uroot/initramfs.cpio.lzma: uroot
+
+cbfs-files-y += bzImage
+bzImage-file := payloads/external/linux/linux/bzImage
+bzImage-type := raw
+bzImage-compression := none
+
+cbfs-files-y += initrd
+initrd-file := payloads/external/u-root/uroot/initramfs.cpio.lzma
+initrd-type := raw
+initrd-compression := none
+endif
+
 # U-Boot
 
 payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG)
@@ -321,6 +353,7 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(PXE_CONFIG_SCRIPT)
 	PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \
 	CONFIG_IPXE_MASTER=$(CONFIG_IPXE_MASTER) \
 	CONFIG_IPXE_STABLE=$(CONFIG_IPXE_STABLE) \
+	CONFIG_IPXE_LZ=$(CONFIG_IPXE_LZ) \
 	CONSOLE_SERIAL=$(IPXE_SERIAL_CONSOLE) \
 	IPXE_UART=$(IPXE_UART) \
 	CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \

payloads/external/iPXE/Kconfig

@@ -54,6 +54,11 @@ config IPXE_MASTER
 	help
 	  Newest iPXE version.
 
+config IPXE_LZ
+	bool "landing_zone"
+	help
+	  iPXE with support for TrenchBoot's Landing Zone.
+
 endchoice
 
 config PXE_ROM_FILE

payloads/external/iPXE/Makefile

@@ -19,10 +19,15 @@ STABLE_COMMIT_ID=ebf2eaf515e46abd43bc798e7e4ba77bfe529218
 
 TAG-$(CONFIG_IPXE_MASTER)=origin/master
 TAG-$(CONFIG_IPXE_STABLE)=$(STABLE_COMMIT_ID)
+TAG-$(CONFIG_IPXE_LZ)=origin/landing_zone
 
 project_name=iPXE
 project_dir=ipxe
+ifeq ($(CONFIG_IPXE_LZ),y)
+project_git_repo=https://github.com/3mdeb/ipxe.git
+else
 project_git_repo=https://git.ipxe.org/ipxe.git
+endif
 
 unexport KCONFIG_AUTOHEADER
 unexport KCONFIG_AUTOCONFIG

payloads/external/linux/Makefile

@@ -0,0 +1,46 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2016 Google Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+project_name=Linux
+project_dir=$(CURDIR)/linux
+project_git_repo=https://github.com/3mdeb/linux-stable.git
+project_git_branch=linux-sl-5.1-sha2-amd
+
+unexport $(COREBOOT_EXPORTS)
+
+all: build
+
+$(project_dir):
+	echo "    Cloning $(project_name) from Git"
+	git clone $(project_git_repo) $(project_dir) --depth=1 -b $(project_git_branch)
+
+build: $(project_dir)
+	echo "    MAKE       $(project_name)"
+	cp $(CURDIR)/linux_defconfig-5.1 $(project_dir)/.config
+	$(MAKE) -C $(project_dir) olddefconfig V=1
+	$(MAKE) -C $(project_dir) bzImage V=1
+	cp $(project_dir)/arch/x86/boot/bzImage $(project_dir)/bzImage
+
+clean:
+	test -d $(project_dir) && rm $(project_dir)/bzImage || exit 0
+	test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
+
+distclean:
+	rm -rf $(project_dir)
+
+print-repo-info:
+	echo "$(project_git_repo) $(project_dir)"
+
+.PHONY: all build clean distclean print-repo-info