Merge pull request #1403 from tlaurion/libgfxinit-or-native-gfx-init_…

…simplefb_linuxboot_splashscreen libgfxinit/nativegfx init: efifb enforced fb (+coreboot ramstage enabled bootsplash)
linuxboot · Aug 16, 2023 · 6e31163 · 6e31163
2 parents fbc0993 + 97f39a8
commit 6e31163
Show file tree

Hide file tree

Showing 52 changed files with 3,919 additions and 883 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ commands:
           command: |
             ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
             apt update
-            apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg gawk iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo libssl-dev device-tree-compiler u-boot-tools sharutils e2fsprogs parted curl unzip
+            apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg gawk iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo libssl-dev device-tree-compiler u-boot-tools sharutils e2fsprogs parted curl unzip imagemagick
       - run:
           name: Make Board (FULL ORDERED BUILD LOGS HERE UNTIL JOB FAILED)
           command: |
@@ -51,7 +51,7 @@ jobs:
           command: |
             ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime 
             apt update
-            apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg gawk iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo
+            apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg gawk iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo imagemagick
       - checkout
 
       - run:
@@ -303,22 +303,22 @@ workflows:
             - x230-hotp-maximized
 
       - build:
-          name: t430-legacy-flash
-          target: t430-legacy-flash
+          name: UNTESTED_t430-legacy-flash
+          target: UNTESTED_t430-legacy-flash
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t430-legacy
-          target: t430-legacy
+          name: UNTESTED_t430-legacy
+          target: UNTESTED_t430-legacy
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t430-hotp-legacy
-          target: t430-hotp-legacy
+          name: UNTESTED_t430-hotp-legacy
+          target: UNTESTED_t430-hotp-legacy
           subcommand: ""
           requires:
             - x230-hotp-maximized
@@ -485,15 +485,15 @@ workflows:
             - x230-hotp-maximized
 
       - build:
-          name: UNTESTED_p8z77-m_pro-tpm1-maximized
-          target: UNTESTED_p8z77-m_pro-tpm1-maximized
+          name: p8z77-m_pro-tpm1-maximized
+          target: p8z77-m_pro-tpm1-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
-          target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
+          name: p8z77-m_pro-tpm1-hotp-maximized
+          target: p8z77-m_pro-tpm1-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized

diff --git a/.../t430-hotp-legacy/t430-hotp-legacy.config → ...p-legacy/UNTESTED_t430-hotp-legacy.config b/.../t430-hotp-legacy/t430-hotp-legacy.config → ...p-legacy/UNTESTED_t430-hotp-legacy.config
diff --git a/...430-legacy-flash/t430-legacy-flash.config → ...y-flash/UNTESTED_t430-legacy-flash.config b/...430-legacy-flash/t430-legacy-flash.config → ...y-flash/UNTESTED_t430-legacy-flash.config
@@ -1,9 +1,16 @@
 # Minimal configuration for a t430 to support flashrom and USB
+# This top SPI flash image needed to flash legacy board counterpart internally
+# This image can be flashed through 1vyrain and skulls
+# IDEALLY you should flash maximized top and bottom rom images exteranlly once instead.
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
 export CONFIG_LINUX_VERSION=5.10.5
 
+CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy-flash.config
+CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
+
+#Add bare minimal tools for flashing boards
 CONFIG_BASH=n
 CONFIG_FLASHROM=y
 #CONFIG_GPG=y
@@ -14,7 +21,7 @@ CONFIG_PCIUTILS=y
 #CONFIG_TPMTOTP=y
 #CONFIG_DROPBEAR=y
 
-CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
+#Additional hardware support
 CONFIG_LINUX_USB=y
 #CONFIG_LINUX_E1000E=y
 

diff --git a/boards/t430-legacy/t430-legacy.config → ...D_t430-legacy/UNTESTED_t430-legacy.config b/boards/t430-legacy/t430-legacy.config → ...D_t430-legacy/UNTESTED_t430-legacy.config
diff --git a/boards/UNTESTED_x220/UNTESTED_x220.config b/boards/UNTESTED_x220/UNTESTED_x220.config
@@ -6,6 +6,10 @@ export CONFIG_LINUX_VERSION=5.10.5
 CONFIG_COREBOOT_CONFIG=config/coreboot-x220.config
 CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
 
+#Additional hardware support
+CONFIG_LINUX_USB=y
+CONFIG_LINUX_E1000E=y
+
 CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
@@ -15,18 +19,37 @@ CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_PCIUTILS=y
+
+#platform locking finalization (PR0)
+CONFIG_IO386=y
+export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y
+
+
+#Remote attestation support
+#TPM based requirements
+export CONFIG_TPM=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
-CONFIG_DROPBEAR=n
+#HOTP based remote attestation for supported USB Security dongle
+#With/Without TPM support
+#CONFIG_HOTPKEY=y
+
+#Nitrokey Storage admin tool
+CONFIG_NKSTORECLI=n
 
+#GUI Support
+#Console based Whiptail support(Console based, no FB):
+#CONFIG_SLANG=y
+#CONFIG_NEWT=y
+#FBWhiptail based (Graphical):
 CONFIG_CAIRO=y
 CONFIG_FBWHIPTAIL=y
 
-CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=y
+#Additional tools:
+#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
+CONFIG_DROPBEAR=n
 
-export CONFIG_TPM=y
 export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n

diff --git a/...ED_p8z77-m_pro-tpm1-hotp-maximized.config → ...ed/p8z77-m_pro-tpm1-hotp-maximized.config b/...ED_p8z77-m_pro-tpm1-hotp-maximized.config → ...ed/p8z77-m_pro-tpm1-hotp-maximized.config
@@ -1,5 +1,5 @@
 # Inherit the rest from the base Asus P8Z77-M Pro config.
-include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config
+include $(pwd)/boards/p8z77-m_pro-tpm1-maximized/p8z77-m_pro-tpm1-maximized.config
 
 CONFIG_HOTPKEY=y
 

diff --git a/...NTESTED_p8z77-m_pro-tpm1-maximized.config → ...ximized/p8z77-m_pro-tpm1-maximized.config b/...NTESTED_p8z77-m_pro-tpm1-maximized.config → ...ximized/p8z77-m_pro-tpm1-maximized.config
diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config
@@ -140,8 +140,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config
@@ -138,8 +138,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config
@@ -147,8 +147,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config
@@ -146,8 +146,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config
@@ -140,8 +140,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config
@@ -138,8 +138,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config
@@ -147,8 +147,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config
@@ -146,8 +146,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
 		--machine q35,accel=kvm:tcg \
 		-rtc base=utc \
 		-smp "$$(nproc)" \
-		-vga virtio \
-		-full-screen \
+		-vga std \
 		-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
 		-serial stdio \
 		--bios "$(QEMU_BOOT_ROM)" \

diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config
@@ -1,9 +1,16 @@
 # Minimal configuration for a x230 to support flashrom and USB
+# This top SPI flash image needed to flash legacy board counterpart internally
+# This image can be flashed through 1vyrain and skulls
+# IDEALLY you should flash maximized top and bottom rom images exteranlly once instead.
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
 export CONFIG_LINUX_VERSION=5.10.5
 
+CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy-flash.config
+CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
+
+#Add bare minimal tools for flashing boards
 CONFIG_BASH=n
 CONFIG_FLASHROM=y
 #CONFIG_GPG=y
@@ -14,7 +21,7 @@ CONFIG_PCIUTILS=y
 #CONFIG_TPMTOTP=y
 #CONFIG_DROPBEAR=y
 
-CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
+#Additional hardware support
 CONFIG_LINUX_USB=y
 #CONFIG_LINUX_E1000E=y