Mercurial > ecos

changeset 511:403eb06720a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use QUICC functions unless QUICC HAL is present.
author gthomas
date Mon, 20 Jan 2003 11:13:07 +0000
parents 390fd9d82c7f
children 86bfbf46eeba
files packages/hal/powerpc/mpc8xx/current/ChangeLog packages/hal/powerpc/mpc8xx/current/src/variant.S
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog
+++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-20  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/variant.S: Be careful about using QUICC functions unless that
+	package is present (some MPC8xx platforms don't use it).
+
 2003-01-18  Bart Veer  <bartv@ecoscentric.com>
 
 	* src/variant.S: _mpc8xx_reset caused build failures with current
--- a/packages/hal/powerpc/mpc8xx/current/src/variant.S
+++ b/packages/hal/powerpc/mpc8xx/current/src/variant.S
@@ -10,7 +10,7 @@
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 2003 Bart Veer
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-## Copyright (C) 2002 Gary Thomas
+## Copyright (C) 2002, 2003 Gary Thomas
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -55,7 +55,10 @@
 #include <cyg/hal/arch.inc>
 #include <cyg/hal/ppc_regs.h>		/* on-chip resource layout, special */
 					/* registers, IMM layout...         */
+
+#ifdef CYGPKG_HAL_QUICC                
 #include <cyg/hal/quicc/ppc8xx.h>       /* more of the same */
+#endif        
         
 #---------------------------------------------------------------------------
 # Interrupt vector tables.
@@ -93,7 +96,8 @@ hal_interrupt_objects:
 
         .text                
         .globl  _mpc8xx_reset
-_mpc8xx_reset:                                                  
+_mpc8xx_reset:
+#ifdef CYGPKG_HAL_QUICC                
 	lwi     r4,CYGARC_REG_IMM_BASE  # base address of control registers
 
         // Enable checkstop reset
@@ -112,8 +116,11 @@ hal_interrupt_objects:
         lwi     r3,_end
 10:     nop
         lwzu    r3,4(r2)        // Force a memory access
-        b       10b        
-                        
+        b       10b
+#else
+10:     nop
+        b       10b
+#endif                        
 
 ##-----------------------------------------------------------------------------
 ## end of variant.S