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

diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c
index 1c68a8019c0e1ac317243a45c2069b4d6de14fd0..292561913d1a73ad3a5951baf07a7fe7bc6f213e 100644 (file)
--- 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 001edab4efc04a355c4f38094d8f02eab58c2571..fff26cbc0c8ee1b0e055986e2a13b9c3607167be 100644 (file)
--- 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 97589261a57dd410a57dcfcbc901e689819efdd2..af76f182fc6bbd27d7712f50d30b33ed4cc00058 100644 (file)
--- 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 686b28ffc6c6f4ced31dd2adec080cf00f3049c6..a845a2817b4d4cdc18eefed07cc7b753378709a4 100644 (file)
--- 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 ff69eaad2fc3d3fe146a7613974d3b4f0c441be3..9e95291bc44891de2376383fbb7590e7717adc08 100644 (file)
--- 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