Drop unneeded #includes, add EXIT_SUCCESS/EXIT_FAILURE (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3237 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h
index 0a861ce..001edab 100644
--- a/payloads/libpayload/curses/local.h
+++ b/payloads/libpayload/curses/local.h
@@ -59,8 +59,6 @@
#undef USE_TERMLIB
#include <libpayload.h>
-#include <arch/types.h>
-#include <arch/io.h>
#include <curses.h>
#include <curses.priv.h>
@@ -86,9 +84,4 @@
/* Share the color table for easy lookup */
extern unsigned char color_pairs[256];
-/* speaker.c */
-void speaker_enable(u16 freq);
-void speaker_disable(void);
-void speaker_tone(u16 freq, unsigned int duration);
-
#endif
diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index 9a3e4b8..1049b9c 100644
--- a/payloads/libpayload/drivers/keyboard.c
+++ b/payloads/libpayload/drivers/keyboard.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <arch/io.h>
#include <libpayload.h>
unsigned char map[2][0x57] = {
diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c
index b3179c7..a97e7dd 100644
--- a/payloads/libpayload/drivers/serial.c
+++ b/payloads/libpayload/drivers/serial.c
@@ -28,7 +28,6 @@
*/
#include <libpayload.h>
-#include <sysinfo.h>
#define IOBASE lib_sysinfo.ser_ioport
diff --git a/payloads/libpayload/drivers/video/geode.c b/payloads/libpayload/drivers/video/geode.c
index 230926c..b0631c5 100644
--- a/payloads/libpayload/drivers/video/geode.c
+++ b/payloads/libpayload/drivers/video/geode.c
@@ -30,9 +30,7 @@
#include <libpayload.h>
#include <pci.h>
#include <video_console.h>
-#include <arch/io.h>
#include <arch/msr.h>
-
#include "font8x16.h"
/* This is the video mode that we're going to use for our VGA screen */
diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c
index e9bc40f..9cbd4ef 100644
--- a/payloads/libpayload/i386/coreboot.c
+++ b/payloads/libpayload/i386/coreboot.c
@@ -28,7 +28,6 @@
*/
#include <libpayload.h>
-#include <sysinfo.h>
#include <coreboot_tables.h>
/*
diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c
index cb149ea..7b1f785 100644
--- a/payloads/libpayload/i386/sysinfo.c
+++ b/payloads/libpayload/i386/sysinfo.c
@@ -28,7 +28,6 @@
*/
#include <libpayload.h>
-#include <sysinfo.h>
/**
* This is a global structure that is used through the library - we set it
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 27668e1..611f65e 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -49,6 +49,9 @@
#define BYTE_ORDER BIG_ENDIAN
#endif
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
+
#define RAND_MAX 0x7fffffff
/* Some NVRAM byte definitions */
diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c
index 062879c..2f1ca8b 100644
--- a/payloads/libpayload/libc/printf.c
+++ b/payloads/libpayload/libc/printf.c
@@ -34,7 +34,6 @@
*/
#include <libpayload.h>
-#include <stdarg.h>
/** Structure for specifying output methods for different printf clones. */
struct printf_spec {