[coreboot-gerrit] New patch to review for coreboot: 737bbec usbdebug: Fix uses without EARLY_CONSOLE

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Wed Jun 12 10:44:25 CEST 2013


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3437

-gerrit

commit 737bbec6e706c8ff59a91420e77e09f4cc2ced00
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Tue Jun 11 16:32:01 2013 +0300

    usbdebug: Fix uses without EARLY_CONSOLE
    
    With introduction of EARLY_CONSOLE option, enable_usbdebug()
    may be used in either romstage or ramstage. The choice of
    using simple device model was introduced in intel/i82801gx.
    
    Change-Id: I2de8d9c77bb458ba797c3aac9e2cd0d653e06684
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/southbridge/amd/agesa/hudson/enable_usbdebug.c | 5 +++++
 src/southbridge/amd/sb600/enable_usbdebug.c        | 4 ++++
 src/southbridge/amd/sb700/enable_usbdebug.c        | 4 ++++
 src/southbridge/amd/sb800/enable_usbdebug.c        | 5 +++++
 src/southbridge/nvidia/ck804/enable_usbdebug.c     | 4 ++++
 src/southbridge/nvidia/mcp55/enable_usbdebug.c     | 4 ++++
 src/southbridge/sis/sis966/enable_usbdebug.c       | 4 ++++
 7 files changed, 30 insertions(+)

diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
index c74ac9a..af900a3 100644
--- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
@@ -16,6 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/amd/sb600/enable_usbdebug.c b/src/southbridge/amd/sb600/enable_usbdebug.c
index 305362f..b1963ba 100644
--- a/src/southbridge/amd/sb600/enable_usbdebug.c
+++ b/src/southbridge/amd/sb600/enable_usbdebug.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/amd/sb700/enable_usbdebug.c b/src/southbridge/amd/sb700/enable_usbdebug.c
index 2a7fc38..f7fdf06 100644
--- a/src/southbridge/amd/sb700/enable_usbdebug.c
+++ b/src/southbridge/amd/sb700/enable_usbdebug.c
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/amd/sb800/enable_usbdebug.c b/src/southbridge/amd/sb800/enable_usbdebug.c
index f085eab..98e9bb0 100644
--- a/src/southbridge/amd/sb800/enable_usbdebug.c
+++ b/src/southbridge/amd/sb800/enable_usbdebug.c
@@ -16,6 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/nvidia/ck804/enable_usbdebug.c b/src/southbridge/nvidia/ck804/enable_usbdebug.c
index 659fdc6..1842a33 100644
--- a/src/southbridge/nvidia/ck804/enable_usbdebug.c
+++ b/src/southbridge/nvidia/ck804/enable_usbdebug.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/nvidia/mcp55/enable_usbdebug.c b/src/southbridge/nvidia/mcp55/enable_usbdebug.c
index f753c78..cb32944 100644
--- a/src/southbridge/nvidia/mcp55/enable_usbdebug.c
+++ b/src/southbridge/nvidia/mcp55/enable_usbdebug.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>
diff --git a/src/southbridge/sis/sis966/enable_usbdebug.c b/src/southbridge/sis/sis966/enable_usbdebug.c
index 78a3838..e4252e3 100644
--- a/src/southbridge/sis/sis966/enable_usbdebug.c
+++ b/src/southbridge/sis/sis966/enable_usbdebug.c
@@ -23,6 +23,10 @@
 
 /* TODO: Check whether this actually works (might be copy-paste leftover). */
 
+#ifndef __PRE_RAM__
+#define __PRE_RAM__
+#endif
+
 #include <stdint.h>
 #include <arch/io.h>
 #include <usbdebug.h>



More information about the coreboot-gerrit mailing list