mb/hp: Add Pro 3400

Based on autoport and HP Pro 3500.
As part of this change renamed 3500 to 3x00 and added this as
it's variant.

It's an almost identical board to the 3500 but has a smaller flash.

Other differences between boards were identified by autoport.
They may or may not important but were included anyway.

Tested on HP Pro 3400, behaves exactly as 3500 described in the docs.
Changes were not significant enough to require retesting on 3500.

Change-Id: I833996f6eddcaac91fb0ad0cd95fcc2a99447387
Signed-off-by: Vesek <venda.straka@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85825
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/mainboard/hp/pro_3500_series/Kconfig

@@ -1,37 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if BOARD_HP_PRO_3500_SERIES
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select BOARD_ROMSIZE_KB_8192
-	select HAVE_ACPI_RESUME
-	select HAVE_ACPI_TABLES
-	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_USES_IFD_GBE_REGION
-	select NORTHBRIDGE_INTEL_SANDYBRIDGE
-	select NO_UART_ON_SUPERIO
-	select SERIRQ_CONTINUOUS_MODE
-	select SOUTHBRIDGE_INTEL_BD82X6X
-	select SUPERIO_ITE_IT8772F
-	select USE_NATIVE_RAMINIT
-
-config CBFS_SIZE
-	default 0x400000
-
-config MAINBOARD_DIR
-	default "hp/pro_3500_series"
-
-config MAINBOARD_PART_NUMBER
-	default "Pro 3500 Series"
-
-config VGA_BIOS_ID
-	default "8086,0152"
-
-config DRAM_RESET_GATE_GPIO
-	default 60
-
-config USBDEBUG_HCD_INDEX
-	default 2
-endif

src/mainboard/hp/pro_3x00_series/Kconfig

@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+config BOARD_HP_PRO_3X00_SERIES_COMMON
+	def_bool n
+	select HAVE_ACPI_RESUME
+	select HAVE_ACPI_TABLES
+	select HAVE_CMOS_DEFAULT
+	select HAVE_OPTION_TABLE
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_HAS_LIBGFXINIT
+	select NORTHBRIDGE_INTEL_SANDYBRIDGE
+	select NO_UART_ON_SUPERIO
+	select SERIRQ_CONTINUOUS_MODE
+	select SOUTHBRIDGE_INTEL_BD82X6X
+	select SUPERIO_ITE_IT8772F
+	select USE_NATIVE_RAMINIT
+
+config BOARD_HP_PRO_3400_SERIES
+	select BOARD_HP_PRO_3X00_SERIES_COMMON
+	select BOARD_ROMSIZE_KB_4096
+
+config BOARD_HP_PRO_3500_SERIES
+	select BOARD_HP_PRO_3X00_SERIES_COMMON
+	select BOARD_ROMSIZE_KB_8192
+
+if BOARD_HP_PRO_3X00_SERIES_COMMON
+
+config CBFS_SIZE
+	default 0x200000 if BOARD_ROMSIZE_KB_4096
+	default 0x400000 if BOARD_ROMSIZE_KB_8192
+
+config MAINBOARD_DIR
+	default "hp/pro_3x00_series"
+
+config VARIANT_DIR
+	default "pro_3400_series" if BOARD_HP_PRO_3400_SERIES
+	default "pro_3500_series" if BOARD_HP_PRO_3500_SERIES
+
+config MAINBOARD_PART_NUMBER
+	default "Pro 3400 Series" if BOARD_HP_PRO_3400_SERIES
+	default "Pro 3500 Series" if BOARD_HP_PRO_3500_SERIES
+
+config OVERRIDE_DEVICETREE
+	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
+
+config USBDEBUG_HCD_INDEX
+	default 2
+endif

src/mainboard/hp/pro_3x00_series/Kconfig.name

@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+config BOARD_HP_PRO_3400_SERIES
+	bool "Pro 3400 Series"
+
 config BOARD_HP_PRO_3500_SERIES
 	bool "Pro 3500 Series"

src/mainboard/hp/pro_3x00_series/Makefile.mk

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 bootblock-y += early_init.c
-bootblock-y += gpio.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 bootblock-y += led.c
 
 romstage-y += early_init.c
-romstage-y += gpio.c
+romstage-y += variants/$(VARIANT_DIR)/gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 

src/mainboard/hp/pro_3x00_series/board_info.txt

@@ -0,0 +1,5 @@
+Category: desktop
+ROM package: SOIC-8
+ROM socketed: no
+Flashrom support: yes
+Release year: 2011-2012

src/mainboard/hp/pro_3x00_series/cmos.default

@@ -0,0 +1,8 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+boot_option=Fallback
+debug_level=Debug
+gfx_uma_size=64M
+nmi=Disable
+power_on_after_fail=Disable
+sata_mode=AHCI

src/mainboard/hp/pro_3x00_series/cmos.layout

@@ -0,0 +1,68 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+# -----------------------------------------------------------------
+entries
+
+# start-bit	length	config	enum-ID	name
+0		384	r	0	reserved_memory
+
+# -----------------------------------------------------------------
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384		1	e	3	boot_option
+388		4	h	0	reboot_counter
+
+# -----------------------------------------------------------------
+# coreboot config options: console
+395		4	e	4	debug_level
+
+# coreboot config options: southbridge
+408		1	e	1	nmi
+409		2	e	5	power_on_after_fail
+411		1	e	6	sata_mode
+
+# coreboot config options: northbridge
+412		3	e	7	gfx_uma_size
+
+# coreboot config options: check sums
+984		16	h	0	check_sum
+
+# -----------------------------------------------------------------
+
+enumerations
+
+#ID	value	text
+1	0	Disable
+1	1	Enable
+
+3	0	Fallback
+3	1	Normal
+
+4	0	Emergency
+4	1	Alert
+4	2	Critical
+4	3	Error
+4	4	Warning
+4	5	Notice
+4	6	Info
+4	7	Debug
+4	8	Spew
+
+5	0	Disable
+5	1	Enable
+5	2	Keep
+
+6	0	AHCI
+6	1	Compatible
+
+7	0	32M
+7	1	64M
+7	2	96M
+7	3	128M
+7	4	160M
+7	5	192M
+7	6	224M
+
+# -----------------------------------------------------------------
+checksums
+
+checksum 392 415 984

src/mainboard/hp/pro_3x00_series/devicetree.cb

@@ -22,22 +22,6 @@ chip northbridge/intel/sandybridge
 			register "sata_port_map" = "0x33"
 			register "spi_lvscc" = "0x2005"
 			register "spi_uvscc" = "0x2005"
-			register "usb_port_config" = "{
-				{ 1,  6, 0 },
-				{ 1,  6, 0 },
-				{ 1,  6, 1 },
-				{ 1,  9, 1 },
-				{ 1, 10, 2 },
-				{ 1, 11, 2 },
-				{ 1,  6, 3 },
-				{ 1,  6, 3 },
-				{ 1,  6, 4 },
-				{ 1, 12, 4 },
-				{ 1,  6, 6 },
-				{ 1, 11, 5 },
-				{ 1,  6, 5 },
-				{ 1,  6, 6 },
-			}"
 			device ref ehci2 on end
 			device ref hda on end
 			device ref pcie_rp2 on end # MINI_PCIE

src/mainboard/hp/pro_3x00_series/dsdt.asl

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
+
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-
-
 #include <acpi/acpi.h>
 
 DefinitionBlock(

src/mainboard/hp/pro_3x00_series/variants/pro_3400_series/board_info.txt

@@ -0,0 +1,5 @@
+Category: desktop
+ROM package: SOIC-8
+ROM socketed: n
+Flashrom support: y
+Release year: 2011

src/mainboard/hp/pro_3x00_series/variants/pro_3400_series/gpio.c

@@ -0,0 +1,189 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <southbridge/intel/common/gpio.h>
+
+static const struct pch_gpio_set1 pch_gpio_set1_mode = {
+	.gpio0 = GPIO_MODE_GPIO,
+	.gpio1 = GPIO_MODE_GPIO,
+	.gpio2 = GPIO_MODE_NATIVE,
+	.gpio3 = GPIO_MODE_NATIVE,
+	.gpio4 = GPIO_MODE_NATIVE,
+	.gpio5 = GPIO_MODE_NATIVE,
+	.gpio6 = GPIO_MODE_GPIO,
+	.gpio7 = GPIO_MODE_GPIO,
+	.gpio8 = GPIO_MODE_GPIO,
+	.gpio9 = GPIO_MODE_NATIVE,
+	.gpio10 = GPIO_MODE_NATIVE,
+	.gpio11 = GPIO_MODE_NATIVE,
+	.gpio12 = GPIO_MODE_GPIO,
+	.gpio13 = GPIO_MODE_GPIO,
+	.gpio14 = GPIO_MODE_NATIVE,
+	.gpio15 = GPIO_MODE_GPIO,
+	.gpio16 = GPIO_MODE_GPIO,
+	.gpio17 = GPIO_MODE_GPIO,
+	.gpio18 = GPIO_MODE_NATIVE,
+	.gpio19 = GPIO_MODE_NATIVE,
+	.gpio20 = GPIO_MODE_NATIVE,
+	.gpio21 = GPIO_MODE_NATIVE,
+	.gpio22 = GPIO_MODE_GPIO,
+	.gpio23 = GPIO_MODE_NATIVE,
+	.gpio24 = GPIO_MODE_GPIO,
+	.gpio25 = GPIO_MODE_NATIVE,
+	.gpio26 = GPIO_MODE_NATIVE,
+	.gpio27 = GPIO_MODE_GPIO,
+	.gpio28 = GPIO_MODE_GPIO,
+	.gpio29 = GPIO_MODE_GPIO,
+	.gpio30 = GPIO_MODE_NATIVE,
+	.gpio31 = GPIO_MODE_GPIO,
+};
+
+static const struct pch_gpio_set1 pch_gpio_set1_direction = {
+	.gpio0 = GPIO_DIR_INPUT,
+	.gpio1 = GPIO_DIR_INPUT,
+	.gpio6 = GPIO_DIR_INPUT,
+	.gpio7 = GPIO_DIR_INPUT,
+	.gpio8 = GPIO_DIR_OUTPUT,
+	.gpio12 = GPIO_DIR_INPUT,
+	.gpio13 = GPIO_DIR_INPUT,
+	.gpio15 = GPIO_DIR_OUTPUT,
+	.gpio16 = GPIO_DIR_INPUT,
+	.gpio17 = GPIO_DIR_INPUT,
+	.gpio22 = GPIO_DIR_INPUT,
+	.gpio24 = GPIO_DIR_OUTPUT,
+	.gpio27 = GPIO_DIR_INPUT,
+	.gpio28 = GPIO_DIR_OUTPUT,
+	.gpio29 = GPIO_DIR_OUTPUT,
+	.gpio31 = GPIO_DIR_INPUT,
+};
+
+static const struct pch_gpio_set1 pch_gpio_set1_level = {
+	.gpio8 = GPIO_LEVEL_HIGH,
+	.gpio15 = GPIO_LEVEL_LOW,
+	.gpio24 = GPIO_LEVEL_LOW,
+	.gpio28 = GPIO_LEVEL_LOW,
+	.gpio29 = GPIO_LEVEL_HIGH,
+};
+
+static const struct pch_gpio_set1 pch_gpio_set1_reset = {
+};
+
+static const struct pch_gpio_set1 pch_gpio_set1_invert = {
+	.gpio13 = GPIO_INVERT,
+};
+
+static const struct pch_gpio_set1 pch_gpio_set1_blink = {
+};
+
+static const struct pch_gpio_set2 pch_gpio_set2_mode = {
+	.gpio32 = GPIO_MODE_GPIO,
+	.gpio33 = GPIO_MODE_GPIO,
+	.gpio34 = GPIO_MODE_GPIO,
+	.gpio35 = GPIO_MODE_GPIO,
+	.gpio36 = GPIO_MODE_GPIO,
+	.gpio37 = GPIO_MODE_GPIO,
+	.gpio38 = GPIO_MODE_GPIO,
+	.gpio39 = GPIO_MODE_GPIO,
+	.gpio40 = GPIO_MODE_NATIVE,
+	.gpio41 = GPIO_MODE_NATIVE,
+	.gpio42 = GPIO_MODE_NATIVE,
+	.gpio43 = GPIO_MODE_GPIO,
+	.gpio44 = GPIO_MODE_NATIVE,
+	.gpio45 = GPIO_MODE_NATIVE,
+	.gpio46 = GPIO_MODE_NATIVE,
+	.gpio47 = GPIO_MODE_NATIVE,
+	.gpio48 = GPIO_MODE_GPIO,
+	.gpio49 = GPIO_MODE_GPIO,
+	.gpio50 = GPIO_MODE_NATIVE,
+	.gpio51 = GPIO_MODE_NATIVE,
+	.gpio52 = GPIO_MODE_NATIVE,
+	.gpio53 = GPIO_MODE_NATIVE,
+	.gpio54 = GPIO_MODE_NATIVE,
+	.gpio55 = GPIO_MODE_NATIVE,
+	.gpio56 = GPIO_MODE_NATIVE,
+	.gpio57 = GPIO_MODE_GPIO,
+	.gpio58 = GPIO_MODE_NATIVE,
+	.gpio59 = GPIO_MODE_NATIVE,
+	.gpio60 = GPIO_MODE_GPIO,
+	.gpio61 = GPIO_MODE_GPIO,
+	.gpio62 = GPIO_MODE_NATIVE,
+	.gpio63 = GPIO_MODE_NATIVE,
+};
+
+static const struct pch_gpio_set2 pch_gpio_set2_direction = {
+	.gpio32 = GPIO_DIR_OUTPUT,
+	.gpio33 = GPIO_DIR_OUTPUT,
+	.gpio34 = GPIO_DIR_INPUT,
+	.gpio35 = GPIO_DIR_INPUT,
+	.gpio36 = GPIO_DIR_INPUT,
+	.gpio37 = GPIO_DIR_INPUT,
+	.gpio38 = GPIO_DIR_INPUT,
+	.gpio39 = GPIO_DIR_INPUT,
+	.gpio43 = GPIO_DIR_INPUT,
+	.gpio48 = GPIO_DIR_INPUT,
+	.gpio49 = GPIO_DIR_INPUT,
+	.gpio57 = GPIO_DIR_INPUT,
+	.gpio60 = GPIO_DIR_OUTPUT,
+	.gpio61 = GPIO_DIR_OUTPUT,
+};
+
+static const struct pch_gpio_set2 pch_gpio_set2_level = {
+	.gpio32 = GPIO_LEVEL_HIGH,
+	.gpio33 = GPIO_LEVEL_HIGH,
+	.gpio60 = GPIO_LEVEL_LOW,
+	.gpio61 = GPIO_LEVEL_HIGH,
+};
+
+static const struct pch_gpio_set2 pch_gpio_set2_reset = {
+};
+
+static const struct pch_gpio_set3 pch_gpio_set3_mode = {
+	.gpio64 = GPIO_MODE_NATIVE,
+	.gpio65 = GPIO_MODE_NATIVE,
+	.gpio66 = GPIO_MODE_NATIVE,
+	.gpio67 = GPIO_MODE_NATIVE,
+	.gpio68 = GPIO_MODE_GPIO,
+	.gpio69 = GPIO_MODE_GPIO,
+	.gpio70 = GPIO_MODE_GPIO,
+	.gpio71 = GPIO_MODE_GPIO,
+	.gpio72 = GPIO_MODE_GPIO,
+	.gpio73 = GPIO_MODE_NATIVE,
+	.gpio74 = GPIO_MODE_NATIVE,
+	.gpio75 = GPIO_MODE_NATIVE,
+};
+
+static const struct pch_gpio_set3 pch_gpio_set3_direction = {
+	.gpio68 = GPIO_DIR_INPUT,
+	.gpio69 = GPIO_DIR_INPUT,
+	.gpio70 = GPIO_DIR_INPUT,
+	.gpio71 = GPIO_DIR_INPUT,
+	.gpio72 = GPIO_DIR_INPUT,
+};
+
+static const struct pch_gpio_set3 pch_gpio_set3_level = {
+};
+
+static const struct pch_gpio_set3 pch_gpio_set3_reset = {
+};
+
+const struct pch_gpio_map mainboard_gpio_map = {
+	.set1 = {
+		.mode		= &pch_gpio_set1_mode,
+		.direction	= &pch_gpio_set1_direction,
+		.level		= &pch_gpio_set1_level,
+		.blink		= &pch_gpio_set1_blink,
+		.invert		= &pch_gpio_set1_invert,
+		.reset		= &pch_gpio_set1_reset,
+	},
+	.set2 = {
+		.mode		= &pch_gpio_set2_mode,
+		.direction	= &pch_gpio_set2_direction,
+		.level		= &pch_gpio_set2_level,
+		.reset		= &pch_gpio_set2_reset,
+	},
+	.set3 = {
+		.mode		= &pch_gpio_set3_mode,
+		.direction	= &pch_gpio_set3_direction,
+		.level		= &pch_gpio_set3_level,
+		.reset		= &pch_gpio_set3_reset,
+	},
+};

src/mainboard/hp/pro_3x00_series/variants/pro_3400_series/overridetree.cb

@@ -0,0 +1,27 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+chip northbridge/intel/sandybridge
+	device domain 0x0 on
+		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
+			register "usb_port_config" = "{
+				{ 0,  6, -1 },
+				{ 1,  6,  0 },
+				{ 1,  6,  0 },
+				{ 1,  6,  1 },
+				{ 1,  6,  1 },
+				{ 1,  6,  2 },
+				{ 0,  6, -1 },
+				{ 0,  6, -1 },
+				{ 1, 12,  5 },
+				{ 1, 12,  5 },
+				{ 1, 12,  6 },
+				{ 1, 12,  6 },
+				{ 0,  6, -1 },
+				{ 0,  6, -1 },
+			}"
+
+			# Dummy device, sconfig requires at least one device per chip
+			device ref ehci1 on end
+		end
+	end
+end

src/mainboard/hp/pro_3x00_series/variants/pro_3500_series/board_info.txt

@@ -1,6 +1,5 @@
 Category: desktop
 ROM package: SOIC-8
-ROM protocol: SPI
 ROM socketed: n
 Flashrom support: y
 Release year: 2012

src/mainboard/hp/pro_3x00_series/variants/pro_3500_series/overridetree.cb

@@ -0,0 +1,27 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+chip northbridge/intel/sandybridge
+	device domain 0x0 on
+		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
+			register "usb_port_config" = "{
+				{ 1,  6, 0 },
+				{ 1,  6, 0 },
+				{ 1,  6, 1 },
+				{ 1,  9, 1 },
+				{ 1, 10, 2 },
+				{ 1, 11, 2 },
+				{ 1,  6, 3 },
+				{ 1,  6, 3 },
+				{ 1,  6, 4 },
+				{ 1, 12, 4 },
+				{ 1,  6, 6 },
+				{ 1, 11, 5 },
+				{ 1,  6, 5 },
+				{ 1,  6, 6 },
+			}"
+
+			# Dummy device, sconfig requires at least one device per chip
+			device ref ehci1 on end
+		end
+	end
+end