summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevin.morfitt@fearnside-systems.co.uk <kevin.morfitt@fearnside-systems.co.uk>2009-11-03 18:08:41 +0900
committerTom Rix <Tom.Rix@windriver.com>2009-11-27 16:26:12 -0600
commit492fb1fdbcdd5e21be0b6742c15f76c648f0653b (patch)
treef49c1af76281fecc778a0a3712838a556c4bc67d
parent2d251ccaa90997012e0b1f13bf791df2bf03a144 (diff)
downloadu-boot-imx-492fb1fdbcdd5e21be0b6742c15f76c648f0653b.zip
u-boot-imx-492fb1fdbcdd5e21be0b6742c15f76c648f0653b.tar.gz
u-boot-imx-492fb1fdbcdd5e21be0b6742c15f76c648f0653b.tar.bz2
Move s3c24x0 header files to asm-arm/arch-s3c24x0/
This patch moves the s3c24x0 header files from include/ to include/asm-arm/arch-s3c24x0/. checkpatch.pl showed 2 errors and 3 warnings. The 2 errors were both due to a non-UTF8 character in David M?ller's name: ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8 #489: FILE: include/asm-arm/arch-s3c24x0/s3c2410.h:3: + * David M?ller ELSOFT AG Switzerland. d.mueller@elsoft.ch As David's name correctly contains a non-UTF8 character I haven't fixed these errors. The 3 warnings were all because of the use of 'volatile' in s3c24x0.h: WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt #673: FILE: include/asm-arm/arch-s3c24x0/s3c24x0.h:35: +typedef volatile u8 S3C24X0_REG8; +typedef volatile u16 S3C24X0_REG16; +typedef volatile u32 S3C24X0_REG32; I'll fix these errors in another patch. Tested by running MAKEALL for ARM8 targets and ensuring there were no new errors or warnings. Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--board/mpl/vcma9/vcma9.c2
-rw-r--r--board/mpl/vcma9/vcma9.h2
-rw-r--r--board/samsung/smdk2400/smdk2400.c2
-rw-r--r--board/samsung/smdk2410/smdk2410.c2
-rw-r--r--board/sbc2410x/sbc2410x.c2
-rw-r--r--board/trab/cmd_trab.c2
-rw-r--r--board/trab/rs485.c2
-rw-r--r--board/trab/rs485.h2
-rw-r--r--board/trab/trab.c2
-rw-r--r--board/trab/trab_fkt.c2
-rw-r--r--board/trab/tsc2000.c2
-rw-r--r--board/trab/vfd.c2
-rw-r--r--cpu/arm920t/s3c24x0/interrupts.c4
-rw-r--r--cpu/arm920t/s3c24x0/speed.c4
-rw-r--r--cpu/arm920t/s3c24x0/timer.c4
-rw-r--r--cpu/arm920t/s3c24x0/usb.c4
-rw-r--r--cpu/arm920t/s3c24x0/usb_ohci.c4
-rw-r--r--drivers/i2c/s3c24x0_i2c.c4
-rw-r--r--drivers/mtd/nand/s3c2410_nand.c2
-rw-r--r--drivers/rtc/s3c24x0_rtc.c4
-rw-r--r--drivers/serial/serial_s3c24x0.c4
-rw-r--r--include/asm-arm/arch-s3c24x0/s3c2400.h (renamed from include/s3c2400.h)2
-rw-r--r--include/asm-arm/arch-s3c24x0/s3c2410.h (renamed from include/s3c2410.h)2
-rw-r--r--include/asm-arm/arch-s3c24x0/s3c24x0.h (renamed from include/s3c24x0.h)0
24 files changed, 31 insertions, 31 deletions
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 4d8b579..f3bd288 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#include <stdio_dev.h>
#include <i2c.h>
diff --git a/board/mpl/vcma9/vcma9.h b/board/mpl/vcma9/vcma9.h
index f46e0e4..9f32808 100644
--- a/board/mpl/vcma9/vcma9.h
+++ b/board/mpl/vcma9/vcma9.h
@@ -25,7 +25,7 @@
* Global routines used for VCMA9
*****************************************************************************/
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
extern int mem_test(unsigned long start, unsigned long ramsize,int mode);
diff --git a/board/samsung/smdk2400/smdk2400.c b/board/samsung/smdk2400/smdk2400.c
index 42bf008..be0c70a 100644
--- a/board/samsung/smdk2400/smdk2400.c
+++ b/board/samsung/smdk2400/smdk2400.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <netdev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/smdk2410/smdk2410.c b/board/samsung/smdk2410/smdk2410.c
index fde7730..a8cf287 100644
--- a/board/samsung/smdk2410/smdk2410.c
+++ b/board/samsung/smdk2410/smdk2410.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc2410x/sbc2410x.c b/board/sbc2410x/sbc2410x.c
index 7452c1f..6768c02 100644
--- a/board/sbc2410x/sbc2410x.c
+++ b/board/sbc2410x/sbc2410x.c
@@ -30,7 +30,7 @@
#include <common.h>
#include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand.h>
diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c
index 04a3607..a01ffcc 100644
--- a/board/trab/cmd_trab.c
+++ b/board/trab/cmd_trab.c
@@ -25,7 +25,7 @@
#include <common.h>
#include <command.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#include <rtc.h>
/*
diff --git a/board/trab/rs485.c b/board/trab/rs485.c
index 7d5c0a2..f402c59 100644
--- a/board/trab/rs485.c
+++ b/board/trab/rs485.c
@@ -22,7 +22,7 @@
*/
#include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#include "rs485.h"
static void rs485_setbrg (void);
diff --git a/board/trab/rs485.h b/board/trab/rs485.h
index 9f0a5b9..4a2d83f 100644
--- a/board/trab/rs485.h
+++ b/board/trab/rs485.h
@@ -24,7 +24,7 @@
#ifndef _RS485_H_
#define _RS485_H_
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
int rs485_init (void);
int rs485_getc (void);
diff --git a/board/trab/trab.c b/board/trab/trab.c
index ea782a9..f8836ff 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -26,7 +26,7 @@
#include <common.h>
#include <netdev.h>
#include <malloc.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#include <command.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c
index dc2a8d7..940e12f 100644
--- a/board/trab/trab_fkt.c
+++ b/board/trab/trab_fkt.c
@@ -26,7 +26,7 @@
#include <common.h>
#include <exports.h>
#include <timestamp.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#include "tsc2000.h"
#include "rs485.h"
diff --git a/board/trab/tsc2000.c b/board/trab/tsc2000.c
index fc501a8..f757202 100644
--- a/board/trab/tsc2000.c
+++ b/board/trab/tsc2000.c
@@ -26,7 +26,7 @@
*/
#include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#include <asm/io.h>
#include <div64.h>
#include "tsc2000.h"
diff --git a/board/trab/vfd.c b/board/trab/vfd.c
index d5ad5bb..8d9a057 100644
--- a/board/trab/vfd.c
+++ b/board/trab/vfd.c
@@ -37,7 +37,7 @@
#include <stdarg.h>
#include <linux/types.h>
#include <stdio_dev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/cpu/arm920t/s3c24x0/interrupts.c
index 9148946..3e8422e 100644
--- a/cpu/arm920t/s3c24x0/interrupts.c
+++ b/cpu/arm920t/s3c24x0/interrupts.c
@@ -32,9 +32,9 @@
#include <common.h>
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
#include <asm/proc-armv/ptrace.h>
diff --git a/cpu/arm920t/s3c24x0/speed.c b/cpu/arm920t/s3c24x0/speed.c
index 136c779..85c73a3 100644
--- a/cpu/arm920t/s3c24x0/speed.c
+++ b/cpu/arm920t/s3c24x0/speed.c
@@ -35,9 +35,9 @@
#include <asm/io.h>
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
#define MPLL 0
diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c
index 20cedd4..2667da6 100644
--- a/cpu/arm920t/s3c24x0/timer.c
+++ b/cpu/arm920t/s3c24x0/timer.c
@@ -37,9 +37,9 @@
#include <asm/io.h>
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
int timer_load_val = 0;
diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c
index b5ba8c4..5e19cda 100644
--- a/cpu/arm920t/s3c24x0/usb.c
+++ b/cpu/arm920t/s3c24x0/usb.c
@@ -27,9 +27,9 @@
# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
#if defined(CONFIG_S3C2400)
-# include <s3c2400.h>
+# include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-# include <s3c2410.h>
+# include <asm/arch/s3c2410.h>
#endif
#include <asm/io.h>
diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c
index 7672e4c..4111992 100644
--- a/cpu/arm920t/s3c24x0/usb_ohci.c
+++ b/cpu/arm920t/s3c24x0/usb_ohci.c
@@ -39,9 +39,9 @@
#ifdef CONFIG_USB_OHCI
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
#include <asm/io.h>
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 55c6a12..8fecc6e 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -28,9 +28,9 @@
#include <common.h>
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
#include <asm/io.h>
diff --git a/drivers/mtd/nand/s3c2410_nand.c b/drivers/mtd/nand/s3c2410_nand.c
index 815c78e..2f89b8c 100644
--- a/drivers/mtd/nand/s3c2410_nand.c
+++ b/drivers/mtd/nand/s3c2410_nand.c
@@ -21,7 +21,7 @@
#include <common.h>
#include <nand.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#include <asm/io.h>
#define S3C2410_NFCONF_EN (1<<15)
diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 1ce34e3..2d78f93 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -31,9 +31,9 @@
#if (defined(CONFIG_CMD_DATE))
#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
#include <rtc.h>
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index c2c72e4..914d07c 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -20,9 +20,9 @@
#include <common.h>
#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
#endif
DECLARE_GLOBAL_DATA_PTR;
diff --git a/include/s3c2400.h b/include/asm-arm/arch-s3c24x0/s3c2400.h
index 062259d..26bd4e4 100644
--- a/include/s3c2400.h
+++ b/include/asm-arm/arch-s3c24x0/s3c2400.h
@@ -60,7 +60,7 @@ enum s3c24x0_uarts_nr {
#define S3C2400_MMC_BASE 0x15A00000
/* include common stuff */
-#include <s3c24x0.h>
+#include <asm/arch/s3c24x0.h>
static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)
diff --git a/include/s3c2410.h b/include/asm-arm/arch-s3c24x0/s3c2410.h
index 03b33b4..be2e76e 100644
--- a/include/s3c2410.h
+++ b/include/asm-arm/arch-s3c24x0/s3c2410.h
@@ -66,7 +66,7 @@ enum s3c24x0_uarts_nr {
/* include common stuff */
-#include <s3c24x0.h>
+#include <asm/arch/s3c24x0.h>
static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)
diff --git a/include/s3c24x0.h b/include/asm-arm/arch-s3c24x0/s3c24x0.h
index 56a551a..56a551a 100644
--- a/include/s3c24x0.h
+++ b/include/asm-arm/arch-s3c24x0/s3c24x0.h