From e28f0155f60d64c5968e3eb7ef1b7f0d9db8ffdb Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Tue, 20 Nov 2007 19:06:03 +0000
Subject: [PATCH] Only post_code.h should have the prototype for post_code()
 from post_code.c (thus drop it from console.h).

Instead, have console.h #include post_code.h and drop other
explicit #includes of post_code.h in the code; console.h is already
included in pretty much every file.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@513 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 arch/x86/stage1.c                     | 1 -
 include/console.h                     | 2 +-
 include/post_code.h                   | 4 ++++
 mainboard/adl/msm800sev/initram.c     | 1 -
 mainboard/adl/msm800sev/stage1.c      | 1 -
 mainboard/amd/norwich/initram.c       | 1 -
 mainboard/amd/norwich/stage1.c        | 1 -
 mainboard/artecgroup/dbe61/initram.c  | 1 -
 mainboard/artecgroup/dbe61/stage1.c   | 1 -
 northbridge/amd/geodelx/geodelxinit.c | 1 -
 northbridge/amd/geodelx/raminit.c     | 1 -
 southbridge/amd/cs5536/cs5536.c       | 1 -
 12 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/arch/x86/stage1.c b/arch/x86/stage1.c
index 12943db774..70d6e9f509 100644
--- a/arch/x86/stage1.c
+++ b/arch/x86/stage1.c
@@ -26,7 +26,6 @@
 #include <tables.h>
 #include <lib.h>
 #include <mc146818rtc.h>
-#include <post_code.h>
 
 /* ah, well, what a mess! This is a hard code. FIX ME but how? 
  * By getting rid of ELF ...
diff --git a/include/console.h b/include/console.h
index a62c30c3cc..2e4a000033 100644
--- a/include/console.h
+++ b/include/console.h
@@ -19,6 +19,7 @@
 
 #include <types.h>
 #include <shared.h> /* We share symbols from stage 0 */
+#include <post_code.h>
 
 #define BIOS_EMERG      0   /* system is unusable                   */
 #define BIOS_ALERT      1   /* action must be taken immediately     */
@@ -35,7 +36,6 @@ void console_tx_byte(unsigned char byte, void *arg);
 void console_tx_flush(void);
 unsigned char console_rx_byte(void);
 int console_tst_byte(void);
-void post_code(u8 value);
 void die(const char *msg);
 
 struct console_driver {
diff --git a/include/post_code.h b/include/post_code.h
index 700fe3a4c7..c991cfd1c0 100644
--- a/include/post_code.h
+++ b/include/post_code.h
@@ -18,9 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef POST_CODE_H
+#define POST_CODE_H
+
 #include <shared.h>
 
 SHARED(post_code, void, u8 value);
 
 #define POST_START_OF_MAIN                              0x01
 
+#endif /* POST_CODE_H */
diff --git a/mainboard/adl/msm800sev/initram.c b/mainboard/adl/msm800sev/initram.c
index a9c1ac6b23..ade50cfec4 100644
--- a/mainboard/adl/msm800sev/initram.c
+++ b/mainboard/adl/msm800sev/initram.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <io.h>
diff --git a/mainboard/adl/msm800sev/stage1.c b/mainboard/adl/msm800sev/stage1.c
index 630f46e0f0..df0d325ddf 100644
--- a/mainboard/adl/msm800sev/stage1.c
+++ b/mainboard/adl/msm800sev/stage1.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <io.h>
diff --git a/mainboard/amd/norwich/initram.c b/mainboard/amd/norwich/initram.c
index 84e249b72d..a0c00b064e 100644
--- a/mainboard/amd/norwich/initram.c
+++ b/mainboard/amd/norwich/initram.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/mainboard/amd/norwich/stage1.c b/mainboard/amd/norwich/stage1.c
index 45daa56830..3a5a54bd90 100644
--- a/mainboard/amd/norwich/stage1.c
+++ b/mainboard/amd/norwich/stage1.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/mainboard/artecgroup/dbe61/initram.c b/mainboard/artecgroup/dbe61/initram.c
index 87c2aacd59..75c82c035a 100644
--- a/mainboard/artecgroup/dbe61/initram.c
+++ b/mainboard/artecgroup/dbe61/initram.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/mainboard/artecgroup/dbe61/stage1.c b/mainboard/artecgroup/dbe61/stage1.c
index e941f3aa15..923b48002c 100644
--- a/mainboard/artecgroup/dbe61/stage1.c
+++ b/mainboard/artecgroup/dbe61/stage1.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/northbridge/amd/geodelx/geodelxinit.c b/northbridge/amd/geodelx/geodelxinit.c
index 024baf24ff..aeb9f1dd3a 100644
--- a/northbridge/amd/geodelx/geodelxinit.c
+++ b/northbridge/amd/geodelx/geodelxinit.c
@@ -20,7 +20,6 @@
 
 #include <types.h>
 #include <console.h>
-#include <post_code.h>
 #include <msr.h>
 #include <cpu.h>
 #include <amd_geodelx.h>
diff --git a/northbridge/amd/geodelx/raminit.c b/northbridge/amd/geodelx/raminit.c
index 0f3e3666f9..7ecc741d69 100644
--- a/northbridge/amd/geodelx/raminit.c
+++ b/northbridge/amd/geodelx/raminit.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <msr.h>
 #include <spd.h>
 #include <io.h>
diff --git a/southbridge/amd/cs5536/cs5536.c b/southbridge/amd/cs5536/cs5536.c
index 99e5a42ea9..73e46241a9 100644
--- a/southbridge/amd/cs5536/cs5536.c
+++ b/southbridge/amd/cs5536/cs5536.c
@@ -20,7 +20,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/pci.h>
 #include <msr.h>
 #include <amd_geodelx.h>