Skip to contentSkip to conversation

OMAP3: Remove legacy NAND defines

PATCH New Dirk Behme 2 participants 3 messages Apr 5, 2009

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 OMAP3: Remove legacy NAND defines

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

---

For Zoom1 it was already removed by

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

 include/configs/omap3_beagle.h  |   17 -----------------
 include/configs/omap3_evm.h     |   17 -----------------
 include/configs/omap3_overo.h   |   17 -----------------
 include/configs/omap3_pandora.h |   17 -----------------
 4 files changed, 68 deletions(-)
include/configs/omap3_beagle.h +0 -17
Index: u-boot-main/include/configs/omap3_beagle.h
===================================================================
@@ -306,21 +306,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 */
include/configs/omap3_evm.h +0 -17
Index: u-boot-main/include/configs/omap3_evm.h
===================================================================
@@ -299,23 +299,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
  *----------------------------------------------------------------------------
include/configs/omap3_overo.h +0 -17
Index: u-boot-main/include/configs/omap3_overo.h
===================================================================
@@ -293,21 +293,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 */
include/configs/omap3_pandora.h +0 -17
Index: u-boot-main/include/configs/omap3_pandora.h
===================================================================
@@ -295,21 +295,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 */
author
#2 lore raw

PATCH 1/1 OMAP3: Remove legacy NAND defines

Dear Jean-Christophe,

Quoted 10 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 8 lines · Dirk Behme

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

---

For Zoom1 it was already removed by

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

Scott can I apply this one or will you?

As Zoom1 was done by you, most probably it would be more consistent if you do this, too (via ARM git).

Dirk