Merge branch 'restructure' of and_who/libreboot into master

36 files changed, 17 insertions, 26 deletions

diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/config b/projects/coreboot/configs/x200/16mb/config
index 6ea330af..6ea330af 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/config
+++ b/projects/coreboot/configs/x200/16mb/config
diff --git a/projects/coreboot/configs/x200/corebootfb/config b/projects/coreboot/configs/x200/16mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/x200/corebootfb/config
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/config
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/grub/config b/projects/coreboot/configs/x200/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x200/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/targets b/projects/coreboot/configs/x200/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/16mb/targets b/projects/coreboot/configs/x200/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/textmode/config b/projects/coreboot/configs/x200/16mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/x200/textmode/config
+++ b/projects/coreboot/configs/x200/16mb/textmode/config
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/grub/config b/projects/coreboot/configs/x200/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/grub/config
+++ b/projects/coreboot/configs/x200/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config b/projects/coreboot/configs/x200/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/targets b/projects/coreboot/configs/x200/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/x200/16mb/textmode/targets
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/config b/projects/coreboot/configs/x200/4mb/config
index ea998f4c..ea998f4c 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/config
+++ b/projects/coreboot/configs/x200/4mb/config
diff --git a/projects/coreboot/configs/x200/4mb/corebootfb/config b/projects/coreboot/configs/x200/4mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/grub/config b/projects/coreboot/configs/x200/4mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/grub/config
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config b/projects/coreboot/configs/x200/4mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/targets b/projects/coreboot/configs/x200/4mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/targets
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/4mb/targets b/projects/coreboot/configs/x200/4mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/4mb/textmode/config b/projects/coreboot/configs/x200/4mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/16mb/grub/config b/projects/coreboot/configs/x200/4mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/x200/4mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/16mb/seabios/config b/projects/coreboot/configs/x200/4mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/4mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/16mb/targets b/projects/coreboot/configs/x200/4mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/targets
+++ b/projects/coreboot/configs/x200/4mb/textmode/targets
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/config b/projects/coreboot/configs/x200/8mb/config
index c07a65f3..c07a65f3 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/config
+++ b/projects/coreboot/configs/x200/8mb/config
diff --git a/projects/coreboot/configs/x200/8mb/corebootfb/config b/projects/coreboot/configs/x200/8mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/4mb/grub/config b/projects/coreboot/configs/x200/8mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/grub/config
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/4mb/seabios/config b/projects/coreboot/configs/x200/8mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/4mb/targets b/projects/coreboot/configs/x200/8mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/targets
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/8mb/targets b/projects/coreboot/configs/x200/8mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/8mb/textmode/config b/projects/coreboot/configs/x200/8mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/8mb/grub/config b/projects/coreboot/configs/x200/8mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/grub/config
+++ b/projects/coreboot/configs/x200/8mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/8mb/seabios/config b/projects/coreboot/configs/x200/8mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/8mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/8mb/targets b/projects/coreboot/configs/x200/8mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/targets
+++ b/projects/coreboot/configs/x200/8mb/textmode/targets
diff --git a/projects/coreboot/configs/x200/corebootfb/targets b/projects/coreboot/configs/x200/corebootfb/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/x200/corebootfb/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb
diff --git a/projects/coreboot/configs/x200/targets b/projects/coreboot/configs/x200/targets
index f84c583a..4d24a91a 100644
--- a/projects/coreboot/configs/x200/targets
+++ b/projects/coreboot/configs/x200/targets
@@ -1,2 +1,3 @@
-corebootfb
-textmode
+16mb
+4mb
+8mb
diff --git a/projects/coreboot/configs/x200/textmode/16mb/config b/projects/coreboot/configs/x200/textmode/16mb/config
deleted file mode 100644
index 6ea330af..00000000
--- a/projects/coreboot/configs/x200/textmode/16mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/x200/textmode/4mb/config b/projects/coreboot/configs/x200/textmode/4mb/config
deleted file mode 100644
index ea998f4c..00000000
--- a/projects/coreboot/configs/x200/textmode/4mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/x200/textmode/8mb/config b/projects/coreboot/configs/x200/textmode/8mb/config
deleted file mode 100644
index c07a65f3..00000000
--- a/projects/coreboot/configs/x200/textmode/8mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
-CONFIG_BOARD_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
diff --git a/projects/coreboot/configs/x200/textmode/targets b/projects/coreboot/configs/x200/textmode/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/x200/textmode/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb