diff options
author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 16:38:46 -0500 |
---|---|---|
committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-22 11:25:35 -0500 |
commit | 405bb978ee2321b6cf5381a012c812bdc7679e40 (patch) | |
tree | fcab2b9817cbadafc512f39972468ea9ccecc8d5 /board/at91sam9261ek | |
parent | 3c7ac4df9c9718e0bf11705a1a4d0e4b9dae700f (diff) |
Fix various configuration problems with Atmel patch
The CMD API has changed significantly since the patches were originally written. This fixes these problems and cleans up the code a little.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'board/at91sam9261ek')
-rw-r--r-- | board/at91sam9261ek/at91sam9261ek.c | 4 | ||||
-rw-r--r-- | board/at91sam9261ek/nand.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/board/at91sam9261ek/at91sam9261ek.c b/board/at91sam9261ek/at91sam9261ek.c index 003f846b82..b7ef19291c 100644 --- a/board/at91sam9261ek/at91sam9261ek.c +++ b/board/at91sam9261ek/at91sam9261ek.c @@ -130,8 +130,8 @@ int board_late_init(void) DECLARE_GLOBAL_DATA_PTR; /* Fix Ethernet Initialization Bug when starting Linux from U-Boot */ -#if (CONFIG_COMMANDS & CFG_CMD_NET) -#ifdef CONFIG_DRIVER_DM9000 +#ifdef CONFIG_CMD_NET +#ifdef CONFIG_DRIVER_DM9000 /* configure SMC's NCS2 to use it with DM9000 chip */ at91sam9261ek_dm9000_init(); #endif diff --git a/board/at91sam9261ek/nand.c b/board/at91sam9261ek/nand.c index ee33961000..1ae7e6119a 100644 --- a/board/at91sam9261ek/nand.c +++ b/board/at91sam9261ek/nand.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/arch/hardware.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#ifdef CONFIG_CMD_NAND #include <nand.h> @@ -100,7 +100,7 @@ static int at91sam9261ek_nand_ready(struct mtd_info *mtd) return (*AT91C_PIOC_PDSR & AT91C_PIO_PC15); } -void board_nand_init(struct nand_chip *nand) +int board_nand_init(struct nand_chip *nand) { /* Init due to switch 8/16 bits mode */ if (nand->write_byte) @@ -120,5 +120,7 @@ void board_nand_init(struct nand_chip *nand) nand->chip_delay = 18; at91sam9261ek_nand_init(nand); + + return 0; } #endif |