From d3edb1fd150d6d656d18ebacc3b57e5aabd8c7a3 Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Fri, 16 Oct 2009 16:28:49 -0400 Subject: Fix configuration so that multiple flash chips can be enabled The original port only allowed you to enable the chip that contains the environment. This enables everything possible. It also adds configuration options to build for different environment locations by specifying the flash type during the configure step. --- board/da8xx/da8xx-evm/da850.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'board/da8xx/da8xx-evm/da850.c') diff --git a/board/da8xx/da8xx-evm/da850.c b/board/da8xx/da8xx-evm/da850.c index ccc464d124..94520d4f22 100644 --- a/board/da8xx/da8xx-evm/da850.c +++ b/board/da8xx/da8xx-evm/da850.c @@ -165,7 +165,7 @@ int board_init(void) #endif /* Async EMIF */ -#if defined(CONFIG_SYS_USE_NOR) +#if defined(CONFIG_CMD_FLASH) REG(PINMUX6) = 0x11111111; REG(PINMUX7) = 0x11111111; REG(PINMUX8) = 0x11111111; @@ -175,7 +175,7 @@ int board_init(void) REG(PINMUX12) = 0x11111111; REG(PINMUX5) &= 0x00FFFFFF; REG(PINMUX5) |= 0x11000000; -#elif defined(CONFIG_SYS_USE_NAND) +#else REG(PINMUX7) &= 0xFF00F00F; REG(PINMUX7) |= 0x00110110; REG(PINMUX9) = 0x11111111; -- cgit v1.2.3