diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/omap3_beagle.h | 18 | ||||
| -rw-r--r-- | include/configs/omap3_evm.h | 18 | ||||
| -rw-r--r-- | include/configs/omap3_overo.h | 18 | ||||
| -rw-r--r-- | include/configs/omap3_pandora.h | 20 | ||||
| -rw-r--r-- | include/configs/omap3_sdp3430.h | 7 | ||||
| -rw-r--r-- | include/configs/omap3_zoom1.h | 18 | ||||
| -rw-r--r-- | include/configs/omap3_zoom2.h | 10 | 
7 files changed, 0 insertions, 109 deletions
| diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 076dd5a8a..56363f762 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; diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index aeb45c6b6..84b29866b 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -296,9 +296,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 @@ -321,21 +318,6 @@  #define CONFIG_ENV_OFFSET		boot_flash_off  #define CONFIG_ENV_ADDR			boot_flash_env_addr -/*----------------------------------------------------------------------- - * 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; diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 79a5b855d..1b3d43979 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -269,9 +269,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 @@ -288,21 +285,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; diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index b8cd2cd20..f386bc493 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -261,40 +261,20 @@  #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  /* Monitor at start of flash */  #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ONENAND_BASE		ONENAND_MAP  #define CONFIG_ENV_IS_IN_NAND		1 -#define ONENAND_ENV_OFFSET		0x240000 /* environment starts here */  #define SMNAND_ENV_OFFSET		0x240000 /* environment starts here */  #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec  #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; diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index fab263d6c..a5eb6483b 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -159,10 +159,6 @@  #define PHYS_FLASH_SIZE			(128 << 20)  #define CONFIG_SYS_MAX_FLASH_SECT	512	/* max sectors on one chip */ -/* timeout values are in milliseconds */ -#define CONFIG_SYS_FLASH_ERASE_TOUT	(100 * CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT	(100 * CONFIG_SYS_HZ) -  /* OMITTED:  single 2 Gbit KFM2G16 OneNAND flash */  #define CONFIG_ENV_IS_IN_FLASH		1 @@ -338,9 +334,6 @@  #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE  #define CONFIG_SYS_MONITOR_LEN		(256 << 10) -#define CONFIG_SYS_JFFS2_FIRST_BANK	CONFIG_SYS_MAX_FLASH_BANKS -#define CONFIG_SYS_JFFS2_NUM_BANKS	1 -  /*   * NAND FLASH usage ... default nCS1:   *  - four 128KB sectors for X-Loader diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 10b248ad8..d9e8ea010 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -277,9 +277,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 @@ -296,21 +293,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; diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index b7c301f8e..41abe044e 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -246,9 +246,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 @@ -263,13 +260,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) -  #ifndef __ASSEMBLY__  extern unsigned int boot_flash_base;  extern volatile unsigned int boot_flash_env_addr; |