# HG changeset patch
# User msalter
# Date 1056978427 0
# Node ID f66c8d5a570d2d0eaad675b8ffe98ebd583a7a3f
# Parent  1ab73d8839594a63cef334c51355443556272d3f
ixp4xx port tweaks

diff --git a/packages/hal/arm/xscale/grg/current/ChangeLog b/packages/hal/arm/xscale/grg/current/ChangeLog
--- a/packages/hal/arm/xscale/grg/current/ChangeLog
+++ b/packages/hal/arm/xscale/grg/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-30  Mark Salter  <msalter@redhat.com>
+
+	* include/hal_platform_setup.h: Fix CYGINT_HAL_ARM_BIGENDIAN test.
+	Remove unused ROMRAM cruft.
+
 2003-04-04  Mark Salter  <msalter@redhat.com>
 
 	* include/grg.h: Add GPIO line definitions.
diff --git a/packages/hal/arm/xscale/grg/current/include/hal_platform_setup.h b/packages/hal/arm/xscale/grg/current/include/hal_platform_setup.h
--- a/packages/hal/arm/xscale/grg/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/xscale/grg/current/include/hal_platform_setup.h
@@ -63,7 +63,7 @@
 #include <cyg/hal/hal_mm.h>             // more MMU definitions
 #include <cyg/hal/grg.h>                // Platform specific hardware definitions
 
-#if defined(CYG_HAL_STARTUP_ROM) || defined(CYG_HAL_STARTUP_ROMRAM)
+#if defined(CYG_HAL_STARTUP_ROM)
 #define PLATFORM_SETUP1  _platform_setup1
 #define PLATFORM_EXTRAS  <cyg/hal/hal_platform_extras.h>
 #define CYGHWR_HAL_ARM_HAS_MMU
@@ -86,7 +86,7 @@
 // This macro represents the initial startup code for the platform        
 	.macro _platform_setup1
 
-#ifdef CYGINT_HAL_ARM_BIGENDIAN
+#if CYGINT_HAL_ARM_BIGENDIAN
         // set big-endian
 	mrc	p15, 0, r0, c1, c0, 0
         orr	r0, r0, #0x80
@@ -201,16 +201,6 @@
         str	r1, [r0, #IXP425_SDRAM_IR]
 	DELAY   0x10000, r1
 
-#if defined(CYG_HAL_STARTUP_ROMRAM)
-        ldr     r0,=0x00000000
-        ldr     r1,=0x10000000
-        ldr     r2,=__bss_start
-  0:    ldr     r3,[r0],#4
-        str     r3,[r1],#4
-        cmp     r0,r2
-        bne     0b
-#endif
-                
 	// value to load into pc to jump to real runtime address
 	ldr     r0, =1f
 
@@ -236,7 +226,6 @@ icache_boundary:
     0:  b       0b
     1:
 
-#if defined(CYG_HAL_STARTUP_ROM)
 	// Move mmu tables into RAM so page table walks by the cpu
 	// don't interfere with FLASH programming.
 	ldr	r0, =mmu_table
@@ -250,7 +239,6 @@ icache_boundary:
 	str	r3, [r1], #4
 	cmp	r0, r2
 	bne	1b
-#endif
 
         mcr     p15, 0, r0, c7, c10, 4  // drain the write & fill buffers
         CPWAIT  r0
diff --git a/packages/hal/arm/xscale/ixdp425/current/ChangeLog b/packages/hal/arm/xscale/ixdp425/current/ChangeLog
--- a/packages/hal/arm/xscale/ixdp425/current/ChangeLog
+++ b/packages/hal/arm/xscale/ixdp425/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-30  Mark Salter  <msalter@redhat.com>
+
+	* include/hal_platform_setup.h: Fix CYGINT_HAL_ARM_BIGENDIAN test.
+	Remove unused ROMRAM cruft.
+
 2003-05-15  Mark Salter  <msalter@redhat.com>
 
 	* src/ixdp425_misc.c (plf_hardware_init): Set EEPROM_SCL line high.
diff --git a/packages/hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h b/packages/hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h
--- a/packages/hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h
@@ -11,7 +11,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 //
 // 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
@@ -63,7 +63,7 @@
 #include <cyg/hal/hal_mm.h>             // more MMU definitions
 #include <cyg/hal/ixdp425.h>            // Platform specific hardware definitions
 
-#if defined(CYG_HAL_STARTUP_ROM) || defined(CYG_HAL_STARTUP_ROMRAM)
+#if defined(CYG_HAL_STARTUP_ROM)
 #define PLATFORM_SETUP1  _platform_setup1
 #define PLATFORM_EXTRAS  <cyg/hal/hal_platform_extras.h>
 #define CYGHWR_HAL_ARM_HAS_MMU
@@ -86,7 +86,7 @@
 // This macro represents the initial startup code for the platform        
 	.macro _platform_setup1
 
-#ifdef CYGINT_HAL_ARM_BIGENDIAN
+#if CYGINT_HAL_ARM_BIGENDIAN
         // set big-endian
 	mrc	p15, 0, r0, c1, c0, 0
         orr	r0, r0, #0x80
@@ -207,16 +207,6 @@
 
 	DISPLAY	0x1003, r7, r8
 
-#if defined(CYG_HAL_STARTUP_ROMRAM)
-        ldr     r0,=0x00000000
-        ldr     r1,=0x10000000
-        ldr     r2,=__bss_start
-  0:    ldr     r3,[r0],#4
-        str     r3,[r1],#4
-        cmp     r0,r2
-        bne     0b
-#endif
-                
 	// value to load into pc to jump to real runtime address
 	ldr     r0, =1f
 
@@ -246,7 +236,6 @@ icache_boundary:
 
 	DISPLAY	0x1004, r7, r8
 
-#if defined(CYG_HAL_STARTUP_ROM)
 	// Move mmu tables into RAM so page table walks by the cpu
 	// don't interfere with FLASH programming.
 	ldr	r0, =mmu_table
@@ -260,7 +249,6 @@ icache_boundary:
 	str	r3, [r1], #4
 	cmp	r0, r2
 	bne	1b
-#endif
 
 	DISPLAY	0x1005, r7, r8
 
diff --git a/packages/hal/arm/xscale/prpmc1100/current/ChangeLog b/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
--- a/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
+++ b/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-30  Mark Salter  <msalter@redhat.com>
+
+	* include/hal_platform_setup.h: Fix CYGINT_HAL_ARM_BIGENDIAN test.
+	Remove unused ROMRAM cruft.
+
 2003-04-06  Mark Salter  <msalter@redhat.com>
 
 	* src/prpmc1100_misc.c: Support serial EEPROM. Init GPIO.
diff --git a/packages/hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h b/packages/hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h
--- a/packages/hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h
@@ -63,7 +63,7 @@
 #include <cyg/hal/hal_mm.h>             // more MMU definitions
 #include <cyg/hal/prpmc1100.h>          // Platform specific hardware definitions
 
-#if defined(CYG_HAL_STARTUP_ROM) || defined(CYG_HAL_STARTUP_ROMRAM)
+#if defined(CYG_HAL_STARTUP_ROM)
 #define PLATFORM_SETUP1  _platform_setup1
 #define PLATFORM_EXTRAS  <cyg/hal/hal_platform_extras.h>
 #define CYGHWR_HAL_ARM_HAS_MMU
@@ -86,7 +86,7 @@
 // This macro represents the initial startup code for the platform        
 	.macro _platform_setup1
 
-#ifdef CYGINT_HAL_ARM_BIGENDIAN
+#if CYGINT_HAL_ARM_BIGENDIAN
         // set big-endian
 	mrc	p15, 0, r0, c1, c0, 0
         orr	r0, r0, #0x80
@@ -201,16 +201,6 @@
         str	r1, [r0, #IXP425_SDRAM_IR]
 	DELAY   0x10000, r1
 
-#if defined(CYG_HAL_STARTUP_ROMRAM)
-        ldr     r0,=0x00000000
-        ldr     r1,=0x10000000
-        ldr     r2,=__bss_start
-  0:    ldr     r3,[r0],#4
-        str     r3,[r1],#4
-        cmp     r0,r2
-        bne     0b
-#endif
-                
 	// value to load into pc to jump to real runtime address
 	ldr     r0, =1f
 
@@ -236,7 +226,6 @@ icache_boundary:
     0:  b       0b
     1:
 
-#if defined(CYG_HAL_STARTUP_ROM)
 	// Move mmu tables into RAM so page table walks by the cpu
 	// don't interfere with FLASH programming.
 	ldr	r0, =mmu_table
@@ -250,7 +239,6 @@ icache_boundary:
 	str	r3, [r1], #4
 	cmp	r0, r2
 	bne	1b
-#endif
 
         mcr     p15, 0, r0, c7, c10, 4  // drain the write & fill buffers
         CPWAIT  r0