summaryrefslogtreecommitdiff
path: root/board/esd/hh405/hh405.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-16 11:42:47 +0200
committerWolfgang Denk <wd@denx.de>2007-08-16 11:42:47 +0200
commit4a3c7eb917de9cfd611cdd778c58253869587ad5 (patch)
tree8512d7ea2cdcbad35b9cbd4a090a533fe5108c2e /board/esd/hh405/hh405.c
parent2d78074d2e806edc380c1464eb9e5df335ece65e (diff)
parenta44e7a97c8cbbac3cbc32376dcaad0ec1f76f604 (diff)
downloadu-boot-imx-4a3c7eb917de9cfd611cdd778c58253869587ad5.zip
u-boot-imx-4a3c7eb917de9cfd611cdd778c58253869587ad5.tar.gz
u-boot-imx-4a3c7eb917de9cfd611cdd778c58253869587ad5.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-nand-flash
Diffstat (limited to 'board/esd/hh405/hh405.c')
-rw-r--r--board/esd/hh405/hh405.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index 9ef5907..67b5d54 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -5,7 +5,7 @@
* (C) Copyright 2005
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
- * (C) Copyright 2006
+ * (C) Copyright 2006-2007
* Matthias Fuchs, esd GmbH, matthias.fuchs@esd-electronics.com
*
* See file CREDITS for list of people who contributed to this
@@ -477,12 +477,6 @@ int misc_init_r (void)
out32(GPIO0_OR, in32(GPIO0_OR) | CFG_EEPROM_WP);
/*
- * Set NAND-FLASH GPIO signals to default
- */
- out32(GPIO0_OR, in32(GPIO0_OR) & ~(CFG_NAND_CLE | CFG_NAND_ALE));
- out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND_CE);
-
- /*
* Reset touch-screen controller
*/
out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_TOUCH_RST);
@@ -690,20 +684,6 @@ void ide_set_reset(int on)
#endif /* CONFIG_IDE_RESET */
-#if defined(CONFIG_CMD_NAND)
-#include <linux/mtd/nand_legacy.h>
-extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
-
-void nand_init(void)
-{
- nand_probe(CFG_NAND_BASE);
- if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) {
- print_size(nand_dev_desc[0].totlen, "\n");
- }
-}
-#endif
-
-
#if defined(CFG_EEPROM_WREN)
/* Input: <dev_addr> I2C address of EEPROM device to enable.
* <state> -1: deliver current state