diff --git a/src/mainboard/purism/librem13v1/Kconfig b/src/mainboard/purism/librem_bdl/Kconfig similarity index 61% rename from src/mainboard/purism/librem13v1/Kconfig rename to src/mainboard/purism/librem_bdl/Kconfig index c4fb14bff3..63863ca41a 100644 --- a/src/mainboard/purism/librem13v1/Kconfig +++ b/src/mainboard/purism/librem_bdl/Kconfig @@ -1,7 +1,5 @@ -if BOARD_PURISM_LIBREM13_V1 - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y +config BOARD_PURISM_BASEBOARD_LIBREM_BDL + def_bool n select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 select EC_PURISM_LIBREM @@ -10,6 +8,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_INT15 select SOC_INTEL_BROADWELL +if BOARD_PURISM_BASEBOARD_LIBREM_BDL + +config VARIANT_DIR + string + default "librem13v1" if BOARD_PURISM_LIBREM13_V1 + +config DEVICETREE + string + default "variants/librem13v1/devicetree.cb" if BOARD_PURISM_LIBREM13_V1 + config DRIVERS_PS2_KEYBOARD def_bool y help @@ -37,11 +45,23 @@ config HAVE_ME_BIN config MAINBOARD_DIR string - default purism/librem13v1 + default purism/librem_bdl + +config MAINBOARD_VENDOR + string + default "Purism" config MAINBOARD_PART_NUMBER string - default "Librem 13 v1" + default "Librem 13 v1" if BOARD_PURISM_LIBREM13_V1 + +config MAINBOARD_FAMILY + string + default "Librem 13" if BOARD_PURISM_LIBREM13_V1 + +config MAINBOARD_VERSION + string + default "1.0" if BOARD_PURISM_LIBREM13_V1 config MAX_CPUS int diff --git a/src/mainboard/purism/librem13v1/Kconfig.name b/src/mainboard/purism/librem_bdl/Kconfig.name similarity index 55% rename from src/mainboard/purism/librem13v1/Kconfig.name rename to src/mainboard/purism/librem_bdl/Kconfig.name index c32690c430..498c6ef2bf 100644 --- a/src/mainboard/purism/librem13v1/Kconfig.name +++ b/src/mainboard/purism/librem_bdl/Kconfig.name @@ -1,2 +1,3 @@ config BOARD_PURISM_LIBREM13_V1 bool "Librem 13 v1" + select BOARD_PURISM_BASEBOARD_LIBREM_BDL diff --git a/src/mainboard/purism/librem13v1/Makefile.inc b/src/mainboard/purism/librem_bdl/Makefile.inc similarity index 84% rename from src/mainboard/purism/librem13v1/Makefile.inc rename to src/mainboard/purism/librem_bdl/Makefile.inc index 44e79c3889..293e186cec 100644 --- a/src/mainboard/purism/librem13v1/Makefile.inc +++ b/src/mainboard/purism/librem_bdl/Makefile.inc @@ -13,5 +13,5 @@ ## GNU General Public License for more details. ## -romstage-y += pei_data.c -ramstage-y += pei_data.c +romstage-y += variants/$(VARIANT_DIR)/pei_data.c +ramstage-y += variants/$(VARIANT_DIR)/pei_data.c diff --git a/src/mainboard/purism/librem13v1/acpi/ec.asl b/src/mainboard/purism/librem_bdl/acpi/ec.asl similarity index 100% rename from src/mainboard/purism/librem13v1/acpi/ec.asl rename to src/mainboard/purism/librem_bdl/acpi/ec.asl diff --git a/src/mainboard/purism/librem13v1/acpi/mainboard.asl b/src/mainboard/purism/librem_bdl/acpi/mainboard.asl similarity index 100% rename from src/mainboard/purism/librem13v1/acpi/mainboard.asl rename to src/mainboard/purism/librem_bdl/acpi/mainboard.asl diff --git a/src/mainboard/purism/librem13v1/acpi/superio.asl b/src/mainboard/purism/librem_bdl/acpi/superio.asl similarity index 100% rename from src/mainboard/purism/librem13v1/acpi/superio.asl rename to src/mainboard/purism/librem_bdl/acpi/superio.asl diff --git a/src/mainboard/purism/librem13v1/acpi_tables.c b/src/mainboard/purism/librem_bdl/acpi_tables.c similarity index 100% rename from src/mainboard/purism/librem13v1/acpi_tables.c rename to src/mainboard/purism/librem_bdl/acpi_tables.c diff --git a/src/mainboard/purism/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/board_info.txt similarity index 67% rename from src/mainboard/purism/librem13v1/board_info.txt rename to src/mainboard/purism/librem_bdl/board_info.txt index caaa9d924f..99b05e7fd7 100644 --- a/src/mainboard/purism/librem13v1/board_info.txt +++ b/src/mainboard/purism/librem_bdl/board_info.txt @@ -1,7 +1,6 @@ Category: laptop Vendor name: Purism -Board name: Librem 13 v1 -Board URL: https://puri.sm/librem-13/ +Board name: Librem Broadwell baseboard ROM package: SOIC8 ROM protocol: SPI ROM socketed: n diff --git a/src/mainboard/purism/librem13v1/dsdt.asl b/src/mainboard/purism/librem_bdl/dsdt.asl similarity index 100% rename from src/mainboard/purism/librem13v1/dsdt.asl rename to src/mainboard/purism/librem_bdl/dsdt.asl diff --git a/src/mainboard/purism/librem13v1/fadt.c b/src/mainboard/purism/librem_bdl/fadt.c similarity index 100% rename from src/mainboard/purism/librem13v1/fadt.c rename to src/mainboard/purism/librem_bdl/fadt.c diff --git a/src/mainboard/purism/librem13v1/gpio.h b/src/mainboard/purism/librem_bdl/gpio.h similarity index 100% rename from src/mainboard/purism/librem13v1/gpio.h rename to src/mainboard/purism/librem_bdl/gpio.h diff --git a/src/mainboard/purism/librem13v1/hda_verb.c b/src/mainboard/purism/librem_bdl/hda_verb.c similarity index 100% rename from src/mainboard/purism/librem13v1/hda_verb.c rename to src/mainboard/purism/librem_bdl/hda_verb.c diff --git a/src/mainboard/purism/librem13v1/mainboard.c b/src/mainboard/purism/librem_bdl/mainboard.c similarity index 100% rename from src/mainboard/purism/librem13v1/mainboard.c rename to src/mainboard/purism/librem_bdl/mainboard.c diff --git a/src/mainboard/purism/librem13v1/romstage.c b/src/mainboard/purism/librem_bdl/romstage.c similarity index 100% rename from src/mainboard/purism/librem13v1/romstage.c rename to src/mainboard/purism/librem_bdl/romstage.c diff --git a/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt new file mode 100644 index 0000000000..2e4dfd9ee1 --- /dev/null +++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt @@ -0,0 +1,9 @@ +Category: laptop +Vendor name: Purism +Board name: Librem 13 v1 +Board URL: https://web.archive.org/web/20161018125457/https://puri.sm/librem-13 +ROM package: SOIC8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y +Release year: 2015 diff --git a/src/mainboard/purism/librem13v1/devicetree.cb b/src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb similarity index 100% rename from src/mainboard/purism/librem13v1/devicetree.cb rename to src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb diff --git a/src/mainboard/purism/librem13v1/pei_data.c b/src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c similarity index 100% rename from src/mainboard/purism/librem13v1/pei_data.c rename to src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c