diff --git a/Makefile b/Makefile
index 217a189e..840a186f 100644
--- a/Makefile
+++ b/Makefile
@@ -424,7 +424,10 @@ $(build)/$(BOARD)/tools.cpio: \
 
 	$(call do,INSTALL,$(CONFIG), \
 		mkdir -p "$(initrd_dir)/etc" ; \
-		cp "$(CONFIG)" "$(initrd_dir)/etc/config" \
+		export \
+			| grep ' CONFIG_' \
+			| sed 's/^declare -x /export /' \
+			> "$(initrd_dir)/etc/config" \
 	)
 	$(call do-cpio,$@,$(initrd_dir))
 	@$(RM) -rf "$(initrd_dir)"
diff --git a/boards/librem13v2.config b/boards/librem13v2.config
index 25eb471a..1b6a5333 100644
--- a/boards/librem13v2.config
+++ b/boards/librem13v2.config
@@ -15,13 +15,13 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 
 CONFIG_LINUX_USB=y
-CONFIG_TPM=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_TPM=y
+export CONFIG_BOOTSCRIPT=/bin/generic-init
 
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
-CONFIG_BOOT_KERNEL_REMOVE="quiet"
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
+export CONFIG_BOOT_KERNEL_REMOVE="quiet"
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
diff --git a/boards/qemu-coreboot.config b/boards/qemu-coreboot.config
index c0d4c062..fe2963a6 100644
--- a/boards/qemu-coreboot.config
+++ b/boards/qemu-coreboot.config
@@ -13,7 +13,7 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_POPT=y
 CONFIG_FLASHTOOLS=y
-#CONFIG_FLASHROM=y
+CONFIG_FLASHROM=y
 CONFIG_PCIUTILS=y
 CONFIG_UTIL_LINUX=y
 CONFIG_CRYPTSETUP=y
@@ -28,8 +28,8 @@ endif
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
-CONFIG_TPM=n
+export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_TPM=n
 
 #run: coreboot.intermediate
 run:
diff --git a/boards/qemu-linuxboot.config b/boards/qemu-linuxboot.config
index 98db32be..6c648b7b 100644
--- a/boards/qemu-linuxboot.config
+++ b/boards/qemu-linuxboot.config
@@ -29,12 +29,12 @@ CONFIG_LINUX_SCSI_GDTH=y
 CONFIG_LINUX_ATA=y
 CONFIG_LINUX_AHCI=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOTSCRIPT=/bin/generic-init
 
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 
 # You can ssh into the qemu instance by running
 # ssh -p 5555 root@localhost
diff --git a/boards/r630.config b/boards/r630.config
index b24425e1..23c8d43b 100644
--- a/boards/r630.config
+++ b/boards/r630.config
@@ -23,9 +23,9 @@ CONFIG_LINUX_IGB=y
 CONFIG_LINUX_MEGARAID=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOTSCRIPT=/bin/generic-init
 
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
diff --git a/boards/s2600wf.config b/boards/s2600wf.config
index b384ada0..8af98511 100644
--- a/boards/s2600wf.config
+++ b/boards/s2600wf.config
@@ -15,6 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 
 #CONFIG_CRYPTSETUP=y
 #CONFIG_FLASHROM=y
+CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
@@ -34,9 +35,9 @@ CONFIG_LINUX_SCSI_GDTH=y
 CONFIG_LINUX_ATA=y
 CONFIG_LINUX_AHCI=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
-
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_TPM=n
+export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
diff --git a/boards/winterfell.config b/boards/winterfell.config
index fb2cb05c..5aecb293 100644
--- a/boards/winterfell.config
+++ b/boards/winterfell.config
@@ -37,12 +37,12 @@ CONFIG_LINUX_AHCI=y
 CONFIG_LINUX_E1000E=y
 CONFIG_LINUX_NVME=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
-
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_TPM=n
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 
 $(build)/$(BOARD)/linuxboot.rom: linuxboot.intermediate
 
diff --git a/boards/x220.config b/boards/x220.config
index f59573c3..9e980b06 100644
--- a/boards/x220.config
+++ b/boards/x220.config
@@ -20,11 +20,11 @@ CONFIG_DROPBEAR=y
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
-
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
-CONFIG_BOOT_KERNEL_REMOVE="quiet"
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_TPM=y
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
+export CONFIG_BOOT_KERNEL_REMOVE="quiet"
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
diff --git a/boards/x230.config b/boards/x230.config
index 1e38a27f..ab499425 100644
--- a/boards/x230.config
+++ b/boards/x230.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config
 CONFIG_LINUX_CONFIG=config/linux-x230.config
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
@@ -15,16 +15,15 @@ CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_DROPBEAR=y
-CONFIG_TPM=y
 
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_BOOTSCRIPT=/bin/generic-init
-
-CONFIG_BOOT_REQ_HASH=n
-CONFIG_BOOT_REQ_ROLLBACK=n
-CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
-CONFIG_BOOT_KERNEL_REMOVE="quiet"
-CONFIG_BOOT_DEV="/dev/sda1"
-CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_TPM=y
+export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
+export CONFIG_BOOT_KERNEL_REMOVE="quiet"
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"