diff --git a/src/mainboard/dell/e7240/Makefile.mk b/src/mainboard/dell/e7240/Makefile.mk deleted file mode 100644 index c3dd619421..0000000000 --- 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/e7240/Kconfig b/src/mainboard/dell/haswell_latitude/Kconfig similarity index 51% rename from src/mainboard/dell/e7240/Kconfig rename to src/mainboard/dell/haswell_latitude/Kconfig index 4f24cf93ed..c01735d35d 100644 --- a/src/mainboard/dell/e7240/Kconfig +++ b/src/mainboard/dell/haswell_latitude/Kconfig @@ -1,26 +1,38 @@ ## SPDX-License-Identifier: GPL-2.0-only -if BOARD_DELL_LATITUDE_E7240 - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_8192 +config BOARD_DELL_HASWELL_LATITUDE_COMMON + def_bool n 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 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/e7240" + default "dell/haswell_latitude" config MAINBOARD_PART_NUMBER - default "Latitude E7240" + 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" 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 0000000000..38679fffac --- /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 87% rename from src/mainboard/dell/e7240/bootblock.c rename to src/mainboard/dell/haswell_latitude/bootblock.c index 2f6090a40f..a9223d3372 100644 --- a/src/mainboard/dell/e7240/bootblock.c +++ b/src/mainboard/dell/haswell_latitude/bootblock.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include #include diff --git a/src/mainboard/dell/e7240/devicetree.cb b/src/mainboard/dell/haswell_latitude/devicetree_lp.cb similarity index 82% rename from src/mainboard/dell/e7240/devicetree.cb rename to src/mainboard/dell/haswell_latitude/devicetree_lp.cb index 07d7cd1d5b..d9537886c0 100644 --- a/src/mainboard/dell/e7240/devicetree.cb +++ b/src/mainboard/dell/haswell_latitude/devicetree_lp.cb @@ -10,7 +10,6 @@ chip northbridge/intel/haswell device domain 0x0 on ops haswell_pci_domain_ops - subsystemid 0x1028 0x05ca inherit device pci 00.0 on end # Host bridge device pci 02.0 on # Internal graphics VGA controller @@ -30,7 +29,7 @@ chip northbridge/intel/haswell end device pci 03.0 on end # Mini-HD audio - chip southbridge/intel/lynxpoint # Intel Series 8 Lynx Point PCH + chip southbridge/intel/lynxpoint # Intel Series 8 Lynx Point LP PCH register "docking_supported" = "true" register "alt_gp_smi_en" = "0x00002000" register "gpe0_en_1" = "0x00000100" @@ -53,13 +52,12 @@ chip northbridge/intel/haswell device pci 17.0 off end # SDIO device pci 19.0 on end # Intel Gigabit Ethernet device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on end # PCIe Port #1 + device pci 1c.0 off end # PCIe Port #1 device pci 1c.1 off end # PCIe Port #2 device pci 1c.2 off end # PCIe Port #3 - device pci 1c.3 on end # PCIe Port #4, WLAN - device pci 1c.4 on end # PCIe Port #5, SD/MMC Card Reader - # PCIe Port #6 Can be muxed between PCIe and SATA - device pci 1c.5 on end # PCIe Port #6 + device pci 1c.3 off end # PCIe Port #4 + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 device pci 1d.0 on end # USB2 EHCI #1 device pci 1f.0 on # LPC bridge register "gen1_dec" = "0x007c0681" @@ -72,10 +70,7 @@ chip northbridge/intel/haswell device pnp ff.0 on end end end - device pci 1f.2 on # SATA Controller (AHCI) - # 0(eSATA on dock), 1(mSATA near the fan), 3(mSATA near WLAN) - register "sata_port_map" = "0x0b" - end + device pci 1f.2 on end # SATA Controller (AHCI) device pci 1f.3 on end # SMBus device pci 1f.6 off end # Thermal end 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 0000000000..a29e184fde --- /dev/null +++ b/src/mainboard/dell/haswell_latitude/variants/e7240/overridetree.cb @@ -0,0 +1,21 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +chip northbridge/intel/haswell + device domain 0 on + subsystemid 0x1028 0x05ca inherit + + chip southbridge/intel/lynxpoint # Intel Series 8 Lynx Point PCH + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 on end # PCIe Port #5, SD/MMC Card Reader + # PCIe Port #6 Can be muxed between PCIe and SATA + device pci 1c.5 on end # PCIe Port #6 + device pci 1f.2 on # SATA Controller (AHCI) + # 0(eSATA on dock), 1(mSATA near the fan), 3(mSATA near WLAN) + register "sata_port_map" = "0x0b" + end + end + 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