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 with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
board
/
sixnet
/
sixnet.c
diff --git
a/board/sixnet/sixnet.c
b/board/sixnet/sixnet.c
index
a25dffd
..
798e185
100644
(file)
--- a/
board/sixnet/sixnet.c
+++ b/
board/sixnet/sixnet.c
@@
-33,11
+33,13
@@
# include <status_led.h>
#endif
# include <status_led.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
#endif
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
#define ORMASK(size) ((-size) & OR_AM_MSK)
static long ram_size(ulong *, long);
#define ORMASK(size) ((-size) & OR_AM_MSK)
static long ram_size(ulong *, long);
@@
-73,9
+75,9
@@
int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
#error "SXNI855T has no PCMCIA port"
#error "SXNI855T has no PCMCIA port"
-#endif
/* CFG_CMD_PCMCIA */
+#endif
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-256,8
+258,6
@@
int board_postclk_init (void)
int misc_init_r (void)
{
int misc_init_r (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
char* s;
volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
char* s;
@@
-327,7
+327,7
@@
int misc_init_r (void)
return (0);
}
return (0);
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
void nand_init(void)
{
unsigned long totlen = nand_probe(CFG_DFLASH_BASE);
void nand_init(void)
{
unsigned long totlen = nand_probe(CFG_DFLASH_BASE);