[coreboot-gerrit] Patch set updated for coreboot: 31c88e3 usbdebug: Fix uses without EARLY_CONSOLE [NOTFORMERGE]

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Thu Jun 13 16:39:22 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 31c88e36a4d39136a68c927561cb5020ec5437a9
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 [NOTFORMERGE]
    
    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 9ba4b17..13f6522 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 dcab84a..69a7289 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 aec491c..c93f4da 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 2577529..75d97fd 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 ffebcf4..3b09177 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 4855cf2..a1b8f30 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 b042b93..2b623f7 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