Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
[platform/kernel/u-boot.git] / include / configs / ads5121.h
index 11e7e44..81e7c1e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 DENX Software Engineering
+ * (C) Copyright 2007, 2008 DENX Software Engineering
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -27,9 +27,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define DEBUG
-#undef DEBUG
-
 /*
  * Memory map for the ADS5121 board:
  *
@@ -37,6 +34,9 @@
  * 0x3000_0000 - 0x3001_FFFF   SRAM (128 KB)
  * 0x8000_0000 - 0x803F_FFFF   IMMR (4 MB)
  * 0x8200_0000 - 0x8200_001F   CPLD (32 B)
+ * 0x8400_0000 - 0x82FF_FFFF   PCI I/O space (16 MB)
+ * 0xA000_0000 - 0xAFFF_FFFF   PCI memory space (256 MB)
+ * 0xB000_0000 - 0xBFFF_FFFF   PCI memory mapped I/O space (256 MB)
  * 0xFC00_0000 - 0xFFFF_FFFF   NOR Boot FLASH (64 MB)
  */
 
@@ -46,7 +46,7 @@
 #define CONFIG_E300            1       /* E300 Family */
 #define CONFIG_MPC512X         1       /* MPC512X family */
 
-#undef CONFIG_PCI
+/* CONFIG_PCI is defined at config time */
 
 #define CFG_MPC512X_CLKIN      66000000        /* in Hz */
 
  *     [04:00] DRAM tRPA
  */
 
-#define CFG_MDDRC_SYS_CFG      0xF8604200
-#define CFG_MDDRC_SYS_CFG_RUN  0xE8604200
-#define CFG_MDDRC_SYS_CFG_EN   0x30000000
-#define CFG_MDDRC_TIME_CFG0    0x0000281E
-#define CFG_MDDRC_TIME_CFG0_RUN        0x01F4281E
+#define CFG_MDDRC_SYS_CFG      0xF8604A00
+#define CFG_MDDRC_SYS_CFG_RUN  0xE8604A00
+#define CFG_MDDRC_SYS_CFG_EN   0xF0000000
+#define CFG_MDDRC_TIME_CFG0    0x00003D2E
+#define CFG_MDDRC_TIME_CFG0_RUN        0x06183D2E
 #define CFG_MDDRC_TIME_CFG1    0x54EC1168
 #define CFG_MDDRC_TIME_CFG2    0x35210864
 
 #define CFG_MICRON_NOP         0x01380000
 #define CFG_MICRON_PCHG_ALL    0x01100400
-#define CFG_MICRON_MR          0x01000022
 #define CFG_MICRON_EM2         0x01020000
 #define CFG_MICRON_EM3         0x01030000
 #define CFG_MICRON_EN_DLL      0x01010000
-#define CFG_MICRON_RST_DLL     0x01000932
 #define CFG_MICRON_RFSH                0x01080000
-#define CFG_MICRON_INIT_DEV_OP 0x01000832
+#define CFG_MICRON_INIT_DEV_OP 0x01000432
 #define CFG_MICRON_OCD_DEFAULT 0x01010780
-#define CFG_MICRON_OCD_EXIT    0x01010400
 
 /* DDR Priority Manager Configuration */
 #define CFG_MDDRCGRP_PM_CFG1   0x000777AA
 #define CFG_PROMPT_HUSH_PS2 "> "
 #endif
 
+/*
+ * PCI
+ */
+#ifdef CONFIG_PCI
+
+/*
+ * General PCI
+ */
+#define CFG_PCI_MEM_BASE       0xA0000000
+#define CFG_PCI_MEM_PHYS       CFG_PCI_MEM_BASE
+#define CFG_PCI_MEM_SIZE       0x10000000      /* 256M */
+#define CFG_PCI_MMIO_BASE      (CFG_PCI_MEM_BASE + CFG_PCI_MEM_SIZE)
+#define CFG_PCI_MMIO_PHYS      CFG_PCI_MMIO_BASE
+#define CFG_PCI_MMIO_SIZE      0x10000000      /* 256M */
+#define CFG_PCI_IO_BASE                0x00000000
+#define CFG_PCI_IO_PHYS                0x84000000
+#define CFG_PCI_IO_SIZE                0x01000000      /* 16M */
+
+
+#define CONFIG_PCI_PNP                 /* do pci plug-and-play */
+
+#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
+
+#endif
+
 /* I2C */
 #define CONFIG_HARD_I2C                        /* I2C with hardware support */
 #undef CONFIG_SOFT_I2C                 /* so disable bit-banged I2C */
  * to 0xFFFF, watchdog timeouts after about 64s. For details refer
  * to chapter 36 of the MPC5121e Reference Manual.
  */
-#define CONFIG_WATCHDOG                        /* enable watchdog */
+/* #define CONFIG_WATCHDOG */          /* enable watchdog */
 #define CFG_WATCHDOG_VALUE 0xFFFF
 
  /*
 #define CFG_PROMPT     "=> "           /* Monitor Command Prompt */
 
 #ifdef CONFIG_CMD_KGDB
-       #define CFG_CBSIZE      1024            /* Console I/O Buffer Size */
+       #define CFG_CBSIZE      1024    /* Console I/O Buffer Size */
 #else
-       #define CFG_CBSIZE      256             /* Console I/O Buffer Size */
+       #define CFG_CBSIZE      256     /* Console I/O Buffer Size */
 #endif
 
 
  *
  * Boot Flags
  */
-#define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02    /* Software reboot */
+#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
+#define BOOTFLAG_WARM          0x02    /* Software reboot */
 
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 /*
  * Environment Configuration
  */
-#define CONFIG_ENV_OVERWRITE
+#define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME                ads5121
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                ads5121/uImage
+#define CONFIG_ROOTPATH                /opt/eldk/pcc_6xx
 
-#define CONFIG_LOADADDR                200000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                400000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       5       /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                        /* the boot command will set bootargs */
 #define CONFIG_BAUDRATE                115200
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+       "u-boot_addr_r=200000\0"                                        \
+       "kernel_addr_r=300000\0"                                        \
+       "fdt_addr_r=400000\0"                                           \
+       "ramdisk_addr_r=500000\0"                                       \
+       "u-boot_addr=FFF00000\0"                                        \
+       "kernel_addr=FC040000\0"                                        \
+       "fdt_addr=FC2C0000\0"                                           \
+       "ramdisk_addr=FC300000\0"                                       \
+       "ramdiskfile=ads5121/uRamdisk\0"                                \
+       "fdtfile=ads5121/ads5121.dtb\0"                                 \
+       "u-boot=ads5121/u-boot.bin\0"                                   \
        "netdev=eth0\0"                                                 \
+       "consdev=ttyPSC0\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
-       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
+       "addtty=setenv bootargs ${bootargs} "                           \
+               "console=${consdev},${baudrate}\0"                      \
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm ${kernel_addr}\0"                                \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
-               "bootm\0"                                               \
-       "load=tftp 200000 /tftpboot/ads5121/u-boot.bin\0"               \
-       "update=protect off FFF00000 +${filesize};"                     \
-               "era FFF00000 +${filesize};cp.b 200000 FFF00000 ${filesize}\0" \
-       "upd=run load;run update\0"                                     \
+               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
+       "net_nfs=tftp ${kernel_addr_r} ${bootfile};"                    \
+               "tftp ${fdt_addr_r} ${fdtfile};"                        \
+               "run nfsargs addip addtty;"                             \
+               "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
+       "net_self=tftp ${kernel_addr_r} ${bootfile};"                   \
+               "tftp ${ramdisk_addr_r} ${ramdiskfile};"                \
+               "tftp ${fdt_addr_r} ${fdtfile};"                        \
+               "run ramargs addip addtty;"                             \
+               "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0"\
+       "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \
+       "update=protect off ${u-boot_addr} +${filesize};"               \
+               "era ${u-boot_addr} +${filesize};"                      \
+               "cp.b ${u-boot_addr_r} ${u-boot_addr} ${filesize}\0"    \
+       "upd=run load update\0"                                         \
        ""
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
-       "setenv bootargs root=/dev/nfs rw "                             \
-               "nfsroot=$serverip:$rootpath "                          \
-               "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
-               "console=$consoledev,$baudrate $othbootargs;"           \
-       "tftp $loadaddr $bootfile;"                                     \
-       "tftp $fdtaddr $fdtfile;"                                       \
-       "bootm $loadaddr - $fdtaddr"
-
-#define CONFIG_RAMBOOTCOMMAND                                          \
-       "setenv bootargs root=/dev/ram rw "                             \
-               "console=$consoledev,$baudrate $othbootargs;"           \
-       "tftp $ramdiskaddr $ramdiskfile;"                               \
-       "tftp $loadaddr $bootfile;"                                     \
-       "tftp $fdtaddr $fdtfile;"                                       \
-       "bootm $loadaddr $ramdiskaddr $fdtaddr"
-
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
 #define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1
 
 #define OF_CPU                 "PowerPC,5121@0"
-#define OF_SOC                 "soc5121@80000000"
+#define OF_SOC                 "soc@80000000"
+#define OF_SOC_OLD             "soc5121@80000000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH         "/soc5121@80000000/serial@11300"
+#define OF_STDOUT_PATH         "/soc@80000000/serial@11300"
 
 #endif /* __CONFIG_H */