Pablo Stebler has uploaded this change for review.
mb/dell/latitude_e7240: Transform into variant
In preparation for E7440 support.
Untested for now.
Something like "hsw_bdw_laptops" could be a better name from a git
history POV if other boards like E5450 or M4800 are subsequently added.
Signed-off-by: Pablo Stebler <pablo@stebler.xyz>
Change-Id: I95a9d72a285f296309f4c0d11ec0de6079ac383d
---
D src/mainboard/dell/latitude_e7240/Kconfig.name
D src/mainboard/dell/latitude_e7240/Makefile.inc
D src/mainboard/dell/latitude_e7240/board_info.txt
R src/mainboard/dell/latitude_e7x40/Kconfig
A src/mainboard/dell/latitude_e7x40/Kconfig.name
A src/mainboard/dell/latitude_e7x40/Makefile.inc
R src/mainboard/dell/latitude_e7x40/acpi/ec.asl
R src/mainboard/dell/latitude_e7x40/acpi/platform.asl
R src/mainboard/dell/latitude_e7x40/acpi/superio.asl
R src/mainboard/dell/latitude_e7x40/acpi_tables.c
A src/mainboard/dell/latitude_e7x40/board_info.txt
R src/mainboard/dell/latitude_e7x40/bootblock.c
R src/mainboard/dell/latitude_e7x40/devicetree.cb
R src/mainboard/dell/latitude_e7x40/dsdt.asl
R src/mainboard/dell/latitude_e7x40/gma-mainboard.ads
R src/mainboard/dell/latitude_e7x40/mainboard.c
R src/mainboard/dell/latitude_e7x40/romstage.c
A src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/board_info.txt
R src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/gpio.c
R src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/hda_verb.c
A src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/overridetree.cb
21 files changed, 39 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/46539/1
diff --git a/src/mainboard/dell/latitude_e7240/Kconfig.name b/src/mainboard/dell/latitude_e7240/Kconfig.name
deleted file mode 100644
index 83ab935..0000000
--- a/src/mainboard/dell/latitude_e7240/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_DELL_LATITUDE_E7240
- bool "Latitude E7240"
diff --git a/src/mainboard/dell/latitude_e7240/Makefile.inc b/src/mainboard/dell/latitude_e7240/Makefile.inc
deleted file mode 100644
index ec8ca22..0000000
--- a/src/mainboard/dell/latitude_e7240/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-bootblock-y += bootblock.c
-bootblock-y += gpio.c
-romstage-y += gpio.c
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/dell/latitude_e7240/board_info.txt b/src/mainboard/dell/latitude_e7240/board_info.txt
deleted file mode 100644
index 46e950a..0000000
--- a/src/mainboard/dell/latitude_e7240/board_info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Category: laptop
-Board URL: https://www.dell.com/support/home/en-us/product-support/product/latitude-e7240-ultrabook/docs
-ROM protocol: SPI
-ROM package: SOIC-8
-ROM socketed: n
-Flashrom support: n
-Release year: 2013
diff --git a/src/mainboard/dell/latitude_e7240/Kconfig b/src/mainboard/dell/latitude_e7x40/Kconfig
similarity index 65%
rename from src/mainboard/dell/latitude_e7240/Kconfig
rename to src/mainboard/dell/latitude_e7x40/Kconfig
index 2e3b4b4..05ed643 100644
--- a/src/mainboard/dell/latitude_e7240/Kconfig
+++ b/src/mainboard/dell/latitude_e7x40/Kconfig
@@ -1,7 +1,7 @@
-if BOARD_DELL_LATITUDE_E7240
+## SPDX-License-Identifier: GPL-2.0-only
-config BOARD_SPECIFIC_OPTIONS
- def_bool y
+config BOARD_DELL_LATITUDE_E7x40
+ def_bool n
select BOARD_ROMSIZE_KB_8192
select EC_DELL_MEC5055
select HAVE_ACPI_RESUME
@@ -14,13 +14,19 @@
select SOUTHBRIDGE_INTEL_LYNXPOINT
select SYSTEM_TYPE_LAPTOP
+if BOARD_DELL_LATITUDE_E7x40
+
config MAINBOARD_DIR
string
- default "dell/latitude_e7240"
+ default "dell/latitude_e7x40"
+
+config VARIANT_DIR
+ string
+ default "latitude_e7240" if BOARD_DELL_LATITUDE_E7240
config MAINBOARD_PART_NUMBER
string
- default "Latitude E7240"
+ default "Latitude E7240" if BOARD_DELL_LATITUDE_E7240
config VGA_BIOS_FILE
string
diff --git a/src/mainboard/dell/latitude_e7x40/Kconfig.name b/src/mainboard/dell/latitude_e7x40/Kconfig.name
new file mode 100644
index 0000000..5eefdf7
--- /dev/null
+++ b/src/mainboard/dell/latitude_e7x40/Kconfig.name
@@ -0,0 +1,6 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+config BOARD_DELL_LATITUDE_E7240
+ bool "Latitude E7240"
+
+ select BOARD_DELL_LATITUDE_E7x40
diff --git a/src/mainboard/dell/latitude_e7x40/Makefile.inc b/src/mainboard/dell/latitude_e7x40/Makefile.inc
new file mode 100644
index 0000000..eb2cc792
--- /dev/null
+++ b/src/mainboard/dell/latitude_e7x40/Makefile.inc
@@ -0,0 +1,6 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+bootblock-y += bootblock.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
+romstage-y += variants/$(VARIANT_DIR)/gpio.c
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/dell/latitude_e7240/acpi/ec.asl b/src/mainboard/dell/latitude_e7x40/acpi/ec.asl
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/acpi/ec.asl
rename to src/mainboard/dell/latitude_e7x40/acpi/ec.asl
diff --git a/src/mainboard/dell/latitude_e7240/acpi/platform.asl b/src/mainboard/dell/latitude_e7x40/acpi/platform.asl
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/acpi/platform.asl
rename to src/mainboard/dell/latitude_e7x40/acpi/platform.asl
diff --git a/src/mainboard/dell/latitude_e7240/acpi/superio.asl b/src/mainboard/dell/latitude_e7x40/acpi/superio.asl
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/acpi/superio.asl
rename to src/mainboard/dell/latitude_e7x40/acpi/superio.asl
diff --git a/src/mainboard/dell/latitude_e7240/acpi_tables.c b/src/mainboard/dell/latitude_e7x40/acpi_tables.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/acpi_tables.c
rename to src/mainboard/dell/latitude_e7x40/acpi_tables.c
diff --git a/src/mainboard/dell/latitude_e7x40/board_info.txt b/src/mainboard/dell/latitude_e7x40/board_info.txt
new file mode 100644
index 0000000..6ad3641
--- /dev/null
+++ b/src/mainboard/dell/latitude_e7x40/board_info.txt
@@ -0,0 +1,6 @@
+Category: laptop
+ROM protocol: SPI
+ROM package: SOIC-8
+ROM socketed: n
+Flashrom support: y
+Release year: 2013
diff --git a/src/mainboard/dell/latitude_e7240/bootblock.c b/src/mainboard/dell/latitude_e7x40/bootblock.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/bootblock.c
rename to src/mainboard/dell/latitude_e7x40/bootblock.c
diff --git a/src/mainboard/dell/latitude_e7240/devicetree.cb b/src/mainboard/dell/latitude_e7x40/devicetree.cb
similarity index 98%
rename from src/mainboard/dell/latitude_e7240/devicetree.cb
rename to src/mainboard/dell/latitude_e7x40/devicetree.cb
index 345d504..ce7ef7a 100644
--- a/src/mainboard/dell/latitude_e7240/devicetree.cb
+++ b/src/mainboard/dell/latitude_e7x40/devicetree.cb
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
chip northbridge/intel/haswell
register "ec_present" = "true"
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
@@ -24,8 +26,6 @@
end
end
device domain 0x0 on
- subsystemid 0x1028 0x05ca inherit
-
device pci 00.0 on end # Host bridge Host bridge
device pci 02.0 on end # Internal graphics VGA controller
device pci 03.0 on end # Mini-HD audio
diff --git a/src/mainboard/dell/latitude_e7240/dsdt.asl b/src/mainboard/dell/latitude_e7x40/dsdt.asl
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/dsdt.asl
rename to src/mainboard/dell/latitude_e7x40/dsdt.asl
diff --git a/src/mainboard/dell/latitude_e7240/gma-mainboard.ads b/src/mainboard/dell/latitude_e7x40/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/gma-mainboard.ads
rename to src/mainboard/dell/latitude_e7x40/gma-mainboard.ads
diff --git a/src/mainboard/dell/latitude_e7240/mainboard.c b/src/mainboard/dell/latitude_e7x40/mainboard.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/mainboard.c
rename to src/mainboard/dell/latitude_e7x40/mainboard.c
diff --git a/src/mainboard/dell/latitude_e7240/romstage.c b/src/mainboard/dell/latitude_e7x40/romstage.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/romstage.c
rename to src/mainboard/dell/latitude_e7x40/romstage.c
diff --git a/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/board_info.txt b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/board_info.txt
new file mode 100644
index 0000000..cacaa17
--- /dev/null
+++ b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/board_info.txt
@@ -0,0 +1 @@
+Board URL: https://www.dell.com/support/home/en-us/product-support/product/latitude-e7240-ultrabook/docs
diff --git a/src/mainboard/dell/latitude_e7240/gpio.c b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/gpio.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/gpio.c
rename to src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/gpio.c
diff --git a/src/mainboard/dell/latitude_e7240/hda_verb.c b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/hda_verb.c
similarity index 100%
rename from src/mainboard/dell/latitude_e7240/hda_verb.c
rename to src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/hda_verb.c
diff --git a/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/overridetree.cb b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/overridetree.cb
new file mode 100644
index 0000000..416e09e
--- /dev/null
+++ b/src/mainboard/dell/latitude_e7x40/variants/latitude_e7240/overridetree.cb
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+chip northbridge/intel/haswell
+ device domain 0x0 on
+ subsystemid 0x1028 0x05ca inherit
+ end
+end
To view, visit change 46539. To unsubscribe, or for help writing mail filters, visit settings.