Author: uwe Date: 2007-11-20 20:06:03 +0100 (Tue, 20 Nov 2007) New Revision: 513
Modified: LinuxBIOSv3/arch/x86/stage1.c LinuxBIOSv3/include/console.h LinuxBIOSv3/include/post_code.h LinuxBIOSv3/mainboard/adl/msm800sev/initram.c LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c LinuxBIOSv3/mainboard/amd/norwich/initram.c LinuxBIOSv3/mainboard/amd/norwich/stage1.c LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c LinuxBIOSv3/northbridge/amd/geodelx/raminit.c LinuxBIOSv3/southbridge/amd/cs5536/cs5536.c Log: 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
Modified: LinuxBIOSv3/arch/x86/stage1.c =================================================================== --- LinuxBIOSv3/arch/x86/stage1.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/arch/x86/stage1.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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 ...
Modified: LinuxBIOSv3/include/console.h =================================================================== --- LinuxBIOSv3/include/console.h 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/include/console.h 2007-11-20 19:06:03 UTC (rev 513) @@ -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_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 {
Modified: LinuxBIOSv3/include/post_code.h =================================================================== --- LinuxBIOSv3/include/post_code.h 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/include/post_code.h 2007-11-20 19:06:03 UTC (rev 513) @@ -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 */
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/initram.c =================================================================== --- LinuxBIOSv3/mainboard/adl/msm800sev/initram.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/adl/msm800sev/initram.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c =================================================================== --- LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/mainboard/amd/norwich/initram.c =================================================================== --- LinuxBIOSv3/mainboard/amd/norwich/initram.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/amd/norwich/initram.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/mainboard/amd/norwich/stage1.c =================================================================== --- LinuxBIOSv3/mainboard/amd/norwich/stage1.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/amd/norwich/stage1.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c =================================================================== --- LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c 2007-11-20 19:06:03 UTC (rev 513) @@ -20,7 +20,6 @@
#include <types.h> #include <console.h> -#include <post_code.h> #include <msr.h> #include <cpu.h> #include <amd_geodelx.h>
Modified: LinuxBIOSv3/northbridge/amd/geodelx/raminit.c =================================================================== --- LinuxBIOSv3/northbridge/amd/geodelx/raminit.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/northbridge/amd/geodelx/raminit.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>
Modified: LinuxBIOSv3/southbridge/amd/cs5536/cs5536.c =================================================================== --- LinuxBIOSv3/southbridge/amd/cs5536/cs5536.c 2007-11-20 18:20:53 UTC (rev 512) +++ LinuxBIOSv3/southbridge/amd/cs5536/cs5536.c 2007-11-20 19:06:03 UTC (rev 513) @@ -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>