diff options
author | Wolfgang Denk <wd@denx.de> | 2010-11-26 21:33:14 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-11-26 21:33:14 +0100 |
commit | 41bb7531e1382e730b8a6b06d249ea72d936c468 (patch) | |
tree | 2a4fe1e8c16802e76aff9fd790e23e34c18c7d37 /include/configs/omap3_beagle.h | |
parent | c70e7ddb7e15e768d79edcbc4322d735e65ec31f (diff) | |
parent | e42a7dff09dd7306f8eaffbe8aaf44148dbfba35 (diff) | |
download | u-boot-imx-41bb7531e1382e730b8a6b06d249ea72d936c468.zip u-boot-imx-41bb7531e1382e730b8a6b06d249ea72d936c468.tar.gz u-boot-imx-41bb7531e1382e730b8a6b06d249ea72d936c468.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/omap3_beagle.h')
-rw-r--r-- | include/configs/omap3_beagle.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 076dd5a..56363f7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -304,9 +304,6 @@ #define PISMO1_NAND_SIZE GPMC_SIZE_128M #define PISMO1_ONEN_SIZE GPMC_SIZE_128M -#define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */ - /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #define CONFIG_SYS_FLASH_BASE boot_flash_base @@ -323,21 +320,6 @@ #define CONFIG_ENV_OFFSET boot_flash_off #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET -/*----------------------------------------------------------------------- - * CFI FLASH driver setup - */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) - -/* Flash banks JFFS2 should use */ -#define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \ - CONFIG_SYS_MAX_NAND_DEVICE) -#define CONFIG_SYS_JFFS2_MEM_NAND -/* use flash_info[2] */ -#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS -#define CONFIG_SYS_JFFS2_NUM_BANKS 1 - #ifndef __ASSEMBLY__ extern unsigned int boot_flash_base; extern volatile unsigned int boot_flash_env_addr; |