Merge pull request #1115 from tlaurion/xx30-flash_revival

Revive xx30-flash boards

boards/t430-flash/t430-flash.config

@@ -1,5 +1,4 @@
-# Minimal configuration for a t430 to support flashrom, USB and networking
-BOARD=t430.flash
+# Minimal configuration for a t430 to support flashrom and USB
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.13
@@ -7,7 +6,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_FLASHROM=y
 #CONFIG_GPG=y
-CONFIG_FLASHTOOLS=y
+#CONFIG_FLASHTOOLS=y
 CONFIG_PCIUTILS=y
 #CONFIG_MBEDTLS=y
 #CONFIG_QRENCODE=y
@@ -16,19 +15,25 @@ CONFIG_PCIUTILS=y
 
 CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
 CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=y
+#CONFIG_LINUX_E1000E=y
 
 export CONFIG_BOOTSCRIPT=/bin/t430-flash.init
 export CONFIG_BOARD_NAME="ThinkPad T430-flash"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
 
-# This board is "special" in that we only want the top 4 MB of the ROM
-# for flashing into SPI flash 1 on the mainboard.  This is enough to
-# allow the board to boot into a minimal Heads and read the full
+# This board is "special" in that we need a 4MB top SPI flashable ROM.
+# This is enough to allow the board to boot into a minimal Heads and read the full Legacy
 # ROM from an external USB media.
+# 
+# No tools outside of flashrom are provided here as you can see per activated modules above.
+# Everything Heads is now delegated to the Legacy ROM to be flashed
+# from xx30-flash ROMs. 
+#
+# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen
+# per CONFIG_BOOTSCRIPT script above.
+#
+# Below, we just move produced ROM with a name appended with -top.rom for clarity.
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
-	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
+	$(call do,MV 4MB top ROM,$@, mv $< $@)
 	@sha256sum $@
-	#We remove the original ROM, leaving only the 4mb top one
-	rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE)

boards/x230-flash/x230-flash.config

@@ -1,4 +1,4 @@
-# Minimal configuration for a x230 to support flashrom, USB and networking
+# Minimal configuration for a x230 to support flashrom and USB
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.13
@@ -6,7 +6,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_FLASHROM=y
 #CONFIG_GPG=y
-CONFIG_FLASHTOOLS=y
+#CONFIG_FLASHTOOLS=y
 CONFIG_PCIUTILS=y
 #CONFIG_MBEDTLS=y
 #CONFIG_QRENCODE=y
@@ -15,19 +15,25 @@ CONFIG_PCIUTILS=y
 
 CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
 CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=y
+#CONFIG_LINUX_E1000E=y
 
 export CONFIG_BOOTSCRIPT=/bin/x230-flash.init
 export CONFIG_BOARD_NAME="ThinkPad X230-flash"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
 
-# This board is "special" in that we only want the top 4 MB of the ROM
-# for flashing into SPI flash 1 on the mainboard.  This is enough to
-# allow the board to boot into a minimal Heads and read the full
+# This board is "special" in that we need a 4MB top SPI flashable ROM.
+# This is enough to allow the board to boot into a minimal Heads and read the full Legacy
 # ROM from an external USB media.
+# 
+# No tools outside of flashrom are provided here as you can see per activated modules above.
+# Everything Heads is now delegated to the Legacy ROM to be flashed
+# from xx30-flash ROMs. 
+#
+# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen
+# per CONFIG_BOOTSCRIPT script above.
+#
+# Below, we just move produced ROM with a name appended with -top.rom for clarity.
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
-	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
+	$(call do,MV 4MB top ROM,$@, mv $< $@)
 	@sha256sum $@
-	#We remove the original ROM, leaving only the 4mb top one
-	rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE)

config/coreboot-t430-flash.config

@@ -1,12 +1,22 @@
+CONFIG_TIMESTAMPS_ON_CONSOLE=y
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x700000
+CONFIG_CBFS_SIZE=0x400000
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_BOARD_LENOVO_X230=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 CONFIG_UART_PCI_ADDR=0
+# CONFIG_ENABLE_VMX is not set
+# CONFIG_SET_IA32_FC_LOCK_BIT is not set
+# CONFIG_SET_MSR_AESNI_LOCK_BIT is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+# CONFIG_RAMINIT_ENABLE_ECC is not set
+# CONFIG_INTEL_CHIPSET_LOCKDOWN is not set
+CONFIG_NO_GFX_INIT=y
+# CONFIG_PCI_ALLOW_BUS_MASTER is not set
+# CONFIG_INTEL_GMA_ADD_VBT is not set
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000

config/coreboot-x230-flash.config

@@ -1,12 +1,22 @@
+CONFIG_TIMESTAMPS_ON_CONSOLE=y
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x700000
+CONFIG_CBFS_SIZE=0x400000
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_BOARD_LENOVO_X230=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 CONFIG_UART_PCI_ADDR=0
+# CONFIG_ENABLE_VMX is not set
+# CONFIG_SET_IA32_FC_LOCK_BIT is not set
+# CONFIG_SET_MSR_AESNI_LOCK_BIT is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
+# CONFIG_RAMINIT_ENABLE_ECC is not set
+# CONFIG_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_NO_GFX_INIT=y
+# CONFIG_PCI_ALLOW_BUS_MASTER is not set
+# CONFIG_INTEL_GMA_ADD_VBT is not set
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000