diff --git a/boards/qemu-coreboot.config b/boards/qemu-coreboot.config index c4963b67..cedc4fcc 100644 --- a/boards/qemu-coreboot.config +++ b/boards/qemu-coreboot.config @@ -1,8 +1,6 @@ # Configuration for building a coreboot ROM that works in the. # the qemu emulator. Note that the TPM does not work, so this # will just drop into the recovery shell. -BOARD=qemu - CONFIG_COREBOOT=y CONFIG_COREBOOT_CONFIG=config/coreboot-qemu.config CONFIG_LINUX_CONFIG=config/linux-qemu.config diff --git a/boards/qemu-linuxboot.config b/boards/qemu-linuxboot.config index db349442..aa9c42e5 100644 --- a/boards/qemu-linuxboot.config +++ b/boards/qemu-linuxboot.config @@ -1,7 +1,5 @@ # Configuration for emulating LinuxBoot+Heads with qemu # -BOARD=qemu-linuxboot - CONFIG_LINUXBOOT=y CONFIG_LINUXBOOT_BOARD=qemu CONFIG_LINUX_CONFIG=config/linux-linuxboot.config diff --git a/boards/r630.config b/boards/r630.config index 94241c65..b112818a 100644 --- a/boards/r630.config +++ b/boards/r630.config @@ -1,8 +1,6 @@ # Configuration for a Dell R630 # flashrom doesn't work on this mainboard # and it is NERF, not coreboot. -BOARD=r630 - CONFIG_LINUXBOOT=y CONFIG_LINUXBOOT_ROM=blobs/r630-1.3.6.rom CONFIG_LINUX_CONFIG=config/linux-linuxboot.config diff --git a/boards/s2600wf.config b/boards/s2600wf.config index 09999e96..e40203b2 100644 --- a/boards/s2600wf.config +++ b/boards/s2600wf.config @@ -9,8 +9,6 @@ # The DxeCore also needs to be updated to know about the # new firmware volume location. # -BOARD=s2600wf - CONFIG_LINUXBOOT=y CONFIG_LINUXBOOT_ROM=blobs/s2600wf.rom CONFIG_LINUX_CONFIG=config/linux-linuxboot.config diff --git a/boards/winterfell.config b/boards/winterfell.config index 07f3e157..aa145943 100644 --- a/boards/winterfell.config +++ b/boards/winterfell.config @@ -1,7 +1,5 @@ # Configuration for a Winterfell OCP node # and it is NERF, not coreboot. -BOARD=winterfell - CONFIG_LINUXBOOT=y CONFIG_LINUXBOOT_ROM=blobs/winterfell.rom CONFIG_LINUX_CONFIG=config/linux-linuxboot.config diff --git a/boards/x220.config b/boards/x220.config index 5567682d..b485bfba 100644 --- a/boards/x220.config +++ b/boards/x220.config @@ -1,6 +1,4 @@ # Configuration for a x220 running Qubes and other OS -BOARD=x220 - # The Linux configuration is close enough to the x230 CONFIG_COREBOOT=y CONFIG_COREBOOT_CONFIG=config/coreboot-x220.config diff --git a/boards/x230.config b/boards/x230.config index d6e9e490..3e0b2085 100644 --- a/boards/x230.config +++ b/boards/x230.config @@ -1,6 +1,4 @@ # Configuration for a x230 running Qubes and other OSes -BOARD=x230 - CONFIG_COREBOOT=y CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config CONFIG_LINUX_CONFIG=config/linux-x230.config