Dear Kevin Morifitt, 2009/11/13 kevin.morf...@fearnside-systems.co.uk <kevin.morf...@fearnside-systems.co.uk>: > Hi Minky > > > Minkyu Kang wrote: >> Dear Kevin Morfitt >> >> 2009/11/10 kevin.morf...@fearnside-systems.co.uk >> <kevin.morf...@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. >>> >>> Signed-off-by: Kevin Morfitt <kevin.morf...@fearnside-systems.co.uk> >>> --- >>> 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 >>> >>> diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c >>> index f3bd288..1835677 100644 >>> --- a/board/mpl/vcma9/vcma9.c >>> +++ b/board/mpl/vcma9/vcma9.c >>> @@ -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> >>> >>> diff --git a/board/mpl/vcma9/vcma9.h b/board/mpl/vcma9/vcma9.h >>> index 2c4305c..94fd2fa 100644 >>> --- a/board/mpl/vcma9/vcma9.h >>> +++ b/board/mpl/vcma9/vcma9.h >>> @@ -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); >>> >>> diff --git a/board/samsung/smdk2400/smdk2400.c >>> b/board/samsung/smdk2400/smdk2400.c >>> index be0c70a..1294d3f 100644 >>> --- a/board/samsung/smdk2400/smdk2400.c >>> +++ b/board/samsung/smdk2400/smdk2400.c >>> @@ -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; >>> >>> diff --git a/board/samsung/smdk2410/smdk2410.c >>> b/board/samsung/smdk2410/smdk2410.c >>> index a8cf287..5d1a8bb 100644 >>> --- a/board/samsung/smdk2410/smdk2410.c >>> +++ b/board/samsung/smdk2410/smdk2410.c >>> @@ -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; >>> >>> diff --git a/board/sbc2410x/sbc2410x.c b/board/sbc2410x/sbc2410x.c >>> index 6768c02..3a93677 100644 >>> --- a/board/sbc2410x/sbc2410x.c >>> +++ b/board/sbc2410x/sbc2410x.c >>> @@ -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> >>> diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c >>> index a01ffcc..472d7d8 100644 >>> --- a/board/trab/cmd_trab.c >>> +++ b/board/trab/cmd_trab.c >>> @@ -25,7 +25,7 @@ >>> >>> #include <common.h> >>> #include <command.h> >>> -#include <asm/arch/s3c2400.h> >>> +#include <asm/arch/s3c24x0_cpu.h> >>> #include <rtc.h> >>> >>> /* >>> diff --git a/board/trab/rs485.c b/board/trab/rs485.c >>> index f402c59..ad0c136 100644 >>> --- a/board/trab/rs485.c >>> +++ b/board/trab/rs485.c >>> @@ -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); >>> diff --git a/board/trab/rs485.h b/board/trab/rs485.h >>> index 4a2d83f..16d69bb 100644 >>> --- a/board/trab/rs485.h >>> +++ b/board/trab/rs485.h >>> @@ -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); >>> diff --git a/board/trab/trab.c b/board/trab/trab.c >>> index f8836ff..71fd22c 100644 >>> --- a/board/trab/trab.c >>> +++ b/board/trab/trab.c >>> @@ -26,7 +26,7 @@ >>> #include <common.h> >>> #include <netdev.h> >>> #include <malloc.h> >>> -#include <asm/arch/s3c2400.h> >>> +#include <asm/arch/s3c24x0_cpu.h> >>> #include <command.h> >>> >>> DECLARE_GLOBAL_DATA_PTR; >>> diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c >>> index 940e12f..2df9a04 100644 >>> --- a/board/trab/trab_fkt.c >>> +++ b/board/trab/trab_fkt.c >>> @@ -26,7 +26,7 @@ >>> #include <common.h> >>> #include <exports.h> >>> #include <timestamp.h> >>> -#include <asm/arch/s3c2400.h> >>> +#include <asm/arch/s3c24x0_cpu.h> >>> #include "tsc2000.h" >>> #include "rs485.h" >>> >>> diff --git a/board/trab/tsc2000.c b/board/trab/tsc2000.c >>> index f757202..5890624 100644 >>> --- a/board/trab/tsc2000.c >>> +++ b/board/trab/tsc2000.c >>> @@ -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" >>> diff --git a/board/trab/vfd.c b/board/trab/vfd.c >>> index 8d9a057..b7eb8cc 100644 >>> --- a/board/trab/vfd.c >>> +++ b/board/trab/vfd.c >>> @@ -37,7 +37,7 @@ >>> #include <stdarg.h> >>> #include <linux/types.h> >>> #include <stdio_dev.h> >>> -#include <asm/arch/s3c2400.h> >>> +#include <asm/arch/s3c24x0_cpu.h> >>> >>> DECLARE_GLOBAL_DATA_PTR; >>> >>> diff --git a/cpu/arm920t/s3c24x0/interrupts.c >>> b/cpu/arm920t/s3c24x0/interrupts.c >>> index 3e8422e..879fda6 100644 >>> --- a/cpu/arm920t/s3c24x0/interrupts.c >>> +++ b/cpu/arm920t/s3c24x0/interrupts.c >>> @@ -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) >>> diff --git a/cpu/arm920t/s3c24x0/speed.c b/cpu/arm920t/s3c24x0/speed.c >>> index 85c73a3..b13283a 100644 >>> --- a/cpu/arm920t/s3c24x0/speed.c >>> +++ b/cpu/arm920t/s3c24x0/speed.c >>> @@ -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 */ >>> diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c >>> index 2667da6..cd06f6b 100644 >>> --- a/cpu/arm920t/s3c24x0/timer.c >>> +++ b/cpu/arm920t/s3c24x0/timer.c >>> @@ -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 */ >>> diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c >>> index 5e19cda..bad3532 100644 >>> --- a/cpu/arm920t/s3c24x0/usb.c >>> +++ b/cpu/arm920t/s3c24x0/usb.c >>> @@ -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) */ >>> diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c >>> index 4111992..5aa8d64 100644 >>> --- a/cpu/arm920t/s3c24x0/usb_ohci.c >>> +++ b/cpu/arm920t/s3c24x0/usb_ohci.c >>> @@ -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) */ >>> diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S >>> index 114427a..779f192 100644 >>> --- a/cpu/arm920t/start.S >>> +++ b/cpu/arm920t/start.S >>> @@ -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, >>> 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 7d3f79d..15714cd 100644 >>> --- a/drivers/mtd/nand/s3c2410_nand.c >>> +++ b/drivers/mtd/nand/s3c2410_nand.c >>> @@ -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 >> >> 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?
applied where? I couldn't find :( > > Kevin > >> >>> #if defined(CONFIG_S3C2410_NAND_HWECC) && >>> defined(CONFIG_SYS_NAND_LARGEPAGE) >>> 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) || \ >>> diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h >>> b/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h >>> new file mode 100644 >>> index 0000000..c37d4a1 >>> --- /dev/null >>> +++ b/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h >>> @@ -0,0 +1,27 @@ >>> +/* >>> + * (C) Copyright 2009 >>> + * Kevin Morfitt, Fearnside Systems Ltd, >>> <kevin.morf...@fearnside-systems.co.uk> >>> + * >>> + * 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 >>> diff --git a/include/common.h b/include/common.h >>> index f7c93bf..8ee80c1 100644 >>> --- a/include/common.h >>> +++ b/include/common.h >>> @@ -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); >>> diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h >>> index 618b7f0..ebc81c4 100644 >>> --- a/include/configs/VCMA9.h >>> +++ b/include/configs/VCMA9.h >>> @@ -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 */ >>> diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h >>> index e6886cf..025ad09 100644 >>> --- a/include/configs/sbc2410x.h >>> +++ b/include/configs/sbc2410x.h >>> @@ -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 */ >>> diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h >>> index a1beb65..fd51219 100644 >>> --- a/include/configs/smdk2400.h >>> +++ b/include/configs/smdk2400.h >>> @@ -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 >>> */ >>> diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h >>> index c57751b..f9d1e55 100644 >>> --- a/include/configs/smdk2410.h >>> +++ b/include/configs/smdk2410.h >>> @@ -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 */ >>> diff --git a/include/configs/trab.h b/include/configs/trab.h >>> index 97f30ce..9827195 100644 >>> --- a/include/configs/trab.h >>> +++ b/include/configs/trab.h >>> @@ -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 >>> -- >>> 1.6.0.6 >>> >> >> Thanks >> Minkyu Kang > -- from. prom. www.promsoft.net _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
