diff --git a/blobs/librem_kbl/readme.md b/blobs/librem_kbl/readme.md index 427af8650..b24ec9a80 100644 --- a/blobs/librem_kbl/readme.md +++ b/blobs/librem_kbl/readme.md @@ -14,7 +14,7 @@ The script depends on: wget sha256sum python2.7 bspatch pv You can now compile the image with: ``` -make BOARD=librem13v4 +make BOARD=librem_13v4 or -make BOARD=librem15v4 +make BOARD=librem_15v4 ``` diff --git a/blobs/librem_skl/readme.md b/blobs/librem_skl/readme.md index 01d2596b2..39995cdc9 100644 --- a/blobs/librem_skl/readme.md +++ b/blobs/librem_skl/readme.md @@ -14,5 +14,7 @@ The script depends on: wget sha256sum python2.7 bspatch pv You can now compile the image with: ``` -make BOARD=librem13v2 +make BOARD=librem_13v2 +or +make BOARD=librem_15v3 ``` diff --git a/boards/librem13v2/librem13v2.config b/boards/librem_13v2/librem_13v2.config similarity index 86% rename from boards/librem13v2/librem13v2.config rename to boards/librem_13v2/librem_13v2.config index 1fbbe88d5..9c84e678c 100644 --- a/boards/librem13v2/librem13v2.config +++ b/boards/librem_13v2/librem_13v2.config @@ -1,6 +1,6 @@ -# Configuration for a librem13v2 -CONFIG_LINUX_CONFIG=config/linux-librem13v2.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem13v2.config +# Configuration for a librem_13v2 +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 diff --git a/boards/librem13v4/librem13v4.config b/boards/librem_13v4/librem_13v4.config similarity index 86% rename from boards/librem13v4/librem13v4.config rename to boards/librem_13v4/librem_13v4.config index f3996b395..09540cfd8 100644 --- a/boards/librem13v4/librem13v4.config +++ b/boards/librem_13v4/librem_13v4.config @@ -1,6 +1,6 @@ -# Configuration for a librem13v4 -CONFIG_LINUX_CONFIG=config/linux-librem13v2.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem13v4.config +# Configuration for a librem_13v4 +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v4.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 diff --git a/boards/librem15v3/librem15v3.config b/boards/librem_15v3/librem_15v3.config similarity index 82% rename from boards/librem15v3/librem15v3.config rename to boards/librem_15v3/librem_15v3.config index 7f1169896..2f1d5ca35 100644 --- a/boards/librem15v3/librem15v3.config +++ b/boards/librem_15v3/librem_15v3.config @@ -1,8 +1,6 @@ -# Configuration for a librem15v3 - -# The L15v3 Linux config is the same as the L13v2 linux config -CONFIG_LINUX_CONFIG=config/linux-librem13v2.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem15v3.config +# Configuration for a librem_15v3 +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 diff --git a/boards/librem15v4/librem15v4.config b/boards/librem_15v4/librem_15v4.config similarity index 82% rename from boards/librem15v4/librem15v4.config rename to boards/librem_15v4/librem_15v4.config index 651a6189e..f9d0f5d98 100644 --- a/boards/librem15v4/librem15v4.config +++ b/boards/librem_15v4/librem_15v4.config @@ -1,8 +1,6 @@ -# Configuration for a librem15v4 - -# The L15v4 Linux config is the same as the L13v2 linux config -CONFIG_LINUX_CONFIG=config/linux-librem13v2.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem15v4.config +# Configuration for a librem_15v4 +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index b2cb29b8a..a68773c0c 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -1,5 +1,5 @@ # Configuration for a librem mini -CONFIG_LINUX_CONFIG=config/linux-librem13v2.config +CONFIG_LINUX_CONFIG=config/linux-librem_common.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config export CONFIG_COREBOOT=y diff --git a/config/coreboot-librem13v2.config b/config/coreboot-librem_13v2.config similarity index 90% rename from config/coreboot-librem13v2.config rename to config/coreboot-librem_13v2.config index 412c2bfc2..d7c899877 100644 --- a/config/coreboot-librem13v2.config +++ b/config/coreboot-librem_13v2.config @@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage" +CONFIG_PAYLOAD_FILE="../../build/librem_13v2/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" -CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz" +CONFIG_LINUX_INITRD="../../build/librem_13v2/initrd.cpio.xz" diff --git a/config/coreboot-librem13v4.config b/config/coreboot-librem_13v4.config similarity index 90% rename from config/coreboot-librem13v4.config rename to config/coreboot-librem_13v4.config index 0d4abc8b5..66fd6aa07 100644 --- a/config/coreboot-librem13v4.config +++ b/config/coreboot-librem_13v4.config @@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage" +CONFIG_PAYLOAD_FILE="../../build/librem_13v4/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" -CONFIG_LINUX_INITRD="../../build/librem13v4/initrd.cpio.xz" +CONFIG_LINUX_INITRD="../../build/librem_13v4/initrd.cpio.xz" diff --git a/config/coreboot-librem15v3.config b/config/coreboot-librem_15v3.config similarity index 90% rename from config/coreboot-librem15v3.config rename to config/coreboot-librem_15v3.config index 4359227eb..7be32773d 100644 --- a/config/coreboot-librem15v3.config +++ b/config/coreboot-librem_15v3.config @@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage" +CONFIG_PAYLOAD_FILE="../../build/librem_15v3/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" -CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz" +CONFIG_LINUX_INITRD="../../build/librem_15v3/initrd.cpio.xz" diff --git a/config/coreboot-librem15v4.config b/config/coreboot-librem_15v4.config similarity index 90% rename from config/coreboot-librem15v4.config rename to config/coreboot-librem_15v4.config index 013718c26..36c0e95b8 100644 --- a/config/coreboot-librem15v4.config +++ b/config/coreboot-librem_15v4.config @@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage" +CONFIG_PAYLOAD_FILE="../../build/librem_15v4/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" -CONFIG_LINUX_INITRD="../../build/librem15v4/initrd.cpio.xz" +CONFIG_LINUX_INITRD="../../build/librem_15v4/initrd.cpio.xz" diff --git a/config/linux-librem13v2.config b/config/linux-librem_common.config similarity index 100% rename from config/linux-librem13v2.config rename to config/linux-librem_common.config