diff options
author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/configs/v5fx30teval.h | |
parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/v5fx30teval.h')
-rw-r--r-- | include/configs/v5fx30teval.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h index 1636d42..d300c4b 100644 --- a/include/configs/v5fx30teval.h +++ b/include/configs/v5fx30teval.h @@ -24,7 +24,7 @@ #include "../board/avnet/v5fx30teval/xparameters.h" /*Mem Map*/ -#define CFG_SDRAM_SIZE_MB 64 +#define CONFIG_SYS_SDRAM_SIZE_MB 64 /*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 "v5fx30t:/# " /* Monitor Command Prompt */ +#define CONFIG_SYS_PROMPT "v5fx30t:/# " /* Monitor Command Prompt */ #define CONFIG_PREBOOT "echo U-Boot is up and runnining;" /*Flash*/ -#define CFG_FLASH_SIZE (16*1024*1024) -#define CFG_MAX_FLASH_SECT 131 +#define CONFIG_SYS_FLASH_SIZE (16*1024*1024) +#define CONFIG_SYS_MAX_FLASH_SECT 131 #define MTDIDS_DEFAULT "nor0=v5fx30t-flash" #define MTDPARTS_DEFAULT "mtdparts=v5fx30t-flash:-(user)" |