Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
This commit is contained in:
Wolfgang Denk
commit
d9d47d18e8
|
|
@ -342,7 +342,7 @@ cpu_init_f (void)
|
|||
#endif
|
||||
|
||||
#if defined(CONFIG_WATCHDOG)
|
||||
val = mfspr(tcr);
|
||||
val = mfspr(SPRN_TCR);
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
val |= 0xb8000000; /* generate system reset after 1.34 seconds */
|
||||
#elif defined(CONFIG_440EPX)
|
||||
|
|
@ -354,11 +354,11 @@ cpu_init_f (void)
|
|||
val &= ~0x30000000; /* clear WRC bits */
|
||||
val |= CONFIG_SYS_4xx_RESET_TYPE << 28; /* set board specific WRC type */
|
||||
#endif
|
||||
mtspr(tcr, val);
|
||||
mtspr(SPRN_TCR, val);
|
||||
|
||||
val = mfspr(tsr);
|
||||
val = mfspr(SPRN_TSR);
|
||||
val |= 0x80000000; /* enable watchdog timer */
|
||||
mtspr(tsr, val);
|
||||
mtspr(SPRN_TSR, val);
|
||||
|
||||
reset_4xx_watchdog();
|
||||
#endif /* CONFIG_WATCHDOG */
|
||||
|
|
|
|||
|
|
@ -67,13 +67,6 @@ static __inline__ void set_pit(unsigned long val)
|
|||
asm volatile("mtpit %0" : : "r" (val));
|
||||
}
|
||||
|
||||
|
||||
static __inline__ void set_tcr(unsigned long val)
|
||||
{
|
||||
asm volatile("mttcr %0" : : "r" (val));
|
||||
}
|
||||
|
||||
|
||||
static __inline__ void set_evpr(unsigned long val)
|
||||
{
|
||||
asm volatile("mtevpr %0" : : "r" (val));
|
||||
|
|
|
|||
|
|
@ -46,15 +46,6 @@ extern unsigned long search_exception_table(unsigned long);
|
|||
*/
|
||||
#define END_OF_MEM (gd->bd->bi_memstart + gd->bd->bi_memsize)
|
||||
|
||||
static __inline__ void set_tsr(unsigned long val)
|
||||
{
|
||||
#if defined(CONFIG_440)
|
||||
asm volatile("mtspr 0x150, %0" : : "r" (val));
|
||||
#else
|
||||
asm volatile("mttsr %0" : : "r" (val));
|
||||
#endif
|
||||
}
|
||||
|
||||
static __inline__ unsigned long get_esr(void)
|
||||
{
|
||||
unsigned long val;
|
||||
|
|
@ -364,7 +355,7 @@ DecrementerPITException(struct pt_regs *regs)
|
|||
/*
|
||||
* Reset PIT interrupt
|
||||
*/
|
||||
set_tsr(0x08000000);
|
||||
mtspr(SPRN_TSR, 0x08000000);
|
||||
|
||||
/*
|
||||
* Call timer_interrupt routine in interrupts.c
|
||||
|
|
|
|||
|
|
@ -155,7 +155,8 @@ int misc_init_r(void)
|
|||
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
|
||||
gd->bd->bi_flashoffset = 0;
|
||||
|
||||
#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
||||
#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) || \
|
||||
defined(CONFIG_SYS_RAMBOOT)
|
||||
mtdcr(EBC0_CFGADDR, PB3CR);
|
||||
#else
|
||||
mtdcr(EBC0_CFGADDR, PB0CR);
|
||||
|
|
@ -163,7 +164,8 @@ int misc_init_r(void)
|
|||
pbcr = mfdcr(EBC0_CFGDATA);
|
||||
size_val = ffs(gd->bd->bi_flashsize) - 21;
|
||||
pbcr = (pbcr & 0x0001ffff) | gd->bd->bi_flashstart | (size_val << 17);
|
||||
#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
||||
#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) || \
|
||||
defined(CONFIG_SYS_RAMBOOT)
|
||||
mtdcr(EBC0_CFGADDR, PB3CR);
|
||||
#else
|
||||
mtdcr(EBC0_CFGADDR, PB0CR);
|
||||
|
|
|
|||
|
|
@ -81,17 +81,6 @@
|
|||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_REGINFO
|
||||
|
||||
#if defined(CONFIG_SYS_RAMBOOT)
|
||||
/*
|
||||
* Disable NOR FLASH commands on RAM-booting version. One main reason for this
|
||||
* RAM-booting version is boards with NAND and without NOR. This image can
|
||||
* be used for initial NAND programming.
|
||||
*/
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#undef CONFIG_CMD_FLASH
|
||||
#undef CONFIG_CMD_IMLS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
|
|
@ -282,13 +271,13 @@
|
|||
"load=tftp 200000 ${u-boot}\0" \
|
||||
"update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;" \
|
||||
"era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;" \
|
||||
"cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}" \
|
||||
"cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \
|
||||
"upd=run load update\0" \
|
||||
|
||||
#define CONFIG_AMCC_DEF_ENV_NAND_UPD \
|
||||
"u-boot-nand=" xstr(CONFIG_HOSTNAME) "/u-boot-nand.bin\0" \
|
||||
"nload=tftp 200000 ${u-boot-nand}\0" \
|
||||
"nupdate=nand erase 0 100000;nand write 200000 0 100000" \
|
||||
"nupdate=nand erase 0 100000;nand write 200000 0 100000\0" \
|
||||
"nupd=run nload nupdate\0"
|
||||
|
||||
#endif /* __AMCC_COMMON_H */
|
||||
|
|
|
|||
|
|
@ -193,6 +193,17 @@
|
|||
#define CONFIG_SYS_POST_UART_TABLE { CONFIG_SYS_NS16550_COM1, \
|
||||
CONFIG_SYS_NS16550_COM2 }
|
||||
|
||||
#define CONFIG_POST_UART { \
|
||||
"UART test", \
|
||||
"uart", \
|
||||
"This test verifies the UART operation.", \
|
||||
POST_RAM | POST_SLOWTEST | POST_ALWAYS | POST_MANUAL, \
|
||||
&uart_post_test, \
|
||||
NULL, \
|
||||
NULL, \
|
||||
CONFIG_SYS_POST_UART \
|
||||
}
|
||||
|
||||
#define CONFIG_POST_WATCHDOG { \
|
||||
"Watchdog timer test", \
|
||||
"watchdog", \
|
||||
|
|
|
|||
|
|
@ -165,6 +165,9 @@ struct post_test post_list[] =
|
|||
},
|
||||
#endif
|
||||
#if CONFIG_POST & CONFIG_SYS_POST_UART
|
||||
#if defined(CONFIG_POST_UART)
|
||||
CONFIG_POST_UART,
|
||||
#else
|
||||
{
|
||||
"UART test",
|
||||
"uart",
|
||||
|
|
@ -175,6 +178,7 @@ struct post_test post_list[] =
|
|||
NULL,
|
||||
CONFIG_SYS_POST_UART
|
||||
},
|
||||
#endif /* CONFIG_POST_UART */
|
||||
#endif
|
||||
#if CONFIG_POST & CONFIG_SYS_POST_ETHER
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue