2004-11-23 Richard Campbell <richard.campbell@oarcorp.com>

* startup/bspstart.c: Removed mpc824x conditionals around call to
	L1_caches_enables, conditionals are now in mmuAsm.S.
 	* vme/VMEConfig.h: Set up VME A16, A24 and A32 windows at different
	locations for mvme2100.
	* vme/vmeconfig.c: Fixed spelling.
This commit is contained in:
Joel Sherrill
2004-11-23 15:44:50 +00:00
parent 21b54fc117
commit 0bedb7eced
4 changed files with 18 additions and 9 deletions

View File

@@ -1,3 +1,11 @@
2004-11-23 Richard Campbell <richard.campbell@oarcorp.com>
* startup/bspstart.c: Removed mpc824x conditionals around call to
L1_caches_enables, conditionals are now in mmuAsm.S.
* vme/VMEConfig.h: Set up VME A16, A24 and A32 windows at different
locations for mvme2100.
* vme/vmeconfig.c: Fixed spelling.
2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com>
* ChangeLog, Makefile.am, bootloader/misc.c, bootloader/pci.c, * ChangeLog, Makefile.am, bootloader/misc.c, bootloader/pci.c,

View File

@@ -244,9 +244,7 @@ unsigned int get_eumbbar() {
void bsp_start( void ) void bsp_start( void )
{ {
unsigned char *stack; unsigned char *stack;
#if !defined(mpc8240) && !defined(mpc8245)
unsigned l2cr; unsigned l2cr;
#endif
register unsigned char* intrStack; register unsigned char* intrStack;
unsigned char *work_space_start; unsigned char *work_space_start;
ppc_cpu_id_t myCpu; ppc_cpu_id_t myCpu;
@@ -271,7 +269,6 @@ void bsp_start( void )
{ unsigned v = 0x3000 ; _CPU_MSR_SET(v); } { unsigned v = 0x3000 ; _CPU_MSR_SET(v); }
#endif #endif
#if !defined(mpc8240) && !defined(mpc8245)
/* /*
* enables L1 Cache. Note that the L1_caches_enables() codes checks for * enables L1 Cache. Note that the L1_caches_enables() codes checks for
* relevant CPU type so that the reason why there is no use of myCpu... * relevant CPU type so that the reason why there is no use of myCpu...
@@ -288,7 +285,6 @@ void bsp_start( void )
#endif #endif
if ( (! (l2cr & 0x80000000)) && ((int) l2cr == -1)) if ( (! (l2cr & 0x80000000)) && ((int) l2cr == -1))
set_L2CR(0xb9A14000); set_L2CR(0xb9A14000);
#endif
/* /*
* the initial stack has already been set to this value in start.S * the initial stack has already been set to this value in start.S

View File

@@ -11,10 +11,15 @@
* hardcoded window lengths that match this * hardcoded window lengths that match this
* layout: * layout:
*/ */
#define _VME_A32_WIN0_ON_PCI 0x10000000 #if defined(mvme2100)
#define _VME_A24_ON_PCI 0x1f000000 #define _VME_A32_WIN0_ON_PCI 0x80000000
#define _VME_A16_ON_PCI 0x1fff0000 #define _VME_A24_ON_PCI 0x8f000000
#define _VME_A16_ON_PCI 0x8fff0000
#else
#define _VME_A32_WIN0_ON_PCI 0x10000000
#define _VME_A24_ON_PCI 0x1f000000
#define _VME_A16_ON_PCI 0x1fff0000
#endif
/* start of the A32 window on the VME bus /* start of the A32 window on the VME bus
* TODO: this should perhaps be a configuration option * TODO: this should perhaps be a configuration option
*/ */

View File

@@ -93,7 +93,7 @@ union {
vmeUniverseMasterPortsShow(0); vmeUniverseMasterPortsShow(0);
vmeUniverseSlavePortsShow(0); vmeUniverseSlavePortsShow(0);
/* install the VME insterrupt manager */ /* install the VME interrupt manager */
vmeUniverseInstallIrqMgr(0,5,1,6); vmeUniverseInstallIrqMgr(0,5,1,6);
if (vmeUniverse0PciIrqLine<0) if (vmeUniverse0PciIrqLine<0)
BSP_panic("Unable to get interrupt line info from PCI config"); BSP_panic("Unable to get interrupt line info from PCI config");