Attention is currently required from: Jason Glenesk, Marshall Dawson, Felix Held. Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56962 )
Change subject: mb/(amd,google): Remove spi configuration from devicetree ......................................................................
mb/(amd,google): Remove spi configuration from devicetree
Now that the SPI configuration has been moved into Kconfig, it is no longer needed in devicetree.
BUG=b:194919326 TEST=Build & boot guybrush
Change-Id: Ifdcd3f33173194c4a25794137756b143751edd70 --- M src/mainboard/amd/bilby/devicetree.cb M src/mainboard/amd/majolica/Makefile.inc M src/mainboard/amd/mandolin/variants/cereme/devicetree.cb M src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb M src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb 6 files changed, 10 insertions(+), 46 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/56962/1
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 7073aee..c089d0d 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -109,15 +109,6 @@ register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0"
- # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc index 23e9dd1..e4c483f 100644 --- a/src/mainboard/amd/majolica/Makefile.inc +++ b/src/mainboard/amd/majolica/Makefile.inc @@ -2,10 +2,19 @@
bootblock-y += bootblock.c bootblock-y += early_gpio.c +ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin),) +$(info APCB sources present.) +APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin +APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin +else +$(info APCB sources not found. Skipping APCB.) +endif
romstage-y += port_descriptors.c +romstage-y += romstage.c
-ramstage-y += chromeos.c +ramstage-y += mainboard.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c
APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index 628ba64..dbb1a14 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -100,15 +100,6 @@ register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0"
- # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index 2aac197..6b5a60b 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -100,15 +100,6 @@ register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0"
- # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 92ca4e3..f1300c6 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -193,15 +193,6 @@ register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE" # Camera register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE" # Bluetooth
- # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_66M, /* MHz */ - .tpm_speed = SPI_SPEED_66M, /* MHz */ - .read_mode = SPI_READ_MODE_DUAL122, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0x80_EN | ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 8b1c68a..0a85393 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -178,15 +178,6 @@
# End RV2 USB3 phy setting
- # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_66M, /* MHz */ - .tpm_speed = SPI_SPEED_66M, /* MHz */ - .read_mode = SPI_READ_MODE_DUAL122, - }" - # USB OC pin mapping register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0