This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
ixp4xx port tweaks
- From: Mark Salter <msalter at redhat dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Mon, 30 Jun 2003 09:07:46 -0400 (EDT)
- Subject: ixp4xx port tweaks
Index: hal/arm/xscale/grg/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/grg/current/ChangeLog,v
retrieving revision 1.3
diff -u -p -5 -r1.3 ChangeLog
--- hal/arm/xscale/grg/current/ChangeLog 4 Apr 2003 14:52:31 -0000 1.3
+++ hal/arm/xscale/grg/current/ChangeLog 30 Jun 2003 12:56:24 -0000
@@ -1,5 +1,10 @@
+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.
* include/hal_plf_ints.h: Add GPIO IRQ definitions.
* src/grg_misc.c (plf_hardware_init): Initialize GPIO lines.
Index: hal/arm/xscale/grg/current/include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/grg/current/include/hal_platform_setup.h,v
retrieving revision 1.1
diff -u -p -5 -r1.1 hal_platform_setup.h
--- hal/arm/xscale/grg/current/include/hal_platform_setup.h 18 Mar 2003 13:10:03 -0000 1.1
+++ hal/arm/xscale/grg/current/include/hal_platform_setup.h 30 Jun 2003 12:56:24 -0000
@@ -61,11 +61,11 @@
#include <cyg/hal/hal_ixp425.h> // Variant specific hardware definitions
#include <cyg/hal/hal_mmu.h> // MMU definitions
#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
// ------------------------------------------------------------------------
@@ -84,11 +84,11 @@
// ------------------------------------------------------------------------
// 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
mcr p15, 0, r0, c1, c0, 0
CPWAIT r0
@@ -199,20 +199,10 @@
// start normal operation
mov r1, #SDRAM_IR_NORMAL
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
// Setup EXP_CNFG0 value to switch EXP bus out of low memory
ldr r2, =IXP425_EXP_CFG_BASE
@@ -234,11 +224,10 @@ icache_boundary:
nop
// display FFFF and loop forever.
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
add r2, r0, #0x4000 // End of tables
mov r1, #SDRAM_PHYS_BASE
@@ -248,11 +237,10 @@ icache_boundary:
1:
ldr r3, [r0], #4
str r3, [r1], #4
cmp r0, r2
bne 1b
-#endif
mcr p15, 0, r0, c7, c10, 4 // drain the write & fill buffers
CPWAIT r0
// Set the TTB register to DRAM mmu_table
Index: hal/arm/xscale/ixdp425/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/ixdp425/current/ChangeLog,v
retrieving revision 1.5
diff -u -p -5 -r1.5 ChangeLog
--- hal/arm/xscale/ixdp425/current/ChangeLog 15 May 2003 18:46:58 -0000 1.5
+++ hal/arm/xscale/ixdp425/current/ChangeLog 30 Jun 2003 12:56:24 -0000
@@ -1,5 +1,10 @@
+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.
(eeprom_stop): Leave EEPROM_SCL line high.
Index: hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h,v
retrieving revision 1.1
diff -u -p -5 -r1.1 hal_platform_setup.h
--- hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h 18 Mar 2003 13:10:03 -0000 1.1
+++ hal/arm/xscale/ixdp425/current/include/hal_platform_setup.h 30 Jun 2003 12:56:26 -0000
@@ -9,11 +9,11 @@
//
//=============================================================================
//####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
// Software Foundation; either version 2 or (at your option) any later version.
//
@@ -61,11 +61,11 @@
#include <cyg/hal/hal_ixp425.h> // Variant specific hardware definitions
#include <cyg/hal/hal_mmu.h> // MMU definitions
#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
// ------------------------------------------------------------------------
@@ -84,11 +84,11 @@
// ------------------------------------------------------------------------
// 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
mcr p15, 0, r0, c1, c0, 0
CPWAIT r0
@@ -205,20 +205,10 @@
str r1, [r0, #IXP425_SDRAM_IR]
DELAY 0x10000, r1
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
// Setup EXP_CNFG0 value to switch EXP bus out of low memory
ldr r2, =IXP425_EXP_CFG_BASE
@@ -244,11 +234,10 @@ icache_boundary:
0: b 0b
1:
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
add r2, r0, #0x4000 // End of tables
mov r1, #SDRAM_PHYS_BASE
@@ -258,11 +247,10 @@ icache_boundary:
1:
ldr r3, [r0], #4
str r3, [r1], #4
cmp r0, r2
bne 1b
-#endif
DISPLAY 0x1005, r7, r8
mcr p15, 0, r0, c7, c10, 4 // drain the write & fill buffers
CPWAIT r0
Index: hal/arm/xscale/prpmc1100/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/prpmc1100/current/ChangeLog,v
retrieving revision 1.1
diff -u -p -5 -r1.1 ChangeLog
--- hal/arm/xscale/prpmc1100/current/ChangeLog 5 Jun 2003 13:21:25 -0000 1.1
+++ hal/arm/xscale/prpmc1100/current/ChangeLog 30 Jun 2003 12:56:26 -0000
@@ -1,5 +1,10 @@
+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.
* src/prpmc1100_pci.c: Support both monarch and non-monarch modes.
* include/prpmc1100.h: Add GPIO defines. Add CTL/STS register defines.
Index: hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h,v
retrieving revision 1.1
diff -u -p -5 -r1.1 hal_platform_setup.h
--- hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h 5 Jun 2003 13:21:26 -0000 1.1
+++ hal/arm/xscale/prpmc1100/current/include/hal_platform_setup.h 30 Jun 2003 12:56:26 -0000
@@ -61,11 +61,11 @@
#include <cyg/hal/hal_ixp425.h> // Variant specific hardware definitions
#include <cyg/hal/hal_mmu.h> // MMU definitions
#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
// ------------------------------------------------------------------------
@@ -84,11 +84,11 @@
// ------------------------------------------------------------------------
// 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
mcr p15, 0, r0, c1, c0, 0
CPWAIT r0
@@ -199,20 +199,10 @@
// start normal operation
mov r1, #SDRAM_IR_NORMAL
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
// Setup EXP_CNFG0 value to switch EXP bus out of low memory
ldr r2, =IXP425_EXP_CFG_BASE
@@ -234,11 +224,10 @@ icache_boundary:
nop
// display FFFF and loop forever.
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
add r2, r0, #0x4000 // End of tables
mov r1, #SDRAM_PHYS_BASE
@@ -248,11 +237,10 @@ icache_boundary:
1:
ldr r3, [r0], #4
str r3, [r1], #4
cmp r0, r2
bne 1b
-#endif
mcr p15, 0, r0, c7, c10, 4 // drain the write & fill buffers
CPWAIT r0
// Set the TTB register to DRAM mmu_table