Nicholas Chin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86096?usp=email )
Change subject: mb/dell: Convert Latitude E7240 into a variant ......................................................................
mb/dell: Convert Latitude E7240 into a variant
In preparation for adding additional Haswell based Dell Latitude laptops, rework the E7240 port to use a variant scheme.
Change-Id: I3031910db6d817824320320f137b0f99cdfe1d9a Signed-off-by: Nicholas Chin nic.c3.14@gmail.com --- D src/mainboard/dell/e7240/Kconfig D src/mainboard/dell/e7240/Makefile.mk A src/mainboard/dell/haswell_latitude/Kconfig R src/mainboard/dell/haswell_latitude/Kconfig.name A src/mainboard/dell/haswell_latitude/Makefile.mk R src/mainboard/dell/haswell_latitude/acpi/ec.asl R src/mainboard/dell/haswell_latitude/acpi/platform.asl R src/mainboard/dell/haswell_latitude/acpi/superio.asl R src/mainboard/dell/haswell_latitude/board_info.txt R src/mainboard/dell/haswell_latitude/bootblock.c R src/mainboard/dell/haswell_latitude/devicetree_lp.cb R src/mainboard/dell/haswell_latitude/dsdt.asl R src/mainboard/dell/haswell_latitude/gma-mainboard.ads R src/mainboard/dell/haswell_latitude/variants/e7240/gpio.c R src/mainboard/dell/haswell_latitude/variants/e7240/hda_verb.c A src/mainboard/dell/haswell_latitude/variants/e7240/overridetree.cb R src/mainboard/dell/haswell_latitude/variants/e7240/romstage.c 17 files changed, 57 insertions(+), 36 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/86096/1
diff --git a/src/mainboard/dell/e7240/Kconfig b/src/mainboard/dell/e7240/Kconfig deleted file mode 100644 index 4f24cf9..0000000 --- a/src/mainboard/dell/e7240/Kconfig +++ /dev/null @@ -1,31 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -if BOARD_DELL_LATITUDE_E7240 - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_8192 - select EC_DELL_MEC5035 - select HAVE_ACPI_RESUME - select HAVE_ACPI_TABLES - select INTEL_LYNXPOINT_LP - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_USES_IFD_GBE_REGION - select NORTHBRIDGE_INTEL_HASWELL - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_LYNXPOINT - select SYSTEM_TYPE_LAPTOP - -config MAINBOARD_DIR - default "dell/e7240" - -config MAINBOARD_PART_NUMBER - default "Latitude E7240" - -config VGA_BIOS_ID - default "8086,0a16" - -config USBDEBUG_HCD_INDEX - default 1 - -endif diff --git a/src/mainboard/dell/e7240/Makefile.mk b/src/mainboard/dell/e7240/Makefile.mk deleted file mode 100644 index c3dd619..0000000 --- a/src/mainboard/dell/e7240/Makefile.mk +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/dell/haswell_latitude/Kconfig b/src/mainboard/dell/haswell_latitude/Kconfig new file mode 100644 index 0000000..c01735d --- /dev/null +++ b/src/mainboard/dell/haswell_latitude/Kconfig @@ -0,0 +1,43 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config BOARD_DELL_HASWELL_LATITUDE_COMMON + def_bool n + select EC_DELL_MEC5035 + select HAVE_ACPI_RESUME + select HAVE_ACPI_TABLES + select MAINBOARD_HAS_LIBGFXINIT + select NORTHBRIDGE_INTEL_HASWELL + select SERIRQ_CONTINUOUS_MODE + select SOUTHBRIDGE_INTEL_LYNXPOINT + select SYSTEM_TYPE_LAPTOP + +config BOARD_DELL_LATITUDE_E7240 + select BOARD_DELL_HASWELL_LATITUDE_COMMON + select BOARD_ROMSIZE_KB_8192 + select INTEL_LYNXPOINT_LP + select MAINBOARD_USES_IFD_GBE_REGION + +if BOARD_DELL_HASWELL_LATITUDE_COMMON + +config MAINBOARD_DIR + default "dell/haswell_latitude" + +config MAINBOARD_PART_NUMBER + default "Latitude E7240" if BOARD_DELL_LATITUDE_E7240 + +config DEVICETREE + default "devicetree_lp.cb" if INTEL_LYNXPOINT_LP + +config VARIANT_DIR + default "e7240" if BOARD_DELL_LATITUDE_E7240 + +config OVERRIDE_DEVICETREE + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + +config VGA_BIOS_ID + default "8086,0a16" + +config USBDEBUG_HCD_INDEX + default 1 + +endif diff --git a/src/mainboard/dell/e7240/Kconfig.name b/src/mainboard/dell/haswell_latitude/Kconfig.name similarity index 100% rename from src/mainboard/dell/e7240/Kconfig.name rename to src/mainboard/dell/haswell_latitude/Kconfig.name diff --git a/src/mainboard/dell/haswell_latitude/Makefile.mk b/src/mainboard/dell/haswell_latitude/Makefile.mk new file mode 100644 index 0000000..38679ff --- /dev/null +++ b/src/mainboard/dell/haswell_latitude/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +romstage-y += variants/$(VARIANT_DIR)/gpio.c +romstage-y += variants/$(VARIANT_DIR)/romstage.c +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c diff --git a/src/mainboard/dell/e7240/acpi/ec.asl b/src/mainboard/dell/haswell_latitude/acpi/ec.asl similarity index 100% rename from src/mainboard/dell/e7240/acpi/ec.asl rename to src/mainboard/dell/haswell_latitude/acpi/ec.asl diff --git a/src/mainboard/dell/e7240/acpi/platform.asl b/src/mainboard/dell/haswell_latitude/acpi/platform.asl similarity index 100% rename from src/mainboard/dell/e7240/acpi/platform.asl rename to src/mainboard/dell/haswell_latitude/acpi/platform.asl diff --git a/src/mainboard/dell/e7240/acpi/superio.asl b/src/mainboard/dell/haswell_latitude/acpi/superio.asl similarity index 100% rename from src/mainboard/dell/e7240/acpi/superio.asl rename to src/mainboard/dell/haswell_latitude/acpi/superio.asl diff --git a/src/mainboard/dell/e7240/board_info.txt b/src/mainboard/dell/haswell_latitude/board_info.txt similarity index 100% rename from src/mainboard/dell/e7240/board_info.txt rename to src/mainboard/dell/haswell_latitude/board_info.txt diff --git a/src/mainboard/dell/e7240/bootblock.c b/src/mainboard/dell/haswell_latitude/bootblock.c similarity index 100% rename from src/mainboard/dell/e7240/bootblock.c rename to src/mainboard/dell/haswell_latitude/bootblock.c diff --git a/src/mainboard/dell/e7240/devicetree.cb b/src/mainboard/dell/haswell_latitude/devicetree_lp.cb similarity index 100% rename from src/mainboard/dell/e7240/devicetree.cb rename to src/mainboard/dell/haswell_latitude/devicetree_lp.cb diff --git a/src/mainboard/dell/e7240/dsdt.asl b/src/mainboard/dell/haswell_latitude/dsdt.asl similarity index 100% rename from src/mainboard/dell/e7240/dsdt.asl rename to src/mainboard/dell/haswell_latitude/dsdt.asl diff --git a/src/mainboard/dell/e7240/gma-mainboard.ads b/src/mainboard/dell/haswell_latitude/gma-mainboard.ads similarity index 100% rename from src/mainboard/dell/e7240/gma-mainboard.ads rename to src/mainboard/dell/haswell_latitude/gma-mainboard.ads diff --git a/src/mainboard/dell/e7240/gpio.c b/src/mainboard/dell/haswell_latitude/variants/e7240/gpio.c similarity index 100% rename from src/mainboard/dell/e7240/gpio.c rename to src/mainboard/dell/haswell_latitude/variants/e7240/gpio.c diff --git a/src/mainboard/dell/e7240/hda_verb.c b/src/mainboard/dell/haswell_latitude/variants/e7240/hda_verb.c similarity index 100% rename from src/mainboard/dell/e7240/hda_verb.c rename to src/mainboard/dell/haswell_latitude/variants/e7240/hda_verb.c diff --git a/src/mainboard/dell/haswell_latitude/variants/e7240/overridetree.cb b/src/mainboard/dell/haswell_latitude/variants/e7240/overridetree.cb new file mode 100644 index 0000000..58a8983 --- /dev/null +++ b/src/mainboard/dell/haswell_latitude/variants/e7240/overridetree.cb @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +chip northbridge/intel/haswell + device domain 0 on + subsystemid 0x1028 0x05ca inherit + end +end diff --git a/src/mainboard/dell/e7240/romstage.c b/src/mainboard/dell/haswell_latitude/variants/e7240/romstage.c similarity index 100% rename from src/mainboard/dell/e7240/romstage.c rename to src/mainboard/dell/haswell_latitude/variants/e7240/romstage.c