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

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
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(-)
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 @@ -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 */ 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 @@ -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 *---------------------------------------------------------------------------- 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 @@ -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 */ 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 @@ -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 */

On 07:38 Sun 05 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
Scott can I apply this one or will you?
Best Regards, J.

Dear Jean-Christophe,
Jean-Christophe PLAGNIOL-VILLARD wrote:
On 07:38 Sun 05 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
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
participants (2)
-
Dirk Behme
-
Jean-Christophe PLAGNIOL-VILLARD