Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36881 )
Change subject: */Makefile: Always build usb_debuc.c ......................................................................
*/Makefile: Always build usb_debuc.c
This always builds the usb debug callback functions when implemented. They get garbage collected if not CONFIG_USBDEBUG is not set.
Change-Id: I33051df583645cd00d08e06774383763172d5822 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/amd/stoneyridge/Makefile.inc M src/soc/intel/broadwell/Makefile.inc M src/southbridge/amd/agesa/hudson/Makefile.inc M src/southbridge/amd/pi/hudson/Makefile.inc M src/southbridge/amd/sb700/Makefile.inc M src/southbridge/amd/sb800/Makefile.inc M src/southbridge/nvidia/ck804/Makefile.inc M src/southbridge/nvidia/mcp55/Makefile.inc 8 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/36881/1
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 53aabf5..b74bc68 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -42,7 +42,7 @@ bootblock-y += bootblock/bootblock.c bootblock-y += gpio.c bootblock-y += i2c.c -bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c bootblock-y += monotonic_timer.c bootblock-y += pmutil.c bootblock-y += reset.c @@ -54,7 +54,7 @@ romstage-y += BiosCallOuts.c romstage-y += i2c.c romstage-y += romstage.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-y += enable_usbdebug.c romstage-y += gpio.c romstage-y += monotonic_timer.c romstage-y += pmutil.c @@ -89,7 +89,7 @@ ramstage-y += chip.c ramstage-y += cpu.c ramstage-y += mca.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +ramstage-y += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-y += gpio.c ramstage-y += monotonic_timer.c diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc index 8f690cc..03aa3fb 100644 --- a/src/soc/intel/broadwell/Makefile.inc +++ b/src/soc/intel/broadwell/Makefile.inc @@ -65,9 +65,9 @@ smm-y += tsc_freq.c postcar-y += tsc_freq.c verstage-y += tsc_freq.c -bootblock-$(CONFIG_USBDEBUG) += usb_debug.c -romstage-$(CONFIG_USBDEBUG) += usb_debug.c -ramstage-$(CONFIG_USBDEBUG) += usb_debug.c +bootblock-y += usb_debug.c +romstage-y += usb_debug.c +ramstage-y += usb_debug.c ramstage-y += ehci.c ramstage-y += xhci.c smm-y += xhci.c diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc index cd0a1d5..8ad82d2 100644 --- a/src/southbridge/amd/agesa/hudson/Makefile.inc +++ b/src/southbridge/amd/agesa/hudson/Makefile.inc @@ -17,9 +17,9 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c ramstage-y += reset.c
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c +romstage-y += enable_usbdebug.c +ramstage-y += enable_usbdebug.c romstage-y += early_setup.c
ramstage-$(CONFIG_SPI_FLASH) += spi.c diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 4b4b138..0eccadb 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -28,10 +28,10 @@ # #*****************************************************************************
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c
romstage-y += early_setup.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-y += enable_usbdebug.c romstage-$(CONFIG_HUDSON_IMC_FWM) += imc.c romstage-y += smbus.c romstage-y += smbus_spd.c @@ -41,7 +41,7 @@ verstage-y += reset.c verstage-$(CONFIG_HUDSON_UART) += uart.c
-ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +ramstage-y += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c ramstage-$(CONFIG_SOUTHBRIDGE_AMD_PI_KERN) += gpio.c ramstage-y += hda.c diff --git a/src/southbridge/amd/sb700/Makefile.inc b/src/southbridge/amd/sb700/Makefile.inc index 17d0a3a..0a20a8c 100644 --- a/src/southbridge/amd/sb700/Makefile.inc +++ b/src/southbridge/amd/sb700/Makefile.inc @@ -14,9 +14,9 @@ ramstage-y += reset.c ramstage-y += spi.c
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c +romstage-y += enable_usbdebug.c +ramstage-y += enable_usbdebug.c
romstage-y += early_setup.c romstage-y += smbus.c diff --git a/src/southbridge/amd/sb800/Makefile.inc b/src/southbridge/amd/sb800/Makefile.inc index fd2577c..276ca29 100644 --- a/src/southbridge/amd/sb800/Makefile.inc +++ b/src/southbridge/amd/sb800/Makefile.inc @@ -12,9 +12,9 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c ramstage-y += reset.c
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c +romstage-y += enable_usbdebug.c +ramstage-y += enable_usbdebug.c
romstage-y += ramtop.c ramstage-y += ramtop.c diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc index 68495c5..e74c70b 100644 --- a/src/southbridge/nvidia/ck804/Makefile.inc +++ b/src/southbridge/nvidia/ck804/Makefile.inc @@ -17,9 +17,9 @@
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c +romstage-y += enable_usbdebug.c +ramstage-y += enable_usbdebug.c romstage-y += early_smbus.c
bootblock-y += romstrap.ld diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc index db0b310..d9c4134 100644 --- a/src/southbridge/nvidia/mcp55/Makefile.inc +++ b/src/southbridge/nvidia/mcp55/Makefile.inc @@ -17,9 +17,9 @@
ramstage-y += reset.c
-bootblock-$(CONFIG_USBDEBUG) += enable_usbdebug.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c -ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +bootblock-y += enable_usbdebug.c +romstage-y += enable_usbdebug.c +ramstage-y += enable_usbdebug.c romstage-y += early_smbus.c romstage-y += early_ctrl.c