Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[platform/kernel/u-boot.git] / include / configs / eb_cpux9k2.h

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 754fc8b..9046cf0 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -29,18 +29,20 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
-#define CONFIG_AT91RM9200      1       /* It's an Atmel AT91RM9200 SoC */
-#define CONFIG_EB_CPUX9K2      1       /* on an EP+CPUX9K2 Board       */
-#define USE_920T_MMU           1
+#define CONFIG_AT91RM9200              /* It's an Atmel AT91RM9200 SoC */
+#define CONFIG_EB_CPUX9K2              /* on an EP+CPUX9K2 Board       */
+#define USE_920T_MMU
 
-#define CONFIG_VERSION_VARIABLE 1
+#define CONFIG_VERSION_VARIABLE
 #define CONFIG_IDENT_STRING    " on EB+CPUx9K2"
 
-#include <asm/arch/hardware.h> /* needed for port definitions */
+#include <asm/hardware.h>      /* needed for port definitions */
 
 #define CONFIG_MISC_INIT_R
+#define CONFIG_BOARD_EARLY_INIT_F
 
+#define MACH_TYPE_EB_CPUX9K2           1977
+#define CONFIG_MACH_TYPE               MACH_TYPE_EB_CPUX9K2
 /*--------------------------------------------------------------------------*/
 #define CONFIG_SYS_TEXT_BASE           0x00000000
 #define CONFIG_SYS_LOAD_ADDR           0x21000000  /* default load address */
@@ -70,7 +72,7 @@
 #define CONFIG_SYS_HZ          1000
 #define CONFIG_SYS_HZ_CLOCK    (AT91C_MASTER_CLOCK / 2)
 
-#define AT91_SLOW_CLOCK                        32768           /* slow clock */
+#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock */
 
 #define CONFIG_CMDLINE_TAG             1
 #define CONFIG_SETUP_MEMORY_TAGS       1
@@ -175,13 +177,13 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 19200, 38400, 57600, 9600 }
 
 #define CONFIG_BAUDRATE 115200
-#define CONFIG_AT91RM9200_USART
-#define CONFIG_DBGU                    /* define DBGU as console */
+#define CONFIG_ATMEL_USART
+#define CONFIG_USART_BASE      ATMEL_BASE_DBGU
+#define CONFIG_USART_ID                0/* ignored in arm */
 
 /*
  * network
  */
-#define CONFIG_NET_MULTI               1
 
 #define CONFIG_NET_RETRY_COUNT         10
 #define CONFIG_RESET_PHY_R             1
@@ -217,19 +219,19 @@
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 #define I2C_INIT       i2c_init_board();
-#define I2C_ACTIVE     writel(AT91_PMX_AA_TWD, &pio->pioa.mddr);
-#define I2C_TRISTATE   writel(AT91_PMX_AA_TWD, &pio->pioa.mder);
-#define I2C_READ       ((readl(&pio->pioa.pdsr) & AT91_PMX_AA_TWD) != 0)
+#define I2C_ACTIVE     writel(ATMEL_PMX_AA_TWD, &pio->pioa.mddr);
+#define I2C_TRISTATE   writel(ATMEL_PMX_AA_TWD, &pio->pioa.mder);
+#define I2C_READ       ((readl(&pio->pioa.pdsr) & ATMEL_PMX_AA_TWD) != 0)
 #define I2C_SDA(bit)                                           \
        if (bit)                                                \
-               writel(AT91_PMX_AA_TWD, &pio->pioa.sodr);       \
+               writel(ATMEL_PMX_AA_TWD, &pio->pioa.sodr);      \
        else                                                    \
-               writel(AT91_PMX_AA_TWD, &pio->pioa.codr);
+               writel(ATMEL_PMX_AA_TWD, &pio->pioa.codr);
 #define I2C_SCL(bit)                                           \
        if (bit)                                                \
-               writel(AT91_PMX_AA_TWCK, &pio->pioa.sodr);      \
+               writel(ATMEL_PMX_AA_TWCK, &pio->pioa.sodr);     \
        else                                                    \
-               writel(AT91_PMX_AA_TWCK, &pio->pioa.codr);
+               writel(ATMEL_PMX_AA_TWCK, &pio->pioa.codr);
 
 #define I2C_DELAY      udelay(2500000/CONFIG_SYS_I2C_SPEED)
 
@@ -268,7 +270,6 @@
 
 /* NAND */
 
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_DBW_8          1