This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Miscellaneous fixes
- From: Nick Garnett <nickg at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: 05 Feb 2003 18:36:41 +0000
- Subject: Miscellaneous fixes
The following are a bunch of minor fixes to make various redboot or
ecos targets compile again after suffering a little bitrot.
Index: e7t/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/e7t/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -r1.8 ChangeLog
--- e7t/current/ChangeLog 29 Jan 2003 12:45:02 -0000 1.8
+++ e7t/current/ChangeLog 5 Feb 2003 18:24:53 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * include/plf_io.h (CYGARC_PHYSICAL_ADDRESS): Added this
+ definition to keep redboot_linux_exec.c happy.
+
2003-01-29 John Dallaway <jld@ecoscentric.com>
* src/flash_cksum.tcl: Accommodate latest Cygwin Tcl shell
(tclsh83.exe)
Index: e7t/current/include/plf_io.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/e7t/current/include/plf_io.h,v
retrieving revision 1.4
diff -u -5 -r1.4 plf_io.h
--- e7t/current/include/plf_io.h 23 May 2002 23:01:52 -0000 1.4
+++ e7t/current/include/plf_io.h 5 Feb 2003 18:24:53 -0000
@@ -236,7 +236,12 @@
#define E7T_CACHE_SET0_ADDR 0x14000000
#define E7T_CACHE_SET1_ADDR 0x14800000
#define E7T_CACHE_TAG_ADDR 0x15000000
//-----------------------------------------------------------------------------
+// Memory map is 1-1
+
+#define CYGARC_PHYSICAL_ADDRESS(_x_) (_x_)
+
+//-----------------------------------------------------------------------------
// end of plf_io.h
#endif // CYGONCE_HAL_PLF_IO_H
Index: pid/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/pid/current/ChangeLog,v
retrieving revision 1.31
diff -u -5 -r1.31 ChangeLog
--- pid/current/ChangeLog 23 May 2002 23:02:10 -0000 1.31
+++ pid/current/ChangeLog 5 Feb 2003 18:24:57 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * include/plf_io.h (CYGARC_PHYSICAL_ADDRESS): Added this
+ definition to keep redboot_linux_exec.c happy.
+
2002-05-23 Jesper Skov <jskov@redhat.com>
* cdl/hal_arm_pid.cdl: Don't run cache tests.
2002-05-13 Jesper Skov <jskov@redhat.com>
Index: pid/current/include/plf_io.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/pid/current/include/plf_io.h,v
retrieving revision 1.2
diff -u -5 -r1.2 plf_io.h
--- pid/current/include/plf_io.h 23 May 2002 23:02:11 -0000 1.2
+++ pid/current/include/plf_io.h 5 Feb 2003 18:24:57 -0000
@@ -52,7 +52,13 @@
//
//####DESCRIPTIONEND####
//
//===========================================================================*/
+//-----------------------------------------------------------------------------
+// Memory map is 1-1
+
+#define CYGARC_PHYSICAL_ADDRESS(_x_) (_x_)
+
+//-----------------------------------------------------------------------------
#endif // CYGONCE_HAL_ARM_PID_PLF_IO_H
// EOF plf_io.h
Index: snds/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/snds/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -r1.3 ChangeLog
--- snds/current/ChangeLog 3 Oct 2002 16:19:48 -0000 1.3
+++ snds/current/ChangeLog 5 Feb 2003 18:24:57 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * include/plf_io.h (CYGARC_PHYSICAL_ADDRESS): Added this
+ definition to keep redboot_linux_exec.c happy.
+
2002-10-03 Jonathan Larmour <jifl@eCosCentric.com>
* include/pkgconf/mlt_arm_snds_ram.ldi: Add definition of heap1.
2002-05-07 Gary Thomas <gthomas@redhat.com>
Index: snds/current/include/plf_io.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/snds/current/include/plf_io.h,v
retrieving revision 1.2
diff -u -5 -r1.2 plf_io.h
--- snds/current/include/plf_io.h 23 May 2002 23:02:30 -0000 1.2
+++ snds/current/include/plf_io.h 5 Feb 2003 18:24:57 -0000
@@ -275,7 +275,12 @@
#define KS32C_CACHE_SET0_ADDR 0x14000000
#define KS32C_CACHE_SET1_ADDR 0x14800000
#define KS32C_CACHE_TAG_ADDR 0x15000000
//-----------------------------------------------------------------------------
+// Memory map is 1-1
+
+#define CYGARC_PHYSICAL_ADDRESS(_x_) (_x_)
+
+//-----------------------------------------------------------------------------
// end of plf_io.h
#endif // CYGONCE_HAL_PLF_IO_H
Index: xscale/iq80310/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/iq80310/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -r1.6 ChangeLog
--- xscale/iq80310/current/ChangeLog 4 Feb 2003 22:27:56 -0000 1.6
+++ xscale/iq80310/current/ChangeLog 5 Feb 2003 18:25:00 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * src/diag/iq80310.h: Added CYGONCE_IQ80310_H to avoid compilation
+ errors.
+
2003-01-31 Mark Salter <msalter@redhat.com>
* include/hal_platform_setup.h: Disabling of write buffer
is not necessary.
Index: xscale/iq80310/current/src/diag/iq80310.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/iq80310/current/src/diag/iq80310.h,v
retrieving revision 1.3
diff -u -5 -r1.3 iq80310.h
--- xscale/iq80310/current/src/diag/iq80310.h 22 Jan 2003 13:33:13 -0000 1.3
+++ xscale/iq80310/current/src/diag/iq80310.h 5 Feb 2003 18:25:00 -0000
@@ -1,5 +1,7 @@
+#ifndef CYGONCE_IQ80310_H
+#define CYGONCE_IQ80310_H
//=============================================================================
//
// iq80310.h - Cyclone Diagnostics
//
//=============================================================================
@@ -545,5 +547,6 @@
#define SAR8_ADDR 0x00001838
/* Reserved 0x0000183C through 0x000018FF */
+#endif /* CYGONCE_IQ80310_H */
Index: xscale/mpc50/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/mpc50/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -r1.1 ChangeLog
--- xscale/mpc50/current/ChangeLog 24 Jan 2003 18:47:54 -0000 1.1
+++ xscale/mpc50/current/ChangeLog 5 Feb 2003 18:25:00 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * cdl/hal_arm_xscale_mpc50.cdl: Changed compiler prefix to arm-elf
+ and added -mcpu=xscale to global flags.
+
2003-01-24 Knud Woehler <knud.woehler@microplex.de>
2003-01-24 Mark Salter <msalter@redhat.com>
* Initial import from Knud Woehler.
Index: xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl,v
retrieving revision 1.1
diff -u -5 -r1.1 hal_arm_xscale_mpc50.cdl
--- xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl 24 Jan 2003 18:47:54 -0000 1.1
+++ xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl 5 Feb 2003 18:25:00 -0000
@@ -139,32 +139,32 @@
cdl_option CYGBLD_GLOBAL_COMMAND_PREFIX {
display "Global command prefix"
flavor data
no_define
- default_value { "xscale-elf" }
+ default_value { "arm-elf" }
description "
This option specifies the command prefix used when
invoking the build tools."
}
cdl_option CYGBLD_GLOBAL_CFLAGS {
display "Global compiler flags"
flavor data
no_define
- default_value { "-Wall -Wpointer-arith -Wstrict-prototypes -Winline -Wundef -Woverloaded-virtual -g -O2 -fno-rtti -fno-exceptions -fvtable-gc -finit-priority -mapcs-frame" }
+ default_value { "-mcpu=xscale -Wall -Wpointer-arith -Wstrict-prototypes -Winline -Wundef -Woverloaded-virtual -g -O2 -fno-rtti -fno-exceptions -fvtable-gc -finit-priority -mapcs-frame" }
description "
This option controls the global compiler flags which are used to
compile all packages by default. Individual packages may define
options which override these global flags."
}
cdl_option CYGBLD_GLOBAL_LDFLAGS {
display "Global linker flags"
flavor data
no_define
- default_value { "-Wl,--gc-sections -Wl,-static -g -O2 -nostdlib" }
+ default_value { "-mcpu=xscale -Wl,--gc-sections -Wl,-static -g -O2 -nostdlib" }
description "
This option controls the global linker flags. Individual
packages may define options which override these global flags."
}
Index: sh4/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/sh/sh4/current/ChangeLog,v
retrieving revision 1.19
diff -u -5 -r1.19 ChangeLog
--- sh4/current/ChangeLog 6 Aug 2002 16:00:27 -0000 1.19
+++ sh4/current/ChangeLog 5 Feb 2003 18:27:53 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * include/var_cache.h: Added include for hal_io.h since this file
+ uses HAL_READ_UINT32() etc.
+
2002-08-06 Gary Thomas <gary@chez-thomas.org>
2002-08-06 Motoya Kurotsu <kurotsu@allied-telesis.co.jp>
* src/sh4_scif.c:
* include/sh4_scif.h: I/O channel data can't be constant - contains
Index: sh4/current/include/var_cache.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/sh/sh4/current/include/var_cache.h,v
retrieving revision 1.5
diff -u -5 -r1.5 var_cache.h
--- sh4/current/include/var_cache.h 23 May 2002 23:05:04 -0000 1.5
+++ sh4/current/include/var_cache.h 5 Feb 2003 18:27:53 -0000
@@ -60,10 +60,12 @@
#include <cyg/hal/sh_regs.h>
#include <cyg/hal/plf_cache.h>
+#include <cyg/hal/hal_io.h>
+
//=============================================================================
#ifndef HAL_DCACHE_DEFINED
#define HAL_DCACHE_SIZE CYGARC_SH_MOD_CAC_D_SIZE
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/eth/intel/i82544/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -r1.4 ChangeLog
--- ChangeLog 12 Nov 2002 17:38:39 -0000 1.4
+++ ChangeLog 5 Feb 2003 18:33:21 -0000
@@ -1,5 +1,10 @@
+2003-02-05 Nick Garnett <nickg@calivar.com>
+
+ * src/if_i82544.c (BUS_TO_VIRT): Added default definition of this
+ macro.
+
2002-11-12 Gary Thomas <gary@mlbassoc.com>
* src/if_i82544.c: Minor fixes - use HAL_DELAY_US(), additional
PCI device type (0x100D) which is present on the NPWR Linux Engine.
Index: src/if_i82544.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/eth/intel/i82544/current/src/if_i82544.c,v
retrieving revision 1.4
diff -u -5 -r1.4 if_i82544.c
--- src/if_i82544.c 12 Nov 2002 17:38:39 -0000 1.4
+++ src/if_i82544.c 5 Feb 2003 18:33:26 -0000
@@ -257,10 +257,14 @@
#define VIRT_TO_BUS( _x_ ) virt_to_bus((cyg_uint32)(_x_))
static inline cyg_uint32 virt_to_bus(cyg_uint32 p_memory)
{ return CYGARC_PHYSICAL_ADDRESS(p_memory); }
+#define BUS_TO_VIRT( _x_ ) bus_to_virt((cyg_uint32)(_x_))
+static inline cyg_uint32 bus_to_virt(cyg_uint32 p_bus)
+{ return CYGARC_UNCACHED_ADDRESS(p_bus); }
+
#endif // not defined CYGHWR_INTEL_I82544_PCI_VIRT_TO_BUS
// ------------------------------------------------------------------------
//
// 82544 REGISTER OFFSETS
--
Nick Garnett - eCos Kernel Architect
http://www.eCosCentric.com/