OMAP3: remove unused config macros

PATCH New Grazvydas Ignotas 3 participants 5 messages Apr 29, 2010 – Aug 13, 2010

Share & tools

Grazvydas Ignotas

author

2010-04-29 14:19 UTC #0 lore raw

PATCH 1/1 OMAP3: remove unused config macros

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 <[email protected]>

---
 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(-)

include/configs/omap3_beagle.h +0 ~~-18~~

index 08d79ac..f8266b1 100644
@@ -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;

include/configs/omap3_evm.h +0 ~~-18~~

index 0d99f7d..39eb4b5 100644
@@ -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;

include/configs/omap3_overo.h +0 ~~-18~~

index a43500b..b5b2dbe 100644
@@ -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;

include/configs/omap3_pandora.h +0 ~~-20~~

index 945c053..9e3ee99 100644
@@ -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@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;

include/configs/omap3_sdp3430.h +0 -7

index b4919db..e3a7073 100644
@@ -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

include/configs/omap3_zoom1.h +0 ~~-18~~

index ae7ebf9..834d8f0 100644
@@ -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;

include/configs/omap3_zoom2.h +0 ~~-10~~

index c88c732..865659f 100644
@@ -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;

Signature · 1 line

1.6.3.3

Grazvydas Ignotas

author

2010-06-08 12:10 UTC #1 lore raw

PATCH 1/1 OMAP3: remove unused config macros

Just a ping.
Sandeep, maybe you could pick this? Those defines are mostly dead code.

Quoted 261 lines · Grazvydas Ignotas

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 <[email protected]>
---
?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(-)
include/configs/omap3_beagle.h +0 -0
index 08d79ac..f8266b1 100644
@@ -291,9 +291,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_beagle.h +0 -3
-#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
include/configs/omap3_beagle.h +0 -0
@@ -310,21 +307,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
include/configs/omap3_beagle.h +0 ~~-15~~
-/*-----------------------------------------------------------------------
- * 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;
include/configs/omap3_evm.h +0 -0
index 0d99f7d..39eb4b5 100644
@@ -295,9 +295,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_evm.h +0 -3
-#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
include/configs/omap3_evm.h +0 -0
@@ -314,21 +311,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?boot_flash_env_addr
include/configs/omap3_evm.h +0 ~~-15~~
-/*-----------------------------------------------------------------------
- * 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;
include/configs/omap3_overo.h +0 -0
index a43500b..b5b2dbe 100644
@@ -260,9 +260,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_overo.h +0 -3
-#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
include/configs/omap3_overo.h +0 -0
@@ -279,21 +276,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
include/configs/omap3_overo.h +0 ~~-15~~
-/*-----------------------------------------------------------------------
- * 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;
include/configs/omap3_pandora.h +0 -0
index 945c053..9e3ee99 100644
@@ -252,40 +252,20 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_pandora.h +0 -3
-#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
include/configs/omap3_pandora.h +0 ~~-15~~
-/*-----------------------------------------------------------------------
- * 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;
include/configs/omap3_sdp3430.h +0 -0
index b4919db..e3a7073 100644
@@ -158,10 +158,6 @@
 ?#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?(128 << 20)
?#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?512 ? ? /* max sectors on one chip */
include/configs/omap3_sdp3430.h +0 -4
-/* 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
include/configs/omap3_sdp3430.h +0 -0
@@ -337,9 +333,6 @@
?#define CONFIG_SYS_MONITOR_BASE ? ? ? ? ? ? ? ?CONFIG_SYS_FLASH_BASE ?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10)
include/configs/omap3_sdp3430.h +0 -3
-#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
include/configs/omap3_zoom1.h +0 -0
index ae7ebf9..834d8f0 100644
@@ -276,9 +276,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_zoom1.h +0 -3
-#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
include/configs/omap3_zoom1.h +0 -0
@@ -295,21 +292,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
include/configs/omap3_zoom1.h +0 ~~-15~~
-/*-----------------------------------------------------------------------
- * 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;
include/configs/omap3_zoom2.h +0 -0
index c88c732..865659f 100644
@@ -245,9 +245,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
include/configs/omap3_zoom2.h +0 -3
-#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
include/configs/omap3_zoom2.h +0 -0
@@ -262,13 +259,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
include/configs/omap3_zoom2.h +0 -7
-/*-----------------------------------------------------------------------
- * 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

Paulraj

2010-06-08 21:30 UTC #2 lore raw

PATCH 1/1 OMAP3: remove unused config macros

Quoted 5 lines

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.

Quoted 297 lines

Quoted 13 lines · Grazvydas Ignotas
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 <[email protected]>
---
?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 ----------
Review
Quoted 3 lines
?7 files changed, 0 insertions(+), 109 deletions(-)
(quoted diff) +0 -0
b/include/configs/omap3_beagle.h
Quoted 8 lines
index 08d79ac..f8266b1 100644
include/configs/omap3_beagle.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_beagle.h +0 -0
@@ -310,21 +307,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 25 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_beagle.h +0 ~~-12~~
-/* 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;
include/configs/omap3_evm.h +0 -0
index 0d99f7d..39eb4b5 100644
@@ -295,9 +295,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
Quoted 1 line
-#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?520 ? ? /* max number of sectors
*/
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* on one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_evm.h +0 -0
@@ -314,21 +311,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?boot_flash_env_addr
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_evm.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_overo.h
Quoted 8 lines
index a43500b..b5b2dbe 100644
include/configs/omap3_overo.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_overo.h +0 -0
@@ -279,21 +276,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_overo.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_pandora.h
Quoted 8 lines
index 945c053..9e3ee99 100644
include/configs/omap3_pandora.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 9 lines
?#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 */
Quoted 1 line
?#define SMNAND_ENV_OFFSET ? ? ? ? ? ? ?0x240000 /* environment starts
here */
Quoted 6 lines
?#define CONFIG_SYS_ENV_SECT_SIZE ? ? ? boot_flash_sec ?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_pandora.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_sdp3430.h
Quoted 6 lines
index b4919db..e3a7073 100644
include/configs/omap3_sdp3430.h +0 -0
@@ -158,10 +158,6 @@
 ?#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?(128 << 20)
?#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?512 ? ? /* max sectors on one
chip */
Quoted 18 lines
include/configs/omap3_sdp3430.h +0 -4
-/* 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
include/configs/omap3_sdp3430.h +0 -0
@@ -337,9 +333,6 @@
?#define CONFIG_SYS_MONITOR_BASE ? ? ? ? ? ? ? ?CONFIG_SYS_FLASH_BASE ?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10)
include/configs/omap3_sdp3430.h +0 -3
-#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
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom1.h
Quoted 8 lines
index ae7ebf9..834d8f0 100644
include/configs/omap3_zoom1.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom1.h +0 -0
@@ -295,21 +292,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom1.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom2.h
Quoted 8 lines
index c88c732..865659f 100644
include/configs/omap3_zoom2.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom2.h +0 -0
@@ -262,13 +259,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 13 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom2.h +0 -4
-/* 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

Steve Sakoman

2010-06-08 21:44 UTC #3 lore raw

PATCH 1/1 OMAP3: remove unused config macros

Quoted 9 lines · Sandeep

Quoted 5 lines
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.

No objections:

Acked-by Steve Sakoman <[email protected]>

Steve

Quoted 297 lines

Quoted 296 lines
Quoted 13 lines · Grazvydas Ignotas
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 <[email protected]>
---
?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 ----------
Review
Quoted 3 lines
?7 files changed, 0 insertions(+), 109 deletions(-)
(quoted diff) +0 -0
b/include/configs/omap3_beagle.h
Quoted 8 lines
index 08d79ac..f8266b1 100644
include/configs/omap3_beagle.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_beagle.h +0 -0
@@ -310,21 +307,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 25 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_beagle.h +0 ~~-12~~
-/* 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;
include/configs/omap3_evm.h +0 -0
index 0d99f7d..39eb4b5 100644
@@ -295,9 +295,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
Quoted 1 line
-#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?520 ? ? /* max number of sectors
*/
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* on one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_evm.h +0 -0
@@ -314,21 +311,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?boot_flash_env_addr
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_evm.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_overo.h
Quoted 8 lines
index a43500b..b5b2dbe 100644
include/configs/omap3_overo.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_overo.h +0 -0
@@ -279,21 +276,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_overo.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_pandora.h
Quoted 8 lines
index 945c053..9e3ee99 100644
include/configs/omap3_pandora.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 9 lines
?#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 */
Quoted 1 line
?#define SMNAND_ENV_OFFSET ? ? ? ? ? ? ?0x240000 /* environment starts
here */
Quoted 6 lines
?#define CONFIG_SYS_ENV_SECT_SIZE ? ? ? boot_flash_sec ?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_pandora.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_sdp3430.h
Quoted 6 lines
index b4919db..e3a7073 100644
include/configs/omap3_sdp3430.h +0 -0
@@ -158,10 +158,6 @@
 ?#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?(128 << 20)
?#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?512 ? ? /* max sectors on one
chip */
Quoted 18 lines
include/configs/omap3_sdp3430.h +0 -4
-/* 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
include/configs/omap3_sdp3430.h +0 -0
@@ -337,9 +333,6 @@
?#define CONFIG_SYS_MONITOR_BASE ? ? ? ? ? ? ? ?CONFIG_SYS_FLASH_BASE ?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10)
include/configs/omap3_sdp3430.h +0 -3
-#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
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom1.h
Quoted 8 lines
index ae7ebf9..834d8f0 100644
include/configs/omap3_zoom1.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom1.h +0 -0
@@ -295,21 +292,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom1.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom2.h
Quoted 8 lines
index c88c732..865659f 100644
include/configs/omap3_zoom2.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom2.h +0 -0
@@ -262,13 +259,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 13 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom2.h +0 -4
-/* 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

Grazvydas Ignotas

author

2010-08-13 10:06 UTC #4 lore raw

PATCH 1/1 OMAP3: remove unused config macros

In reply to Paulraj

Another ping for this old patch.. This still applies cleanly, and I have verified those macros are unused by those boards. There were no objections so far, and Steve ACKed it.

Quoted 306 lines · Sandeep

Quoted 2 lines
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.
Quoted 297 lines
Quoted 13 lines · Grazvydas Ignotas
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 <[email protected]>
---
?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 ----------
Review
Quoted 3 lines
?7 files changed, 0 insertions(+), 109 deletions(-)
(quoted diff) +0 -0
b/include/configs/omap3_beagle.h
Quoted 8 lines
index 08d79ac..f8266b1 100644
include/configs/omap3_beagle.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_beagle.h +0 -0
@@ -310,21 +307,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 25 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_beagle.h +0 ~~-12~~
-/* 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;
include/configs/omap3_evm.h +0 -0
index 0d99f7d..39eb4b5 100644
@@ -295,9 +295,6 @@
?#define PISMO1_NAND_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M ?#define PISMO1_ONEN_SIZE ? ? ? ? ? ? ? GPMC_SIZE_128M
Quoted 1 line
-#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?520 ? ? /* max number of sectors
*/
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* on one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_evm.h +0 -0
@@ -314,21 +311,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?boot_flash_env_addr
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_evm.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_overo.h
Quoted 8 lines
index a43500b..b5b2dbe 100644
include/configs/omap3_overo.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_overo.h +0 -0
@@ -279,21 +276,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_overo.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_pandora.h
Quoted 8 lines
index 945c053..9e3ee99 100644
include/configs/omap3_pandora.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 9 lines
?#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 */
Quoted 1 line
?#define SMNAND_ENV_OFFSET ? ? ? ? ? ? ?0x240000 /* environment starts
here */
Quoted 6 lines
?#define CONFIG_SYS_ENV_SECT_SIZE ? ? ? boot_flash_sec ?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_pandora.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_sdp3430.h
Quoted 6 lines
index b4919db..e3a7073 100644
include/configs/omap3_sdp3430.h +0 -0
@@ -158,10 +158,6 @@
 ?#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?(128 << 20)
?#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?512 ? ? /* max sectors on one
chip */
Quoted 18 lines
include/configs/omap3_sdp3430.h +0 -4
-/* 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
include/configs/omap3_sdp3430.h +0 -0
@@ -337,9 +333,6 @@
?#define CONFIG_SYS_MONITOR_BASE ? ? ? ? ? ? ? ?CONFIG_SYS_FLASH_BASE ?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10)
include/configs/omap3_sdp3430.h +0 -3
-#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
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom1.h
Quoted 8 lines
index ae7ebf9..834d8f0 100644
include/configs/omap3_zoom1.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom1.h +0 -0
@@ -295,21 +292,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 17 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom1.h +0 ~~-12~~
-/* 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;
Review
Quoted 1 line
(quoted diff) +0 -0
b/include/configs/omap3_zoom2.h
Quoted 8 lines
index c88c732..865659f 100644
include/configs/omap3_zoom2.h +0 -0
@@ -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 */
Quoted 2 lines
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 2 ? ? ? /* max number of flash
banks */
Quoted 1 line
?#define CONFIG_SYS_MONITOR_LEN ? ? ? ? (256 << 10) ? ? /* Reserve 2
sectors */
Quoted 7 lines
?#define CONFIG_SYS_FLASH_BASE ? ? ? ? ?boot_flash_base
include/configs/omap3_zoom2.h +0 -0
@@ -262,13 +259,6 @@
?#define CONFIG_ENV_OFFSET ? ? ? ? ? ? ?boot_flash_off ?#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ? ? ? ? ?SMNAND_ENV_OFFSET
-/*---------------------------------------------------------------------
--
Quoted 13 lines
- * CFI FLASH driver setup
- */
include/configs/omap3_zoom2.h +0 -4
-/* 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