From a911b758482025d46e132eeb2ed0279b65692075 Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Mon, 5 Feb 2024 19:18:43 -0500 Subject: mb/*: Remove old USB configurations from SNB/bd82x6x boards Remove USB configurations and data structures from northbridge devicetree (SNB+MRC boards) and bootblock/romstage C code (native-only SNB boards). All USB configurations are drawn from southbridge devicetree going forward. Change-Id: Ie1cd21077136998a6e90050c95263f2efed68a67 Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/c/coreboot/+/81882 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/mainboard/asrock/b75m-itx/Makefile.mk | 2 -- src/mainboard/asrock/b75m-itx/early_init.c | 9 --------- src/mainboard/asrock/b75pro3-m/early_init.c | 17 ----------------- src/mainboard/asrock/h77pro4-m/early_init.c | 17 ----------------- 4 files changed, 45 deletions(-) delete mode 100644 src/mainboard/asrock/b75m-itx/early_init.c (limited to 'src/mainboard/asrock') diff --git a/src/mainboard/asrock/b75m-itx/Makefile.mk b/src/mainboard/asrock/b75m-itx/Makefile.mk index d1b484d217..ae57dabd07 100644 --- a/src/mainboard/asrock/b75m-itx/Makefile.mk +++ b/src/mainboard/asrock/b75m-itx/Makefile.mk @@ -3,6 +3,4 @@ bootblock-y += gpio.c romstage-y += gpio.c -bootblock-y += early_init.c -romstage-y += early_init.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/asrock/b75m-itx/early_init.c b/src/mainboard/asrock/b75m-itx/early_init.c deleted file mode 100644 index b70794aeba..0000000000 --- a/src/mainboard/asrock/b75m-itx/early_init.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include -#include - -const struct southbridge_usb_port mainboard_usb_ports[] = { - {1, 0, 0}, {1, 0, 0}, {1, 1, 1}, {1, 1, 1}, {1, 1, 2}, {1, 1, 2}, {1, 0, 3}, - {1, 0, 3}, {1, 0, 4}, {1, 0, 4}, {1, 0, 6}, {1, 1, 5}, {1, 1, 5}, {1, 0, 6}, -}; diff --git a/src/mainboard/asrock/b75pro3-m/early_init.c b/src/mainboard/asrock/b75pro3-m/early_init.c index 4052b6f22d..1ffd896e26 100644 --- a/src/mainboard/asrock/b75pro3-m/early_init.c +++ b/src/mainboard/asrock/b75pro3-m/early_init.c @@ -8,23 +8,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, NCT6776_SP1) -const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 0, 0 }, - { 1, 0, 0 }, - { 1, 1, 1 }, - { 1, 1, 1 }, - { 1, 1, 2 }, - { 1, 1, 2 }, - { 1, 0, 3 }, - { 1, 0, 3 }, - { 1, 0, 4 }, - { 1, 0, 4 }, - { 1, 0, 6 }, - { 1, 1, 5 }, - { 1, 1, 5 }, - { 1, 0, 6 }, -}; - void bootblock_mainboard_early_init(void) { /* Set GPIOs on superio, enable UART */ diff --git a/src/mainboard/asrock/h77pro4-m/early_init.c b/src/mainboard/asrock/h77pro4-m/early_init.c index 4637378456..df8f043657 100644 --- a/src/mainboard/asrock/h77pro4-m/early_init.c +++ b/src/mainboard/asrock/h77pro4-m/early_init.c @@ -21,23 +21,6 @@ enum cpu_fan_tach_src { CPU_FAN_HEADER_BOTH }; -const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 0, 0 }, - { 1, 0, 0 }, - { 1, 1, 1 }, - { 1, 1, 1 }, - { 1, 1, 2 }, - { 1, 1, 2 }, - { 1, 0, 3 }, - { 1, 0, 3 }, - { 1, 0, 4 }, - { 1, 0, 4 }, - { 1, 0, 6 }, - { 1, 1, 5 }, - { 1, 1, 5 }, - { 1, 0, 6 }, -}; - /* * The tachometer signal that goes to CPUFANIN of the Super I/O is set via * GPIOs. -- cgit v1.2.3