83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x

[u-boot] / include / configs / at91cap9adk.h

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 2ddbd172a2d1bf389df3e91e9bc6d5ba03aec360..526cd60ae0961fbe87570e6ec4ba98f1f24d8185 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,18 +28,13 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define AT91_CPU_NAME          "AT91CAP9"
 #define AT91_MAIN_CLOCK                12000000        /* 12 MHz crystal */
-#define AT91_MASTER_CLOCK      100000000       /* peripheral */
-#define AT91_CPU_CLOCK         200000000       /* cpu */
-#define CONFIG_SYS_AT91_PLLB   0x10073e01      /* PLLB settings for USB */
-#define CONFIG_SYS_HZ          1000000         /* 1us resolution */
-
-#define AT91_SLOW_CLOCK                32768   /* slow clock */
+#define CONFIG_SYS_HZ          1000
 
 #define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
 #define CONFIG_AT91CAP9                1       /* It's an Atmel AT91CAP9 SoC   */
 #define CONFIG_AT91CAP9ADK     1       /* on an AT91CAP9ADK Board      */
+#define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 
 #define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs      */
@@ -107,6 +102,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
@@ -144,6 +140,7 @@
 #define CONFIG_RESET_PHY_R             1
 
 /* USB */
+#define CONFIG_USB_ATMEL
 #define CONFIG_USB_OHCI_NEW            1
 #define CONFIG_DOS_PARTITION           1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT           1