diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/configs/xilinx-ppc440-generic.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'include/configs/xilinx-ppc440-generic.h')
| -rw-r--r-- | include/configs/xilinx-ppc440-generic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index e968651..fc0f932 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -24,7 +24,7 @@ #include "../board/xilinx/ppc440-generic/xparameters.h" /*Mem Map*/ -#define CFG_SDRAM_SIZE_MB 256 +#define CONFIG_SYS_SDRAM_SIZE_MB 256 /*Env*/ #define CONFIG_ENV_IS_IN_FLASH 1 @@ -34,12 +34,12 @@ #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ -#define CFG_PROMPT "board:/# " /* Monitor Command Prompt */ +#define CONFIG_SYS_PROMPT "board:/# " /* Monitor Command Prompt */ #define CONFIG_PREBOOT "echo U-Boot is up and runnining;" /*Flash*/ -#define CFG_FLASH_SIZE (32*1024*1024) -#define CFG_MAX_FLASH_SECT 259 +#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)" |