diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-16 19:50:53 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-16 19:50:53 +0200 |
| commit | fc9970137c8f187b5938e4926224e0f3d46c3476 (patch) | |
| tree | 8d7a004483b1ec71ab7779cab468dece8382d13b /board/esd/hh405/hh405.c | |
| parent | 07bc20560cb9d3d186cca268c05c82762e8c55ad (diff) | |
| parent | d35b508a55508535b6e8445b718585d27df733d3 (diff) | |
| download | u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.zip u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.gz u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/esd/hh405/hh405.c')
| -rw-r--r-- | board/esd/hh405/hh405.c | 22 |
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 |