From 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a Mon Sep 17 00:00:00 2001
From: Riku Viitanen <riku.viitanen@protonmail.com>
Date: Tue, 31 Dec 2024 01:01:58 +0200
Subject: [PATCH] mb/hp/snb_ivb_desktops/z220*: Remove leftover old usb
 configurations

Since all USB configurations are read from the southbridge devicetree,
these configurations aren't used anymore.

TEST=Built Z220 CMT with BUILD_TIMELESS=1, output ROMs are identical.

Change-Id: I8f478625ad4928cf23bbb8ac2689004010bbdd4b
Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85817
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nicholas Chin <nic.c3.14@gmail.com>
---
 .../variants/z220_cmt_workstation/early_init.c | 18 ------------------
 .../variants/z220_sff_workstation/early_init.c | 18 ------------------
 2 files changed, 36 deletions(-)

diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
index 74a646238c..aace18dfa8 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
@@ -3,27 +3,9 @@
 #include <bootblock_common.h>
 #include <superio/nuvoton/npcd378/npcd378.h>
 #include <superio/nuvoton/common/nuvoton.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, NPCD378_SP2)
 
-const struct southbridge_usb_port mainboard_usb_ports[] = {
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 1, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 7 },
-	{ 1, 0, 7 },
-};
-
 void bootblock_mainboard_early_init(void)
 {
 	if (CONFIG(CONSOLE_SERIAL))
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
index 74a646238c..aace18dfa8 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
@@ -3,27 +3,9 @@
 #include <bootblock_common.h>
 #include <superio/nuvoton/npcd378/npcd378.h>
 #include <superio/nuvoton/common/nuvoton.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, NPCD378_SP2)
 
-const struct southbridge_usb_port mainboard_usb_ports[] = {
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 0 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 0, 3 },
-	{ 1, 1, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 5 },
-	{ 1, 0, 7 },
-	{ 1, 0, 7 },
-};
-
 void bootblock_mainboard_early_init(void)
 {
 	if (CONFIG(CONSOLE_SERIAL))