mb/hp/revolve_810_g1: Transform into variant

Update Makefile.inc so as to add the SPD data when needed. Tested
building other variants, no spd.bin gets added because they don't select
GENERIC_SPD_BIN.

Tested with BUILD_TIMELESS=1, binary does not change.

Change-Id: I0cda3f839baa227ce6a4b8f0510934125e5afb59
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38096
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

22 files changed, 21 insertions, 340 deletions

diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig
deleted file mode 100644
index da272428ba..0000000000
--- a/src/mainboard/hp/revolve_810_g1/Kconfig
+++ /dev/null
@@ -1,48 +0,0 @@
-if BOARD_HP_REVOLVE_810_G1
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select BOARD_ROMSIZE_KB_16384
-	select EC_HP_KBC1126
-	select GENERIC_SPD_BIN
-	select GFX_GMA_INTERNAL_IS_LVDS
-	select HAVE_ACPI_RESUME
-	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
-	select INTEL_INT15
-	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_USES_IFD_GBE_REGION
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
-	select MAINBOARD_HAS_TPM1
-	select NORTHBRIDGE_INTEL_SANDYBRIDGE
-	select SERIRQ_CONTINUOUS_MODE
-	select SOUTHBRIDGE_INTEL_C216
-	select SYSTEM_TYPE_LAPTOP
-	select USE_NATIVE_RAMINIT
-
-config MAINBOARD_DIR
-	string
-	default "hp/revolve_810_g1"
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "EliteBook Revolve 810 G1"
-
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0166.rom"
-
-config VGA_BIOS_ID
-	string
-	default "8086,0166"
-
-config MAX_CPUS
-	int
-	default 8
-
-config USBDEBUG_HCD_INDEX # FIXME: check this
-	int
-	default 2
-endif
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig.name b/src/mainboard/hp/revolve_810_g1/Kconfig.name
deleted file mode 100644
index 9a0c1ffa2f..0000000000
--- a/src/mainboard/hp/revolve_810_g1/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_HP_REVOLVE_810_G1
-	bool "EliteBook Revolve 810 G1"
diff --git a/src/mainboard/hp/revolve_810_g1/Makefile.inc b/src/mainboard/hp/revolve_810_g1/Makefile.inc
deleted file mode 100644
index 0a15c42fdd..0000000000
--- a/src/mainboard/hp/revolve_810_g1/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-bootblock-y += gpio.c
-romstage-y += gpio.c
-
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-
-# FIXME: Other varients with same size onboard ram may exist.
-SPD_SOURCES = hynix_4g
-bootblock-y += early_init.c
-romstage-y += early_init.c
diff --git a/src/mainboard/hp/revolve_810_g1/acpi/ec.asl b/src/mainboard/hp/revolve_810_g1/acpi/ec.asl
deleted file mode 100644
index ac65fb399f..0000000000
--- a/src/mainboard/hp/revolve_810_g1/acpi/ec.asl
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2017 Iru Cai <mytbk920423@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <ec/hp/kbc1126/acpi/ec.asl>
diff --git a/src/mainboard/hp/revolve_810_g1/acpi/platform.asl b/src/mainboard/hp/revolve_810_g1/acpi/platform.asl
deleted file mode 100644
index fe0f936a61..0000000000
--- a/src/mainboard/hp/revolve_810_g1/acpi/platform.asl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011-2012 The Chromium OS Authors. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_WAK,1)
-{
-	\_SB.PCI0.LPCB.EC0.ACPI = 1
-	\_SB.PCI0.LPCB.EC0.SLPT = 0
-
-	Return(Package(){0,0})
-}
-
-Method(_PTS,1)
-{
-	\_SB.PCI0.LPCB.EC0.SLPT = Arg0
-}
diff --git a/src/mainboard/hp/revolve_810_g1/acpi/superio.asl b/src/mainboard/hp/revolve_810_g1/acpi/superio.asl
deleted file mode 100644
index f2b35ba9c1..0000000000
--- a/src/mainboard/hp/revolve_810_g1/acpi/superio.asl
+++ /dev/null
@@ -1 +0,0 @@
-#include <drivers/pc80/pc/ps2_controller.asl>
diff --git a/src/mainboard/hp/revolve_810_g1/acpi_tables.c b/src/mainboard/hp/revolve_810_g1/acpi_tables.c
deleted file mode 100644
index 4ef3b53792..0000000000
--- a/src/mainboard/hp/revolve_810_g1/acpi_tables.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008-2009 coresystems GmbH
- * Copyright (C) 2014 Vladimir Serbinenko
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-/* FIXME: check this function.  */
-void acpi_create_gnvs(global_nvs_t *gnvs)
-{
-	// the lid is open by default.
-	gnvs->lids = 1;
-
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
-}
diff --git a/src/mainboard/hp/revolve_810_g1/cmos.default b/src/mainboard/hp/revolve_810_g1/cmos.default
deleted file mode 100644
index 455dc1cda9..0000000000
--- a/src/mainboard/hp/revolve_810_g1/cmos.default
+++ /dev/null
@@ -1,6 +0,0 @@
-boot_option=Fallback
-debug_level=Debug
-power_on_after_fail=Disable
-nmi=Enable
-volume=0x3
-gfx_uma_size=32M
diff --git a/src/mainboard/hp/revolve_810_g1/cmos.layout b/src/mainboard/hp/revolve_810_g1/cmos.layout
deleted file mode 100644
index f1526f34c9..0000000000
--- a/src/mainboard/hp/revolve_810_g1/cmos.layout
+++ /dev/null
@@ -1,116 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-2008 coresystems GmbH
-## Copyright (C) 2014 Vladimir Serbinenko
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-# -----------------------------------------------------------------
-entries
-
-# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96           4       r       0        status_c_rsvd
-#100          1       r       0        uf_flag
-#101          1       r       0        af_flag
-#102          1       r       0        pf_flag
-#103          1       r       0        irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104          7       r       0        status_d_rsvd
-#111          1       r       0        valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112          8       r       0        diag_rsvd1
-
-# -----------------------------------------------------------------
-0          120       r       0        reserved_memory
-#120        264       r       0        unused
-
-# -----------------------------------------------------------------
-# RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
-#390          2       r       0        unused?
-
-# -----------------------------------------------------------------
-# coreboot config options: console
-#392          3       r       0        unused
-395          4       e       6        debug_level
-#399          1       r       0        unused
-
-#400         8       r       0        reserved for century byte
-
-# coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
-
-421         1       e       9        sata_mode
-
-# coreboot config options: cpu
-#424        8       r       0        unused
-
-# coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
-#435        5        r       0        unused
-
-440          8       h       0        volume
-
-# SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
-
-# coreboot config options: check sums
-984         16       h       0        check_sum
-
-# -----------------------------------------------------------------
-
-enumerations
-
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-9     0     AHCI
-9     1     Compatible
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-
-# -----------------------------------------------------------------
-checksums
-
-checksum 392 447 984
diff --git a/src/mainboard/hp/revolve_810_g1/dsdt.asl b/src/mainboard/hp/revolve_810_g1/dsdt.asl
deleted file mode 100644
index 81f45c155e..0000000000
--- a/src/mainboard/hp/revolve_810_g1/dsdt.asl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
-#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
-DefinitionBlock(
-	"dsdt.aml",
-	"DSDT",
-	0x02,		// DSDT revision: ACPI v2.0 and up
-	OEM_ID,
-	ACPI_TABLE_CREATOR,
-	0x20141018	// OEM revision
-)
-{
-	#include "acpi/platform.asl"
-	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/common/acpi/platform.asl>
-	/* global NVS and variables.  */
-	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
-	#include <southbridge/intel/common/acpi/sleepstates.asl>
-
-	Scope (\_SB) {
-		Device (PCI0)
-		{
-		#include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
-		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
-		#include <southbridge/intel/bd82x6x/acpi/pch.asl>
-		}
-	}
-}
diff --git a/src/mainboard/hp/revolve_810_g1/mainboard.c b/src/mainboard/hp/revolve_810_g1/mainboard.c
deleted file mode 100644
index 48ffce5211..0000000000
--- a/src/mainboard/hp/revolve_810_g1/mainboard.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2017 Bill Xie <persmule@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <device/device.h>
-#include <drivers/intel/gma/int15.h>
-
-static void mainboard_enable(struct device *dev)
-{
-	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
-			GMA_INT15_PANEL_FIT_DEFAULT,
-		        GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
-}
-
-struct chip_operations mainboard_ops = {
-	.enable_dev = mainboard_enable,
-};
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
index c6b218f839..869a4afb32 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -39,6 +39,7 @@ config VARIANT_DIR
 	default "8470p"          if BOARD_HP_8470P
 	default "8770w"          if BOARD_HP_8770W
 	default "folio_9470m"    if BOARD_HP_FOLIO_9470M
+	default "revolve_810_g1" if BOARD_HP_REVOLVE_810_G1
 
 config MAINBOARD_PART_NUMBER
 	string
@@ -48,6 +49,7 @@ config MAINBOARD_PART_NUMBER
 	default "EliteBook 8470p"          if BOARD_HP_8470P
 	default "EliteBook 8770w"          if BOARD_HP_8770W
 	default "EliteBook Folio 9470m"    if BOARD_HP_FOLIO_9470M
+	default "EliteBook Revolve 810 G1" if BOARD_HP_REVOLVE_810_G1
 
 config DEVICETREE
 	string
@@ -75,5 +77,6 @@ config USBDEBUG_HCD_INDEX
 	default 2 if BOARD_HP_8470P
 	default 2 if BOARD_HP_8770W
 	default 0 if BOARD_HP_FOLIO_9470M
+	default 2 if BOARD_HP_REVOLVE_810_G1 # FIXME: check this
 
 endif
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
index 4ae7b9b83d..3c95e85e4a 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
@@ -82,3 +82,18 @@ config BOARD_HP_FOLIO_9470M
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SOUTHBRIDGE_INTEL_C216
+
+config BOARD_HP_REVOLVE_810_G1
+	bool "EliteBook Revolve 810 G1"
+
+	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_ROMSIZE_KB_16384
+	select GENERIC_SPD_BIN
+	select GFX_GMA_INTERNAL_IS_LVDS
+	select INTEL_INT15
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_USES_IFD_GBE_REGION
+	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_HAS_LPC_TPM
+	select MAINBOARD_HAS_TPM1
+	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/hp/snb_ivb_laptops/Makefile.inc b/src/mainboard/hp/snb_ivb_laptops/Makefile.inc
index 663f81adad..d949ad8c05 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Makefile.inc
+++ b/src/mainboard/hp/snb_ivb_laptops/Makefile.inc
@@ -19,3 +19,6 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y  += variants/$(VARIANT_DIR)/gpio.c
 ramstage-y  += variants/$(VARIANT_DIR)/hda_verb.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
+
+# FIXME: Other variants with same size onboard ram may exist.
+SPD_SOURCES = hynix_4g
diff --git a/src/mainboard/hp/revolve_810_g1/spd/hynix_4g.spd.hex b/src/mainboard/hp/snb_ivb_laptops/spd/hynix_4g.spd.hex
index 544d57605d..544d57605d 100644
--- a/src/mainboard/hp/revolve_810_g1/spd/hynix_4g.spd.hex
+++ b/src/mainboard/hp/snb_ivb_laptops/spd/hynix_4g.spd.hex
diff --git a/src/mainboard/hp/revolve_810_g1/board_info.txt b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/board_info.txt
index 5f22183778..5f22183778 100644
--- a/src/mainboard/hp/revolve_810_g1/board_info.txt
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/board_info.txt
diff --git a/src/mainboard/hp/revolve_810_g1/data.vbt b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/data.vbt
index 5b5a6fdb0c..5b5a6fdb0c 100644
--- a/src/mainboard/hp/revolve_810_g1/data.vbt
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/data.vbt
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/devicetree.cb
index 048120ae0a..048120ae0a 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/devicetree.cb
diff --git a/src/mainboard/hp/revolve_810_g1/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c
index 29be074db1..29be074db1 100644
--- a/src/mainboard/hp/revolve_810_g1/early_init.c
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c
diff --git a/src/mainboard/hp/revolve_810_g1/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads
index 01ae99aaaf..01ae99aaaf 100644
--- a/src/mainboard/hp/revolve_810_g1/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads
diff --git a/src/mainboard/hp/revolve_810_g1/gpio.c b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gpio.c
index 5a9d87592d..5a9d87592d 100644
--- a/src/mainboard/hp/revolve_810_g1/gpio.c
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gpio.c
diff --git a/src/mainboard/hp/revolve_810_g1/hda_verb.c b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/hda_verb.c
index c421b1b818..c421b1b818 100644
--- a/src/mainboard/hp/revolve_810_g1/hda_verb.c
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/hda_verb.c