This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
PowerPC/Viper - fix some powerup glitches
- From: Gary Thomas <gary at chez-thomas dot org>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 18 Jul 2002 10:01:17 -0600
- Subject: PowerPC/Viper - fix some powerup glitches
Index: hal/powerpc/quicc/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/quicc/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- hal/powerpc/quicc/current/ChangeLog 11 Jul 2002 16:39:24 -0000 1.23
+++ hal/powerpc/quicc/current/ChangeLog 18 Jul 2002 15:55:32 -0000
@@ -1,5 +1,10 @@
+2002-07-18 Gary Thomas <gary@chez-thomas.org>
+
+ * src/quicc_smc1.c (cyg_hal_scc1_init_channel): Fix init which
+ failed from power-up - wrong channel in CP command!
+
2002-07-11 Gary Thomas <gary@chez-thomas.org>
* src/quicc_smc1.c:
* include/quicc_smc1.h:
* cdl/hal_powerpc_quicc.cdl: Add support for SCC1 as a serial
Index: hal/powerpc/quicc/current/src/quicc_smc1.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/quicc/current/src/quicc_smc1.c,v
retrieving revision 1.20
diff -u -5 -p -r1.20 quicc_smc1.c
--- hal/powerpc/quicc/current/src/quicc_smc1.c 11 Jul 2002 16:39:24 -0000 1.20
+++ hal/powerpc/quicc/current/src/quicc_smc1.c 18 Jul 2002 15:53:40 -0000
@@ -243,11 +243,11 @@ cyg_hal_smc1_init_channel(struct port_in
regs->smc_smcmr = 0x4823;
/*
* Init Rx & Tx params for SMC1
*/
- eppc->cp_cr = 0x91;
+ eppc->cp_cr = QUICC_CPM_CR_INIT_TXRX | QUICC_CPM_SMC1 | QUICC_CPM_CR_BUSY;
info->irq = 0; // Interrupts not enabled
#ifndef CYGSEM_HAL_VIRTUAL_VECTOR_SUPPORT // remove below
#ifdef CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT
HAL_INTERRUPT_UNMASK( CYGNUM_HAL_INTERRUPT_CPM_SMC1 );
@@ -648,11 +648,11 @@ cyg_hal_scc1_init_channel(struct port_in
txbd->ctrl = 0x2000;
/*
* Init Rx & Tx params for SCC1
*/
- eppc->cp_cr = 0x41;
+ eppc->cp_cr = QUICC_CPM_CR_INIT_TXRX | QUICC_CPM_SCC1 | QUICC_CPM_CR_BUSY;
/*
* Clear any previous events. Mask interrupts.
* (Section 16.15.7.14 and 16.15.7.15)
*/
Index: hal/powerpc/viper/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/viper/current/ChangeLog,v
retrieving revision 1.10
diff -u -5 -p -r1.10 ChangeLog
--- hal/powerpc/viper/current/ChangeLog 11 Jul 2002 16:39:24 -0000 1.10
+++ hal/powerpc/viper/current/ChangeLog 18 Jul 2002 15:56:02 -0000
@@ -1,5 +1,9 @@
+2002-07-18 Gary Thomas <gary@chez-thomas.org>
+
+ * src/viper.S: Increase power-up delay before starting SDRAM.
+
2002-07-11 Gary Thomas <gary@chez-thomas.org>
* cdl/hal_powerpc_viper.cdl: Add SCC1 as a serial console port.
2002-06-27 Gary Thomas <gary@chez-thomas.org>
Index: hal/powerpc/viper/current/src/viper.S
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/viper/current/src/viper.S,v
retrieving revision 1.4
diff -u -5 -p -r1.4 viper.S
--- hal/powerpc/viper/current/src/viper.S 20 Jun 2002 23:11:16 -0000 1.4
+++ hal/powerpc/viper/current/src/viper.S 18 Jul 2002 13:03:02 -0000
@@ -359,11 +359,11 @@ FUNC_START( hal_hardware_init )
/* MF (0:11) = 0x00C = 12 = (47MHz/3.6864MHz)-1 */
lwi r3,0x00C04000
stw r3,PLPRCR(r4)
LED(0xE0)
- lwi r3,0x10000
+ lwi r3,0x40000
mtctr r3
10: nop
bdnz 10b
LED(0xE1)