Patch set updated for coreboot: 61339b0 usbdebug: Support AMD cimx/sb700 cimx/sb800 once again

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3439

-gerrit

commit 61339b0cf5e514c9196ea3f5d40476a8f07d653a
Author: Kyösti Mälkki 
Date:   Tue Jun 11 16:32:01 2013 +0300

usbdebug: Support AMD cimx/sb700 cimx/sb800 once again

Support code for sb700 and sb800 existed already, but Kconfig and
    compile-time issues prevented from enabling USBDEBUG for boards
    with the affected AMD southbridges.

Change-Id: I49e955fcc6e54927320b9dc7f62ea00c55c3cedf
    Signed-off-by: Kyösti Mälkki 
---
 src/southbridge/amd/cimx/sb700/Kconfig      | 1 +
 src/southbridge/amd/cimx/sb700/Makefile.inc | 3 ++-
 src/southbridge/amd/cimx/sb800/Kconfig      | 1 +
 src/southbridge/amd/cimx/sb800/Makefile.inc | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig
index 97cdf1c..0a22296 100644
--- a/src/southbridge/amd/cimx/sb700/Kconfig
+++ b/src/southbridge/amd/cimx/sb700/Kconfig
@@ -20,6 +20,7 @@
 config SOUTHBRIDGE_AMD_CIMX_SB700
    bool
    select IOAPIC
+	select HAVE_USBDEBUG
    select AMD_SB_CIMX
    select HAVE_HARD_RESET

diff --git a/src/southbridge/amd/cimx/sb700/Makefile.inc b/src/southbridge/amd/cimx/sb700/Makefile.inc
index 268629f..f6f0d86 100644
--- a/src/southbridge/amd/cimx/sb700/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb700/Makefile.inc
@@ -30,4 +30,5 @@ ramstage-y += reset.c
 ramstage-y   += smbus.c
 ramstage-y   += lpc.c

-
+romstage-$(CONFIG_USBDEBUG) += ../../sb700/enable_usbdebug.c
+ramstage-$(CONFIG_USBDEBUG) += ../../sb700/enable_usbdebug.c
diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index b82409d..92027b1 100644
--- a/src/southbridge/amd/cimx/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -21,6 +21,7 @@ config SOUTHBRIDGE_AMD_CIMX_SB800
    bool
    default n
    select IOAPIC
+	select HAVE_USBDEBUG
    select AMD_SB_CIMX
    select HAVE_HARD_RESET

diff --git a/src/southbridge/amd/cimx/sb800/Makefile.inc b/src/southbridge/amd/cimx/sb800/Makefile.inc
index 831cc2e..0ff9e1e 100644
--- a/src/southbridge/amd/cimx/sb800/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb800/Makefile.inc
@@ -34,8 +34,8 @@ ramstage-$(CONFIG_SB800_IMC_FAN_CONTROL) += fan.c
 ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c
 ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c

-romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
-ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
+romstage-$(CONFIG_USBDEBUG) += ../../sb800/enable_usbdebug.c
+ramstage-$(CONFIG_USBDEBUG) += ../../sb800/enable_usbdebug.c

ramstage-y   += smbus.c
 ramstage-y   += lpc.c