Skip to contentSkip to conversation

Clean-up of s3c24x0 header files

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

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

PATCH v2 1/1 Clean-up of s3c24x0 header files

Cleans up the s3c24x0 header files:

s4c24x0.h: removes the use of 'volatile' from the S3C24X0_REG8, S3C24X0_REG16 and S3C24X0_REG32 register typedef's. Registers are always accessed using the IO accessor functions which cast the register address as 'volatile' anyway so it isn't required here.

s3c2400.h and s3c2410.h: insert a blank line between the static inline functions

---
v2 changes: remove the S3C24X0_REG8, S3C24X0_REG16 and S3C24X0_REG32 register typedef's from s3c24x0.h, s3c2400.h, s3c2410.h and vcma9.h

 board/mpl/vcma9/vcma9.h                |   14 +-
 include/asm-arm/arch-s3c24x0/s3c2400.h |   16 +
 include/asm-arm/arch-s3c24x0/s3c2410.h |   17 +
 include/asm-arm/arch-s3c24x0/s3c24x0.h |  904 ++++++++++++++++----------------
 4 files changed, 490 insertions(+), 461 deletions(-)
board/mpl/vcma9/vcma9.h +7 -7
index 9f32808..2c4305c 100644
@@ -118,13 +118,13 @@ static inline u32 NF_Read_ECC(void)
 
 /* VCMA9 PLD regsiters */
 typedef struct {
-	S3C24X0_REG8	ID;
-	S3C24X0_REG8	NIC;
-	S3C24X0_REG8	CAN;
-	S3C24X0_REG8	MISC;
-	S3C24X0_REG8	GPCD;
-	S3C24X0_REG8	BOARD;
-	S3C24X0_REG8	SDRAM;
+	u8	ID;
+	u8	NIC;
+	u8	CAN;
+	u8	MISC;
+	u8	GPCD;
+	u8	BOARD;
+	u8	SDRAM;
 } /*__attribute__((__packed__))*/ VCMA9_PLD;
 
 #define VCMA9_PLD_BASE	0x2C000100
include/asm-arm/arch-s3c24x0/s3c2400.h +16 -0
index 26bd4e4..2678be1 100644
@@ -67,67 +67,83 @@ static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)
 {
 	return (struct s3c24x0_memctl *)S3C24X0_MEMCTL_BASE;
 }
+
 static inline struct s3c24x0_usb_host *s3c24x0_get_base_usb_host(void)
 {
 	return (struct s3c24x0_usb_host *)S3C24X0_USB_HOST_BASE;
 }
+
 static inline struct s3c24x0_interrupt *s3c24x0_get_base_interrupt(void)
 {
 	return (struct s3c24x0_interrupt *)S3C24X0_INTERRUPT_BASE;
 }
+
 static inline struct s3c24x0_dmas *s3c24x0_get_base_dmas(void)
 {
 	return (struct s3c24x0_dmas *)S3C24X0_DMA_BASE;
 }
+
 static inline struct s3c24x0_clock_power *s3c24x0_get_base_clock_power(void)
 {
 	return (struct s3c24x0_clock_power *)S3C24X0_CLOCK_POWER_BASE;
 }
+
 static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void)
 {
 	return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE;
 }
+
 static inline struct s3c24x0_uart
 	*s3c24x0_get_base_uart(enum s3c24x0_uarts_nr n)
 {
 	return (struct s3c24x0_uart *)(S3C24X0_UART_BASE + (n * 0x4000));
 }
+
 static inline struct s3c24x0_timers *s3c24x0_get_base_timers(void)
 {
 	return (struct s3c24x0_timers *)S3C24X0_TIMER_BASE;
 }
+
 static inline struct s3c24x0_usb_device *s3c24x0_get_base_usb_device(void)
 {
 	return (struct s3c24x0_usb_device *)S3C24X0_USB_DEVICE_BASE;
 }
+
 static inline struct s3c24x0_watchdog *s3c24x0_get_base_watchdog(void)
 {
 	return (struct s3c24x0_watchdog *)S3C24X0_WATCHDOG_BASE;
 }
+
 static inline struct s3c24x0_i2c *s3c24x0_get_base_i2c(void)
 {
 	return (struct s3c24x0_i2c *)S3C24X0_I2C_BASE;
 }
+
 static inline struct s3c24x0_i2s *s3c24x0_get_base_i2s(void)
 {
 	return (struct s3c24x0_i2s *)S3C24X0_I2S_BASE;
 }
+
 static inline struct s3c24x0_gpio *s3c24x0_get_base_gpio(void)
 {
 	return (struct s3c24x0_gpio *)S3C24X0_GPIO_BASE;
 }
+
 static inline struct s3c24x0_rtc *s3c24x0_get_base_rtc(void)
 {
 	return (struct s3c24x0_rtc *)S3C24X0_RTC_BASE;
 }
+
 static inline struct s3c2400_adc *s3c2400_get_base_adc(void)
 {
 	return (struct s3c2400_adc *)S3C24X0_ADC_BASE;
 }
+
 static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void)
 {
 	return (struct s3c24x0_spi *)S3C24X0_SPI_BASE;
 }
+
 static inline struct s3c2400_mmc *s3c2400_get_base_mmc(void)
 {
 	return (struct s3c2400_mmc *)S3C2400_MMC_BASE;
include/asm-arm/arch-s3c24x0/s3c2410.h +17 -0
index be2e76e..0543fe1 100644
@@ -73,71 +73,88 @@ static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)
 {
 	return (struct s3c24x0_memctl *)S3C24X0_MEMCTL_BASE;
 }
+
 static inline struct s3c24x0_usb_host *s3c24x0_get_base_usb_host(void)
 {
 	return (struct s3c24x0_usb_host *)S3C24X0_USB_HOST_BASE;
 }
+
 static inline struct s3c24x0_interrupt *s3c24x0_get_base_interrupt(void)
 {
 	return (struct s3c24x0_interrupt *)S3C24X0_INTERRUPT_BASE;
 }
+
 static inline struct s3c24x0_dmas *s3c24x0_get_base_dmas(void)
 {
 	return (struct s3c24x0_dmas *)S3C24X0_DMA_BASE;
 }
+
 static inline struct s3c24x0_clock_power *s3c24x0_get_base_clock_power(void)
 {
 	return (struct s3c24x0_clock_power *)S3C24X0_CLOCK_POWER_BASE;
 }
+
 static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void)
 {
 	return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE;
 }
+
 static inline struct s3c2410_nand *s3c2410_get_base_nand(void)
 {
 	return (struct s3c2410_nand *)S3C2410_NAND_BASE;
 }
+
 static inline struct s3c24x0_uart
 	*s3c24x0_get_base_uart(enum s3c24x0_uarts_nr n)
 {
 	return (struct s3c24x0_uart *)(S3C24X0_UART_BASE + (n * 0x4000));
 }
+
 static inline struct s3c24x0_timers *s3c24x0_get_base_timers(void)
 {
 	return (struct s3c24x0_timers *)S3C24X0_TIMER_BASE;
 }
+
 static inline struct s3c24x0_usb_device *s3c24x0_get_base_usb_device(void)
 {
 	return (struct s3c24x0_usb_device *)S3C24X0_USB_DEVICE_BASE;
 }
+
 static inline struct s3c24x0_watchdog *s3c24x0_get_base_watchdog(void)
 {
 	return (struct s3c24x0_watchdog *)S3C24X0_WATCHDOG_BASE;
 }
+
 static inline struct s3c24x0_i2c *s3c24x0_get_base_i2c(void)
 {
 	return (struct s3c24x0_i2c *)S3C24X0_I2C_BASE;
 }
+
 static inline struct s3c24x0_i2s *s3c24x0_get_base_i2s(void)
 {
 	return (struct s3c24x0_i2s *)S3C24X0_I2S_BASE;
 }
+
 static inline struct s3c24x0_gpio *s3c24x0_get_base_gpio(void)
 {
 	return (struct s3c24x0_gpio *)S3C24X0_GPIO_BASE;
 }
+
 static inline struct s3c24x0_rtc *s3c24x0_get_base_rtc(void)
 {
 	return (struct s3c24x0_rtc *)S3C24X0_RTC_BASE;
 }
+
 static inline struct s3c2410_adc *s3c2410_get_base_adc(void)
 {
 	return (struct s3c2410_adc *)S3C2410_ADC_BASE;
 }
+
 static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void)
 {
 	return (struct s3c24x0_spi *)S3C24X0_SPI_BASE;
 }
+
 static inline struct s3c2410_sdi *s3c2410_get_base_sdi(void)
 {
 	return (struct s3c2410_sdi *)S3C2410_SDI_BASE;
include/asm-arm/arch-s3c24x0/s3c24x0.h +450 -454

1,063 lines not on this page · raw message

Signature · 1 line
1.6.0.6
#1 lore raw

PATCH v2 1/1 Clean-up of s3c24x0 header files

Dear kevin.morfitt,

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

Quoted 15 lines

Cleans up the s3c24x0 header files:

s4c24x0.h: removes the use of 'volatile' from the S3C24X0_REG8, S3C24X0_REG16 and S3C24X0_REG32 register typedef's. Registers are always accessed using the IO accessor functions which cast the register address as 'volatile' anyway so it isn't required here.

s3c2400.h and s3c2410.h: insert a blank line between the static inline functions

---
?v2 changes: remove the S3C24X0_REG8, S3C24X0_REG16 and S3C24X0_REG32 ?register typedef's from s3c24x0.h, s3c2400.h, s3c2410.h and vcma9.h

Quoted 6 lines
?board/mpl/vcma9/vcma9.h ? ? ? ? ? ? ? ?| ? 14 +-
?include/asm-arm/arch-s3c24x0/s3c2400.h | ? 16 +
?include/asm-arm/arch-s3c24x0/s3c2410.h | ? 17 +
?include/asm-arm/arch-s3c24x0/s3c24x0.h | ?904 ++++++++++++++++----------------

?4 files changed, 490 insertions(+), 461 deletions(-)

applied to u-boot-samsung

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#2 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

In reply to kevin.morfitt at fearnside-systems.co.uk

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

---
 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           |    6 +-----
 cpu/arm920t/s3c24x0/speed.c                |   13 +++----------
 cpu/arm920t/s3c24x0/timer.c                |   15 +++------------
 cpu/arm920t/s3c24x0/usb.c                  |   17 +++++++----------
 cpu/arm920t/s3c24x0/usb_ohci.c             |   11 +++--------
 cpu/arm920t/start.S                        |    4 ++--
 drivers/i2c/s3c24x0_i2c.c                  |    6 +-----
 drivers/mtd/nand/s3c2410_nand.c            |    2 +-
 drivers/rtc/s3c24x0_rtc.c                  |    6 +-----
 drivers/serial/serial_s3c24x0.c            |    6 +-----
 drivers/usb/host/ohci-hcd.c                |    3 +--
 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h |   27 +++++++++++++++++++++++++++
 include/common.h                           |    5 +++--
 include/configs/VCMA9.h                    |    7 ++++---
 include/configs/sbc2410x.h                 |    7 ++++---
 include/configs/smdk2400.h                 |    7 ++++---
 include/configs/smdk2410.h                 |    7 ++++---
 include/configs/trab.h                     |    9 +++++----
 30 files changed, 87 insertions(+), 95 deletions(-)
 create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h
board/mpl/vcma9/vcma9.c +1 -1
index f3bd288..1835677 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 
board/mpl/vcma9/vcma9.h +1 -1
index 2c4305c..94fd2fa 100644
@@ -25,7 +25,7 @@
  * Global routines used for VCMA9
  *****************************************************************************/
 
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 extern int  mem_test(unsigned long start, unsigned long ramsize,int mode);
 
board/samsung/smdk2400/smdk2400.c +1 -1
index be0c70a..1294d3f 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/samsung/smdk2410/smdk2410.c +1 -1
index a8cf287..5d1a8bb 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/sbc2410x/sbc2410x.c +1 -1
index 6768c02..3a93677 100644
@@ -30,7 +30,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/nand.h>
board/trab/cmd_trab.c +1 -1
index a01ffcc..472d7d8 100644
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <rtc.h>
 
 /*
board/trab/rs485.c +1 -1
index f402c59..ad0c136 100644
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include "rs485.h"
 
 static void rs485_setbrg (void);
board/trab/rs485.h +1 -1
index 4a2d83f..16d69bb 100644
@@ -24,7 +24,7 @@
 #ifndef _RS485_H_
 #define _RS485_H_
 
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 int rs485_init (void);
 int rs485_getc (void);
board/trab/trab.c +1 -1
index f8836ff..71fd22c 100644
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <malloc.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;
board/trab/trab_fkt.c +1 -1
index 940e12f..2df9a04 100644
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <exports.h>
 #include <timestamp.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include "tsc2000.h"
 #include "rs485.h"
 
board/trab/tsc2000.c +1 -1
index f757202..5890624 100644
@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 #include <div64.h>
 #include "tsc2000.h"
board/trab/vfd.c +1 -1
index 8d9a057..b7eb8cc 100644
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
cpu/arm920t/s3c24x0/interrupts.c +1 -5
index 3e8422e..879fda6 100644
@@ -31,11 +31,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/proc-armv/ptrace.h>
 
 void do_irq (struct pt_regs *pt_regs)
cpu/arm920t/s3c24x0/speed.c +3 -10
index 85c73a3..b13283a 100644
@@ -30,15 +30,10 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0
 
 #include <asm/io.h>
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #define MPLL 0
 #define UPLL 1
@@ -100,6 +95,4 @@ ulong get_UCLK(void)
 	return get_PLLCLK(UPLL);
 }
 
-#endif /* defined(CONFIG_S3C2400) ||
-	  defined (CONFIG_S3C2410) ||
-	  defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/timer.c +3 -12
index 2667da6..cd06f6b 100644
@@ -30,17 +30,10 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || \
-    defined(CONFIG_S3C2410) || \
-    defined(CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0
 
 #include <asm/io.h>
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 int timer_load_val = 0;
 static ulong timer_clk;
@@ -225,6 +218,4 @@ void reset_cpu(ulong ignored)
 	/*NOTREACHED*/
 }
 
-#endif /* defined(CONFIG_S3C2400)  ||
-	  defined (CONFIG_S3C2410) ||
-	  defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/usb.c +7 -10
index 5e19cda..bad3532 100644
@@ -23,15 +23,11 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
-
-#if defined(CONFIG_S3C2400)
-# include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-# include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI_NEW) && \
+    defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+    defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 
 int usb_cpu_init(void)
@@ -70,5 +66,6 @@ int usb_cpu_init_fail(void)
 	return 0;
 }
 
-# endif	/* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && \
+	   defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+	   defined(CONFIG_S3C24X0) */
cpu/arm920t/s3c24x0/usb_ohci.c +3 -8
index 4111992..5aa8d64 100644
@@ -36,14 +36,9 @@
 #include <common.h>
 /* #include <pci.h> no PCI on the S3C24X0 */
 
-#ifdef CONFIG_USB_OHCI
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <usb.h>
@@ -1757,4 +1752,4 @@ int usb_lowlevel_stop(void)
 	return 0;
 }
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) */
cpu/arm920t/start.S +2 -2
index 114427a..779f192 100644
@@ -131,7 +131,7 @@ copyex:
 	bne	copyex
 #endif
 
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
+#ifdef CONFIG_S3C24X0
 	/* turn off the watchdog */
 
 # if defined(CONFIG_S3C2400)
@@ -166,7 +166,7 @@ copyex:
 	ldr	r0, =CLKDIVN
 	mov	r1, #3
 	str	r1, [r0]
-#endif	/* CONFIG_S3C2400 || CONFIG_S3C2410 */
+#endif	/* CONFIG_S3C24X0 */
 
 	/*
 	 * we do sys-critical inits only at reboot,
drivers/i2c/s3c24x0_i2c.c +1 -5
index 8fecc6e..c8371cf 100644
@@ -27,11 +27,7 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #include <asm/io.h>
 #include <i2c.h>
drivers/mtd/nand/s3c2410_nand.c +1 -1
index 7d3f79d..15714cd 100644
@@ -26,7 +26,7 @@
 
 #include <nand.h>
 #include <linux/mtd/nand_ecc.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 
 #if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)
drivers/rtc/s3c24x0_rtc.c +1 -5
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@
 
 #if (defined(CONFIG_CMD_DATE))
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #include <rtc.h>
 #include <asm/io.h>
drivers/serial/serial_s3c24x0.c +1 -5
index 914d07c..5dd4dd8 100644
@@ -19,11 +19,7 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
drivers/usb/host/ohci-hcd.c +1 -2
index 67d478f..b03a600 100644
@@ -65,8 +65,7 @@
 #endif
 
 #if defined(CONFIG_ARM920T) || \
-    defined(CONFIG_S3C2400) || \
-    defined(CONFIG_S3C2410) || \
+    defined(CONFIG_S3C24X0) || \
     defined(CONFIG_S3C6400) || \
     defined(CONFIG_440EP) || \
     defined(CONFIG_PCI_OHCI) || \
include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h new file +27 -0
new file mode 100644
index 0000000..c37d4a1
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2009
+ * Kevin Morfitt, Fearnside Systems Ltd, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifdef CONFIG_S3C2400
+	#include <asm/arch/s3c2400.h>
+#elif defined CONFIG_S3C2410
+	#include <asm/arch/s3c2410.h>
+#else
+	#error Please define the s3c24x0 cpu type
+#endif
include/common.h +3 -2
index f7c93bf..8ee80c1 100644
@@ -495,8 +495,9 @@ int	prt_mpc8220_clks (void);
 ulong	get_OPB_freq (void);
 ulong	get_PCI_freq (void);
 #endif
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
-	defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
+#if defined(CONFIG_S3C24X0) || \
+    defined(CONFIG_LH7A40X) || \
+    defined(CONFIG_S3C6400)
 ulong	get_FCLK (void);
 ulong	get_HCLK (void);
 ulong	get_PCLK (void);
include/configs/VCMA9.h +4 -3
index 618b7f0..ebc81c4 100644
@@ -33,9 +33,10 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define	CONFIG_S3C2410		1	/* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_VCMA9		1	/* on a MPL VCMA9 Board  */
+#define CONFIG_ARM920T	1	/* This is an ARM920T Core	*/
+#define CONFIG_S3C24X0	1	/* in a SAMSUNG S3C24x0-type SoC	*/
+#define CONFIG_S3C2410	1	/* specifically a SAMSUNG S3C2410 SoC	*/
+#define CONFIG_VCMA9	1	/* on a MPL VCMA9 Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ	12000000/* VCMA9 has 12MHz input clock	*/
include/configs/sbc2410x.h +4 -3
index e6886cf..025ad09 100644
@@ -43,9 +43,10 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define	CONFIG_S3C2410		1	/* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_SBC2410X		1	/* on a friendly-arm SBC-2410X Board  */
+#define CONFIG_ARM920T	1	/* This is an ARM920T Core	*/
+#define CONFIG_S3C24X0	1	/* in a SAMSUNG S3C24x0-type SoC	*/
+#define CONFIG_S3C2410	1	/* specifically a SAMSUNG S3C2410 SoC	*/
+#define CONFIG_SBC2410X	1	/* on a friendly-arm SBC-2410X Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ	12000000/* the SBC2410X has 12MHz input clock */
include/configs/smdk2400.h +4 -3
index a1beb65..fd51219 100644
@@ -34,9 +34,10 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		1	/* This is an ARM920T core	*/
-#define CONFIG_S3C2400		1	/* in a SAMSUNG S3C2400 SoC	*/
-#define CONFIG_SMDK2400		1	/* on an SAMSUNG SMDK2400 Board */
+#define CONFIG_ARM920T	1	/* This is an ARM920T core	*/
+#define CONFIG_S3C24X0	1	/* in a SAMSUNG S3C24x0-type SoC	*/
+#define CONFIG_S3C2400	1	/* specifically a SAMSUNG S3C2400 SoC	*/
+#define CONFIG_SMDK2400	1	/* on an SAMSUNG SMDK2400 Board */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ	12000000 /* SMDK2400 has 12 MHz input clock */
include/configs/smdk2410.h +4 -3
index c57751b..f9d1e55 100644
@@ -33,9 +33,10 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define	CONFIG_S3C2410		1	/* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_SMDK2410		1	/* on a SAMSUNG SMDK2410 Board  */
+#define CONFIG_ARM920T	1	/* This is an ARM920T Core	*/
+#define CONFIG_S3C24X0	1	/* in a SAMSUNG S3C24x0-type SoC	*/
+#define CONFIG_S3C2410	1	/* specifically a SAMSUNG S3C2410 SoC	*/
+#define CONFIG_SMDK2410	1	/* on a SAMSUNG SMDK2410 Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ	12000000/* the SMDK2410 has 12MHz input clock */
include/configs/trab.h +5 -4
index 97f30ce..9827195 100644
@@ -40,10 +40,11 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T		1	/* This is an arm920t CPU	*/
-#define CONFIG_S3C2400		1	/* in a SAMSUNG S3C2400 SoC	*/
-#define CONFIG_TRAB		1	/* on a TRAB Board		*/
-#undef CONFIG_TRAB_50MHZ		/* run the CPU at 50 MHz	*/
+#define CONFIG_ARM920T	1	/* This is an arm920t CPU	*/
+#define CONFIG_S3C24X0	1	/* in a SAMSUNG S3C24x0-type SoC	*/
+#define CONFIG_S3C2400	1	/* specifically a SAMSUNG S3C2400 SoC	*/
+#define CONFIG_TRAB	1	/* on a TRAB Board		*/
+#undef CONFIG_TRAB_50MHZ	/* run the CPU at 50 MHz	*/
 
 /* automatic software updates (see board/trab/auto_update.c) */
 #define CONFIG_AUTO_UPDATE	1
Signature · 1 line
1.6.0.6
#3 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

Dear Kevin Morfitt

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

Quoted 384 lines

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

---

?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 ? ? ? ? ? | ? ?6 +-----
?cpu/arm920t/s3c24x0/speed.c ? ? ? ? ? ? ? ?| ? 13 +++----------
?cpu/arm920t/s3c24x0/timer.c ? ? ? ? ? ? ? ?| ? 15 +++------------
?cpu/arm920t/s3c24x0/usb.c ? ? ? ? ? ? ? ? ?| ? 17 +++++++----------
?cpu/arm920t/s3c24x0/usb_ohci.c ? ? ? ? ? ? | ? 11 +++--------
?cpu/arm920t/start.S ? ? ? ? ? ? ? ? ? ? ? ?| ? ?4 ++--
?drivers/i2c/s3c24x0_i2c.c ? ? ? ? ? ? ? ? ?| ? ?6 +-----
?drivers/mtd/nand/s3c2410_nand.c ? ? ? ? ? ?| ? ?2 +-
?drivers/rtc/s3c24x0_rtc.c ? ? ? ? ? ? ? ? ?| ? ?6 +-----
?drivers/serial/serial_s3c24x0.c ? ? ? ? ? ?| ? ?6 +-----
?drivers/usb/host/ohci-hcd.c ? ? ? ? ? ? ? ?| ? ?3 +--
?include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h | ? 27 +++++++++++++++++++++++++++
?include/common.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?5 +++--
?include/configs/VCMA9.h ? ? ? ? ? ? ? ? ? ?| ? ?7 ++++---
?include/configs/sbc2410x.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/smdk2400.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/smdk2410.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/trab.h ? ? ? ? ? ? ? ? ? ? | ? ?9 +++++----

?30 files changed, 87 insertions(+), 95 deletions(-) ?create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h

board/mpl/vcma9/vcma9.c +0 -0
index f3bd288..1835677 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/mpl/vcma9/vcma9.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <stdio_dev.h>
?#include <i2c.h>

board/mpl/vcma9/vcma9.h +0 -0
index 2c4305c..94fd2fa 100644
@@ -25,7 +25,7 @@

?* Global routines used for VCMA9 ?*****************************************************************************/

board/mpl/vcma9/vcma9.h +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?extern int ?mem_test(unsigned long start, unsigned long ramsize,int mode);

board/samsung/smdk2400/smdk2400.c +0 -0
index be0c70a..1294d3f 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/samsung/smdk2400/smdk2400.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

board/samsung/smdk2410/smdk2410.c +0 -0
index a8cf287..5d1a8bb 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/samsung/smdk2410/smdk2410.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

board/sbc2410x/sbc2410x.c +0 -0
index 6768c02..3a93677 100644
@@ -30,7 +30,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/sbc2410x/sbc2410x.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#if defined(CONFIG_CMD_NAND)
?#include <linux/mtd/nand.h>

board/trab/cmd_trab.c +0 -0
index a01ffcc..472d7d8 100644
@@ -25,7 +25,7 @@
 

?#include <common.h>
?#include <command.h>

board/trab/cmd_trab.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <rtc.h>

?/*

board/trab/rs485.c +0 -0
index f402c59..ad0c136 100644
@@ -22,7 +22,7 @@

?*/

?#include <common.h>

board/trab/rs485.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include "rs485.h"

?static void rs485_setbrg (void);

board/trab/rs485.h +0 -0
index 4a2d83f..16d69bb 100644
@@ -24,7 +24,7 @@

?#ifndef _RS485_H_
?#define _RS485_H_

board/trab/rs485.h +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?int rs485_init (void);
?int rs485_getc (void);

board/trab/trab.c +0 -0
index f8836ff..71fd22c 100644
@@ -26,7 +26,7 @@

?#include <common.h>
?#include <netdev.h>
?#include <malloc.h>

board/trab/trab.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <command.h>

?DECLARE_GLOBAL_DATA_PTR;

board/trab/trab_fkt.c +0 -0
index 940e12f..2df9a04 100644
@@ -26,7 +26,7 @@

?#include <common.h>
?#include <exports.h>
?#include <timestamp.h>

board/trab/trab_fkt.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include "tsc2000.h"
?#include "rs485.h"

board/trab/tsc2000.c +0 -0
index f757202..5890624 100644
@@ -26,7 +26,7 @@

?*/

?#include <common.h>

board/trab/tsc2000.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <div64.h>
?#include "tsc2000.h"

board/trab/vfd.c +0 -0
index 8d9a057..b7eb8cc 100644
@@ -37,7 +37,7 @@

?#include <stdarg.h>
?#include <linux/types.h>
?#include <stdio_dev.h>

board/trab/vfd.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

cpu/arm920t/s3c24x0/interrupts.c +0 -0
index 3e8422e..879fda6 100644
@@ -31,11 +31,7 @@
 

?#include <common.h>

cpu/arm920t/s3c24x0/interrupts.c +1 -5
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/proc-armv/ptrace.h>

?void do_irq (struct pt_regs *pt_regs)

cpu/arm920t/s3c24x0/speed.c +0 -0
index 85c73a3..b13283a 100644
@@ -30,15 +30,10 @@

?*/

?#include <common.h>

cpu/arm920t/s3c24x0/speed.c +1 -1
-#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0

?#include <asm/io.h>

cpu/arm920t/s3c24x0/speed.c +1 -6
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#define MPLL 0
?#define UPLL 1

cpu/arm920t/s3c24x0/speed.c +1 -3
@@ -100,6 +95,4 @@ ulong get_UCLK(void)
 ? ? ? ?return get_PLLCLK(UPLL);
 ?}
 
-#endif /* defined(CONFIG_S3C2400) ||
- ? ? ? ? defined (CONFIG_S3C2410) ||
- ? ? ? ? defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/timer.c +0 -0
index 2667da6..cd06f6b 100644
@@ -30,17 +30,10 @@

?*/

?#include <common.h>

cpu/arm920t/s3c24x0/timer.c +1 -3
-#if defined(CONFIG_S3C2400) || \
- ? ?defined(CONFIG_S3C2410) || \
- ? ?defined(CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0

?#include <asm/io.h>

cpu/arm920t/s3c24x0/timer.c +1 -6
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?int timer_load_val = 0;
?static ulong timer_clk;

cpu/arm920t/s3c24x0/timer.c +0 -0
@@ -225,6 +218,4 @@ void reset_cpu(ulong ignored)

? ? ? ?/*NOTREACHED*/
?}

cpu/arm920t/s3c24x0/timer.c +1 -3
-#endif /* defined(CONFIG_S3C2400) ?||
- ? ? ? ? defined (CONFIG_S3C2410) ||
- ? ? ? ? defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/usb.c +0 -0
index 5e19cda..bad3532 100644
@@ -23,15 +23,11 @@
 

?#include <common.h>

cpu/arm920t/s3c24x0/usb.c +4 -8
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
-
-#if defined(CONFIG_S3C2400)
-# include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-# include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI_NEW) && \
+ ? ?defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+ ? ?defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>

?int usb_cpu_init(void)

cpu/arm920t/s3c24x0/usb.c +3 -2
@@ -70,5 +66,6 @@ int usb_cpu_init_fail(void)
 ? ? ? ?return 0;
 ?}
 
-# endif ? ? ? ?/* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && \
+ ? ? ? ? ?defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+ ? ? ? ? ?defined(CONFIG_S3C24X0) */
cpu/arm920t/s3c24x0/usb_ohci.c +0 -0
index 4111992..5aa8d64 100644
@@ -36,14 +36,9 @@

?#include <common.h>
?/* #include <pci.h> no PCI on the S3C24X0 */

cpu/arm920t/s3c24x0/usb_ohci.c +2 -7
-#ifdef CONFIG_USB_OHCI
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <malloc.h>
?#include <usb.h>

cpu/arm920t/s3c24x0/usb_ohci.c +1 -1
@@ -1757,4 +1752,4 @@ int usb_lowlevel_stop(void)
 ? ? ? ?return 0;
 ?}
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) */
cpu/arm920t/start.S +0 -0
index 114427a..779f192 100644
@@ -131,7 +131,7 @@ copyex:

? ? ? ?bne ? ? copyex
?#endif

cpu/arm920t/start.S +1 -1
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
+#ifdef CONFIG_S3C24X0

? ? ? ?/* turn off the watchdog */

?# if defined(CONFIG_S3C2400)

cpu/arm920t/start.S +0 -0
@@ -166,7 +166,7 @@ copyex:

? ? ? ?ldr ? ? r0, =CLKDIVN
? ? ? ?mov ? ? r1, #3
? ? ? ?str ? ? r1, [r0]

cpu/arm920t/start.S +1 -1
-#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
+#endif /* CONFIG_S3C24X0 */

? ? ? ?/*
? ? ? ? * we do sys-critical inits only at reboot,

drivers/i2c/s3c24x0_i2c.c +0 -0
index 8fecc6e..c8371cf 100644
@@ -27,11 +27,7 @@

?*/

?#include <common.h>

drivers/i2c/s3c24x0_i2c.c +1 -5
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <i2c.h>

drivers/mtd/nand/s3c2410_nand.c +0 -0
index 7d3f79d..15714cd 100644
@@ -26,7 +26,7 @@
 

?#include <nand.h>
?#include <linux/mtd/nand_ecc.h>

drivers/mtd/nand/s3c2410_nand.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
Quoted 1 line

?#include <asm/io.h>

patch failed at s3c2410_nand.c

patching file drivers/mtd/nand/s3c2410_nand.c
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/mtd/nand/s3c2410_nand.c.rej

please check it

Quoted 189 lines

?#if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)

drivers/rtc/s3c24x0_rtc.c +1 -5
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@
 
 ?#if (defined(CONFIG_CMD_DATE))
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 

?#include <rtc.h>
?#include <asm/io.h>

drivers/serial/serial_s3c24x0.c +0 -0
index 914d07c..5dd4dd8 100644
@@ -19,11 +19,7 @@

?*/

?#include <common.h>

drivers/serial/serial_s3c24x0.c +1 -5
-#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

drivers/usb/host/ohci-hcd.c +0 -0
index 67d478f..b03a600 100644
@@ -65,8 +65,7 @@

?#endif

?#if defined(CONFIG_ARM920T) || \
- ? ?defined(CONFIG_S3C2400) || \
- ? ?defined(CONFIG_S3C2410) || \
+ ? ?defined(CONFIG_S3C24X0) || \
? ? defined(CONFIG_S3C6400) || \

? ? defined(CONFIG_440EP) || \
? ? defined(CONFIG_PCI_OHCI) || \

include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h new file +27 -0
new file mode 100644
index 0000000..c37d4a1
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2009
+ * Kevin Morfitt, Fearnside Systems Ltd, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifdef CONFIG_S3C2400
+ ? ? ? #include <asm/arch/s3c2400.h>
+#elif defined CONFIG_S3C2410
+ ? ? ? #include <asm/arch/s3c2410.h>
+#else
+ ? ? ? #error Please define the s3c24x0 cpu type
+#endif
include/common.h +0 -0
index f7c93bf..8ee80c1 100644
@@ -495,8 +495,9 @@ int prt_mpc8220_clks (void);
 ?ulong ?get_OPB_freq (void);
 ?ulong ?get_PCI_freq (void);

?#endif

include/common.h +3 -2
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
- ? ? ? defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
+#if defined(CONFIG_S3C24X0) || \
+ ? ?defined(CONFIG_LH7A40X) || \
+ ? ?defined(CONFIG_S3C6400)

?ulong ?get_FCLK (void);
?ulong ?get_HCLK (void);
?ulong ?get_PCLK (void);

include/configs/VCMA9.h +0 -0
index 618b7f0..ebc81c4 100644
@@ -33,9 +33,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/VCMA9.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_VCMA9 ? ? ? ? ? 1 ? ? ? /* on a MPL VCMA9 Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_VCMA9 ? 1 ? ? ? /* on a MPL VCMA9 Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* VCMA9 has 12MHz input clock ?*/

include/configs/sbc2410x.h +0 -0
index e6886cf..025ad09 100644
@@ -43,9 +43,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/sbc2410x.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_SBC2410X ? ? ? ? ? ? ? ?1 ? ? ? /* on a friendly-arm SBC-2410X Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_SBC2410X ? ? ? ?1 ? ? ? /* on a friendly-arm SBC-2410X Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* the SBC2410X has 12MHz input clock */

include/configs/smdk2400.h +0 -0
index a1beb65..fd51219 100644
@@ -34,9 +34,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/smdk2400.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T core ? ? ?*/
-#define CONFIG_S3C2400 ? ? ? ? 1 ? ? ? /* in a SAMSUNG S3C2400 SoC ? ? */
-#define CONFIG_SMDK2400 ? ? ? ? ? ? ? ?1 ? ? ? /* on an SAMSUNG SMDK2400 Board */
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2400 1 ? ? ? /* specifically a SAMSUNG S3C2400 SoC ? */
+#define CONFIG_SMDK2400 ? ? ? ?1 ? ? ? /* on an SAMSUNG SMDK2400 Board */

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000 /* SMDK2400 has 12 MHz input clock */

include/configs/smdk2410.h +0 -0
index c57751b..f9d1e55 100644
@@ -33,9 +33,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/smdk2410.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_SMDK2410 ? ? ? ? ? ? ? ?1 ? ? ? /* on a SAMSUNG SMDK2410 Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_SMDK2410 ? ? ? ?1 ? ? ? /* on a SAMSUNG SMDK2410 Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* the SMDK2410 has 12MHz input clock */

include/configs/trab.h +0 -0
index 97f30ce..9827195 100644
@@ -40,10 +40,11 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/trab.h +5 -4
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an arm920t CPU ? ? ? */
-#define CONFIG_S3C2400 ? ? ? ? 1 ? ? ? /* in a SAMSUNG S3C2400 SoC ? ? */
-#define CONFIG_TRAB ? ? ? ? ? ?1 ? ? ? /* on a TRAB Board ? ? ? ? ? ? ?*/
-#undef CONFIG_TRAB_50MHZ ? ? ? ? ? ? ? /* run the CPU at 50 MHz ? ? ? ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an arm920t CPU ? ? ? */
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2400 1 ? ? ? /* specifically a SAMSUNG S3C2400 SoC ? */
+#define CONFIG_TRAB ? ?1 ? ? ? /* on a TRAB Board ? ? ? ? ? ? ?*/
+#undef CONFIG_TRAB_50MHZ ? ? ? /* run the CPU at 50 MHz ? ? ? ?*/
Quoted 5 lines

?/* automatic software updates (see board/trab/auto_update.c) */ ?#define CONFIG_AUTO_UPDATE ? ? 1
--
1.6.0.6

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#4 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

Hi Minky

Quoted 392 lines · Minkyu Kang

Dear Kevin Morfitt

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

Quoted 379 lines

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

---
 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           |    6 +-----
 cpu/arm920t/s3c24x0/speed.c                |   13 +++----------
 cpu/arm920t/s3c24x0/timer.c                |   15 +++------------
 cpu/arm920t/s3c24x0/usb.c                  |   17 +++++++----------
 cpu/arm920t/s3c24x0/usb_ohci.c             |   11 +++--------
 cpu/arm920t/start.S                        |    4 ++--
 drivers/i2c/s3c24x0_i2c.c                  |    6 +-----
 drivers/mtd/nand/s3c2410_nand.c            |    2 +-
 drivers/rtc/s3c24x0_rtc.c                  |    6 +-----
 drivers/serial/serial_s3c24x0.c            |    6 +-----
 drivers/usb/host/ohci-hcd.c                |    3 +--
 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h |   27 +++++++++++++++++++++++++++
 include/common.h                           |    5 +++--
 include/configs/VCMA9.h                    |    7 ++++---
 include/configs/sbc2410x.h                 |    7 ++++---
 include/configs/smdk2400.h                 |    7 ++++---
 include/configs/smdk2410.h                 |    7 ++++---
 include/configs/trab.h                     |    9 +++++----
 30 files changed, 87 insertions(+), 95 deletions(-)
 create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h
board/mpl/vcma9/vcma9.c +1 -1
index f3bd288..1835677 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 
board/mpl/vcma9/vcma9.h +1 -1
index 2c4305c..94fd2fa 100644
@@ -25,7 +25,7 @@
 * Global routines used for VCMA9
 *****************************************************************************/
 
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 extern int  mem_test(unsigned long start, unsigned long ramsize,int mode);
 
board/samsung/smdk2400/smdk2400.c +1 -1
index be0c70a..1294d3f 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/samsung/smdk2410/smdk2410.c +1 -1
index a8cf287..5d1a8bb 100644
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/sbc2410x/sbc2410x.c +1 -1
index 6768c02..3a93677 100644
@@ -30,7 +30,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/nand.h>
board/trab/cmd_trab.c +1 -1
index a01ffcc..472d7d8 100644
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <rtc.h>
 
 /*
board/trab/rs485.c +1 -1
index f402c59..ad0c136 100644
@@ -22,7 +22,7 @@
 */
 
 #include <common.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include "rs485.h"
 
 static void rs485_setbrg (void);
board/trab/rs485.h +1 -1
index 4a2d83f..16d69bb 100644
@@ -24,7 +24,7 @@
 #ifndef _RS485_H_
 #define _RS485_H_
 
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 int rs485_init (void);
 int rs485_getc (void);
board/trab/trab.c +1 -1
index f8836ff..71fd22c 100644
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <malloc.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;
board/trab/trab_fkt.c +1 -1
index 940e12f..2df9a04 100644
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <exports.h>
 #include <timestamp.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include "tsc2000.h"
 #include "rs485.h"
 
board/trab/tsc2000.c +1 -1
index f757202..5890624 100644
@@ -26,7 +26,7 @@
 */
 
 #include <common.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 #include <div64.h>
 #include "tsc2000.h"
board/trab/vfd.c +1 -1
index 8d9a057..b7eb8cc 100644
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
cpu/arm920t/s3c24x0/interrupts.c +1 -5
index 3e8422e..879fda6 100644
@@ -31,11 +31,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/proc-armv/ptrace.h>
 
 void do_irq (struct pt_regs *pt_regs)
cpu/arm920t/s3c24x0/speed.c +3 -10
index 85c73a3..b13283a 100644
@@ -30,15 +30,10 @@
 */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0
 
 #include <asm/io.h>
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #define MPLL 0
 #define UPLL 1
@@ -100,6 +95,4 @@ ulong get_UCLK(void)
       return get_PLLCLK(UPLL);
 }
 
-#endif /* defined(CONFIG_S3C2400) ||
-         defined (CONFIG_S3C2410) ||
-         defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/timer.c +3 -12
index 2667da6..cd06f6b 100644
@@ -30,17 +30,10 @@
 */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || \
-    defined(CONFIG_S3C2410) || \
-    defined(CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0
 
 #include <asm/io.h>
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 int timer_load_val = 0;
 static ulong timer_clk;
@@ -225,6 +218,4 @@ void reset_cpu(ulong ignored)
       /*NOTREACHED*/
 }
 
-#endif /* defined(CONFIG_S3C2400)  ||
-         defined (CONFIG_S3C2410) ||
-         defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/usb.c +7 -10
index 5e19cda..bad3532 100644
@@ -23,15 +23,11 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
-
-#if defined(CONFIG_S3C2400)
-# include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-# include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI_NEW) && \
+    defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+    defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 
 int usb_cpu_init(void)
@@ -70,5 +66,6 @@ int usb_cpu_init_fail(void)
       return 0;
 }
 
-# endif        /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && \
+          defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+          defined(CONFIG_S3C24X0) */
cpu/arm920t/s3c24x0/usb_ohci.c +3 -8
index 4111992..5aa8d64 100644
@@ -36,14 +36,9 @@
 #include <common.h>
 /* #include <pci.h> no PCI on the S3C24X0 */
 
-#ifdef CONFIG_USB_OHCI
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <usb.h>
@@ -1757,4 +1752,4 @@ int usb_lowlevel_stop(void)
       return 0;
 }
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) */
cpu/arm920t/start.S +2 -2
index 114427a..779f192 100644
@@ -131,7 +131,7 @@ copyex:
       bne     copyex
 #endif
 
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
+#ifdef CONFIG_S3C24X0
       /* turn off the watchdog */
 
 # if defined(CONFIG_S3C2400)
@@ -166,7 +166,7 @@ copyex:
       ldr     r0, =CLKDIVN
       mov     r1, #3
       str     r1, [r0]
-#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
+#endif /* CONFIG_S3C24X0 */
 
       /*
        * we do sys-critical inits only at reboot,
drivers/i2c/s3c24x0_i2c.c +1 -5
index 8fecc6e..c8371cf 100644
@@ -27,11 +27,7 @@
 */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #include <asm/io.h>
 #include <i2c.h>
drivers/mtd/nand/s3c2410_nand.c +0 -0
index 7d3f79d..15714cd 100644

drivers/mtd/nand/s3c2410_nand.c line 30

Quoted 6 lines
drivers/mtd/nand/s3c2410_nand.c +1 -1
@@ -26,7 +26,7 @@
 
 #include <nand.h>
 #include <linux/mtd/nand_ecc.h>
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>

patch failed at s3c2410_nand.c

Quoted 6 lines

patching file drivers/mtd/nand/s3c2410_nand.c
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/mtd/nand/s3c2410_nand.c.rej

please check it

This patch assumes that my previous patch,
[U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5 had already been applied.

Would you like me to re-base this one to the current u-boot-samsung, or wait until you've looked at [U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5?

Kevin

Quoted 197 lines
Quoted 192 lines
drivers/mtd/nand/s3c2410_nand.c +0 -0
 #if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)
drivers/rtc/s3c24x0_rtc.c +1 -5
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@
 
 #if (defined(CONFIG_CMD_DATE))
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 #include <rtc.h>
 #include <asm/io.h>
drivers/serial/serial_s3c24x0.c +1 -5
index 914d07c..5dd4dd8 100644
@@ -19,11 +19,7 @@
 */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
drivers/usb/host/ohci-hcd.c +1 -2
index 67d478f..b03a600 100644
@@ -65,8 +65,7 @@
 #endif
 
 #if defined(CONFIG_ARM920T) || \
-    defined(CONFIG_S3C2400) || \
-    defined(CONFIG_S3C2410) || \
+    defined(CONFIG_S3C24X0) || \
    defined(CONFIG_S3C6400) || \
    defined(CONFIG_440EP) || \
    defined(CONFIG_PCI_OHCI) || \
include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h new file +27 -0
new file mode 100644
index 0000000..c37d4a1
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2009
+ * Kevin Morfitt, Fearnside Systems Ltd, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifdef CONFIG_S3C2400
+       #include <asm/arch/s3c2400.h>
+#elif defined CONFIG_S3C2410
+       #include <asm/arch/s3c2410.h>
+#else
+       #error Please define the s3c24x0 cpu type
+#endif
include/common.h +3 -2
index f7c93bf..8ee80c1 100644
@@ -495,8 +495,9 @@ int prt_mpc8220_clks (void);
 ulong  get_OPB_freq (void);
 ulong  get_PCI_freq (void);
 #endif
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
-       defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
+#if defined(CONFIG_S3C24X0) || \
+    defined(CONFIG_LH7A40X) || \
+    defined(CONFIG_S3C6400)
 ulong  get_FCLK (void);
 ulong  get_HCLK (void);
 ulong  get_PCLK (void);
include/configs/VCMA9.h +4 -3
index 618b7f0..ebc81c4 100644
@@ -33,9 +33,10 @@
 * High Level Configuration Options
 * (easy to change)
 */
-#define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
-#define        CONFIG_S3C2410          1       /* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_VCMA9           1       /* on a MPL VCMA9 Board  */
+#define CONFIG_ARM920T 1       /* This is an ARM920T Core      */
+#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
+#define CONFIG_S3C2410 1       /* specifically a SAMSUNG S3C2410 SoC   */
+#define CONFIG_VCMA9   1       /* on a MPL VCMA9 Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ    12000000/* VCMA9 has 12MHz input clock  */
include/configs/sbc2410x.h +4 -3
index e6886cf..025ad09 100644
@@ -43,9 +43,10 @@
 * High Level Configuration Options
 * (easy to change)
 */
-#define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
-#define        CONFIG_S3C2410          1       /* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_SBC2410X                1       /* on a friendly-arm SBC-2410X Board  */
+#define CONFIG_ARM920T 1       /* This is an ARM920T Core      */
+#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
+#define CONFIG_S3C2410 1       /* specifically a SAMSUNG S3C2410 SoC   */
+#define CONFIG_SBC2410X        1       /* on a friendly-arm SBC-2410X Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ    12000000/* the SBC2410X has 12MHz input clock */
include/configs/smdk2400.h +4 -3
index a1beb65..fd51219 100644
@@ -34,9 +34,10 @@
 * High Level Configuration Options
 * (easy to change)
 */
-#define CONFIG_ARM920T         1       /* This is an ARM920T core      */
-#define CONFIG_S3C2400         1       /* in a SAMSUNG S3C2400 SoC     */
-#define CONFIG_SMDK2400                1       /* on an SAMSUNG SMDK2400 Board */
+#define CONFIG_ARM920T 1       /* This is an ARM920T core      */
+#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
+#define CONFIG_S3C2400 1       /* specifically a SAMSUNG S3C2400 SoC   */
+#define CONFIG_SMDK2400        1       /* on an SAMSUNG SMDK2400 Board */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ    12000000 /* SMDK2400 has 12 MHz input clock */
include/configs/smdk2410.h +4 -3
index c57751b..f9d1e55 100644
@@ -33,9 +33,10 @@
 * High Level Configuration Options
 * (easy to change)
 */
-#define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
-#define        CONFIG_S3C2410          1       /* in a SAMSUNG S3C2410 SoC     */
-#define CONFIG_SMDK2410                1       /* on a SAMSUNG SMDK2410 Board  */
+#define CONFIG_ARM920T 1       /* This is an ARM920T Core      */
+#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
+#define CONFIG_S3C2410 1       /* specifically a SAMSUNG S3C2410 SoC   */
+#define CONFIG_SMDK2410        1       /* on a SAMSUNG SMDK2410 Board  */
 
 /* input clock of PLL */
 #define CONFIG_SYS_CLK_FREQ    12000000/* the SMDK2410 has 12MHz input clock */
include/configs/trab.h +5 -5
index 97f30ce..9827195 100644
@@ -40,10 +40,11 @@
 * High Level Configuration Options
 * (easy to change)
 */
-#define CONFIG_ARM920T         1       /* This is an arm920t CPU       */
-#define CONFIG_S3C2400         1       /* in a SAMSUNG S3C2400 SoC     */
-#define CONFIG_TRAB            1       /* on a TRAB Board              */
-#undef CONFIG_TRAB_50MHZ               /* run the CPU at 50 MHz        */
+#define CONFIG_ARM920T 1       /* This is an arm920t CPU       */
+#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
+#define CONFIG_S3C2400 1       /* specifically a SAMSUNG S3C2400 SoC   */
+#define CONFIG_TRAB    1       /* on a TRAB Board              */
+#undef CONFIG_TRAB_50MHZ       /* run the CPU at 50 MHz        */
 
 /* automatic software updates (see board/trab/auto_update.c) */
 #define CONFIG_AUTO_UPDATE     1
--
Quoted 2 lines

1.6.0.6

Thanks
Minkyu Kang

#5 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

Dear Kevin Morifitt,

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

Quoted 403 lines

Hi Minky

Quoted 392 lines · Minkyu Kang

Dear Kevin Morfitt

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

Quoted 384 lines

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

---

?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 ? ? ? ? ? | ? ?6 +-----
?cpu/arm920t/s3c24x0/speed.c ? ? ? ? ? ? ? ?| ? 13 +++----------
?cpu/arm920t/s3c24x0/timer.c ? ? ? ? ? ? ? ?| ? 15 +++------------
?cpu/arm920t/s3c24x0/usb.c ? ? ? ? ? ? ? ? ?| ? 17 +++++++----------
?cpu/arm920t/s3c24x0/usb_ohci.c ? ? ? ? ? ? | ? 11 +++--------
?cpu/arm920t/start.S ? ? ? ? ? ? ? ? ? ? ? ?| ? ?4 ++--
?drivers/i2c/s3c24x0_i2c.c ? ? ? ? ? ? ? ? ?| ? ?6 +-----
?drivers/mtd/nand/s3c2410_nand.c ? ? ? ? ? ?| ? ?2 +-
?drivers/rtc/s3c24x0_rtc.c ? ? ? ? ? ? ? ? ?| ? ?6 +-----
?drivers/serial/serial_s3c24x0.c ? ? ? ? ? ?| ? ?6 +-----
?drivers/usb/host/ohci-hcd.c ? ? ? ? ? ? ? ?| ? ?3 +--
?include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h | ? 27 +++++++++++++++++++++++++++
?include/common.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?5 +++--
?include/configs/VCMA9.h ? ? ? ? ? ? ? ? ? ?| ? ?7 ++++---
?include/configs/sbc2410x.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/smdk2400.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/smdk2410.h ? ? ? ? ? ? ? ? | ? ?7 ++++---
?include/configs/trab.h ? ? ? ? ? ? ? ? ? ? | ? ?9 +++++----

?30 files changed, 87 insertions(+), 95 deletions(-) ?create mode 100644 include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h

board/mpl/vcma9/vcma9.c +0 -0
index f3bd288..1835677 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/mpl/vcma9/vcma9.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <stdio_dev.h>
?#include <i2c.h>

board/mpl/vcma9/vcma9.h +0 -0
index 2c4305c..94fd2fa 100644
@@ -25,7 +25,7 @@

?* Global routines used for VCMA9 ?*****************************************************************************/

board/mpl/vcma9/vcma9.h +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?extern int ?mem_test(unsigned long start, unsigned long ramsize,int mode);

board/samsung/smdk2400/smdk2400.c +0 -0
index be0c70a..1294d3f 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/samsung/smdk2400/smdk2400.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

board/samsung/smdk2410/smdk2410.c +0 -0
index a8cf287..5d1a8bb 100644
@@ -27,7 +27,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/samsung/smdk2410/smdk2410.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

board/sbc2410x/sbc2410x.c +0 -0
index 6768c02..3a93677 100644
@@ -30,7 +30,7 @@
 

?#include <common.h>
?#include <netdev.h>

board/sbc2410x/sbc2410x.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#if defined(CONFIG_CMD_NAND)
?#include <linux/mtd/nand.h>

board/trab/cmd_trab.c +0 -0
index a01ffcc..472d7d8 100644
@@ -25,7 +25,7 @@
 

?#include <common.h>
?#include <command.h>

board/trab/cmd_trab.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <rtc.h>

?/*

board/trab/rs485.c +0 -0
index f402c59..ad0c136 100644
@@ -22,7 +22,7 @@

?*/

?#include <common.h>

board/trab/rs485.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include "rs485.h"

?static void rs485_setbrg (void);

board/trab/rs485.h +0 -0
index 4a2d83f..16d69bb 100644
@@ -24,7 +24,7 @@

?#ifndef _RS485_H_
?#define _RS485_H_

board/trab/rs485.h +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?int rs485_init (void);
?int rs485_getc (void);

board/trab/trab.c +0 -0
index f8836ff..71fd22c 100644
@@ -26,7 +26,7 @@

?#include <common.h>
?#include <netdev.h>
?#include <malloc.h>

board/trab/trab.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <command.h>

?DECLARE_GLOBAL_DATA_PTR;

board/trab/trab_fkt.c +0 -0
index 940e12f..2df9a04 100644
@@ -26,7 +26,7 @@

?#include <common.h>
?#include <exports.h>
?#include <timestamp.h>

board/trab/trab_fkt.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include "tsc2000.h"
?#include "rs485.h"

board/trab/tsc2000.c +0 -0
index f757202..5890624 100644
@@ -26,7 +26,7 @@

?*/

?#include <common.h>

board/trab/tsc2000.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <div64.h>
?#include "tsc2000.h"

board/trab/vfd.c +0 -0
index 8d9a057..b7eb8cc 100644
@@ -37,7 +37,7 @@

?#include <stdarg.h>
?#include <linux/types.h>
?#include <stdio_dev.h>

board/trab/vfd.c +1 -1
-#include <asm/arch/s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

cpu/arm920t/s3c24x0/interrupts.c +0 -0
index 3e8422e..879fda6 100644
@@ -31,11 +31,7 @@
 

?#include <common.h>

cpu/arm920t/s3c24x0/interrupts.c +1 -5
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/proc-armv/ptrace.h>

?void do_irq (struct pt_regs *pt_regs)

cpu/arm920t/s3c24x0/speed.c +0 -0
index 85c73a3..b13283a 100644
@@ -30,15 +30,10 @@

?*/

?#include <common.h>

cpu/arm920t/s3c24x0/speed.c +1 -1
-#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0

?#include <asm/io.h>

cpu/arm920t/s3c24x0/speed.c +1 -6
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#define MPLL 0
?#define UPLL 1

cpu/arm920t/s3c24x0/speed.c +1 -3
@@ -100,6 +95,4 @@ ulong get_UCLK(void)
 ? ? ? ?return get_PLLCLK(UPLL);
 ?}
 
-#endif /* defined(CONFIG_S3C2400) ||
- ? ? ? ? defined (CONFIG_S3C2410) ||
- ? ? ? ? defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/timer.c +0 -0
index 2667da6..cd06f6b 100644
@@ -30,17 +30,10 @@

?*/

?#include <common.h>

cpu/arm920t/s3c24x0/timer.c +1 -3
-#if defined(CONFIG_S3C2400) || \
- ? ?defined(CONFIG_S3C2410) || \
- ? ?defined(CONFIG_TRAB)
+#ifdef CONFIG_S3C24X0

?#include <asm/io.h>

cpu/arm920t/s3c24x0/timer.c +1 -6
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?int timer_load_val = 0;
?static ulong timer_clk;

cpu/arm920t/s3c24x0/timer.c +0 -0
@@ -225,6 +218,4 @@ void reset_cpu(ulong ignored)

? ? ? ?/*NOTREACHED*/
?}

cpu/arm920t/s3c24x0/timer.c +1 -3
-#endif /* defined(CONFIG_S3C2400) ?||
- ? ? ? ? defined (CONFIG_S3C2410) ||
- ? ? ? ? defined (CONFIG_TRAB) */
+#endif /* CONFIG_S3C24X0 */
cpu/arm920t/s3c24x0/usb.c +0 -0
index 5e19cda..bad3532 100644
@@ -23,15 +23,11 @@
 

?#include <common.h>

cpu/arm920t/s3c24x0/usb.c +4 -8
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
-
-#if defined(CONFIG_S3C2400)
-# include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-# include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI_NEW) && \
+ ? ?defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+ ? ?defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>

?int usb_cpu_init(void)

cpu/arm920t/s3c24x0/usb.c +3 -2
@@ -70,5 +66,6 @@ int usb_cpu_init_fail(void)
 ? ? ? ?return 0;
 ?}
 
-# endif ? ? ? ?/* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && \
+ ? ? ? ? ?defined(CONFIG_SYS_USB_OHCI_CPU_INIT) && \
+ ? ? ? ? ?defined(CONFIG_S3C24X0) */
cpu/arm920t/s3c24x0/usb_ohci.c +0 -0
index 4111992..5aa8d64 100644
@@ -36,14 +36,9 @@

?#include <common.h>
?/* #include <pci.h> no PCI on the S3C24X0 */

cpu/arm920t/s3c24x0/usb_ohci.c +2 -7
-#ifdef CONFIG_USB_OHCI
-
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#if defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0)
 
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <malloc.h>
?#include <usb.h>

cpu/arm920t/s3c24x0/usb_ohci.c +1 -1
@@ -1757,4 +1752,4 @@ int usb_lowlevel_stop(void)
 ? ? ? ?return 0;
 ?}
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) */
cpu/arm920t/start.S +0 -0
index 114427a..779f192 100644
@@ -131,7 +131,7 @@ copyex:

? ? ? ?bne ? ? copyex
?#endif

cpu/arm920t/start.S +1 -1
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
+#ifdef CONFIG_S3C24X0

? ? ? ?/* turn off the watchdog */

?# if defined(CONFIG_S3C2400)

cpu/arm920t/start.S +0 -0
@@ -166,7 +166,7 @@ copyex:

? ? ? ?ldr ? ? r0, =CLKDIVN
? ? ? ?mov ? ? r1, #3
? ? ? ?str ? ? r1, [r0]

cpu/arm920t/start.S +1 -1
-#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
+#endif /* CONFIG_S3C24X0 */

? ? ? ?/*
? ? ? ? * we do sys-critical inits only at reboot,

drivers/i2c/s3c24x0_i2c.c +0 -0
index 8fecc6e..c8371cf 100644
@@ -27,11 +27,7 @@

?*/

?#include <common.h>

drivers/i2c/s3c24x0_i2c.c +1 -5
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>
?#include <i2c.h>

drivers/mtd/nand/s3c2410_nand.c +0 -0
index 7d3f79d..15714cd 100644
@@ -26,7 +26,7 @@
 

?#include <nand.h>
?#include <linux/mtd/nand_ecc.h>

drivers/mtd/nand/s3c2410_nand.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
Quoted 1 line

?#include <asm/io.h>

patch failed at s3c2410_nand.c

Quoted 6 lines

patching file drivers/mtd/nand/s3c2410_nand.c
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/mtd/nand/s3c2410_nand.c.rej

please check it

Quoted 7 lines

This patch assumes that my previous patch,
[U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5 had already been applied.

Would you like me to re-base this one to the current u-boot-samsung, or wait until you've looked at [U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5?

applied where?
I couldn't find :(

Quoted 201 lines

Kevin

Quoted 197 lines
Quoted 189 lines

?#if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)

drivers/rtc/s3c24x0_rtc.c +1 -5
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@
 
 ?#if (defined(CONFIG_CMD_DATE))
 
-#if defined(CONFIG_S3C2400)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 

?#include <rtc.h>
?#include <asm/io.h>

drivers/serial/serial_s3c24x0.c +0 -0
index 914d07c..5dd4dd8 100644
@@ -19,11 +19,7 @@

?*/

?#include <common.h>

drivers/serial/serial_s3c24x0.c +1 -5
-#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <asm/arch/s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <asm/arch/s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>

?DECLARE_GLOBAL_DATA_PTR;

drivers/usb/host/ohci-hcd.c +0 -0
index 67d478f..b03a600 100644
@@ -65,8 +65,7 @@

?#endif

?#if defined(CONFIG_ARM920T) || \
- ? ?defined(CONFIG_S3C2400) || \
- ? ?defined(CONFIG_S3C2410) || \
+ ? ?defined(CONFIG_S3C24X0) || \
? ? defined(CONFIG_S3C6400) || \

? ? defined(CONFIG_440EP) || \
? ? defined(CONFIG_PCI_OHCI) || \

include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h new file +27 -0
new file mode 100644
index 0000000..c37d4a1
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2009
+ * Kevin Morfitt, Fearnside Systems Ltd, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifdef CONFIG_S3C2400
+ ? ? ? #include <asm/arch/s3c2400.h>
+#elif defined CONFIG_S3C2410
+ ? ? ? #include <asm/arch/s3c2410.h>
+#else
+ ? ? ? #error Please define the s3c24x0 cpu type
+#endif
include/common.h +0 -0
index f7c93bf..8ee80c1 100644
@@ -495,8 +495,9 @@ int prt_mpc8220_clks (void);
 ?ulong ?get_OPB_freq (void);
 ?ulong ?get_PCI_freq (void);

?#endif

include/common.h +3 -2
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
- ? ? ? defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
+#if defined(CONFIG_S3C24X0) || \
+ ? ?defined(CONFIG_LH7A40X) || \
+ ? ?defined(CONFIG_S3C6400)

?ulong ?get_FCLK (void);
?ulong ?get_HCLK (void);
?ulong ?get_PCLK (void);

include/configs/VCMA9.h +0 -0
index 618b7f0..ebc81c4 100644
@@ -33,9 +33,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/VCMA9.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_VCMA9 ? ? ? ? ? 1 ? ? ? /* on a MPL VCMA9 Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_VCMA9 ? 1 ? ? ? /* on a MPL VCMA9 Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* VCMA9 has 12MHz input clock ?*/

include/configs/sbc2410x.h +0 -0
index e6886cf..025ad09 100644
@@ -43,9 +43,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/sbc2410x.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_SBC2410X ? ? ? ? ? ? ? ?1 ? ? ? /* on a friendly-arm SBC-2410X Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_SBC2410X ? ? ? ?1 ? ? ? /* on a friendly-arm SBC-2410X Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* the SBC2410X has 12MHz input clock */

include/configs/smdk2400.h +0 -0
index a1beb65..fd51219 100644
@@ -34,9 +34,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/smdk2400.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T core ? ? ?*/
-#define CONFIG_S3C2400 ? ? ? ? 1 ? ? ? /* in a SAMSUNG S3C2400 SoC ? ? */
-#define CONFIG_SMDK2400 ? ? ? ? ? ? ? ?1 ? ? ? /* on an SAMSUNG SMDK2400 Board */
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2400 1 ? ? ? /* specifically a SAMSUNG S3C2400 SoC ? */
+#define CONFIG_SMDK2400 ? ? ? ?1 ? ? ? /* on an SAMSUNG SMDK2400 Board */

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000 /* SMDK2400 has 12 MHz input clock */

include/configs/smdk2410.h +0 -0
index c57751b..f9d1e55 100644
@@ -33,9 +33,10 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/smdk2410.h +4 -3
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
-#define ? ? ? ?CONFIG_S3C2410 ? ? ? ? ?1 ? ? ? /* in a SAMSUNG S3C2410 SoC ? ? */
-#define CONFIG_SMDK2410 ? ? ? ? ? ? ? ?1 ? ? ? /* on a SAMSUNG SMDK2410 Board ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an ARM920T Core ? ? ?*/
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2410 1 ? ? ? /* specifically a SAMSUNG S3C2410 SoC ? */
+#define CONFIG_SMDK2410 ? ? ? ?1 ? ? ? /* on a SAMSUNG SMDK2410 Board ?*/

?/* input clock of PLL */
?#define CONFIG_SYS_CLK_FREQ ? ?12000000/* the SMDK2410 has 12MHz input clock */

include/configs/trab.h +0 -0
index 97f30ce..9827195 100644
@@ -40,10 +40,11 @@

?* High Level Configuration Options
?* (easy to change)
?*/

include/configs/trab.h +5 -4
-#define CONFIG_ARM920T ? ? ? ? 1 ? ? ? /* This is an arm920t CPU ? ? ? */
-#define CONFIG_S3C2400 ? ? ? ? 1 ? ? ? /* in a SAMSUNG S3C2400 SoC ? ? */
-#define CONFIG_TRAB ? ? ? ? ? ?1 ? ? ? /* on a TRAB Board ? ? ? ? ? ? ?*/
-#undef CONFIG_TRAB_50MHZ ? ? ? ? ? ? ? /* run the CPU at 50 MHz ? ? ? ?*/
+#define CONFIG_ARM920T 1 ? ? ? /* This is an arm920t CPU ? ? ? */
+#define CONFIG_S3C24X0 1 ? ? ? /* in a SAMSUNG S3C24x0-type SoC ? ? ? ?*/
+#define CONFIG_S3C2400 1 ? ? ? /* specifically a SAMSUNG S3C2400 SoC ? */
+#define CONFIG_TRAB ? ?1 ? ? ? /* on a TRAB Board ? ? ? ? ? ? ?*/
+#undef CONFIG_TRAB_50MHZ ? ? ? /* run the CPU at 50 MHz ? ? ? ?*/
Quoted 5 lines

?/* automatic software updates (see board/trab/auto_update.c) */ ?#define CONFIG_AUTO_UPDATE ? ? 1
--
1.6.0.6

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#6 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

Quoted 19 lines · Minkyu Kang

Dear Kevin Morifitt,

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

Quoted 15 lines

Hi Minky

Quoted 11 lines · Minkyu Kang

Dear Kevin Morfitt

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

Quoted 7 lines

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

<snip>

Quoted 18 lines
Quoted 18 lines
Quoted 8 lines

cpu/arm920t/s3c24x0/usb_ohci.c line 42

Quoted 6 lines

#include <nand.h>
#include <linux/mtd/nand_ecc.h>

cpu/arm920t/s3c24x0/usb_ohci.c +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/io.h>

patch failed at s3c2410_nand.c

Quoted 6 lines

patching file drivers/mtd/nand/s3c2410_nand.c
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/mtd/nand/s3c2410_nand.c.rej

please check it

This patch assumes that my previous patch,
[U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5 had already been applied.

Quoted 6 lines
Quoted 3 lines

Would you like me to re-base this one to the current u-boot-samsung, or wait until you've looked at [U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5?

applied where?
I couldn't find :(

It's not been accepted yet, I submitted it on 5th November, see
http://lists.denx.de/pipermail/u-boot/2009-November/063866.html.

Quoted 9 lines
Quoted 9 lines

Kevin

Quoted 6 lines
Quoted 6 lines

#if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)

drivers/rtc/s3c24x0_rtc.c +0 -0
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@

<snip>

Quoted 3 lines
#7 lore raw

PATCH 1/1 Add a unified s3c24x0 header file

Dear Kevin Morifitt,

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

Quoted 45 lines
Quoted 19 lines · Minkyu Kang

Dear Kevin Morifitt,

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

Quoted 15 lines

Hi Minky

Quoted 11 lines · Minkyu Kang

Dear Kevin Morfitt

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

Quoted 7 lines

This patch adds a unified s3c24x0 cpu header file that selects the header file for the specific s3c24x0 cpu from the SOC and CPU configs defined in board config file. This removes the current chain of s3c24-type #ifdef's from the s3c24x0 code.

<snip>

Quoted 22 lines
Quoted 21 lines
Quoted 8 lines
Quoted 6 lines

?#include <nand.h>
?#include <linux/mtd/nand_ecc.h>

(quoted diff) +1 -1
-#include <asm/arch/s3c2410.h>
+#include <asm/arch/s3c24x0_cpu.h>

?#include <asm/io.h>

patch failed at s3c2410_nand.c

Quoted 6 lines

patching file drivers/mtd/nand/s3c2410_nand.c
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/mtd/nand/s3c2410_nand.c.rej

please check it

This patch assumes that my previous patch,
[U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5 had already been applied.

Would you like me to re-base this one to the current u-boot-samsung, or wait until you've looked at [U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5?

Quoted 5 lines
Quoted 2 lines

applied where?
I couldn't find :(

It's not been accepted yet, I submitted it on 5th November, see
http://lists.denx.de/pipermail/u-boot/2009-November/063866.html.

please rebase it.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

Kevin

Quoted 11 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

?#if defined(CONFIG_S3C2410_NAND_HWECC) && defined(CONFIG_SYS_NAND_LARGEPAGE)

drivers/rtc/s3c24x0_rtc.c +0 -0
index 2d78f93..04de5ca 100644
@@ -30,11 +30,7 @@

<snip>

Quoted 3 lines

Thanks
Minkyu Kang

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