X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fat91cap9adk.h;h=44c287033ff3acb66938699c6fc8f98d6d61e737;hb=37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626;hp=b2e6d7d02c9fa78ea45ebf08913dfd465b6c2cac;hpb=6ebff365eb63093ca35b687316002535c6a18820;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index b2e6d7d..44c2870 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -27,9 +27,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_AT91_LEGACY
+
 /* ARM asynchronous clock */
-#define AT91_CPU_NAME		"AT91CAP9"
-#define AT91_MAIN_CLOCK		12000000	/* 12 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12 MHz crystal */
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
@@ -48,6 +49,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -124,7 +126,6 @@
 /* our CLE is AD22 */
 #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PD15
-#endif
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
@@ -133,6 +134,8 @@
 #define CONFIG_SYS_NAND_BASE			0x40000000
 #define CONFIG_SYS_NAND_DBW_8			1
 
+#endif
+
 /* Ethernet */
 #define CONFIG_MACB			1
 #define CONFIG_RMII			1
@@ -171,7 +174,7 @@
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
 				"root=/dev/mtdblock1 "			\
 				"mtdparts=physmap-flash.0:-(nor);"	\
-				"at91_nand:-(root) "			\
+				"atmel_nand:-(root) "			\
 				"rw rootfstype=jffs2"
 
 #else
@@ -187,7 +190,7 @@
 				"root=/dev/mtdblock4 "			\
 				"mtdparts=physmap-flash.0:16k(bootstrap)ro,"\
 				"16k(env),224k(uboot)ro,-(linux);"	\
-				"at91_nand:-(root) "			\
+				"atmel_nand:-(root) "			\
 				"rw rootfstype=jffs2"
 
 #endif
@@ -202,7 +205,6 @@
 #define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING	1
 
-#define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */