Merge branch 'restructure' of and_who/libreboot into master

25 files changed, 10 insertions, 15 deletions

diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/config b/projects/coreboot/configs/kfsn4-dre/1mb/config
index 52a108b9..52a108b9 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/grub/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/1mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/grub/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/config b/projects/coreboot/configs/kfsn4-dre/2mb/config
index 8076c750..8076c750 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/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/kfsn4-dre/textmode/1mb/grub/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/2mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/kfsn4-dre/2mb/textmode/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/grub/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/targets b/projects/coreboot/configs/kfsn4-dre/corebootfb/targets
deleted file mode 100644
index 3677010e..00000000
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-1mb
-2mb
diff --git a/projects/coreboot/configs/kfsn4-dre/targets b/projects/coreboot/configs/kfsn4-dre/targets
index f84c583a..3677010e 100644
--- a/projects/coreboot/configs/kfsn4-dre/targets
+++ b/projects/coreboot/configs/kfsn4-dre/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+1mb
+2mb
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config b/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config
deleted file mode 100644
index 52a108b9..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=y
-CONFIG_COREBOOT_ROMSIZE_KB=1024
-CONFIG_ROM_SIZE=0x100000
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config b/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config
deleted file mode 100644
index 8076c750..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=n
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/targets b/projects/coreboot/configs/kfsn4-dre/textmode/targets
deleted file mode 100644
index 3677010e..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-1mb
-2mb