ppc4xx: Merge xilinx-ppc440 and xilinx-ppc405 cfg

[people/ms/u-boot.git] / include / configs / xilinx-ppc405.h

diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h
index 74584705ccbbfe4bbdfb7416fd1e393448f23dde..d335f1e29a69336cd2a6c753a830d362459622e1 100644 (file)
--- a/include/configs/xilinx-ppc405.h
+++ b/include/configs/xilinx-ppc405.h
@@ -30,97 +30,10 @@
 #define __CONFIG_H
 
 /* cpu parameter */
-#define CONFIG_4xx             1
 #define CONFIG_405             1
+#define CONFIG_4xx             1
 #define CONFIG_XILINX_405      1
 
-/* memory map */
-#define CONFIG_SYS_SDRAM_BASE  0x0
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN (192 * 1024)
-#define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + 128 * 1024)
-
-/* u-boot commands configuration */
-#include <config_cmd_default.h>
-
-/*Misc*/
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE \
-               + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS     16      /* max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
-#define CONFIG_SYS_MEMTEST_START 0x00400000 /* memtest works on */
-#define CONFIG_SYS_MEMTEST_END 0x00C00000 /* 4 ... 12 MB in DRAM */
-#define CONFIG_SYS_LOAD_ADDR   0x01000000 /* default load address */
-#define CONFIG_SYS_EXTBDINFO   1       /* Extended board_into (bd_t) */
-#define CONFIG_SYS_HZ          1000 /* decrementer freq: 1 ms ticks */
-#define CONFIG_CMDLINE_EDITING         /* add command line history */
-#define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
-#define CONFIG_LOOPW                   /* enable loopw command */
-#define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands */
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
-#define CONFIG_VERSION_VARIABLE                /* include version env variable */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  /* don't print console @ startup */
-#define CONFIG_SYS_HUSH_PARSER         /* Use the HUSH parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_LOADS_ECHO              /* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change */
-#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
-                                       /* Initial Memory map for Linux */
-#define CONFIG_SYS_CACHELINE_SIZE      32
-#define CONFIG_SYS_CACHELINE_SHIFT     2
-
-/* stack */
-#define CONFIG_SYS_INIT_RAM_ADDR       0x800000 /* inside of SDRAM */
-#define CONFIG_SYS_INIT_RAM_END                0x2000 /* End of used area in RAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \
-               CONFIG_SYS_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-
-#define CONFIG_SYS_FLASH_CF            1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#define CONFIG_SYS_FLASH_EMPTY_INFO    1
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_SYS_FLASH_PROTECTION
-
-/* serial communication */
-#ifdef XPAR_UARTLITE_0_BASEADDR
-#define CONFIG_XILINX_UARTLITE
-#define CONFIG_SERIAL_BASE             XPAR_UARTLITE_0_BASEADDR
-#define CONFIG_BAUDRATE                        XPAR_UARTLITE_0_BAUDRATE
-#define CONFIG_SYS_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
-#else
-#ifdef XPAR_UARTNS550_0_BASEADDR
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    4
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_SYS_NS16550_COM1                XPAR_UARTNS550_0_BASEADDR
-#define CONFIG_SYS_NS16550_CLK         XPAR_UARTNS550_0_CLOCK_FREQ_HZ
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 115200 }
-#endif
-#endif
-
-/* cmd config */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_CMDLINE
-#undef CONFIG_CMD_SPI
-#undef CONFIG_CMD_I2C
-#undef CONFIG_CMD_DTT
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_PING
-#undef CONFIG_CMD_DHCP
-#undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_IMLS
+#include <configs/xilinx-ppc.h>
 
 #endif