[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Dirk Behme]

Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
---

For Zoom1 it was already removed by

http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
http://lists.denx.de/pipermail/u-boot/2009-April/050871.html

Changes in v2:

- Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.

This version v2 makes all previous versions of this patch obsolete. 

 include/configs/omap3_beagle.h  |   29 -----------------------------
 include/configs/omap3_evm.h     |   29 -----------------------------
 include/configs/omap3_overo.h   |   30 ------------------------------
 include/configs/omap3_pandora.h |   29 -----------------------------
 4 files changed, 117 deletions(-)

Index: u-boot-main/include/configs/omap3_beagle.h
===================================================================
--- u-boot-main.orig/include/configs/omap3_beagle.h
+++ u-boot-main/include/configs/omap3_beagle.h
@@ -135,18 +135,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
 							/* devices */
-#define SECTORSIZE			512
-
-#define NAND_ALLOW_ERASE_ALL
-#define ADDR_COLUMN			1
-#define ADDR_PAGE			2
-#define ADDR_COLUMN_PAGE		3
-
-#define NAND_ChipID_UNKNOWN		0x00
-#define NAND_MAX_FLOORS			1
-#define NAND_MAX_CHIPS			1
-#define NAND_NO_RB			1
-#define CONFIG_SYS_NAND_WP
 
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
@@ -306,21 +294,4 @@ extern unsigned int boot_flash_sec;
 extern unsigned int boot_flash_type;
 #endif
 
-
-#define WRITE_NAND_COMMAND(d, adr)\
-			writel(d, &nand_cs_base->nand_cmd)
-#define WRITE_NAND_ADDRESS(d, adr)\
-			writel(d, &nand_cs_base->nand_adr)
-#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)
-#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
-
-/* Other NAND Access APIs */
-#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_DISABLE_CE(nand)
-#define NAND_ENABLE_CE(nand)
-#define NAND_WAIT_READY(nand)	udelay(10)
-
 #endif /* __CONFIG_H */
Index: u-boot-main/include/configs/omap3_evm.h
===================================================================
--- u-boot-main.orig/include/configs/omap3_evm.h
+++ u-boot-main/include/configs/omap3_evm.h
@@ -133,18 +133,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */
 							/* NAND devices */
-#define SECTORSIZE			512
-
-#define NAND_ALLOW_ERASE_ALL
-#define ADDR_COLUMN			1
-#define ADDR_PAGE			2
-#define ADDR_COLUMN_PAGE		3
-
-#define NAND_ChipID_UNKNOWN		0x00
-#define NAND_MAX_FLOORS			1
-#define NAND_MAX_CHIPS			1
-#define NAND_NO_RB			1
-#define CONFIG_SYS_NAND_WP
 
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
@@ -299,23 +287,6 @@ extern unsigned int boot_flash_sec;
 extern unsigned int boot_flash_type;
 #endif
 
-
-#define WRITE_NAND_COMMAND(d, adr)\
-			writel(d, &nand_cs_base->nand_cmd)
-#define WRITE_NAND_ADDRESS(d, adr)\
-			writel(d, &nand_cs_base->nand_adr)
-#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)
-#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
-
-/* Other NAND Access APIs */
-#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_DISABLE_CE(nand)
-#define NAND_ENABLE_CE(nand)
-#define NAND_WAIT_READY(nand)	udelay(10)
-
 /*----------------------------------------------------------------------------
  * SMSC9115 Ethernet from SMSC9118 family
  *----------------------------------------------------------------------------
Index: u-boot-main/include/configs/omap3_overo.h
===================================================================
--- u-boot-main.orig/include/configs/omap3_overo.h
+++ u-boot-main/include/configs/omap3_overo.h
@@ -122,19 +122,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND */
 						/* devices */
-#define SECTORSIZE			512
-
-#define NAND_ALLOW_ERASE_ALL
-#define ADDR_COLUMN			1
-#define ADDR_PAGE			2
-#define ADDR_COLUMN_PAGE		3
-
-#define NAND_ChipID_UNKNOWN		0x00
-#define NAND_MAX_FLOORS			1
-#define NAND_MAX_CHIPS			1
-#define NAND_NO_RB			1
-#define CONFIG_SYS_NAND_WP
-
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
 #define CONFIG_JFFS2_DEV		"nand0"
@@ -293,21 +280,4 @@ extern unsigned int boot_flash_sec;
 extern unsigned int boot_flash_type;
 #endif
 
-
-#define WRITE_NAND_COMMAND(d, adr)\
-			writel(d, &nand_cs_base->nand_cmd)
-#define WRITE_NAND_ADDRESS(d, adr)\
-			writel(d, &nand_cs_base->nand_adr)
-#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)
-#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
-
-/* Other NAND Access APIs */
-#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_DISABLE_CE(nand)
-#define NAND_ENABLE_CE(nand)
-#define NAND_WAIT_READY(nand)	udelay(10)
-
 #endif				/* __CONFIG_H */
Index: u-boot-main/include/configs/omap3_pandora.h
===================================================================
--- u-boot-main.orig/include/configs/omap3_pandora.h
+++ u-boot-main/include/configs/omap3_pandora.h
@@ -125,18 +125,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND */
 						/* devices */
-#define SECTORSIZE			512
-
-#define NAND_ALLOW_ERASE_ALL
-#define ADDR_COLUMN			1
-#define ADDR_PAGE			2
-#define ADDR_COLUMN_PAGE		3
-
-#define NAND_ChipID_UNKNOWN		0x00
-#define NAND_MAX_FLOORS			1
-#define NAND_MAX_CHIPS			1
-#define NAND_NO_RB			1
-#define CONFIG_SYS_NAND_WP
 
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
@@ -295,21 +283,4 @@ extern unsigned int boot_flash_sec;
 extern unsigned int boot_flash_type;
 #endif
 
-
-#define WRITE_NAND_COMMAND(d, adr)\
-			writel(d, &nand_cs_base->nand_cmd)
-#define WRITE_NAND_ADDRESS(d, adr)\
-			writel(d, &nand_cs_base->nand_adr)
-#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)
-#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
-
-/* Other NAND Access APIs */
-#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
-			while (0)
-#define NAND_DISABLE_CE(nand)
-#define NAND_ENABLE_CE(nand)
-#define NAND_WAIT_READY(nand)	udelay(10)
-
 #endif				/* __CONFIG_H */

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> 
> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> ---
> 
> For Zoom1 it was already removed by
> 
> http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
> http://lists.denx.de/pipermail/u-boot/2009-April/050871.html
> 
> Changes in v2:
> 
> - Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.
> 
> This version v2 makes all previous versions of this patch obsolete. 
will be apply on the next

Best Regards,
J.

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <20090417053017.GD31923@game.jcrosoft.org> you wrote:
> On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> > Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> > 
> > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> > ---
> > 
> > For Zoom1 it was already removed by
> > 
> > http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
> > http://lists.denx.de/pipermail/u-boot/2009-April/050871.html
> > 
> > Changes in v2:
> > 
> > - Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.
> > 
> > This version v2 makes all previous versions of this patch obsolete. 
> will be apply on the next

Why "next" ? As I understand, this fixes build problems in the
*current* tree?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"To IBM, 'open' means there is a modicum  of  interoperability  among
some of their equipment."                            - Harv Masterson

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Scott Wood]

On Mon, Apr 20, 2009 at 07:19:57AM +0200, Wolfgang Denk wrote:
> Dear Jean-Christophe PLAGNIOL-VILLARD,
> 
> In message <20090417053017.GD31923@game.jcrosoft.org> you wrote:
> > On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> > > Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> > > 
> > > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> > > ---
> > > 
> > > For Zoom1 it was already removed by
> > > 
> > > http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
> > > http://lists.denx.de/pipermail/u-boot/2009-April/050871.html
> > > 
> > > Changes in v2:
> > > 
> > > - Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.
> > > 
> > > This version v2 makes all previous versions of this patch obsolete. 
> > will be apply on the next
> 
> Why "next" ? As I understand, this fixes build problems in the
> *current* tree?

I don't think so -- my understanding is that these boards aren't
currently using legacy NAND; they just have some remnants of it that need
cleaning out.

-Scott

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:21 Mon 20 Apr     , Scott Wood wrote:
> On Mon, Apr 20, 2009 at 07:19:57AM +0200, Wolfgang Denk wrote:
> > Dear Jean-Christophe PLAGNIOL-VILLARD,
> > 
> > In message <20090417053017.GD31923@game.jcrosoft.org> you wrote:
> > > On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> > > > Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> > > > 
> > > > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> > > > ---
> > > > 
> > > > For Zoom1 it was already removed by
> > > > 
> > > > http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
> > > > http://lists.denx.de/pipermail/u-boot/2009-April/050871.html
> > > > 
> > > > Changes in v2:
> > > > 
> > > > - Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.
> > > > 
> > > > This version v2 makes all previous versions of this patch obsolete. 
> > > will be apply on the next
> > 
> > Why "next" ? As I understand, this fixes build problems in the
> > *current* tree?
> 
> I don't think so -- my understanding is that these boards aren't
> currently using legacy NAND; they just have some remnants of it that need
> cleaning out.
correct

as it's cosmetics change I've not in mind to apply them for the release but
the next

Best Regards,
J.

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Dirk Behme]

Dear Jean-Christophe,

Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:21 Mon 20 Apr     , Scott Wood wrote:
>> On Mon, Apr 20, 2009 at 07:19:57AM +0200, Wolfgang Denk wrote:
>>> Dear Jean-Christophe PLAGNIOL-VILLARD,
>>>
>>> In message <20090417053017.GD31923@game.jcrosoft.org> you wrote:
>>>> On 20:15 Tue 14 Apr     , Dirk Behme wrote:
>>>>> Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
>>>>>
>>>>> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
>>>>> ---
>>>>>
>>>>> For Zoom1 it was already removed by
>>>>>
>>>>> http://lists.denx.de/pipermail/u-boot/2009-April/050150.html
>>>>> http://lists.denx.de/pipermail/u-boot/2009-April/050871.html
>>>>>
>>>>> Changes in v2:
>>>>>
>>>>> - Remove even more legacy NAND defines. Thanks to Tom Rix for the hint.
>>>>>
>>>>> This version v2 makes all previous versions of this patch obsolete. 
>>>> will be apply on the next
>>> Why "next" ? As I understand, this fixes build problems in the
>>> *current* tree?
>> I don't think so -- my understanding is that these boards aren't
>> currently using legacy NAND; they just have some remnants of it that need
>> cleaning out.
> correct
> 
> as it's cosmetics change I've not in mind to apply them for the release but
> the next

Independent where it will be applied, it would be nice if you would do 
it *consistent*.

Same changes for Zoom1

http://lists.denx.de/pipermail/u-boot/2009-April/050159.html

were applied to current.

It's my understanding that 'next' is for preparation of new features 
to be merged next merge window? This is no new feature. It's even no 
bug fix. It's just removal of dead, unused marcos. So IMHO should be 
fine to be merged while -rc?

Where can I see 'next' in gitweb, btw?

Dirk

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> 
> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> ---
applied to arm/next

Best Regards,
J.

[U-Boot] [PATCH v2] OMAP3: Remove legacy NAND defines

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <20090426214652.GD32215@game.jcrosoft.org> you wrote:
> On 20:15 Tue 14 Apr     , Dirk Behme wrote:
> > Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.
> > 
> > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> > ---
> applied to arm/next

Could you please move this to master so we hanlde all boards
consistently? Zoom1 has the same change, and this went into master, if
I remember correctly.

And we can be generous and consider this cleanup to be a fix - and we
are pretty sure that it does not hurt anybody else.

Thanks in advance.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
We are Microsoft. Unix is irrelevant. Openness is futile.  Prepare to
be assimilated.