diff options
| author | kevin.morfitt@fearnside-systems.co.uk <kevin.morfitt@fearnside-systems.co.uk> | 2009-11-17 18:30:34 +0900 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2009-11-27 16:26:13 -0600 |
| commit | ac67804fbb2d82a19170066c02af7053d474ce8d (patch) | |
| tree | bb7d9c3392dc690e87aa3e530fe5c99879e58a51 /drivers | |
| parent | a59a23d68ae4f4a1c07d105520c93e6e289d186f (diff) | |
| download | u-boot-imx-ac67804fbb2d82a19170066c02af7053d474ce8d.zip u-boot-imx-ac67804fbb2d82a19170066c02af7053d474ce8d.tar.gz u-boot-imx-ac67804fbb2d82a19170066c02af7053d474ce8d.tar.bz2 | |
Add a unified s3c24x0 header file
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.
Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/s3c2410_nand.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/s3c24x0_rtc.c | 6 | ||||
| -rw-r--r-- | drivers/serial/serial_s3c24x0.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 3 |
5 files changed, 5 insertions, 18 deletions
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 8fecc6e..c8371cf 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -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> diff --git a/drivers/mtd/nand/s3c2410_nand.c b/drivers/mtd/nand/s3c2410_nand.c index 2f89b8c..a27d47e 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 <asm/arch/s3c2410.h> +#include <asm/arch/s3c24x0_cpu.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 2d78f93..04de5ca 100644 --- a/drivers/rtc/s3c24x0_rtc.c +++ b/drivers/rtc/s3c24x0_rtc.c @@ -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> diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index 914d07c..5dd4dd8 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -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; diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 67d478f..b03a600 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -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) || \ |