From 3bd1f08574713bb4170c9d509c43f6d19e2f5eff Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 14 Jan 2019 22:39:00 -0500 Subject: Restructure X60 coreboot target directories The intent is to create a simple rule of thumb where arguments are given beginning with those that relate to the device's physical attributes, such as flash chip size, continuing with arguments on how to use the hardware (e.g. display mode), and ending with anything else. --- projects/coreboot/configs/x60/16mb/config | 5 +++++ projects/coreboot/configs/x60/16mb/corebootfb/config | 3 +++ projects/coreboot/configs/x60/16mb/corebootfb/grub/config | 1 + projects/coreboot/configs/x60/16mb/corebootfb/seabios/config | 1 + projects/coreboot/configs/x60/16mb/corebootfb/targets | 2 ++ projects/coreboot/configs/x60/16mb/targets | 2 ++ projects/coreboot/configs/x60/16mb/textmode/config | 1 + projects/coreboot/configs/x60/16mb/textmode/grub/config | 1 + projects/coreboot/configs/x60/16mb/textmode/seabios/config | 1 + projects/coreboot/configs/x60/16mb/textmode/targets | 2 ++ projects/coreboot/configs/x60/2mb/config | 4 ++++ projects/coreboot/configs/x60/2mb/corebootfb/config | 3 +++ projects/coreboot/configs/x60/2mb/corebootfb/grub/config | 1 + projects/coreboot/configs/x60/2mb/corebootfb/seabios/config | 1 + projects/coreboot/configs/x60/2mb/corebootfb/targets | 2 ++ projects/coreboot/configs/x60/2mb/targets | 2 ++ projects/coreboot/configs/x60/2mb/textmode/config | 1 + projects/coreboot/configs/x60/2mb/textmode/grub/config | 1 + projects/coreboot/configs/x60/2mb/textmode/seabios/config | 1 + projects/coreboot/configs/x60/2mb/textmode/targets | 2 ++ projects/coreboot/configs/x60/corebootfb/16mb/config | 5 ----- projects/coreboot/configs/x60/corebootfb/16mb/grub/config | 1 - projects/coreboot/configs/x60/corebootfb/16mb/seabios/config | 1 - projects/coreboot/configs/x60/corebootfb/16mb/targets | 2 -- projects/coreboot/configs/x60/corebootfb/2mb/config | 4 ---- projects/coreboot/configs/x60/corebootfb/2mb/grub/config | 1 - projects/coreboot/configs/x60/corebootfb/2mb/seabios/config | 1 - projects/coreboot/configs/x60/corebootfb/2mb/targets | 2 -- projects/coreboot/configs/x60/corebootfb/config | 3 --- projects/coreboot/configs/x60/corebootfb/targets | 2 -- projects/coreboot/configs/x60/targets | 4 ++-- projects/coreboot/configs/x60/textmode/16mb/config | 5 ----- projects/coreboot/configs/x60/textmode/16mb/grub/config | 1 - projects/coreboot/configs/x60/textmode/16mb/seabios/config | 1 - projects/coreboot/configs/x60/textmode/16mb/targets | 2 -- projects/coreboot/configs/x60/textmode/2mb/config | 4 ---- projects/coreboot/configs/x60/textmode/2mb/grub/config | 1 - projects/coreboot/configs/x60/textmode/2mb/seabios/config | 1 - projects/coreboot/configs/x60/textmode/2mb/targets | 2 -- projects/coreboot/configs/x60/textmode/config | 1 - projects/coreboot/configs/x60/textmode/targets | 2 -- 41 files changed, 39 insertions(+), 44 deletions(-) create mode 100644 projects/coreboot/configs/x60/16mb/config create mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/config create mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/grub/config create mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/seabios/config create mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/targets create mode 100644 projects/coreboot/configs/x60/16mb/targets create mode 100644 projects/coreboot/configs/x60/16mb/textmode/config create mode 100644 projects/coreboot/configs/x60/16mb/textmode/grub/config create mode 100644 projects/coreboot/configs/x60/16mb/textmode/seabios/config create mode 100644 projects/coreboot/configs/x60/16mb/textmode/targets create mode 100644 projects/coreboot/configs/x60/2mb/config create mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/config create mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/grub/config create mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/seabios/config create mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/targets create mode 100644 projects/coreboot/configs/x60/2mb/targets create mode 100644 projects/coreboot/configs/x60/2mb/textmode/config create mode 100644 projects/coreboot/configs/x60/2mb/textmode/grub/config create mode 100644 projects/coreboot/configs/x60/2mb/textmode/seabios/config create mode 100644 projects/coreboot/configs/x60/2mb/textmode/targets delete mode 100644 projects/coreboot/configs/x60/corebootfb/16mb/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/16mb/grub/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/16mb/seabios/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/16mb/targets delete mode 100644 projects/coreboot/configs/x60/corebootfb/2mb/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/2mb/grub/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/2mb/seabios/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/2mb/targets delete mode 100644 projects/coreboot/configs/x60/corebootfb/config delete mode 100644 projects/coreboot/configs/x60/corebootfb/targets delete mode 100644 projects/coreboot/configs/x60/textmode/16mb/config delete mode 100644 projects/coreboot/configs/x60/textmode/16mb/grub/config delete mode 100644 projects/coreboot/configs/x60/textmode/16mb/seabios/config delete mode 100644 projects/coreboot/configs/x60/textmode/16mb/targets delete mode 100644 projects/coreboot/configs/x60/textmode/2mb/config delete mode 100644 projects/coreboot/configs/x60/textmode/2mb/grub/config delete mode 100644 projects/coreboot/configs/x60/textmode/2mb/seabios/config delete mode 100644 projects/coreboot/configs/x60/textmode/2mb/targets delete mode 100644 projects/coreboot/configs/x60/textmode/config delete mode 100644 projects/coreboot/configs/x60/textmode/targets (limited to 'projects/coreboot') diff --git a/projects/coreboot/configs/x60/16mb/config b/projects/coreboot/configs/x60/16mb/config new file mode 100644 index 00000000..a4cf5cf7 --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/config @@ -0,0 +1,5 @@ +CONFIG_CBFS_SIZE=0x1000000 +CONFIG_COREBOOT_ROMSIZE_KB_2048=n +CONFIG_COREBOOT_ROMSIZE_KB_16384=y +CONFIG_COREBOOT_ROMSIZE_KB=16384 +CONFIG_ROM_SIZE=0x1000000 diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/config b/projects/coreboot/configs/x60/16mb/corebootfb/config new file mode 100644 index 00000000..c86e2073 --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/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/x60/16mb/corebootfb/grub/config b/projects/coreboot/configs/x60/16mb/corebootfb/grub/config new file mode 100644 index 00000000..5170a90a --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/corebootfb/grub/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config new file mode 100644 index 00000000..a3c13aff --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/targets b/projects/coreboot/configs/x60/16mb/corebootfb/targets new file mode 100644 index 00000000..f2cba0e5 --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/corebootfb/targets @@ -0,0 +1,2 @@ +grub +seabios diff --git a/projects/coreboot/configs/x60/16mb/targets b/projects/coreboot/configs/x60/16mb/targets new file mode 100644 index 00000000..f84c583a --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/targets @@ -0,0 +1,2 @@ +corebootfb +textmode diff --git a/projects/coreboot/configs/x60/16mb/textmode/config b/projects/coreboot/configs/x60/16mb/textmode/config new file mode 100644 index 00000000..5d8cce57 --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/textmode/config @@ -0,0 +1 @@ +CONFIG_VGA_TEXT_FRAMEBUFFER=y diff --git a/projects/coreboot/configs/x60/16mb/textmode/grub/config b/projects/coreboot/configs/x60/16mb/textmode/grub/config new file mode 100644 index 00000000..5170a90a --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/textmode/grub/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/16mb/textmode/seabios/config b/projects/coreboot/configs/x60/16mb/textmode/seabios/config new file mode 100644 index 00000000..a3c13aff --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/textmode/seabios/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/16mb/textmode/targets b/projects/coreboot/configs/x60/16mb/textmode/targets new file mode 100644 index 00000000..f2cba0e5 --- /dev/null +++ b/projects/coreboot/configs/x60/16mb/textmode/targets @@ -0,0 +1,2 @@ +grub +seabios diff --git a/projects/coreboot/configs/x60/2mb/config b/projects/coreboot/configs/x60/2mb/config new file mode 100644 index 00000000..adffe7ae --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/config @@ -0,0 +1,4 @@ +CONFIG_CBFS_SIZE=0x200000 +CONFIG_COREBOOT_ROMSIZE_KB_2048=y +CONFIG_COREBOOT_ROMSIZE_KB=2048 +CONFIG_ROM_SIZE=0x200000 diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/config b/projects/coreboot/configs/x60/2mb/corebootfb/config new file mode 100644 index 00000000..c86e2073 --- /dev/null +++ b/projects/coreboot/configs/x60/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/x60/2mb/corebootfb/grub/config b/projects/coreboot/configs/x60/2mb/corebootfb/grub/config new file mode 100644 index 00000000..5170a90a --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/corebootfb/grub/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config new file mode 100644 index 00000000..a3c13aff --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/targets b/projects/coreboot/configs/x60/2mb/corebootfb/targets new file mode 100644 index 00000000..f2cba0e5 --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/corebootfb/targets @@ -0,0 +1,2 @@ +grub +seabios diff --git a/projects/coreboot/configs/x60/2mb/targets b/projects/coreboot/configs/x60/2mb/targets new file mode 100644 index 00000000..f84c583a --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/targets @@ -0,0 +1,2 @@ +corebootfb +textmode diff --git a/projects/coreboot/configs/x60/2mb/textmode/config b/projects/coreboot/configs/x60/2mb/textmode/config new file mode 100644 index 00000000..5d8cce57 --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/textmode/config @@ -0,0 +1 @@ +CONFIG_VGA_TEXT_FRAMEBUFFER=y diff --git a/projects/coreboot/configs/x60/2mb/textmode/grub/config b/projects/coreboot/configs/x60/2mb/textmode/grub/config new file mode 100644 index 00000000..5170a90a --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/textmode/grub/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/2mb/textmode/seabios/config b/projects/coreboot/configs/x60/2mb/textmode/seabios/config new file mode 100644 index 00000000..a3c13aff --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/textmode/seabios/config @@ -0,0 +1 @@ +CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/2mb/textmode/targets b/projects/coreboot/configs/x60/2mb/textmode/targets new file mode 100644 index 00000000..f2cba0e5 --- /dev/null +++ b/projects/coreboot/configs/x60/2mb/textmode/targets @@ -0,0 +1,2 @@ +grub +seabios diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/config b/projects/coreboot/configs/x60/corebootfb/16mb/config deleted file mode 100644 index a4cf5cf7..00000000 --- a/projects/coreboot/configs/x60/corebootfb/16mb/config +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_CBFS_SIZE=0x1000000 -CONFIG_COREBOOT_ROMSIZE_KB_2048=n -CONFIG_COREBOOT_ROMSIZE_KB_16384=y -CONFIG_COREBOOT_ROMSIZE_KB=16384 -CONFIG_ROM_SIZE=0x1000000 diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/grub/config b/projects/coreboot/configs/x60/corebootfb/16mb/grub/config deleted file mode 100644 index 5170a90a..00000000 --- a/projects/coreboot/configs/x60/corebootfb/16mb/grub/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config deleted file mode 100644 index a3c13aff..00000000 --- a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/targets b/projects/coreboot/configs/x60/corebootfb/16mb/targets deleted file mode 100644 index f2cba0e5..00000000 --- a/projects/coreboot/configs/x60/corebootfb/16mb/targets +++ /dev/null @@ -1,2 +0,0 @@ -grub -seabios diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/config b/projects/coreboot/configs/x60/corebootfb/2mb/config deleted file mode 100644 index adffe7ae..00000000 --- a/projects/coreboot/configs/x60/corebootfb/2mb/config +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_CBFS_SIZE=0x200000 -CONFIG_COREBOOT_ROMSIZE_KB_2048=y -CONFIG_COREBOOT_ROMSIZE_KB=2048 -CONFIG_ROM_SIZE=0x200000 diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/grub/config b/projects/coreboot/configs/x60/corebootfb/2mb/grub/config deleted file mode 100644 index 5170a90a..00000000 --- a/projects/coreboot/configs/x60/corebootfb/2mb/grub/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config b/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config deleted file mode 100644 index a3c13aff..00000000 --- a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/targets b/projects/coreboot/configs/x60/corebootfb/2mb/targets deleted file mode 100644 index f2cba0e5..00000000 --- a/projects/coreboot/configs/x60/corebootfb/2mb/targets +++ /dev/null @@ -1,2 +0,0 @@ -grub -seabios diff --git a/projects/coreboot/configs/x60/corebootfb/config b/projects/coreboot/configs/x60/corebootfb/config deleted file mode 100644 index c86e2073..00000000 --- a/projects/coreboot/configs/x60/corebootfb/config +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_VGA_TEXT_FRAMEBUFFER=n -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_LINEAR_FRAMEBUFFER=y diff --git a/projects/coreboot/configs/x60/corebootfb/targets b/projects/coreboot/configs/x60/corebootfb/targets deleted file mode 100644 index b22e49ab..00000000 --- a/projects/coreboot/configs/x60/corebootfb/targets +++ /dev/null @@ -1,2 +0,0 @@ -16mb -2mb diff --git a/projects/coreboot/configs/x60/targets b/projects/coreboot/configs/x60/targets index f84c583a..b22e49ab 100644 --- a/projects/coreboot/configs/x60/targets +++ b/projects/coreboot/configs/x60/targets @@ -1,2 +1,2 @@ -corebootfb -textmode +16mb +2mb diff --git a/projects/coreboot/configs/x60/textmode/16mb/config b/projects/coreboot/configs/x60/textmode/16mb/config deleted file mode 100644 index a4cf5cf7..00000000 --- a/projects/coreboot/configs/x60/textmode/16mb/config +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_CBFS_SIZE=0x1000000 -CONFIG_COREBOOT_ROMSIZE_KB_2048=n -CONFIG_COREBOOT_ROMSIZE_KB_16384=y -CONFIG_COREBOOT_ROMSIZE_KB=16384 -CONFIG_ROM_SIZE=0x1000000 diff --git a/projects/coreboot/configs/x60/textmode/16mb/grub/config b/projects/coreboot/configs/x60/textmode/16mb/grub/config deleted file mode 100644 index 5170a90a..00000000 --- a/projects/coreboot/configs/x60/textmode/16mb/grub/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/textmode/16mb/seabios/config b/projects/coreboot/configs/x60/textmode/16mb/seabios/config deleted file mode 100644 index a3c13aff..00000000 --- a/projects/coreboot/configs/x60/textmode/16mb/seabios/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/textmode/16mb/targets b/projects/coreboot/configs/x60/textmode/16mb/targets deleted file mode 100644 index f2cba0e5..00000000 --- a/projects/coreboot/configs/x60/textmode/16mb/targets +++ /dev/null @@ -1,2 +0,0 @@ -grub -seabios diff --git a/projects/coreboot/configs/x60/textmode/2mb/config b/projects/coreboot/configs/x60/textmode/2mb/config deleted file mode 100644 index adffe7ae..00000000 --- a/projects/coreboot/configs/x60/textmode/2mb/config +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_CBFS_SIZE=0x200000 -CONFIG_COREBOOT_ROMSIZE_KB_2048=y -CONFIG_COREBOOT_ROMSIZE_KB=2048 -CONFIG_ROM_SIZE=0x200000 diff --git a/projects/coreboot/configs/x60/textmode/2mb/grub/config b/projects/coreboot/configs/x60/textmode/2mb/grub/config deleted file mode 100644 index 5170a90a..00000000 --- a/projects/coreboot/configs/x60/textmode/2mb/grub/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2" diff --git a/projects/coreboot/configs/x60/textmode/2mb/seabios/config b/projects/coreboot/configs/x60/textmode/2mb/seabios/config deleted file mode 100644 index a3c13aff..00000000 --- a/projects/coreboot/configs/x60/textmode/2mb/seabios/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf" diff --git a/projects/coreboot/configs/x60/textmode/2mb/targets b/projects/coreboot/configs/x60/textmode/2mb/targets deleted file mode 100644 index f2cba0e5..00000000 --- a/projects/coreboot/configs/x60/textmode/2mb/targets +++ /dev/null @@ -1,2 +0,0 @@ -grub -seabios diff --git a/projects/coreboot/configs/x60/textmode/config b/projects/coreboot/configs/x60/textmode/config deleted file mode 100644 index 5d8cce57..00000000 --- a/projects/coreboot/configs/x60/textmode/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_VGA_TEXT_FRAMEBUFFER=y diff --git a/projects/coreboot/configs/x60/textmode/targets b/projects/coreboot/configs/x60/textmode/targets deleted file mode 100644 index b22e49ab..00000000 --- a/projects/coreboot/configs/x60/textmode/targets +++ /dev/null @@ -1,2 +0,0 @@ -16mb -2mb -- cgit v1.2.3-70-g09d2