Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 9 Nov 2009 23:44:30 +0000 (08:44 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 9 Nov 2009 23:44:30 +0000 (08:44 +0900)
38 files changed:
board/mpl/vcma9/vcma9.c
board/mpl/vcma9/vcma9.h
board/samsung/smdk2400/smdk2400.c
board/samsung/smdk2410/smdk2410.c
board/samsung/smdk6400/lowlevel_init.S
board/samsung/smdk6400/smdk6400.c
board/sbc2410x/sbc2410x.c
board/trab/cmd_trab.c
board/trab/rs485.c
board/trab/rs485.h
board/trab/trab.c
board/trab/trab_fkt.c
board/trab/tsc2000.c
board/trab/vfd.c
cpu/arm1176/cpu.c
cpu/arm1176/s3c64xx/cpu_init.S
cpu/arm1176/s3c64xx/reset.S
cpu/arm1176/s3c64xx/speed.c
cpu/arm1176/s3c64xx/timer.c
cpu/arm1176/start.S
cpu/arm920t/s3c24x0/interrupts.c
cpu/arm920t/s3c24x0/speed.c
cpu/arm920t/s3c24x0/timer.c
cpu/arm920t/s3c24x0/usb.c
cpu/arm920t/s3c24x0/usb_ohci.c
drivers/i2c/s3c24x0_i2c.c
drivers/mtd/nand/s3c2410_nand.c
drivers/mtd/nand/s3c64xx.c
drivers/net/smc911x.c
drivers/rtc/s3c24x0_rtc.c
drivers/serial/s3c64xx.c
drivers/serial/serial_s3c24x0.c
drivers/usb/host/s3c64xx-hcd.c
include/asm-arm/arch-s3c24x0/s3c2400.h [moved from include/s3c2400.h with 99% similarity]
include/asm-arm/arch-s3c24x0/s3c2410.h [moved from include/s3c2410.h with 99% similarity]
include/asm-arm/arch-s3c24x0/s3c24x0.h [moved from include/s3c24x0.h with 100% similarity]
include/asm-arm/arch-s3c64xx/s3c6400.h [moved from include/s3c6400.h with 100% similarity]
include/asm-arm/arch-s3c64xx/s3c64x0.h [moved from include/s3c64x0.h with 100% similarity]

index 4d8b579..f3bd288 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 
index f46e0e4..9f32808 100644 (file)
@@ -25,7 +25,7 @@
  * Global routines used for VCMA9
  *****************************************************************************/
 
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 
 extern int  mem_test(unsigned long start, unsigned long ramsize,int mode);
 
index 42bf008..be0c70a 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index fde7730..a8cf287 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index 47f72f6..30d8878 100644 (file)
@@ -34,7 +34,7 @@
 #include <config.h>
 #include <version.h>
 
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #ifdef CONFIG_SERIAL1
 #define ELFIN_UART_CONSOLE_BASE (ELFIN_UART_BASE + ELFIN_UART0_OFFSET)
index 561c0c8..78aaa9e 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 /* ------------------------------------------------------------------------- */
 #define CS8900_Tacs    0x0     /* 0clk         address set-up          */
index 7452c1f..6768c02 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/nand.h>
index 04a3607..a01ffcc 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include <rtc.h>
 
 /*
index 7d5c0a2..f402c59 100644 (file)
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include "rs485.h"
 
 static void rs485_setbrg (void);
index 9f0a5b9..4a2d83f 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef _RS485_H_
 #define _RS485_H_
 
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 
 int rs485_init (void);
 int rs485_getc (void);
index ea782a9..f8836ff 100644 (file)
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <malloc.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;
index dc2a8d7..940e12f 100644 (file)
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <exports.h>
 #include <timestamp.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include "tsc2000.h"
 #include "rs485.h"
 
index fc501a8..f757202 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #include <asm/io.h>
 #include <div64.h>
 #include "tsc2000.h"
index d5ad5bb..8d9a057 100644 (file)
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index d1a3327..2c0014f 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 #include <asm/system.h>
 
 static void cache_flush (void);
index 32bb467..df88cba 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include <config.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
        .globl mem_ctrl_asm_init
 mem_ctrl_asm_init:
index 315b13f..eae572e 100644 (file)
@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  */
 
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 .globl reset_cpu
 reset_cpu:
index 5c335a5..11962ac 100644 (file)
@@ -31,7 +31,7 @@
  */
 
 #include <common.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #define APLL 0
 #define MPLL 1
index 22a5b77..85ce9cd 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <common.h>
 #include <asm/proc-armv/ptrace.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 #include <div64.h>
 
 static ulong timer_load_val;
index cb891df..2bb9bf2 100644 (file)
@@ -35,7 +35,7 @@
 #ifdef CONFIG_ENABLE_MMU
 #include <asm/proc/domain.h>
 #endif
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #if !defined(CONFIG_ENABLE_MMU) && !defined(CONFIG_SYS_PHY_UBOOT_BASE)
 #define CONFIG_SYS_PHY_UBOOT_BASE      CONFIG_SYS_UBOOT_BASE
index 9148946..3e8422e 100644 (file)
@@ -32,9 +32,9 @@
 #include <common.h>
 
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 #include <asm/proc-armv/ptrace.h>
 
index 136c779..85c73a3 100644 (file)
@@ -35,9 +35,9 @@
 #include <asm/io.h>
 
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 #define MPLL 0
index 20cedd4..2667da6 100644 (file)
@@ -37,9 +37,9 @@
 #include <asm/io.h>
 
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 int timer_load_val = 0;
index b5ba8c4..5e19cda 100644 (file)
@@ -27,9 +27,9 @@
 # if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
 
 #if defined(CONFIG_S3C2400)
-# include <s3c2400.h>
+# include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-# include <s3c2410.h>
+# include <asm/arch/s3c2410.h>
 #endif
 
 #include <asm/io.h>
index 7672e4c..4111992 100644 (file)
@@ -39,9 +39,9 @@
 #ifdef CONFIG_USB_OHCI
 
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 #include <asm/io.h>
index 55c6a12..8fecc6e 100644 (file)
@@ -28,9 +28,9 @@
 
 #include <common.h>
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 #include <asm/io.h>
index f2f3e72..9f02dd8 100644 (file)
@@ -21,7 +21,7 @@
 #include <common.h>
 
 #include <nand.h>
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #include <asm/io.h>
 
 #define S3C2410_NFCONF_EN          (1<<15)
index edaf55a..084e475 100644 (file)
@@ -28,7 +28,7 @@
 #include <common.h>
 
 #include <nand.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #include <asm/io.h>
 #include <asm/errno.h>
index c50758e..613d902 100644 (file)
@@ -270,6 +270,12 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        dev->recv = smc911x_rx;
        sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
 
+       /* Try to detect chip. Will fail if not present. */
+       if (smc911x_detect_chip(dev)) {
+               free(dev);
+               return 0;
+       }
+
        eth_register(dev);
        return 0;
 }
index 1ce34e3..2d78f93 100644 (file)
@@ -31,9 +31,9 @@
 #if (defined(CONFIG_CMD_DATE))
 
 #if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 #include <rtc.h>
index 1b974e0..6d22df7 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #ifdef CONFIG_SERIAL1
 #define UART_NR        S3C64XX_UART0
index c2c72e4..914d07c 100644 (file)
@@ -20,9 +20,9 @@
 
 #include <common.h>
 #if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
 #elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
+#include <asm/arch/s3c2410.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
index 274a4ed..cd295da 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include <common.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 int usb_cpu_init(void)
 {
similarity index 99%
rename from include/s3c2400.h
rename to include/asm-arm/arch-s3c24x0/s3c2400.h
index 062259d..26bd4e4 100644 (file)
@@ -60,7 +60,7 @@ enum s3c24x0_uarts_nr {
 #define S3C2400_MMC_BASE               0x15A00000
 
 /* include common stuff */
-#include <s3c24x0.h>
+#include <asm/arch/s3c24x0.h>
 
 
 static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)
similarity index 99%
rename from include/s3c2410.h
rename to include/asm-arm/arch-s3c24x0/s3c2410.h
index 03b33b4..be2e76e 100644 (file)
@@ -66,7 +66,7 @@ enum s3c24x0_uarts_nr {
 
 
 /* include common stuff */
-#include <s3c24x0.h>
+#include <asm/arch/s3c24x0.h>
 
 
 static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void)