avr32: fixup definitions to ATMEL_BASE_xxx

[karo-tx-uboot.git] / include / configs / favr-32-ezkit.h

diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 3cef4196df47cc8eda148e799e9138d6617eba62..e723ad106997181963e0d31faeca0c113fb72bd7 100644 (file)
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -22,7 +22,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32                   1
 #define CONFIG_AT32AP                  1
@@ -70,6 +70,9 @@
  */
 #define CONFIG_SYS_CLKDIV_PBB                  1
 
+/* Reserve VM regions for SDRAM and NOR flash */
+#define CONFIG_SYS_NR_VM_REGIONS               2
+
 /*
  * The PLLOPT register controls the PLL like this:
  *   icp = PLLOPT<2>
@@ -79,10 +82,8 @@
  */
 #define CONFIG_SYS_PLL0_OPT                    0x04
 
-#undef CONFIG_USART0
-#undef CONFIG_USART1
-#undef CONFIG_USART2
-#define CONFIG_USART3                  1
+#define CONFIG_USART_BASE              ATMEL_BASE_USART3
+#define CONFIG_USART_ID                        3
 
 /* User serviceable stuff */
 #define CONFIG_DOS_PARTITION           1
@@ -139,14 +140,14 @@
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MMC
 
-#undef CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_SOURCE
 #undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART             1
 #define CONFIG_MACB                    1
-#define CONFIG_PIO2                    1
+#define CONFIG_PORTMUX_PIO             1
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC                     1
 #define CONFIG_MMC                     1