diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
| commit | f38536f9138c253b0c1f9c72093a7ec6808e638f (patch) | |
| tree | 43bd82d4f1f96f549821d5fd941dfdc70712b501 /include/configs/omap3_zoom1.h | |
| parent | 34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (diff) | |
| parent | d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (diff) | |
| download | u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.zip u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.gz u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/omap3_zoom1.h')
| -rw-r--r-- | include/configs/omap3_zoom1.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index f7d0652..2bfda4b 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -285,7 +285,9 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ -#define CONFIG_SYS_FLASH_BASE boot_flash_base +#if defined(CONFIG_CMD_NAND) +#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE +#endif /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE @@ -295,16 +297,8 @@ #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec -#define CONFIG_ENV_OFFSET boot_flash_off +#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET -#ifndef __ASSEMBLY__ -extern unsigned int boot_flash_base; -extern volatile unsigned int boot_flash_env_addr; -extern unsigned int boot_flash_off; -extern unsigned int boot_flash_sec; -extern unsigned int boot_flash_type; -#endif - #endif /* __CONFIG_H */ |