diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
| commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
| tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /include/configs/smdk6400.h | |
| parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
| parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
| download | u-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/smdk6400.h')
| -rw-r--r-- | include/configs/smdk6400.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index f0c146e..ea65c0e 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -68,7 +68,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 1024 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes for initial data */ /* @@ -196,7 +196,7 @@ #define CFG_FLASH_ERASE_TOUT (5 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (5 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* * SMDK6400 board specific data @@ -222,7 +222,7 @@ /* NAND U-Boot load and start address */ #define CFG_UBOOT_BASE (CFG_MAPPED_RAM_BASE + 0x07e00000) -#define CFG_ENV_OFFSET 0x0040000 +#define CONFIG_ENV_OFFSET 0x0040000 /* NAND configuration */ #define CFG_MAX_NAND_DEVICE 1 @@ -284,7 +284,7 @@ */ /* Settings as above boot configuration */ -#define CFG_ENV_IS_IN_NAND +#define CONFIG_ENV_IS_IN_NAND #define CONFIG_BOOTARGS "console=ttySAC,115200" #if !defined(CONFIG_ENABLE_MMU) |