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 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
lib_m68k
/
board.c
diff --git
a/lib_m68k/board.c
b/lib_m68k/board.c
index
d27c89c
..
fa6ab6b
100644
(file)
--- a/
lib_m68k/board.c
+++ b/
lib_m68k/board.c
@@
-59,6
+59,12
@@
#include <i2c.h>
#endif
#include <i2c.h>
#endif
+#ifdef CONFIG_CMD_SPI
+#include <spi.h>
+#endif
+
+#include <nand.h>
+
DECLARE_GLOBAL_DATA_PTR;
static char *failed = "*** failed ***\n";
DECLARE_GLOBAL_DATA_PTR;
static char *failed = "*** failed ***\n";
@@
-69,10
+75,10
@@
extern flash_info_t flash_info[];
#include <environment.h>
#include <environment.h>
-#if ( ((C
FG_ENV_ADDR+CF
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
- (C
F
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
- defined(C
F
G_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
F
G_ENV_SIZE)
+#if ( ((C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
+ (C
ONFI
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+ defined(C
ONFI
G_ENV_IS_IN_NVRAM)
+#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
ONFI
G_ENV_SIZE)
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
@@
-136,23
+142,6
@@
void *sbrk (ptrdiff_t increment)
return ((void *)old);
}
return ((void *)old);
}
-char *strmhz(char *buf, long hz)
-{
- long l, n;
- long m;
-
- n = hz / 1000000L;
-
- l = sprintf (buf, "%ld", n);
-
- m = (hz % 1000000L) / 1000L;
-
- if (m != 0)
- sprintf (buf+l, ".%03ld", m);
-
- return (buf);
-}
-
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
@@
-212,6
+201,16
@@
static int init_func_i2c (void)
}
#endif
}
#endif
+#if defined(CONFIG_HARD_SPI)
+static int init_func_spi (void)
+{
+ puts ("SPI: ");
+ spi_init ();
+ puts ("ready\n");
+ return (0);
+}
+#endif
+
/***********************************************************************/
/************************************************************************
/***********************************************************************/
/************************************************************************
@@
-231,6
+230,9
@@
init_fnc_t *init_sequence[] = {
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
init_func_i2c,
#endif
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
init_func_i2c,
#endif
+#if defined(CONFIG_HARD_SPI)
+ init_func_spi,
+#endif
init_func_ram,
#if defined(CFG_DRAM_TEST)
testdram,
init_func_ram,
#if defined(CFG_DRAM_TEST)
testdram,
@@
-347,11
+349,11
@@
board_init_f (ulong bootflag)
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
- debug ("Reserving %
d
Bytes for Board Info at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Board Info at: %08lx\n",
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
- debug ("Reserving %
d
Bytes for Global Data at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Global Data at: %08lx\n",
sizeof (gd_t), addr_sp);
/* Reserve memory for boot params. */
sizeof (gd_t), addr_sp);
/* Reserve memory for boot params. */
@@
-441,7
+443,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
int i;
extern void malloc_bin_reloc (void);
int i;
extern void malloc_bin_reloc (void);
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
extern char * env_name_spec;
#endif
#ifndef CFG_NO_FLASH
extern char * env_name_spec;
#endif
#ifndef CFG_NO_FLASH
@@
-492,7
+494,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#endif
}
/* there are some other pointer constants we must deal with */
#endif
}
/* there are some other pointer constants we must deal with */
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off;
#endif
env_name_spec += gd->reloc_off;
#endif
@@
-566,7
+568,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
malloc_bin_reloc ();
#ifdef CONFIG_SPI
malloc_bin_reloc ();
#ifdef CONFIG_SPI
-# if !defined(C
F
G_ENV_IS_IN_EEPROM)
+# if !defined(C
ONFI
G_ENV_IS_IN_EEPROM)
spi_init_f ();
# endif
spi_init_r ();
spi_init_f ();
# endif
spi_init_r ();