Merge branch 'coreboot-rework' of and_who/libreboot into master

33 files changed, 61 insertions, 3 deletions

diff --git a/projects/coreboot/configs/veyron/jerry/config b/projects/coreboot/configs/veyron/jerry/config
index 9393e7de..30c978cf 100644
--- a/projects/coreboot/configs/veyron/jerry/config
+++ b/projects/coreboot/configs/veyron/jerry/config
@@ -110,7 +110,7 @@ CONFIG_MAINBOARD_PART_NUMBER="Veyron_Jerry"
 CONFIG_MAINBOARD_VENDOR="Google"
 CONFIG_MAX_CPUS=1
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
-CONFIG_CBFS_SIZE=0x100000
+CONFIG_CBFS_SIZE=0x400000
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_DEVICETREE="devicetree.cb"
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/config b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/config
new file mode 100644
index 00000000..d3e3b7aa
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/depthcharge/config
new file mode 100644
index 00000000..afde4a80
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-jerry/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/config b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/depthcharge/config
new file mode 100644
index 00000000..afde4a80
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-jerry/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/targets b/projects/coreboot/configs/veyron/jerry/corebootfb/targets
new file mode 100644
index 00000000..0169dcf0
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/corebootfb/targets
@@ -0,0 +1,2 @@
+16mb
+4mb
diff --git a/projects/coreboot/configs/veyron/jerry/targets b/projects/coreboot/configs/veyron/jerry/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/config b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/depthcharge/config
new file mode 100644
index 00000000..e27c1a5b
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-mickey/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/targets b/projects/coreboot/configs/veyron/mickey/corebootfb/targets
new file mode 100644
index 00000000..50d4bf27
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/corebootfb/targets
@@ -0,0 +1 @@
+4mb
diff --git a/projects/coreboot/configs/veyron/mickey/targets b/projects/coreboot/configs/veyron/mickey/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/config b/projects/coreboot/configs/veyron/minnie/config
index 45672bc9..d9d9206e 100644
--- a/projects/coreboot/configs/veyron/minnie/config
+++ b/projects/coreboot/configs/veyron/minnie/config
@@ -110,7 +110,7 @@ CONFIG_MAINBOARD_PART_NUMBER="Veyron_Minnie"
 CONFIG_MAINBOARD_VENDOR="Google"
 CONFIG_MAX_CPUS=1
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
-CONFIG_CBFS_SIZE=0x100000
+CONFIG_CBFS_SIZE=0x400000
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_DEVICETREE="devicetree.cb"
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/config b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/config
new file mode 100644
index 00000000..d3e3b7aa
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/depthcharge/config
new file mode 100644
index 00000000..aee1ccef
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/config b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/depthcharge/config
new file mode 100644
index 00000000..aee1ccef
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/corebootfb/targets
new file mode 100644
index 00000000..0169dcf0
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/corebootfb/targets
@@ -0,0 +1,2 @@
+16mb
+4mb
diff --git a/projects/coreboot/configs/veyron/minnie/targets b/projects/coreboot/configs/veyron/minnie/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/config b/projects/coreboot/configs/veyron/speedy/config
index b4a74b9a..27ddca6b 100644
--- a/projects/coreboot/configs/veyron/speedy/config
+++ b/projects/coreboot/configs/veyron/speedy/config
@@ -110,7 +110,7 @@ CONFIG_MAINBOARD_PART_NUMBER="Veyron_Speedy"
 CONFIG_MAINBOARD_VENDOR="Google"
 CONFIG_MAX_CPUS=1
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
-CONFIG_CBFS_SIZE=0x100000
+CONFIG_CBFS_SIZE=0x400000
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_DEVICETREE="devicetree.cb"
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/config b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/config
new file mode 100644
index 00000000..d3e3b7aa
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/depthcharge/config
new file mode 100644
index 00000000..8b705934
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/config b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/depthcharge/config
new file mode 100644
index 00000000..8b705934
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/corebootfb/targets
new file mode 100644
index 00000000..0169dcf0
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/corebootfb/targets
@@ -0,0 +1,2 @@
+16mb
+4mb
diff --git a/projects/coreboot/configs/veyron/speedy/targets b/projects/coreboot/configs/veyron/speedy/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/depthcharge/configs/veyron/targets b/projects/depthcharge/configs/veyron/targets
index 1722192f..e4c9ca9e 100644
--- a/projects/depthcharge/configs/veyron/targets
+++ b/projects/depthcharge/configs/veyron/targets
@@ -1,2 +1,4 @@
+jerry
+mickey
 minnie
 speedy