cleanup configuration options to all have the same CONFIG_MODULE_OPTION naming scheme

Makefile

@@ -219,7 +219,7 @@ define define_module =
 	@touch "$$@"
   else
     # Copy the stored config file into the unpacked directory
-    $($1_config_file_path): config/$($1_config) $(build)/$($1_dir)/.canary
+    $($1_config_file_path): $($1_config) $(build)/$($1_dir)/.canary
 	@mkdir -p $$(dir $$@)
 	$(call do-copy,config/$($1_config),$$@)
   endif

boards/qemu-coreboot.config

@@ -1,8 +1,12 @@
-# Configuration for building the MOC "server" built to run under
+# 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
+
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_GPG=y

boards/qemu-linuxboot.config

@@ -3,7 +3,8 @@
 BOARD=qemu-linuxboot
 
 CONFIG_LINUXBOOT=y
-linuxboot-board := qemu
+CONFIG_LINUXBOOT_BOARD=qemu
+CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 
 #CONFIG_CRYPTSETUP=y
 #CONFIG_FLASHROM=y

boards/r630.config

@@ -5,6 +5,7 @@ BOARD=r630
 
 CONFIG_LINUXBOOT=y
 CONFIG_LINUXBOOT_ROM=blobs/r630-1.3.6.rom
+CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 
 #CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

boards/s2600wf.config

@@ -13,6 +13,7 @@ BOARD=s2600wf
 
 CONFIG_LINUXBOOT=y
 CONFIG_LINUXBOOT_ROM=blobs/s2600wf.rom
+CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 
 #CONFIG_CRYPTSETUP=y
 #CONFIG_FLASHROM=y

boards/winterfell.config

@@ -4,6 +4,7 @@ BOARD=winterfell
 
 CONFIG_LINUXBOOT=y
 CONFIG_LINUXBOOT_ROM=blobs/winterfell.rom
+CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 
 #CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

boards/x230-generic.config

@@ -2,7 +2,7 @@
 BOARD=x230
 
 CONFIG_COREBOOT=y
-CONFIG_COREBOOT_CONFIG:=config/coreboot-x230.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

modules/busybox

@@ -7,7 +7,7 @@ busybox_url := https://busybox.net/downloads/$(busybox_tar)
 busybox_hash := da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
 
 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig
-busybox_config := busybox.config
+busybox_config := config/busybox.config
 busybox_output := busybox
 busybox_target := \
 	$(CROSS_TOOLS) \

modules/dropbear

@@ -18,7 +18,6 @@ dropbear_configure := ./configure \
 	--disable-wtmp \
 	--disable-wtmpx \
 	
-dropbear_config :=
 dropbear_output := ssh scp dropbear
 dropbear_target := \
 	$(MAKE_JOBS) \

modules/linux

@@ -13,7 +13,7 @@ linux_board_dir := $(build)/$(linux_dir)/$(BOARD)
 
 # input file in the heads config/ dir
 # Allow board config to specialize Linux configuration if necessary
-linux_config ?= linux.config
+linux_config := $(or $(CONFIG_LINUX_CONFIG,linux.config))
 
 # output file in the build dir
 linux_config_file := $(BOARD)/.config

modules/linuxboot

@@ -9,13 +9,13 @@ linuxboot_configure := \
 	touch .config
 
 # linuxboot builds are specialized on a per-target basis.
-# They can be specialized by defining $(linuxboot-board),
+# They can be specialized by defining $(CONFIG_LINUXBOOT_BOARD)
 # otherwise it is assumed that it will have the same name
 # as the Heads BOARD.
-linuxboot-board ?= $(BOARD)
+linuxboot_board := $(or $(CONFIG_LINUXBOOT_BOARD),$(BOARD))
 
 linuxboot_target := \
-	BOARD:=$(linuxboot-board) \
+	BOARD:=$(linuxboot_board) \
 	KERNEL=$(build)/$(BOARD)/bzImage \
 	INITRD=$(build)/$(BOARD)/initrd.cpio.xz \
 	all
@@ -31,7 +31,7 @@ ifneq "y" "$(shell [ -r '$(CONFIG_LINUXBOOT_ROM)' ] && echo y)"
 $(error $(CONFIG_LINUXBOOT_ROM): you must provide a ROM file)
 endif
 
-linuxboot-vendor-rom := $(build)/$(linuxboot_dir)/boards/$(linuxboot-board)/$(notdir $(CONFIG_LINUXBOOT_ROM))
+linuxboot-vendor-rom := $(build)/$(linuxboot_dir)/boards/$(linuxboot_board)/$(notdir $(CONFIG_LINUXBOOT_ROM))
 linuxboot.intermediate: $(linuxboot-vendor-rom)
 $(linuxboot-vendor-rom): $(CONFIG_LINUXBOOT_ROM)
 	$(call do-copy,$<,$@)
@@ -41,7 +41,7 @@ endif
 # ready to flash onto the mainboard.  There might be partial
 # firmware volumes as well, but that depends on the board
 # so this only retrieves the final one
-linuxboot_output := $(build)/$(linuxboot_dir)/build/$(linuxboot-board)/linuxboot.rom
+linuxboot_output := $(build)/$(linuxboot_dir)/build/$(linuxboot_board)/linuxboot.rom
 
 $(linuxboot_output): linuxboot.intermediate