Skip to content

Commit 6e31163

Browse files
authored
Merge pull request #1403 from tlaurion/libgfxinit-or-native-gfx-init_simplefb_linuxboot_splashscreen
libgfxinit/nativegfx init: efifb enforced fb (+coreboot ramstage enabled bootsplash)
2 parents fbc0993 + 97f39a8 commit 6e31163

File tree

52 files changed

+3919
-883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3919
-883
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ commands:
1515
command: |
1616
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
1717
apt update
18-
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
18+
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
1919
- run:
2020
name: Make Board (FULL ORDERED BUILD LOGS HERE UNTIL JOB FAILED)
2121
command: |
@@ -51,7 +51,7 @@ jobs:
5151
command: |
5252
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
5353
apt update
54-
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
54+
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
5555
- checkout
5656

5757
- run:
@@ -303,22 +303,22 @@ workflows:
303303
- x230-hotp-maximized
304304

305305
- build:
306-
name: t430-legacy-flash
307-
target: t430-legacy-flash
306+
name: UNTESTED_t430-legacy-flash
307+
target: UNTESTED_t430-legacy-flash
308308
subcommand: ""
309309
requires:
310310
- x230-hotp-maximized
311311

312312
- build:
313-
name: t430-legacy
314-
target: t430-legacy
313+
name: UNTESTED_t430-legacy
314+
target: UNTESTED_t430-legacy
315315
subcommand: ""
316316
requires:
317317
- x230-hotp-maximized
318318

319319
- build:
320-
name: t430-hotp-legacy
321-
target: t430-hotp-legacy
320+
name: UNTESTED_t430-hotp-legacy
321+
target: UNTESTED_t430-hotp-legacy
322322
subcommand: ""
323323
requires:
324324
- x230-hotp-maximized
@@ -485,15 +485,15 @@ workflows:
485485
- x230-hotp-maximized
486486

487487
- build:
488-
name: UNTESTED_p8z77-m_pro-tpm1-maximized
489-
target: UNTESTED_p8z77-m_pro-tpm1-maximized
488+
name: p8z77-m_pro-tpm1-maximized
489+
target: p8z77-m_pro-tpm1-maximized
490490
subcommand: ""
491491
requires:
492492
- x230-hotp-maximized
493493

494494
- build:
495-
name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
496-
target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
495+
name: p8z77-m_pro-tpm1-hotp-maximized
496+
target: p8z77-m_pro-tpm1-hotp-maximized
497497
subcommand: ""
498498
requires:
499499
- x230-hotp-maximized

boards/t430-legacy-flash/t430-legacy-flash.config renamed to boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# Minimal configuration for a t430 to support flashrom and USB
2+
# This top SPI flash image needed to flash legacy board counterpart internally
3+
# This image can be flashed through 1vyrain and skulls
4+
# IDEALLY you should flash maximized top and bottom rom images exteranlly once instead.
25

36
export CONFIG_COREBOOT=y
47
export CONFIG_COREBOOT_VERSION=4.19
58
export CONFIG_LINUX_VERSION=5.10.5
69

10+
CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy-flash.config
11+
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
12+
13+
#Add bare minimal tools for flashing boards
714
CONFIG_BASH=n
815
CONFIG_FLASHROM=y
916
#CONFIG_GPG=y
@@ -14,7 +21,7 @@ CONFIG_PCIUTILS=y
1421
#CONFIG_TPMTOTP=y
1522
#CONFIG_DROPBEAR=y
1623

17-
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
24+
#Additional hardware support
1825
CONFIG_LINUX_USB=y
1926
#CONFIG_LINUX_E1000E=y
2027

boards/UNTESTED_x220/UNTESTED_x220.config

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ export CONFIG_LINUX_VERSION=5.10.5
66
CONFIG_COREBOOT_CONFIG=config/coreboot-x220.config
77
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
88

9+
#Additional hardware support
10+
CONFIG_LINUX_USB=y
11+
CONFIG_LINUX_E1000E=y
12+
913
CONFIG_CRYPTSETUP2=y
1014
CONFIG_FLASHROM=y
1115
CONFIG_FLASHTOOLS=y
@@ -15,18 +19,37 @@ CONFIG_UTIL_LINUX=y
1519
CONFIG_LVM2=y
1620
CONFIG_MBEDTLS=y
1721
CONFIG_PCIUTILS=y
22+
23+
#platform locking finalization (PR0)
24+
CONFIG_IO386=y
25+
export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y
26+
27+
28+
#Remote attestation support
29+
#TPM based requirements
30+
export CONFIG_TPM=y
1831
CONFIG_POPT=y
1932
CONFIG_QRENCODE=y
2033
CONFIG_TPMTOTP=y
21-
CONFIG_DROPBEAR=n
34+
#HOTP based remote attestation for supported USB Security dongle
35+
#With/Without TPM support
36+
#CONFIG_HOTPKEY=y
37+
38+
#Nitrokey Storage admin tool
39+
CONFIG_NKSTORECLI=n
2240

41+
#GUI Support
42+
#Console based Whiptail support(Console based, no FB):
43+
#CONFIG_SLANG=y
44+
#CONFIG_NEWT=y
45+
#FBWhiptail based (Graphical):
2346
CONFIG_CAIRO=y
2447
CONFIG_FBWHIPTAIL=y
2548

26-
CONFIG_LINUX_USB=y
27-
CONFIG_LINUX_E1000E=y
49+
#Additional tools:
50+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
51+
CONFIG_DROPBEAR=n
2852

29-
export CONFIG_TPM=y
3053
export CONFIG_BOOTSCRIPT=/bin/gui-init
3154
export CONFIG_BOOT_REQ_HASH=n
3255
export CONFIG_BOOT_REQ_ROLLBACK=n
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Inherit the rest from the base Asus P8Z77-M Pro config.
2-
include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config
2+
include $(pwd)/boards/p8z77-m_pro-tpm1-maximized/p8z77-m_pro-tpm1-maximized.config
33

44
CONFIG_HOTPKEY=y
55

boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
140140
--machine q35,accel=kvm:tcg \
141141
-rtc base=utc \
142142
-smp "$$(nproc)" \
143-
-vga virtio \
144-
-full-screen \
143+
-vga std \
145144
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
146145
-serial stdio \
147146
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
138138
--machine q35,accel=kvm:tcg \
139139
-rtc base=utc \
140140
-smp "$$(nproc)" \
141-
-vga virtio \
142-
-full-screen \
141+
-vga std \
143142
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
144143
-serial stdio \
145144
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
147147
--machine q35,accel=kvm:tcg \
148148
-rtc base=utc \
149149
-smp "$$(nproc)" \
150-
-vga virtio \
151-
-full-screen \
150+
-vga std \
152151
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
153152
-serial stdio \
154153
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
146146
--machine q35,accel=kvm:tcg \
147147
-rtc base=utc \
148148
-smp "$$(nproc)" \
149-
-vga virtio \
150-
-full-screen \
149+
-vga std \
151150
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
152151
-serial stdio \
153152
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
140140
--machine q35,accel=kvm:tcg \
141141
-rtc base=utc \
142142
-smp "$$(nproc)" \
143-
-vga virtio \
144-
-full-screen \
143+
-vga std \
145144
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
146145
-serial stdio \
147146
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
138138
--machine q35,accel=kvm:tcg \
139139
-rtc base=utc \
140140
-smp "$$(nproc)" \
141-
-vga virtio \
142-
-full-screen \
141+
-vga std \
143142
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
144143
-serial stdio \
145144
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
147147
--machine q35,accel=kvm:tcg \
148148
-rtc base=utc \
149149
-smp "$$(nproc)" \
150-
-vga virtio \
151-
-full-screen \
150+
-vga std \
152151
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
153152
-serial stdio \
154153
--bios "$(QEMU_BOOT_ROM)" \

boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
146146
--machine q35,accel=kvm:tcg \
147147
-rtc base=utc \
148148
-smp "$$(nproc)" \
149-
-vga virtio \
150-
-full-screen \
149+
-vga std \
151150
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \
152151
-serial stdio \
153152
--bios "$(QEMU_BOOT_ROM)" \

boards/x230-legacy-flash/x230-legacy-flash.config

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# Minimal configuration for a x230 to support flashrom and USB
2+
# This top SPI flash image needed to flash legacy board counterpart internally
3+
# This image can be flashed through 1vyrain and skulls
4+
# IDEALLY you should flash maximized top and bottom rom images exteranlly once instead.
25

36
export CONFIG_COREBOOT=y
47
export CONFIG_COREBOOT_VERSION=4.19
58
export CONFIG_LINUX_VERSION=5.10.5
69

10+
CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy-flash.config
11+
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
12+
13+
#Add bare minimal tools for flashing boards
714
CONFIG_BASH=n
815
CONFIG_FLASHROM=y
916
#CONFIG_GPG=y
@@ -14,7 +21,7 @@ CONFIG_PCIUTILS=y
1421
#CONFIG_TPMTOTP=y
1522
#CONFIG_DROPBEAR=y
1623

17-
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
24+
#Additional hardware support
1825
CONFIG_LINUX_USB=y
1926
#CONFIG_LINUX_E1000E=y
2027

0 commit comments

Comments
 (0)