Various small consistency fixes (trivial):

 - Use _FOO_H include guard format everywhere.

 - Add missing speaker.c prototypes to libpayload.h.

 - Consistently use short form u8/u16/u32 instead of uint8_t et. al.

 - kcofig: Use 'depends on' instead of 'depends', which seems deprecated.

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@3234 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

4 files changed, 8 insertions, 8 deletions

diff --git a/payloads/libpayload/include/arch/io.h b/payloads/libpayload/include/arch/io.h
index dcf5bd97ea..538b296a11 100644
--- a/payloads/libpayload/include/arch/io.h
+++ b/payloads/libpayload/include/arch/io.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _X86_ARCH_IO_H_
-#define _X86_ARCH_IO_H_
+#ifndef _ARCH_IO_H
+#define _ARCH_IO_H
 
 #define readb(_a) (*(volatile unsigned char *) (_a))
 #define readw(_a) (*(volatile unsigned short *) (_a))
diff --git a/payloads/libpayload/include/arch/msr.h b/payloads/libpayload/include/arch/msr.h
index 5985ab81d8..c28b56cde1 100644
--- a/payloads/libpayload/include/arch/msr.h
+++ b/payloads/libpayload/include/arch/msr.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ARCH_MSR_H_
-#define _ARCH_MSR_H_
+#ifndef _ARCH_MSR_H
+#define _ARCH_MSR_H
 
 static inline unsigned long long _rdmsr(unsigned int msr)
 {
diff --git a/payloads/libpayload/include/arch/rdtsc.h b/payloads/libpayload/include/arch/rdtsc.h
index 1addedafc8..da7949d808 100644
--- a/payloads/libpayload/include/arch/rdtsc.h
+++ b/payloads/libpayload/include/arch/rdtsc.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _RDTSC_H_
-#define _RDTSC_H_
+#ifndef _ARCH_RDTSC_H
+#define _ARCH_RDTSC_H
 
 static inline unsigned long long rdtsc(void)
 {
diff --git a/payloads/libpayload/include/arch/types.h b/payloads/libpayload/include/arch/types.h
index d1f3acda5b..641fb0aef8 100644
--- a/payloads/libpayload/include/arch/types.h
+++ b/payloads/libpayload/include/arch/types.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ARCH_X86_TYPES_H
-#define _ARCH_X86_TYPES_H
+#ifndef _ARCH_TYPES_H
+#define _ARCH_TYPES_H
 
 typedef unsigned char uint8_t;
 typedef unsigned char u8;