powerpc/85xx: Fix NAND SPL support

[oweals/u-boot.git] / include / configs / pm9263.h

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index c9e7489386ef1cff80317f6503a2e0f0896f969b..1f7543c1336a0b9b1be1f6bde3a3c72c16490438 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -28,6 +28,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * SoC must be defined first, before hardware.h is included.
+ * In this case SoC is defined in boards.cfg.
+ */
+#include <asm/hardware.h>
+
 /* ARM asynchronous clock */
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -36,16 +42,15 @@
 #define MASTER_PLL_MUL         65
 #define MAIN_PLL_DIV           2       /* 2 or 4 */
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
+#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
 
 #define CONFIG_SYS_HZ          1000
 
-#define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
-#define CONFIG_AT91SAM9263     1       /* It's an Atmel AT91SAM9263 SoC*/
+#define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9263"
 #define CONFIG_PM9263          1       /* on a Ronetix PM9263 Board    */
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 #define CONFIG_SYS_TEXT_BASE   0
-#define CONFIG_AT91FAMILY
 
 /* clocks */
 #define CONFIG_SYS_MOR_VAL                                             \
@@ -170,10 +175,8 @@
  */
 #define CONFIG_AT91_GPIO       1
 #define CONFIG_ATMEL_USART     1
-#undef CONFIG_USART0
-#undef CONFIG_USART1
-#undef CONFIG_USART2
-#define CONFIG_USART3          1       /* USART 3 is DBGU */
+#define CONFIG_USART_BASE              ATMEL_BASE_DBGU
+#define        CONFIG_USART_ID                 ATMEL_ID_SYS
 
 /* LCD */
 #define CONFIG_LCD                     1
@@ -214,6 +217,7 @@
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_IMLS
 
+#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING                1
 #define CONFIG_CMD_DHCP                1
 #define CONFIG_CMD_NAND                1
@@ -277,7 +281,6 @@
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R             1
 
@@ -349,7 +352,7 @@
 #define CONFIG_SYS_JFFS2_FIRST_SECTOR  11
 
 #define CONFIG_BOOTCOMMAND             "run flashboot"
-#define CONFIG_ROOTPATH                        /ronetix/rootfs
+#define CONFIG_ROOTPATH                        "/ronetix/rootfs"
 #define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n"
 
 #define CONFIG_CON_ROT                 "fbcon=rotate:3 "