projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
board
/
netta
/
netta.c
diff --git
a/board/netta/netta.c
b/board/netta/netta.c
index
4923e3a
..
bc31386
100644
(file)
--- a/
board/netta/netta.c
+++ b/
board/netta/netta.c
@@
-337,7
+337,7
@@
void check_ram(unsigned int addr, unsigned int size)
}
}
}
}
-
long in
t initdram(int board_type)
+
phys_size_
t initdram(int board_type)
{
volatile immap_t *immap = (immap_t *) CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
{
volatile immap_t *immap = (immap_t *) CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
@@
-555,7
+555,7
@@
int board_early_init_f(void)
return 0;
}
return 0;
}
-#if
(CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CF
G_NAND_LEGACY)
+#if
defined(CONFIG_CMD_NAND) && defined(CONFI
G_NAND_LEGACY)
#include <linux/mtd/nand_legacy.h>
#include <linux/mtd/nand_legacy.h>
@@
-570,7
+570,7
@@
void nand_init(void)
}
#endif
}
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
int pcmcia_init(void)
{
int pcmcia_init(void)
{