diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/freescale/m5373evb/nand.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
	drivers/usb/usb_ohci.c
Diffstat (limited to 'board/freescale/m5373evb/nand.c')
| -rw-r--r-- | board/freescale/m5373evb/nand.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c index 404a9c386..d01b819ec 100644 --- a/board/freescale/m5373evb/nand.c +++ b/board/freescale/m5373evb/nand.c @@ -67,7 +67,7 @@ int board_nand_init(struct nand_chip *nand)  	volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;  	volatile fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS; -	*((volatile u16 *)CFG_LATCH_ADDR) |= 0x0004; +	*((volatile u16 *)CONFIG_SYS_LATCH_ADDR) |= 0x0004;  	fbcs->csmr2 &= ~FBCS_CSMR_WP;  	/* set up pin configuration */ |