From 46821c70a11422c0154d1dfa2746ed7db9bc3c75 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 28 Jun 2015 13:57:03 -0400
Subject: coreboot-libre: move GRUB configs to grub/

---
(limited to 'resources')

diff --git a/resources/libreboot/config/kfsn4-dre/config b/resources/libreboot/config/grub/kfsn4-dre/config
index 6902f78..6902f78 100644
--- a/resources/libreboot/config/kfsn4-dre/config
+++ b/resources/libreboot/config/grub/kfsn4-dre/config
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index caf5e7a..caf5e7a 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index a456d19..a456d19 100644
--- a/resources/libreboot/config/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index dcdc067..dcdc067 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index 91dafe9..91dafe9 100644
--- a/resources/libreboot/config/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index 905a997..905a997 100644
--- a/resources/libreboot/config/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index 5ae564a..5ae564a 100644
--- a/resources/libreboot/config/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
diff --git a/resources/libreboot/config/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index 8fbf583..8fbf583 100644
--- a/resources/libreboot/config/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
diff --git a/resources/libreboot/config/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index e864cac..e864cac 100644
--- a/resources/libreboot/config/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
diff --git a/resources/libreboot/config/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index a21072e..a21072e 100644
--- a/resources/libreboot/config/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/grub/t60/config
index 8d23cd5..8d23cd5 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/grub/t60/config
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 95056e5..95056e5 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index de42e49..de42e49 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/grub/x60/config
index 8cfe35b..8cfe35b 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/grub/x60/config
diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper
index b032d3a..236b8da 100755
--- a/resources/scripts/helpers/build/roms/helper
+++ b/resources/scripts/helpers/build/roms/helper
@@ -51,11 +51,11 @@ if [ "${1}" = "qemu_i440fx_piix4" ] || [ "${1}" = "qemu_q35_ich9" ]
 then
 	# assume that the default config enable framebuffer mode, duplicate and patch for text-mode
 	# necessary, otherwise it will ask you to enter the Y/X resolution of the framebuffer at build time
-	cp "../resources/libreboot/config/${1}/config" "config_vesafb"
+	cp "../resources/libreboot/config/grub/${1}/config" "config_vesafb"
 	sed 's/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/' < "config_vesafb" > "config_txtmode"
 else
 	# assume that the default config enables text-mode, duplicate and patch for framebuffer mode
-	cp "../resources/libreboot/config/${1}/config" "config_txtmode"
+	cp "../resources/libreboot/config/grub/${1}/config" "config_txtmode"
 	sed 's/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/' < "config_txtmode" > "config_vesafb"
 fi
 
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index c3b33c5..dbd89e1 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -38,7 +38,7 @@ if [ $# -gt 0 ]; then
 	boards="$@"
 else
 	# build all ROM images
-	boards="$(ls resources/libreboot/config/)"
+	boards="$(ls resources/libreboot/config/grub/)"
 fi
 
 
@@ -70,7 +70,7 @@ cd ../
 # Build ROM images for supported boards
 for board in ${boards}
 do
-	if [ -f "resources/libreboot/config/${board}/config" ]; then
+	if [ -f "resources/libreboot/config/grub/${board}/config" ]; then
 		./build roms helper ${board}
 	fi
 done
--
cgit v0.9.1