aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-11-16 12:13:03 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-18 10:59:39 +0000
commitc63649bdbbeddbdb742b4335af0313fc1c3bd552 (patch)
tree480e7e718e602a958ac11b46937a6436e88cedc3
parent2c43bf7969e5b16f0611ce1686b9f665d87d7f8e (diff)
*/Makefile: Always build enable_usbdebug.c
This always builds the usb debug callback functions when implemented. They get garbage collected if CONFIG_USBDEBUG is not set. Change-Id: I33051df583645cd00d08e06774383763172d5822 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36881 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Mike Banon <mikebdp2@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/soc/amd/stoneyridge/Makefile.inc6
-rw-r--r--src/soc/intel/broadwell/Makefile.inc6
-rw-r--r--src/southbridge/amd/agesa/hudson/Makefile.inc6
-rw-r--r--src/southbridge/amd/pi/hudson/Makefile.inc6
-rw-r--r--src/southbridge/amd/sb700/Makefile.inc6
-rw-r--r--src/southbridge/amd/sb800/Makefile.inc6
-rw-r--r--src/southbridge/nvidia/ck804/Makefile.inc6
-rw-r--r--src/southbridge/nvidia/mcp55/Makefile.inc6
8 files changed, 24 insertions, 24 deletions
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 53aabf5d65..b74bc68cc3 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -42,7 +42,7 @@ bootblock-y += BiosCallOuts.c
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 @@ bootblock-$(CONFIG_HAVE_SMI_HANDLER) += smi_util.c
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 += i2c.c
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 8f690cc4f6..03aa3fbd08 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -65,9 +65,9 @@ romstage-y += tsc_freq.c
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 cd0a1d53e1..8ad82d2766 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -17,9 +17,9 @@ ramstage-y += sd.c
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 4b4b138214..0eccadb4f9 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 += early_setup.c
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 17d0a3abc0..0a20a8c8b3 100644
--- a/src/southbridge/amd/sb700/Makefile.inc
+++ b/src/southbridge/amd/sb700/Makefile.inc
@@ -14,9 +14,9 @@ romstage-y += reset.c
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 fd2577ce39..276ca29acd 100644
--- a/src/southbridge/amd/sb800/Makefile.inc
+++ b/src/southbridge/amd/sb800/Makefile.inc
@@ -12,9 +12,9 @@ ramstage-y += pcie.c
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 68495c5f1b..e74c70b180 100644
--- a/src/southbridge/nvidia/ck804/Makefile.inc
+++ b/src/southbridge/nvidia/ck804/Makefile.inc
@@ -17,9 +17,9 @@ ramstage-y += reset.c
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 db0b3100ec..d9c4134453 100644
--- a/src/southbridge/nvidia/mcp55/Makefile.inc
+++ b/src/southbridge/nvidia/mcp55/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_smbus.c
romstage-y += early_ctrl.c