Restructure Coreboot project configs directory

Moving the board-specific directories into projects/coreboot/configs/
and removing the payload-specific directories (depthcharge, seabios)
will allow for better management of Coreboot configs for each
board.  Instead of having a config for each payload, there will be
at most two main configs (textmode, corebootfb) for each board.

Selecting a default payload will be reimplemented in a subsequent
commit.

69 files changed, 7 insertions, 35 deletions

diff --git a/projects/coreboot/configs/seabios/d510mo/arch b/projects/coreboot/configs/d510mo/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/d510mo/arch
+++ b/projects/coreboot/configs/d510mo/arch
diff --git a/projects/coreboot/configs/seabios/d510mo/config b/projects/coreboot/configs/d510mo/config
index cf8d27f6..cf8d27f6 100644
--- a/projects/coreboot/configs/seabios/d510mo/config
+++ b/projects/coreboot/configs/d510mo/config
diff --git a/projects/coreboot/configs/seabios/d945gclf/arch b/projects/coreboot/configs/d945gclf/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/d945gclf/arch
+++ b/projects/coreboot/configs/d945gclf/arch
diff --git a/projects/coreboot/configs/seabios/d945gclf/config b/projects/coreboot/configs/d945gclf/config
index 1f2d39b7..1f2d39b7 100644
--- a/projects/coreboot/configs/seabios/d945gclf/config
+++ b/projects/coreboot/configs/d945gclf/config
diff --git a/projects/coreboot/configs/depthcharge/targets b/projects/coreboot/configs/depthcharge/targets
deleted file mode 100644
index 792768c4..00000000
--- a/projects/coreboot/configs/depthcharge/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-nyan
-veyron
diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/arch b/projects/coreboot/configs/ga-g41m-es2l/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/arch
+++ b/projects/coreboot/configs/ga-g41m-es2l/arch
diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/config b/projects/coreboot/configs/ga-g41m-es2l/config
index 237f6daa..237f6daa 100644
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/config
diff --git a/projects/coreboot/configs/seabios/kcma-d8/arch b/projects/coreboot/configs/kcma-d8/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/kcma-d8/arch
+++ b/projects/coreboot/configs/kcma-d8/arch
diff --git a/projects/coreboot/configs/seabios/kcma-d8/config b/projects/coreboot/configs/kcma-d8/config
index 8b78ab25..8b78ab25 100644
--- a/projects/coreboot/configs/seabios/kcma-d8/config
+++ b/projects/coreboot/configs/kcma-d8/config
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/arch b/projects/coreboot/configs/kfsn4-dre/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/kfsn4-dre/arch
+++ b/projects/coreboot/configs/kfsn4-dre/arch
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/config b/projects/coreboot/configs/kfsn4-dre/config
index e4435801..e4435801 100644
--- a/projects/coreboot/configs/seabios/kfsn4-dre/config
+++ b/projects/coreboot/configs/kfsn4-dre/config
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/arch b/projects/coreboot/configs/kgpe-d16/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/kgpe-d16/arch
+++ b/projects/coreboot/configs/kgpe-d16/arch
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/config b/projects/coreboot/configs/kgpe-d16/config
index 7a2eca9c..7a2eca9c 100644
--- a/projects/coreboot/configs/seabios/kgpe-d16/config
+++ b/projects/coreboot/configs/kgpe-d16/config
diff --git a/projects/coreboot/configs/seabios/macbook21/arch b/projects/coreboot/configs/macbook21/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/macbook21/arch
+++ b/projects/coreboot/configs/macbook21/arch
diff --git a/projects/coreboot/configs/seabios/macbook21/config b/projects/coreboot/configs/macbook21/config
index 2fcf83ea..2fcf83ea 100644
--- a/projects/coreboot/configs/seabios/macbook21/config
+++ b/projects/coreboot/configs/macbook21/config
diff --git a/projects/coreboot/configs/depthcharge/nyan/arch b/projects/coreboot/configs/nyan/arch
index fb05f39d..fb05f39d 100644
--- a/projects/coreboot/configs/depthcharge/nyan/arch
+++ b/projects/coreboot/configs/nyan/arch
diff --git a/projects/coreboot/configs/depthcharge/nyan/big/config b/projects/coreboot/configs/nyan/big/config
index 41b4eeeb..41b4eeeb 100644
--- a/projects/coreboot/configs/depthcharge/nyan/big/config
+++ b/projects/coreboot/configs/nyan/big/config
diff --git a/projects/coreboot/configs/depthcharge/nyan/blaze/config b/projects/coreboot/configs/nyan/blaze/config
index 10814c6e..10814c6e 100644
--- a/projects/coreboot/configs/depthcharge/nyan/blaze/config
+++ b/projects/coreboot/configs/nyan/blaze/config
diff --git a/projects/coreboot/configs/depthcharge/nyan/ec b/projects/coreboot/configs/nyan/ec
index 903761a1..903761a1 100644
--- a/projects/coreboot/configs/depthcharge/nyan/ec
+++ b/projects/coreboot/configs/nyan/ec
diff --git a/projects/coreboot/configs/depthcharge/nyan/targets b/projects/coreboot/configs/nyan/targets
index 419aafc5..419aafc5 100644
--- a/projects/coreboot/configs/depthcharge/nyan/targets
+++ b/projects/coreboot/configs/nyan/targets
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/arch b/projects/coreboot/configs/qemu_i440fx_piix4/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/arch
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/arch
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config b/projects/coreboot/configs/qemu_i440fx_piix4/config
index a6110151..a6110151 100644
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/config
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/arch b/projects/coreboot/configs/qemu_q35_ich9/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/arch
+++ b/projects/coreboot/configs/qemu_q35_ich9/arch
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/config b/projects/coreboot/configs/qemu_q35_ich9/config
index 7c3a47cf..7c3a47cf 100644
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/qemu_q35_ich9/config
diff --git a/projects/coreboot/configs/seabios/r400_16mb/arch b/projects/coreboot/configs/r400_16mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/r400_16mb/arch
+++ b/projects/coreboot/configs/r400_16mb/arch
diff --git a/projects/coreboot/configs/seabios/r400_16mb/config b/projects/coreboot/configs/r400_16mb/config
index be8209a7..be8209a7 100644
--- a/projects/coreboot/configs/seabios/r400_16mb/config
+++ b/projects/coreboot/configs/r400_16mb/config
diff --git a/projects/coreboot/configs/seabios/r400_4mb/arch b/projects/coreboot/configs/r400_4mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/r400_4mb/arch
+++ b/projects/coreboot/configs/r400_4mb/arch
diff --git a/projects/coreboot/configs/seabios/r400_4mb/config b/projects/coreboot/configs/r400_4mb/config
index d838e8a7..d838e8a7 100644
--- a/projects/coreboot/configs/seabios/r400_4mb/config
+++ b/projects/coreboot/configs/r400_4mb/config
diff --git a/projects/coreboot/configs/seabios/r400_8mb/arch b/projects/coreboot/configs/r400_8mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/r400_8mb/arch
+++ b/projects/coreboot/configs/r400_8mb/arch
diff --git a/projects/coreboot/configs/seabios/r400_8mb/config b/projects/coreboot/configs/r400_8mb/config
index 197e906c..197e906c 100644
--- a/projects/coreboot/configs/seabios/r400_8mb/config
+++ b/projects/coreboot/configs/r400_8mb/config
diff --git a/projects/coreboot/configs/seabios/targets b/projects/coreboot/configs/seabios/targets
deleted file mode 100644
index 3e1041b1..00000000
--- a/projects/coreboot/configs/seabios/targets
+++ /dev/null
@@ -1,26 +0,0 @@
-d510mo
-d945gclf
-ga-g41m-es2l
-kcma-d8
-kfsn4-dre
-kgpe-d16
-macbook21
-qemu_i440fx_piix4
-qemu_q35_ich9
-r400_16mb
-r400_4mb
-r400_8mb
-t400_16mb
-t400_4mb
-t400_8mb
-t500_16mb
-t500_4mb
-t500_8mb
-t60
-w500_16mb
-w500_4mb
-w500_8mb
-x200_16mb
-x200_4mb
-x200_8mb
-x60
diff --git a/projects/coreboot/configs/seabios/t400_16mb/arch b/projects/coreboot/configs/t400_16mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t400_16mb/arch
+++ b/projects/coreboot/configs/t400_16mb/arch
diff --git a/projects/coreboot/configs/seabios/t400_16mb/config b/projects/coreboot/configs/t400_16mb/config
index cdda414b..cdda414b 100644
--- a/projects/coreboot/configs/seabios/t400_16mb/config
+++ b/projects/coreboot/configs/t400_16mb/config
diff --git a/projects/coreboot/configs/seabios/t400_4mb/arch b/projects/coreboot/configs/t400_4mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t400_4mb/arch
+++ b/projects/coreboot/configs/t400_4mb/arch
diff --git a/projects/coreboot/configs/seabios/t400_4mb/config b/projects/coreboot/configs/t400_4mb/config
index 62c1f941..62c1f941 100644
--- a/projects/coreboot/configs/seabios/t400_4mb/config
+++ b/projects/coreboot/configs/t400_4mb/config
diff --git a/projects/coreboot/configs/seabios/t400_8mb/arch b/projects/coreboot/configs/t400_8mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t400_8mb/arch
+++ b/projects/coreboot/configs/t400_8mb/arch
diff --git a/projects/coreboot/configs/seabios/t400_8mb/config b/projects/coreboot/configs/t400_8mb/config
index 045c9d37..045c9d37 100644
--- a/projects/coreboot/configs/seabios/t400_8mb/config
+++ b/projects/coreboot/configs/t400_8mb/config
diff --git a/projects/coreboot/configs/seabios/t500_16mb/arch b/projects/coreboot/configs/t500_16mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t500_16mb/arch
+++ b/projects/coreboot/configs/t500_16mb/arch
diff --git a/projects/coreboot/configs/seabios/t500_16mb/config b/projects/coreboot/configs/t500_16mb/config
index 99dab812..99dab812 100644
--- a/projects/coreboot/configs/seabios/t500_16mb/config
+++ b/projects/coreboot/configs/t500_16mb/config
diff --git a/projects/coreboot/configs/seabios/t500_4mb/arch b/projects/coreboot/configs/t500_4mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t500_4mb/arch
+++ b/projects/coreboot/configs/t500_4mb/arch
diff --git a/projects/coreboot/configs/seabios/t500_4mb/config b/projects/coreboot/configs/t500_4mb/config
index 99908d32..99908d32 100644
--- a/projects/coreboot/configs/seabios/t500_4mb/config
+++ b/projects/coreboot/configs/t500_4mb/config
diff --git a/projects/coreboot/configs/seabios/t500_8mb/arch b/projects/coreboot/configs/t500_8mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t500_8mb/arch
+++ b/projects/coreboot/configs/t500_8mb/arch
diff --git a/projects/coreboot/configs/seabios/t500_8mb/config b/projects/coreboot/configs/t500_8mb/config
index 94541069..94541069 100644
--- a/projects/coreboot/configs/seabios/t500_8mb/config
+++ b/projects/coreboot/configs/t500_8mb/config
diff --git a/projects/coreboot/configs/seabios/t60/arch b/projects/coreboot/configs/t60/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/t60/arch
+++ b/projects/coreboot/configs/t60/arch
diff --git a/projects/coreboot/configs/seabios/t60/config b/projects/coreboot/configs/t60/config
index 04512207..04512207 100644
--- a/projects/coreboot/configs/seabios/t60/config
+++ b/projects/coreboot/configs/t60/config
diff --git a/projects/coreboot/configs/depthcharge/veyron/arch b/projects/coreboot/configs/veyron/arch
index fb05f39d..fb05f39d 100644
--- a/projects/coreboot/configs/depthcharge/veyron/arch
+++ b/projects/coreboot/configs/veyron/arch
diff --git a/projects/coreboot/configs/depthcharge/veyron/jerry/config b/projects/coreboot/configs/veyron/jerry/config
index 0ef0b86b..0ef0b86b 100644
--- a/projects/coreboot/configs/depthcharge/veyron/jerry/config
+++ b/projects/coreboot/configs/veyron/jerry/config
diff --git a/projects/coreboot/configs/depthcharge/veyron/jerry/ec b/projects/coreboot/configs/veyron/jerry/ec
index 903761a1..903761a1 100644
--- a/projects/coreboot/configs/depthcharge/veyron/jerry/ec
+++ b/projects/coreboot/configs/veyron/jerry/ec
diff --git a/projects/coreboot/configs/depthcharge/veyron/mickey/config b/projects/coreboot/configs/veyron/mickey/config
index 764ebdd8..764ebdd8 100644
--- a/projects/coreboot/configs/depthcharge/veyron/mickey/config
+++ b/projects/coreboot/configs/veyron/mickey/config
diff --git a/projects/coreboot/configs/depthcharge/veyron/minnie/config b/projects/coreboot/configs/veyron/minnie/config
index fc6125fa..fc6125fa 100644
--- a/projects/coreboot/configs/depthcharge/veyron/minnie/config
+++ b/projects/coreboot/configs/veyron/minnie/config
diff --git a/projects/coreboot/configs/depthcharge/veyron/minnie/ec b/projects/coreboot/configs/veyron/minnie/ec
index 903761a1..903761a1 100644
--- a/projects/coreboot/configs/depthcharge/veyron/minnie/ec
+++ b/projects/coreboot/configs/veyron/minnie/ec
diff --git a/projects/coreboot/configs/depthcharge/veyron/speedy/config b/projects/coreboot/configs/veyron/speedy/config
index 9f45963d..9f45963d 100644
--- a/projects/coreboot/configs/depthcharge/veyron/speedy/config
+++ b/projects/coreboot/configs/veyron/speedy/config
diff --git a/projects/coreboot/configs/depthcharge/veyron/speedy/ec b/projects/coreboot/configs/veyron/speedy/ec
index 903761a1..903761a1 100644
--- a/projects/coreboot/configs/depthcharge/veyron/speedy/ec
+++ b/projects/coreboot/configs/veyron/speedy/ec
diff --git a/projects/coreboot/configs/depthcharge/veyron/targets b/projects/coreboot/configs/veyron/targets
index e4c9ca9e..e4c9ca9e 100644
--- a/projects/coreboot/configs/depthcharge/veyron/targets
+++ b/projects/coreboot/configs/veyron/targets
diff --git a/projects/coreboot/configs/seabios/w500_16mb/arch b/projects/coreboot/configs/w500_16mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/w500_16mb/arch
+++ b/projects/coreboot/configs/w500_16mb/arch
diff --git a/projects/coreboot/configs/seabios/w500_16mb/config b/projects/coreboot/configs/w500_16mb/config
index 99dab812..99dab812 100644
--- a/projects/coreboot/configs/seabios/w500_16mb/config
+++ b/projects/coreboot/configs/w500_16mb/config
diff --git a/projects/coreboot/configs/seabios/w500_4mb/arch b/projects/coreboot/configs/w500_4mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/w500_4mb/arch
+++ b/projects/coreboot/configs/w500_4mb/arch
diff --git a/projects/coreboot/configs/seabios/w500_4mb/config b/projects/coreboot/configs/w500_4mb/config
index 99908d32..99908d32 100644
--- a/projects/coreboot/configs/seabios/w500_4mb/config
+++ b/projects/coreboot/configs/w500_4mb/config
diff --git a/projects/coreboot/configs/seabios/w500_8mb/arch b/projects/coreboot/configs/w500_8mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/w500_8mb/arch
+++ b/projects/coreboot/configs/w500_8mb/arch
diff --git a/projects/coreboot/configs/seabios/w500_8mb/config b/projects/coreboot/configs/w500_8mb/config
index 94541069..94541069 100644
--- a/projects/coreboot/configs/seabios/w500_8mb/config
+++ b/projects/coreboot/configs/w500_8mb/config
diff --git a/projects/coreboot/configs/seabios/x200_16mb/arch b/projects/coreboot/configs/x200_16mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/x200_16mb/arch
+++ b/projects/coreboot/configs/x200_16mb/arch
diff --git a/projects/coreboot/configs/seabios/x200_16mb/config b/projects/coreboot/configs/x200_16mb/config
index abf25d09..abf25d09 100644
--- a/projects/coreboot/configs/seabios/x200_16mb/config
+++ b/projects/coreboot/configs/x200_16mb/config
diff --git a/projects/coreboot/configs/seabios/x200_4mb/arch b/projects/coreboot/configs/x200_4mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/x200_4mb/arch
+++ b/projects/coreboot/configs/x200_4mb/arch
diff --git a/projects/coreboot/configs/seabios/x200_4mb/config b/projects/coreboot/configs/x200_4mb/config
index 33b2d886..33b2d886 100644
--- a/projects/coreboot/configs/seabios/x200_4mb/config
+++ b/projects/coreboot/configs/x200_4mb/config
diff --git a/projects/coreboot/configs/seabios/x200_8mb/arch b/projects/coreboot/configs/x200_8mb/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/x200_8mb/arch
+++ b/projects/coreboot/configs/x200_8mb/arch
diff --git a/projects/coreboot/configs/seabios/x200_8mb/config b/projects/coreboot/configs/x200_8mb/config
index 8e2be019..8e2be019 100644
--- a/projects/coreboot/configs/seabios/x200_8mb/config
+++ b/projects/coreboot/configs/x200_8mb/config
diff --git a/projects/coreboot/configs/seabios/x60/arch b/projects/coreboot/configs/x60/arch
index 5a9a476a..5a9a476a 100644
--- a/projects/coreboot/configs/seabios/x60/arch
+++ b/projects/coreboot/configs/x60/arch
diff --git a/projects/coreboot/configs/seabios/x60/config b/projects/coreboot/configs/x60/config
index 8257be82..8257be82 100644
--- a/projects/coreboot/configs/seabios/x60/config
+++ b/projects/coreboot/configs/x60/config
diff --git a/projects/coreboot/coreboot b/projects/coreboot/coreboot
index 85c1719d..bc56b9bf 100755
--- a/projects/coreboot/coreboot
+++ b/projects/coreboot/coreboot
@@ -57,18 +57,18 @@ update_check() {
 }
 
 build() {
-	local payload=$1
+	local board="$1"
 	shift
 
 	local repository=$project
 
-	project_sources_directory_missing_empty_error "$project" "$repository" "$payload" "$@"
+	project_sources_directory_missing_empty_error "$project" "$repository" "$board" "$@"
 
-	local sources_path=$(project_sources_path "$project" "$repository" "$payload" "$@")
-	local build_path=$(project_build_path "$project" "$payload" "$@")
-	local config_path=$(coreboot_config_path "$payload" "$@")
+	local sources_path=$(project_sources_path "$project" "$repository" "$board" "$@")
+	local build_path=$(project_build_path "$project" "$board" "$@")
+	local config_path=$(coreboot_config_path "$board" "$@")
 
-	local arch=$(coreboot_arch "$payload" "$@")
+	local arch=$(coreboot_arch "$board" "$@")
 
 	local crossgcc_build_path=$(project_build_path "crossgcc" "$arch")
 	local crossgcc_bin_path="$crossgcc_build_path/bin/"
@@ -76,7 +76,7 @@ build() {
 
 	if git_project_check "$repository"
 	then
-		git_project_checkout "$project" "$repository" "$payload" "$@"
+		git_project_checkout "$project" "$repository" "$board" "$@"
 	fi
 
 	project_action_arguments "checkout" "vboot" "devices"