Skip to contentSkip to conversation

Move s3c24x0 header files to asm-arm/arch-s3c24x0/

PATCH New kevin.morfitt at fearnside-systems.co.uk 2 participants 2 messages Nov 3, 2009 – Nov 4, 2009

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 at 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.

---
 board/mpl/vcma9/vcma9.c                |    2 +-
 board/mpl/vcma9/vcma9.h                |    2 +-
 board/samsung/smdk2400/smdk2400.c      |    2 +-
 board/samsung/smdk2410/smdk2410.c      |    2 +-
 board/sbc2410x/sbc2410x.c              |    2 +-
 board/trab/cmd_trab.c                  |    2 +-
 board/trab/rs485.c                     |    2 +-
 board/trab/rs485.h                     |    2 +-
 board/trab/trab.c                      |    2 +-
 board/trab/trab_fkt.c                  |    2 +-
 board/trab/tsc2000.c                   |    2 +-
 board/trab/vfd.c                       |    2 +-
 cpu/arm920t/s3c24x0/interrupts.c       |    4 +-
 cpu/arm920t/s3c24x0/speed.c            |    4 +-
 cpu/arm920t/s3c24x0/timer.c            |    4 +-
 cpu/arm920t/s3c24x0/usb.c              |    4 +-
 cpu/arm920t/s3c24x0/usb_ohci.c         |    4 +-
 drivers/i2c/s3c24x0_i2c.c              |    4 +-
 drivers/mtd/nand/s3c2410_nand.c        |    2 +-
 drivers/rtc/s3c24x0_rtc.c              |    4 +-
 drivers/serial/serial_s3c24x0.c        |    4 +-
 include/asm-arm/arch-s3c24x0/s3c2400.h |  136 +++++++
 include/asm-arm/arch-s3c24x0/s3c2410.h |  146 +++++++
 include/asm-arm/arch-s3c24x0/s3c24x0.h |  656 ++++++++++++++++++++++++++++++++
 include/s3c2400.h                      |  136 -------
 include/s3c2410.h                      |  146 -------
 include/s3c24x0.h                      |  656 --------------------------------
 27 files changed, 967 insertions(+), 967 deletions(-)
 create mode 100644 include/asm-arm/arch-s3c24x0/s3c2400.h
 create mode 100644 include/asm-arm/arch-s3c24x0/s3c2410.h
 create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0.h
 delete mode 100644 include/s3c2400.h
 delete mode 100644 include/s3c2410.h
 delete mode 100644 include/s3c24x0.h
board/mpl/vcma9/vcma9.c +1 -1
index 4d8b579..f3bd288 100644
@@ -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>
 
board/mpl/vcma9/vcma9.h +1 -1
index f46e0e4..9f32808 100644
@@ -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);
 
board/samsung/smdk2400/smdk2400.c +1 -1
index 42bf008..be0c70a 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/samsung/smdk2410/smdk2410.c +1 -1
index fde7730..a8cf287 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/sbc2410x/sbc2410x.c +1 -1
index 7452c1f..6768c02 100644
@@ -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>
board/trab/cmd_trab.c +1 -1
index 04a3607..a01ffcc 100644
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include <rtc.h>
 
 /*
board/trab/rs485.c +1 -1
index 7d5c0a2..f402c59 100644
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include "rs485.h"
 
 static void rs485_setbrg (void);
board/trab/rs485.h +1 -1
index 9f0a5b9..4a2d83f 100644
@@ -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);
board/trab/trab.c +1 -1
index ea782a9..f8836ff 100644
@@ -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;
board/trab/trab_fkt.c +1 -1
index dc2a8d7..940e12f 100644
@@ -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"
 
board/trab/tsc2000.c +1 -1
index fc501a8..f757202 100644
@@ -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"
board/trab/vfd.c +1 -1
index d5ad5bb..8d9a057 100644
@@ -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;
 
cpu/arm920t/s3c24x0/interrupts.c +2 -2
index 9148946..3e8422e 100644
@@ -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>
 
cpu/arm920t/s3c24x0/speed.c +2 -2
index 136c779..85c73a3 100644
@@ -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
cpu/arm920t/s3c24x0/timer.c +2 -2
index 20cedd4..2667da6 100644
@@ -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;
cpu/arm920t/s3c24x0/usb.c +2 -2
index b5ba8c4..5e19cda 100644
@@ -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>
cpu/arm920t/s3c24x0/usb_ohci.c +2 -2
index 7672e4c..4111992 100644
@@ -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>
drivers/i2c/s3c24x0_i2c.c +2 -2
index 55c6a12..8fecc6e 100644
@@ -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>
drivers/mtd/nand/s3c2410_nand.c +1 -1
index f2f3e72..9f02dd8 100644
@@ -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)
drivers/rtc/s3c24x0_rtc.c +2 -2
index 1ce34e3..2d78f93 100644
@@ -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>
drivers/serial/serial_s3c24x0.c +2 -2
index c2c72e4..914d07c 100644
@@ -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;
include/asm-arm/arch-s3c24x0/s3c2400.h new file +136 -0

136 lines not on this page · raw message

include/asm-arm/arch-s3c24x0/s3c2410.h new file +146 -0

146 lines not on this page · raw message

include/asm-arm/arch-s3c24x0/s3c24x0.h new file +656 -0

656 lines not on this page · raw message

include/s3c2400.h deleted +0 -136

136 lines not on this page · raw message

include/s3c2410.h deleted +0 -146

146 lines not on this page · raw message

include/s3c24x0.h deleted +0 -656

656 lines not on this page · raw message

Signature · 1 line
1.6.0.6
#1 lore raw

PATCH 1/1 Move s3c24x0 header files to asm-arm/arch-s3c24x0/

Dear Kevin Morfitt,

2009/11/3 kevin.morfitt at fearnside-systems.co.uk <[email protected]>:

Quoted 55 lines

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 at 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:

(quoted diff) +3 -0
+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.

---

?board/mpl/vcma9/vcma9.c ? ? ? ? ? ? ? ?| ? ?2 +-
?board/mpl/vcma9/vcma9.h ? ? ? ? ? ? ? ?| ? ?2 +-
?board/samsung/smdk2400/smdk2400.c ? ? ?| ? ?2 +-
?board/samsung/smdk2410/smdk2410.c ? ? ?| ? ?2 +-
?board/sbc2410x/sbc2410x.c ? ? ? ? ? ? ?| ? ?2 +-
?board/trab/cmd_trab.c ? ? ? ? ? ? ? ? ?| ? ?2 +-
?board/trab/rs485.c ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?board/trab/rs485.h ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?board/trab/trab.c ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
?board/trab/trab_fkt.c ? ? ? ? ? ? ? ? ?| ? ?2 +-
?board/trab/tsc2000.c ? ? ? ? ? ? ? ? ? | ? ?2 +-
?board/trab/vfd.c ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?cpu/arm920t/s3c24x0/interrupts.c ? ? ? | ? ?4 +-
?cpu/arm920t/s3c24x0/speed.c ? ? ? ? ? ?| ? ?4 +-
?cpu/arm920t/s3c24x0/timer.c ? ? ? ? ? ?| ? ?4 +-
?cpu/arm920t/s3c24x0/usb.c ? ? ? ? ? ? ?| ? ?4 +-
?cpu/arm920t/s3c24x0/usb_ohci.c ? ? ? ? | ? ?4 +-
?drivers/i2c/s3c24x0_i2c.c ? ? ? ? ? ? ?| ? ?4 +-
?drivers/mtd/nand/s3c2410_nand.c ? ? ? ?| ? ?2 +-
?drivers/rtc/s3c24x0_rtc.c ? ? ? ? ? ? ?| ? ?4 +-
?drivers/serial/serial_s3c24x0.c ? ? ? ?| ? ?4 +-
?include/asm-arm/arch-s3c24x0/s3c2400.h | ?136 +++++++
?include/asm-arm/arch-s3c24x0/s3c2410.h | ?146 +++++++
?include/asm-arm/arch-s3c24x0/s3c24x0.h | ?656 ++++++++++++++++++++++++++++++++
?include/s3c2400.h ? ? ? ? ? ? ? ? ? ? ?| ?136 -------
?include/s3c2410.h ? ? ? ? ? ? ? ? ? ? ?| ?146 -------
?include/s3c24x0.h ? ? ? ? ? ? ? ? ? ? ?| ?656 --------------------------------
Quoted 8 lines

?27 files changed, 967 insertions(+), 967 deletions(-) ?create mode 100644 include/asm-arm/arch-s3c24x0/s3c2400.h ?create mode 100644 include/asm-arm/arch-s3c24x0/s3c2410.h ?create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0.h ?delete mode 100644 include/s3c2400.h
?delete mode 100644 include/s3c2410.h
?delete mode 100644 include/s3c24x0.h

applied to u-boot-samsung

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net