GbE-region MAC randomisation

Makefile

@@ -776,6 +776,7 @@ bin_modules-$(CONFIG_KBD) += kbd
 bin_modules-$(CONFIG_ZSTD) += zstd
 bin_modules-$(CONFIG_E2FSPROGS) += e2fsprogs
 bin_modules-$(CONFIG_EXFATPROGS) += exfatprogs
+bin_modules-$(CONFIG_NVMUTIL) += nvmutil
 
 $(foreach m, $(bin_modules-y), \
 	$(call map,initrd_bin_add,$(call bins,$m)) \
@@ -800,6 +801,9 @@ ifeq ($(CONFIG_COREBOOT),y)
 $(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/cbmem/cbmem))
 #$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/superiotool/superiotool))
 #$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/inteltool/inteltool))
+ifeq ($(CONFIG_IFDTOOL),y)
+$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/ifdtool/ifdtool))
+endif
 endif
 
 $(COREBOOT_UTIL_DIR)/cbmem/cbmem \
@@ -815,6 +819,11 @@ $(COREBOOT_UTIL_DIR)/superiotool/superiotool: \
 	$(build)/$(zlib_dir)/.build \
 	$(build)/$(pciutils_dir)/.build \
 
+$(COREBOOT_UTIL_DIR)/ifdtool/ifdtool: $(build)/$(coreboot_base_dir)/.canary musl-cross-make
+	+$(call do,MAKE,$(notdir $@),\
+		$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
+	)
+
 #
 # --- INITRD IMAGE CREATION ---
 #

boards/EOL_UNTESTED_t530-hotp-maximized/EOL_UNTESTED_t530-hotp-maximized.config

@@ -64,6 +64,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -77,7 +81,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_UNTESTED_t530-maximized/EOL_UNTESTED_t530-maximized.config

@@ -63,6 +63,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -76,7 +80,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_m900_tower-hotp-maximized/EOL_m900_tower-hotp-maximized.config

@@ -82,6 +82,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -95,6 +99,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkcentre m900_tower-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 BOARD_TARGETS := m900_me_blobs

boards/EOL_m900_tower-maximized/EOL_m900_tower-maximized.config

@@ -80,6 +80,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -93,6 +97,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkcentre m900_tower-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 BOARD_TARGETS := m900_me_blobs

boards/EOL_optiplex-7010_9010-hotp-maximized/EOL_optiplex-7010_9010-hotp-maximized.config

@@ -66,6 +66,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -88,7 +92,8 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 HOTP maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_optiplex-7010_9010-maximized/EOL_optiplex-7010_9010-maximized.config

@@ -66,6 +66,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -88,7 +92,8 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_optiplex-7010_9010_TXT-hotp-maximized/EOL_optiplex-7010_9010_TXT-hotp-maximized.config

@@ -66,6 +66,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -88,7 +92,8 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 HOTP maximized (TXT enabled)"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_optiplex-7010_9010_TXT-maximized/EOL_optiplex-7010_9010_TXT-maximized.config

@@ -66,6 +66,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -88,7 +92,8 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 maximized (TXT enabled)"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_t420-hotp-maximized/EOL_t420-hotp-maximized.config

@@ -11,7 +11,8 @@
 #
 # Doesn't include (to fit in 7mb image)
 # - dropbear
-
+# - ifdtool
+# - nvmutil
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=25.09
 export CONFIG_LINUX_VERSION=6.1.8
@@ -67,6 +68,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 CONFIG_DROPBEAR=n
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=n
+export CONFIG_IFDTOOL=n
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -80,7 +85,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T420-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs

boards/EOL_t420-maximized/EOL_t420-maximized.config

@@ -11,6 +11,8 @@
 #
 # Doesn't include (to fit in 7mb image)
 # - dropbear
+# - ifdtool
+# - nvmutil
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=25.09
 export CONFIG_LINUX_VERSION=6.1.8
@@ -65,6 +67,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 CONFIG_DROPBEAR=n
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=n
+export CONFIG_IFDTOOL=n
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -78,7 +84,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T420-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs

boards/EOL_t430-hotp-maximized/EOL_t430-hotp-maximized.config

@@ -62,6 +62,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -75,7 +79,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_t430-maximized/EOL_t430-maximized.config

@@ -62,6 +62,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
 export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
@@ -75,7 +79,8 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs

boards/EOL_t440p-hotp-maximized/EOL_t440p-hotp-maximized.config

@@ -37,6 +37,11 @@ CONFIG_FBWHIPTAIL=y
 CONFIG_LINUX_USB=y
 CONFIG_MOBILE_TETHERING=y
 
+#Additional tools:
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 export CONFIG_TPM=y
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
@@ -49,7 +54,9 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init.sh
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOARD_NAME="ThinkPad T440p-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
+
 CONFIG_HOTPKEY=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 

boards/EOL_t440p-maximized/EOL_t440p-maximized.config

@@ -37,6 +37,11 @@ CONFIG_FBWHIPTAIL=y
 CONFIG_LINUX_USB=y
 CONFIG_MOBILE_TETHERING=y
 
+#Additional tools:
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 export CONFIG_TPM=y
 #Enable DEBUG output
 export CONFIG_DEBUG_OUTPUT=n
@@ -49,7 +54,8 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init.sh
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOARD_NAME="ThinkPad T440p-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: $(pwd)/blobs/t440p/me.bin

boards/EOL_t480-hotp-maximized/EOL_t480-hotp-maximized.config

@@ -69,6 +69,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -89,6 +93,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T480-hotp-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 BOARD_TARGETS := t480_me_blobs

boards/EOL_t480-maximized/EOL_t480-maximized.config

@@ -69,6 +69,10 @@ CONFIG_FBWHIPTAIL=y
 #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
 #CONFIG_DROPBEAR=y
 
+#tools for mac-randomization
+export CONFIG_NVMUTIL=y
+export CONFIG_IFDTOOL=y
+
 #Runtime configuration
 #Automatically boot if HOTP is valid
 export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -89,6 +93,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T480-maximized"
-export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
+export CONFIG_FLASH_TOOL="flashprog --progress --programmer internal"
+export CONFIG_FLASH_OPTIONS="${CONFIG_FLASH_TOOL} --ifd -i bios -i me -i fd"
 
 BOARD_TARGETS := t480_me_blobs