summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2008-08-11 17:10:58 +0000
committerJordan Crouse <jordan.crouse@amd.com>2008-08-11 17:10:58 +0000
commit12e27266c3cb9bd1499731a5c52da7ce565d7912 (patch)
tree82faa71bf727440fa3a5146861594a088a7b14a0
parent5e354b7a43df8626216a5dc3b94d65a590a25349 (diff)
downloadcoreboot-12e27266c3cb9bd1499731a5c52da7ce565d7912.tar.xz
No really, _these_ should be the last occurences of CONFIG_ without
config.h in libpayload - also removed CONFIG_ instance in libpayload which would have been dangerous. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Acked-by: Jordan Crouse <jordan.crouse@amd.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3497 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--payloads/libpayload/crypto/sha1.c9
-rw-r--r--payloads/libpayload/curses/local.h1
-rw-r--r--payloads/libpayload/i386/coreboot.c1
-rw-r--r--payloads/libpayload/i386/sysinfo.c1
-rw-r--r--payloads/libpayload/include/libpayload.h5
5 files changed, 12 insertions, 5 deletions
diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c
index 1c68a8019c..292561913d 100644
--- a/payloads/libpayload/crypto/sha1.c
+++ b/payloads/libpayload/crypto/sha1.c
@@ -20,6 +20,7 @@
* 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
*/
+#include <config.h>
#include <libpayload.h>
typedef u8 u_int8_t;
@@ -27,6 +28,14 @@ typedef u32 u_int32_t;
typedef u64 u_int64_t;
typedef unsigned int u_int;
+/* Moved from libpayload.h */
+
+#ifdef CONFIG_TARGET_I386
+#define BYTE_ORDER LITTLE_ENDIAN
+#else
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+
#if 0
#include <sys/param.h>
#include <string.h>
diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h
index 001edab4ef..fff26cbc0c 100644
--- a/payloads/libpayload/curses/local.h
+++ b/payloads/libpayload/curses/local.h
@@ -58,6 +58,7 @@
#undef USE_TERMLIB
+#include <config.h>
#include <libpayload.h>
#include <curses.h>
#include <curses.priv.h>
diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c
index 97589261a5..af76f182fc 100644
--- a/payloads/libpayload/i386/coreboot.c
+++ b/payloads/libpayload/i386/coreboot.c
@@ -27,6 +27,7 @@
* SUCH DAMAGE.
*/
+#include <config.h>
#include <libpayload.h>
#include <coreboot_tables.h>
diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c
index 686b28ffc6..a845a2817b 100644
--- a/payloads/libpayload/i386/sysinfo.c
+++ b/payloads/libpayload/i386/sysinfo.c
@@ -27,6 +27,7 @@
* SUCH DAMAGE.
*/
+#include <config.h>
#include <libpayload.h>
/**
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index ff69eaad2f..9e95291bc4 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -44,11 +44,6 @@
#define LITTLE_ENDIAN 1234
#define BIG_ENDIAN 4321
-#ifdef CONFIG_TARGET_I386
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
#define EXIT_SUCCESS 0
#define EXIT_FAILURE 1