This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Re: eCos + LPC21xx footprint
- From: Jani Monoses <jani at iv dot ro>
- To: Andrew Lunn <andrew at lunn dot ch>
- Cc: ecos-patches at ecos dot sourceware dot org
- Date: Mon, 15 Nov 2004 11:21:46 +0200
- Subject: Re: eCos + LPC21xx footprint
- References: <20041013115625.F06C941BF2@kraid.nerim.net> <416D1E5B.2000703@iv.ro> <418F8552.5050401@iv.ro> <20041114121207.GA22395@lunn.ch>
thanks.
Jani, please could you checkout the 'htdocs/boards' and create
descriptions of these two targets.
Which CVS module is that in?
Attached is a patch containing some changes I made since I last sent it.
fix thumb build, RAM startup for p2106, a warning fix, and vendor name fix.
I have just commited it.
Jani
Index: devs/serial/arm/lpc2xxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/lpc2xxx/current/ChangeLog,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog
--- devs/serial/arm/lpc2xxx/current/ChangeLog 14 Nov 2004 14:12:13 -0000 1.1
+++ devs/serial/arm/lpc2xxx/current/ChangeLog 15 Nov 2004 09:08:47 -0000
@@ -1,3 +1,8 @@
+2004-11-15 Jani Monoses <jani@iv.ro>
+
+ * include/arm_lpc2xxx_ser.inl:
+ Get rid of unused external function declaration.
+
2004-09-12 Jani Monoses <jani@iv.ro>
* include/arm_lpc2xxx_ser.inl:
Index: devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl,v
retrieving revision 1.1
diff -u -r1.1 arm_lpc2xxx_ser.inl
--- devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl 14 Nov 2004 14:12:14 -0000 1.1
+++ devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl 15 Nov 2004 09:08:47 -0000
@@ -81,7 +81,6 @@
// we need dynamically generated divider values because they depend on the
// value of pclk which in turn is changeable
-externC int cyg_var_baud_generator(int baud);
#define CYG_IO_SERIAL_GENERIC_16X5X_BAUD_GENERATOR \
CYG_HAL_ARM_LPC2XXX_BAUD_GENERATOR
Index: hal/arm/lpc2xxx/mcb2100/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/mcb2100/current/ChangeLog,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog
--- hal/arm/lpc2xxx/mcb2100/current/ChangeLog 14 Nov 2004 14:13:27 -0000 1.1
+++ hal/arm/lpc2xxx/mcb2100/current/ChangeLog 15 Nov 2004 09:08:49 -0000
@@ -1,3 +1,8 @@
+2004-11-15 Jani Monoses <jani@iv.ro>
+
+ * include/hal_platform_setup.h:
+ Fix build in THUMB mode by using ldr instead of mov.
+
2004-09-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_lpc2xxx_mcb2100.cdl:
Index: hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h,v
retrieving revision 1.1
diff -u -r1.1 hal_platform_setup.h
--- hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h 14 Nov 2004 14:13:28 -0000 1.1
+++ hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h 15 Nov 2004 09:08:49 -0000
@@ -59,7 +59,7 @@
.macro _led_init
ldr r0,=CYGARC_HAL_LPC2XXX_REG_IO_BASE
- mov r1,#0x00FF0000 // GPIO1 pins
+ ldr r1,#0x00FF0000 // GPIO1 pins
// 16..23
// outputs
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IO1DIR]
@@ -67,9 +67,9 @@
.macro _led x
ldr r0,=CYGARC_HAL_LPC2XXX_REG_IO_BASE
- mov r1,#0x00FF0000
+ ldr r1,#0x00FF0000
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IO1CLR]
- mov r1,#(\x<<16)
+ ldr r1,#(\x<<16)
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IO1SET]
.endm
Index: hal/arm/lpc2xxx/p2106/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/p2106/current/ChangeLog,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog
--- hal/arm/lpc2xxx/p2106/current/ChangeLog 14 Nov 2004 14:13:53 -0000 1.1
+++ hal/arm/lpc2xxx/p2106/current/ChangeLog 15 Nov 2004 09:08:49 -0000
@@ -1,3 +1,14 @@
+2004-11-15 Jani Monoses <jani@iv.ro>
+
+ * include/hal_platform_setup.h:
+ Use ldr instead of mov so it builds in THUMB mode.
+ * include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi:
+ Fix RAM startup.
+ * cdl/hal_arm_lpc2xxx_p2106.cdl:
+ * src/p2106_misc.c:
+ s/Keil/Olimex/
+
+
2004-10-8 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_lpc2xxx_p2106.cdl:
@@ -5,6 +16,8 @@
* include/hal_platform_setup.h:
* include/pkgconf/mlt_arm_lpc2xxx_p2106_rom.ldi:
* include/pkgconf/mlt_arm_lpc2xxx_p2106_rom.h:
+ * include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi:
+ * include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.h:
* src/p2106_misc.c:
New HAL platform added to support the Olimex LPC-P2106 board.
Index: hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl,v
retrieving revision 1.1
diff -u -r1.1 hal_arm_lpc2xxx_p2106.cdl
--- hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl 14 Nov 2004 14:13:54 -0000 1.1
+++ hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl 15 Nov 2004 09:08:49 -0000
@@ -46,14 +46,14 @@
# ====================================================================
cdl_package CYGPKG_HAL_ARM_LPC2XXX_P2106 {
- display "Keil P2106 eval board HAL"
+ display "Olimex P2106 eval board HAL"
parent CYGPKG_HAL_ARM_LPC2XXX
define_header hal_arm_lpc2xxx_p2106.h
include_dir cyg/hal
hardware
description "
The P2106 HAL package provides the support needed to run
- eCos on an Keil P2106 eval board."
+ eCos on an Olimex P2106 eval board."
compile p2106_misc.c
@@ -65,7 +65,7 @@
puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_arm_lpc2xxx_p2106.h>"
puts $::cdl_system_header "#define CYGBLD_HAL_ARM_VAR_IO_H"
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM7TDMI-S\""
- puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Keil LPC2XXX/P2106\""
+ puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Olimex LPC2XXX/P2106\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
}
Index: hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h,v
retrieving revision 1.1
diff -u -r1.1 hal_platform_setup.h
--- hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h 14 Nov 2004 14:13:54 -0000 1.1
+++ hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h 15 Nov 2004 09:08:49 -0000
@@ -59,15 +59,15 @@
.macro _led_init
ldr r0,=CYGARC_HAL_LPC2XXX_REG_IO_BASE
- mov r1,#(1<<7) // GPIO0 pins 7 is LED output
+ ldr r1,=(1<<7) // GPIO0 pins 7 is LED output
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IODIR]
.endm
.macro _led x
ldr r0,=CYGARC_HAL_LPC2XXX_REG_IO_BASE
- mov r1,#(1<<7)
+ ldr r1,=(1<<7)
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IOCLR]
- mov r1,#((\x & 1)<<7)
+ ldr r1,=((\x & 1)<<7)
str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_IOSET]
.endm
Index: hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi,v
retrieving revision 1.1
diff -u -r1.1 mlt_arm_lpc2xxx_p2106_ram.ldi
--- hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi 14 Nov 2004 14:13:54 -0000 1.1
+++ hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi 15 Nov 2004 09:08:49 -0000
@@ -12,9 +12,9 @@
SECTIONS
{
SECTIONS_BEGIN
- SECTION_rom_vectors (ram, 0x40000000, LMA_EQ_VMA)
SECTION_fixed_vectors (ram, 0x40000400, LMA_EQ_VMA)
- SECTION_text (ram, 0x40006000, LMA_EQ_VMA)
+ SECTION_rom_vectors (ram, 0x40006000, LMA_EQ_VMA)
+ SECTION_text (ram, ALIGN(0x4), LMA_EQ_VMA)
SECTION_fini (ram, ALIGN (0x4), LMA_EQ_VMA)
SECTION_rodata (ram, ALIGN (0x4), LMA_EQ_VMA)
SECTION_rodata1 (ram, ALIGN (0x4), LMA_EQ_VMA)
Index: hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c,v
retrieving revision 1.1
diff -u -r1.1 p2106_misc.c
--- hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c 14 Nov 2004 14:13:54 -0000 1.1
+++ hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c 15 Nov 2004 09:08:49 -0000
@@ -2,7 +2,7 @@
//
// lpc_misc.c
//
-// HAL misc board support code for Keil P2106
+// HAL misc board support code for Olimex P2106
//
//==========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####