> > Just a ping. > Sandeep, maybe you could pick this? Those defines are mostly dead code.
Not pushed yet. I have cc'ed all the concerned board maintainers in case they have an objection. > > On Thu, Apr 29, 2010 at 5:19 PM, Grazvydas Ignotas <nota...@gmail.com> > wrote: > > Most OMAP3 boards have various flash related macros in their configs > > that are either not referenced anywhere in the code or are used by > > drivers that are not enabled. Remove them. > > > > Signed-off-by: Grazvydas Ignotas <nota...@gmail.com> > > --- > > include/configs/omap3_beagle.h | 18 ------------------ > > include/configs/omap3_evm.h | 18 ------------------ > > include/configs/omap3_overo.h | 18 ------------------ > > include/configs/omap3_pandora.h | 20 -------------------- > > include/configs/omap3_sdp3430.h | 7 ------- > > include/configs/omap3_zoom1.h | 18 ------------------ > > 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 08d79ac..f8266b1 100644 > > --- a/include/configs/omap3_beagle.h > > +++ b/include/configs/omap3_beagle.h > > @@ -291,9 +291,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 > > @@ -310,21 +307,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 0d99f7d..39eb4b5 100644 > > --- a/include/configs/omap3_evm.h > > +++ b/include/configs/omap3_evm.h > > @@ -295,9 +295,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 > > @@ -314,21 +311,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 a43500b..b5b2dbe 100644 > > --- a/include/configs/omap3_overo.h > > +++ b/include/configs/omap3_overo.h > > @@ -260,9 +260,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 > > @@ -279,21 +276,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 945c053..9e3ee99 100644 > > --- a/include/configs/omap3_pandora.h > > +++ b/include/configs/omap3_pandora.h > > @@ -252,40 +252,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 b4919db..e3a7073 100644 > > --- a/include/configs/omap3_sdp3430.h > > +++ b/include/configs/omap3_sdp3430.h > > @@ -158,10 +158,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 > > @@ -337,9 +333,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 ae7ebf9..834d8f0 100644 > > --- a/include/configs/omap3_zoom1.h > > +++ b/include/configs/omap3_zoom1.h > > @@ -276,9 +276,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 > > @@ -295,21 +292,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 c88c732..865659f 100644 > > --- a/include/configs/omap3_zoom2.h > > +++ b/include/configs/omap3_zoom2.h > > @@ -245,9 +245,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 > > @@ -262,13 +259,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; > > -- > > 1.6.3.3 > > > > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
