projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked FSL Book-E TLB macros to be more readable
[oweals/u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index 1e7f172d6710df8d26a99473adefa7adf3b8751a..9aa67f93c0f66a6e5764cc1ee31a856da701f924 100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-35,13
+35,13
@@
#ifdef CONFIG_MPC5xxx
#include <mpc5xxx.h>
#endif
#ifdef CONFIG_MPC5xxx
#include <mpc5xxx.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_IDE)
+#if
defined(CONFI
G_CMD_IDE)
#include <ide.h>
#endif
#include <ide.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_SCSI)
+#if
defined(CONFI
G_CMD_SCSI)
#include <scsi.h>
#endif
#include <scsi.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
#include <kgdb.h>
#endif
#ifdef CONFIG_STATUS_LED
#include <kgdb.h>
#endif
#ifdef CONFIG_STATUS_LED
@@
-76,18
+76,18
@@
extern int update_flash_size (int flash_size);
#endif
extern int update_flash_size (int flash_size);
#endif
-#if defined(CONFIG_S
OLIDCARD
3)
+#if defined(CONFIG_S
C
3)
extern void sc3_read_eeprom(void);
#endif
extern void sc3_read_eeprom(void);
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_DOC)
+#if
defined(CONFI
G_CMD_DOC)
void doc_init (void);
#endif
#if defined(CONFIG_HARD_I2C) || \
defined(CONFIG_SOFT_I2C)
#include <i2c.h>
#endif
void doc_init (void);
#endif
#if defined(CONFIG_HARD_I2C) || \
defined(CONFIG_SOFT_I2C)
#include <i2c.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
void nand_init (void);
#endif
void nand_init (void);
#endif
@@
-118,7
+118,7
@@
extern ulong __init_end;
extern ulong _end;
ulong monitor_flash_len;
extern ulong _end;
ulong monitor_flash_len;
-#if
(CONFIG_COMMANDS & CF
G_CMD_BEDBUG)
+#if
defined(CONFI
G_CMD_BEDBUG)
#include <bedbug/type.h>
#endif
#include <bedbug/type.h>
#endif
@@
-139,10
+139,10
@@
static ulong mem_malloc_brk = 0;
*/
static void mem_malloc_init (void)
{
*/
static void mem_malloc_init (void)
{
- ulong dest_addr = CFG_MONITOR_BASE + gd->reloc_off;
-
- mem_malloc_end = dest_addr;
- mem_malloc_start =
dest_addr
- TOTAL_MALLOC_LEN;
+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+ mem_malloc_end = CFG_MONITOR_BASE + gd->reloc_off;
+#endif
+ mem_malloc_start =
mem_malloc_end
- TOTAL_MALLOC_LEN;
mem_malloc_brk = mem_malloc_start;
memset ((void *) mem_malloc_start,
mem_malloc_brk = mem_malloc_start;
memset ((void *) mem_malloc_start,
@@
-209,9
+209,12
@@
static int init_baudrate (void)
/***********************************************************************/
/***********************************************************************/
-#ifdef CONFIG_ADD_RAM_INFO
-void board_add_ram_info(int);
-#endif
+void __board_add_ram_info(int use_default)
+{
+ /* please define platform specific board_add_ram_info() */
+}
+void board_add_ram_info(int) __attribute__((weak, alias("__board_add_ram_info")));
+
static int init_func_ram (void)
{
static int init_func_ram (void)
{
@@
-224,9
+227,7
@@
static int init_func_ram (void)
if ((gd->ram_size = initdram (board_type)) > 0) {
print_size (gd->ram_size, "");
if ((gd->ram_size = initdram (board_type)) > 0) {
print_size (gd->ram_size, "");
-#ifdef CONFIG_ADD_RAM_INFO
board_add_ram_info(0);
board_add_ram_info(0);
-#endif
putc('\n');
return (0);
}
putc('\n');
return (0);
}
@@
-309,7
+310,9
@@
init_fnc_t *init_sequence[] = {
prt_8260_rsr,
prt_8260_clks,
#endif /* CONFIG_8260 */
prt_8260_rsr,
prt_8260_clks,
#endif /* CONFIG_8260 */
-
+#if defined(CONFIG_MPC83XX)
+ prt_83xx_rsr,
+#endif
checkcpu,
#if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks,
checkcpu,
#if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks,
@@
-376,7
+379,7
@@
void board_init_f (ulong bootflag)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
-#if !defined(CONFIG_CPM2)
+#if !defined(CONFIG_CPM2)
&& !defined(CONFIG_MPC83XX)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
@@
-564,7
+567,9
@@
void board_init_f (ulong bootflag)
bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */
bd->bi_plb_busfreq = gd->bus_clk;
bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */
bd->bi_plb_busfreq = gd->bus_clk;
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
+#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
+ defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
+ defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
bd->bi_pci_busfreq = get_PCI_freq ();
bd->bi_opbfreq = get_OPB_freq ();
#elif defined(CONFIG_XILINX_ML300)
bd->bi_pci_busfreq = get_PCI_freq ();
bd->bi_opbfreq = get_OPB_freq ();
#elif defined(CONFIG_XILINX_ML300)
@@
-618,7
+623,13
@@
void board_init_r (gd_t *id, ulong dest_addr)
bd = gd->bd;
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
bd = gd->bd;
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
+
+#if defined(CONFIG_RELOC_FIXUP_WORKS)
+ gd->reloc_off = 0;
+ mem_malloc_end = dest_addr;
+#else
gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
+#endif
#ifdef CONFIG_SERIAL_MULTI
serial_initialize();
#ifdef CONFIG_SERIAL_MULTI
serial_initialize();
@@
-777,7
+788,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
spi_init_r ();
#endif
spi_init_r ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
WATCHDOG_RESET ();
puts ("NAND: ");
nand_init(); /* go init the NAND */
WATCHDOG_RESET ();
puts ("NAND: ");
nand_init(); /* go init the NAND */
@@
-818,7
+829,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#endif /* CONFIG_405GP, CONFIG_405EP */
#endif /* CFG_EXTBDINFO */
#endif /* CONFIG_405GP, CONFIG_405EP */
#endif /* CFG_EXTBDINFO */
-#if defined(CONFIG_S
OLIDCARD
3)
+#if defined(CONFIG_S
C
3)
sc3_read_eeprom();
#endif
s = getenv ("ethaddr");
sc3_read_eeprom();
#endif
s = getenv ("ethaddr");
@@
-894,7
+905,8
@@
void board_init_r (gd_t *id, ulong dest_addr)
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
- defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
+ defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || \
+ defined(CONFIG_KUP4X) || defined(CONFIG_PCS440EP)
load_sernum_ethaddr ();
#endif
/* IP Address */
load_sernum_ethaddr ();
#endif
/* IP Address */
@@
-927,7
+939,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
- defined(CONFIG_S
OLIDCARD3)
|| \
+ defined(CONFIG_S
C3)
|| \
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
@@
-939,7
+951,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
hermes_start_lxt980 ((int) bd->bi_ethspeed);
#endif
hermes_start_lxt980 ((int) bd->bi_ethspeed);
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
WATCHDOG_RESET ();
puts ("KGDB: ");
kgdb_init ();
WATCHDOG_RESET ();
puts ("KGDB: ");
kgdb_init ();
@@
-959,7
+971,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
serial_buffered_init();
#endif
serial_buffered_init();
#endif
-#if
def CONFIG_STATUS_LED
+#if
defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)
status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);
#endif
status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);
#endif
@@
-971,27
+983,27
@@
void board_init_r (gd_t *id, ulong dest_addr)
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
-#endif
/* CFG_CMD_NET */
+#endif
WATCHDOG_RESET ();
WATCHDOG_RESET ();
-#if
(CONFIG_COMMANDS & CF
G_CMD_SCSI)
+#if
defined(CONFI
G_CMD_SCSI)
WATCHDOG_RESET ();
puts ("SCSI: ");
scsi_init ();
#endif
WATCHDOG_RESET ();
puts ("SCSI: ");
scsi_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_DOC)
+#if
defined(CONFI
G_CMD_DOC)
WATCHDOG_RESET ();
puts ("DOC: ");
doc_init ();
#endif
WATCHDOG_RESET ();
puts ("DOC: ");
doc_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
#if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET ();
puts ("Net: ");
#if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET ();
puts ("Net: ");
@@
-999,7
+1011,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
eth_initialize (bd);
#endif
eth_initialize (bd);
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET) && ( \
+#if
defined(CONFI
G_CMD_NET) && ( \
defined(CONFIG_CCM) || \
defined(CONFIG_ELPT860) || \
defined(CONFIG_EP8260) || \
defined(CONFIG_CCM) || \
defined(CONFIG_ELPT860) || \
defined(CONFIG_EP8260) || \
@@
-1024,13
+1036,14
@@
void board_init_r (gd_t *id, ulong dest_addr)
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
+#if defined(CONFIG_CMD_PCMCIA) \
+ && !defined(CONFIG_CMD_IDE)
WATCHDOG_RESET ();
puts ("PCMCIA:");
pcmcia_init ();
#endif
WATCHDOG_RESET ();
puts ("PCMCIA:");
pcmcia_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_IDE)
+#if
defined(CONFI
G_CMD_IDE)
WATCHDOG_RESET ();
# ifdef CONFIG_IDE_8xx_PCCARD
puts ("PCMCIA:");
WATCHDOG_RESET ();
# ifdef CONFIG_IDE_8xx_PCCARD
puts ("PCMCIA:");
@@
-1043,7
+1056,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#else
ide_init ();
#endif
#else
ide_init ();
#endif
-#endif
/* CFG_CMD_IDE */
+#endif
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
@@
-1055,7
+1068,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
last_stage_init ();
#endif
last_stage_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_BEDBUG)
+#if
defined(CONFI
G_CMD_BEDBUG)
WATCHDOG_RESET ();
bedbug_init ();
#endif
WATCHDOG_RESET ();
bedbug_init ();
#endif
@@
-1114,9
+1127,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
void hang (void)
{
puts ("### ERROR ### Please RESET the board ###\n");
void hang (void)
{
puts ("### ERROR ### Please RESET the board ###\n");
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
show_boot_progress(-30);
show_boot_progress(-30);
-#endif
for (;;);
}
for (;;);
}