ppc4xx: Merge xilinx-ppc440 and xilinx-ppc405 cfg
Xilinx ppc440 and ppc405 have many similarities. This patch merge the config files of both infrastuctures Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
3befd85633
commit
cc2dc9b08c
@ -46,6 +46,6 @@
|
||||
#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x00000000
|
||||
|
||||
/* FLASH */
|
||||
#define XPAR_FLASH_2MX16_MEM0_BASEADDR 0xFFC00000
|
||||
#define XPAR_FLASH_MEM0_BASEADDR 0xFFC00000
|
||||
|
||||
#endif
|
||||
|
@ -57,11 +57,8 @@
|
||||
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
|
||||
|
||||
/*Flash*/
|
||||
#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_2MX16_MEM0_BASEADDR
|
||||
#define CONFIG_SYS_FLASH_SIZE (4*1024*1024)
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 71
|
||||
#define CONFIG_SYS_FLASH_CFI 1
|
||||
#define CONFIG_FLASH_CFI_DRIVER 1
|
||||
#define MTDIDS_DEFAULT "nor0=fx12mm-flash"
|
||||
#define MTDPARTS_DEFAULT "mtdparts=fx12mm-flash:-(user)"
|
||||
|
||||
|
@ -30,15 +30,15 @@
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_SIZE 0x20000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000
|
||||
#define CONFIG_ENV_OFFSET 0x340000
|
||||
#define CONFIG_ENV_OFFSET 0x340000
|
||||
#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
|
||||
|
||||
/*Misc*/
|
||||
#define CONFIG_SYS_PROMPT "ml507:/# " /* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_PROMPT "ml507:/# " /* Monitor Command Prompt */
|
||||
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
|
||||
|
||||
/*Flash*/
|
||||
#define CONFIG_SYS_FLASH_SIZE (32*1024*1024)
|
||||
#define CONFIG_SYS_FLASH_SIZE (32*1024*1024)
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 259
|
||||
#define MTDIDS_DEFAULT "nor0=ml507-flash"
|
||||
#define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)"
|
||||
|
136
include/configs/xilinx-ppc.h
Normal file
136
include/configs/xilinx-ppc.h
Normal file
@ -0,0 +1,136 @@
|
||||
/*
|
||||
* (C) Copyright 2008
|
||||
* Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
|
||||
* This work has been supported by: QTechnology http://qtec.com/
|
||||
*
|
||||
* (C) Copyright 2008
|
||||
* Georg Schardt <schardt@team-ctech.de>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_XLX_H
|
||||
#define __CONFIG_XLX_H
|
||||
/*
|
||||
#define DEBUG
|
||||
#define ET_DEBUG
|
||||
*/
|
||||
|
||||
/*Mem 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)
|
||||
|
||||
/*Cmd*/
|
||||
#include <config_cmd_default.h>
|
||||
#define CONFIG_CMD_ASKENV
|
||||
#define CONFIG_CMD_CACHE
|
||||
#define CONFIG_CMD_DIAG
|
||||
#define CONFIG_CMD_ELF
|
||||
#define CONFIG_CMD_IRQ
|
||||
#define CONFIG_CMD_REGINFO
|
||||
#undef CONFIG_CMD_JFFS2
|
||||
#undef 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
|
||||
|
||||
/*Misc*/
|
||||
#define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#if defined(CONFIG_CMD_KGDB)
|
||||
#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
|
||||
#else
|
||||
#define CONFIG_SYS_CBSIZE 256/* Console I/O Buffer Size */
|
||||
#endif
|
||||
#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 0x00400000
|
||||
/* 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 */
|
||||
|
||||
/*Stack*/
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x800000/* Initial RAM address */
|
||||
#define CONFIG_SYS_INIT_RAM_END 0x2000 /* End of used area in RAM */
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */
|
||||
#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
|
||||
/*Speed*/
|
||||
#define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ
|
||||
|
||||
/*Flash*/
|
||||
#ifdef XPAR_FLASH_MEM0_BASEADDR
|
||||
#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR
|
||||
#define CONFIG_SYS_FLASH_CFI 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
|
||||
#define CONFIG_CMD_JFFS2
|
||||
#define CONFIG_JFFS2_CMDLINE
|
||||
#else
|
||||
#define CONFIG_ENV_IS_NOWHERE
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#endif
|
||||
|
||||
/* 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
|
||||
|
||||
#endif /* __CONFIG_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
|
||||
|
@ -17,90 +17,12 @@
|
||||
|
||||
#ifndef __CONFIG_GEN_H
|
||||
#define __CONFIG_GEN_H
|
||||
/*
|
||||
#define DEBUG
|
||||
#define ET_DEBUG
|
||||
*/
|
||||
/*CPU*/
|
||||
#define CONFIG_XILINX_440 1
|
||||
#define CONFIG_440 1
|
||||
|
||||
/*CPU*/
|
||||
#define CONFIG_4xx 1
|
||||
#define CONFIG_440 1
|
||||
#define CONFIG_XILINX_440 1
|
||||
|
||||
/*Mem 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)
|
||||
|
||||
/*Uart*/
|
||||
#define CONFIG_XILINX_UARTLITE
|
||||
#define CONFIG_BAUDRATE XPAR_UARTLITE_0_BAUDRATE
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE { XPAR_UARTLITE_0_BAUDRATE }
|
||||
#define CONFIG_SERIAL_BASE XPAR_UARTLITE_0_BASEADDR
|
||||
|
||||
/*Cmd*/
|
||||
#include <config_cmd_default.h>
|
||||
#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
|
||||
|
||||
/*Misc*/
|
||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#if defined(CONFIG_CMD_KGDB)
|
||||
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
|
||||
#else
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
#endif
|
||||
#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 0x00400000 /* 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 */
|
||||
|
||||
/*Stack*/
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x800000 /* Initial RAM address */
|
||||
#define CONFIG_SYS_INIT_RAM_END 0x2000 /* End of used area in RAM */
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */
|
||||
#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
|
||||
/*Speed*/
|
||||
#define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ
|
||||
|
||||
/*Flash*/
|
||||
#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR
|
||||
#define CONFIG_SYS_FLASH_CFI 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
|
||||
#include <configs/xilinx-ppc.h>
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
Loading…
Reference in New Issue
Block a user