Mercurial > ecos-v3_0-branch
changeset 1844:72da39b0146a
Fix compile warning, make LPC boards build in thumb mode, fix RAM startup for LPC-P2106
line wrap: on
line diff
--- a/packages/devs/serial/arm/lpc2xxx/current/ChangeLog +++ b/packages/devs/serial/arm/lpc2xxx/current/ChangeLog @@ -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:
--- a/packages/devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl +++ b/packages/devs/serial/arm/lpc2xxx/current/include/arm_lpc2xxx_ser.inl @@ -81,7 +81,6 @@ static unsigned int select_baud[] = { // 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
--- a/packages/hal/arm/lpc2xxx/mcb2100/current/ChangeLog +++ b/packages/hal/arm/lpc2xxx/mcb2100/current/ChangeLog @@ -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:
--- a/packages/hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h +++ b/packages/hal/arm/lpc2xxx/mcb2100/current/include/hal_platform_setup.h @@ -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
--- a/packages/hal/arm/lpc2xxx/p2106/current/ChangeLog +++ b/packages/hal/arm/lpc2xxx/p2106/current/ChangeLog @@ -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 @@ 2004-10-8 Jani Monoses <jani@iv.ro> * 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.
--- a/packages/hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl +++ b/packages/hal/arm/lpc2xxx/p2106/current/cdl/hal_arm_lpc2xxx_p2106.cdl @@ -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 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_P2106 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 \"\"" }
--- a/packages/hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h +++ b/packages/hal/arm/lpc2xxx/p2106/current/include/hal_platform_setup.h @@ -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
--- a/packages/hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi +++ b/packages/hal/arm/lpc2xxx/p2106/current/include/pkgconf/mlt_arm_lpc2xxx_p2106_ram.ldi @@ -12,9 +12,9 @@ MEMORY 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)
--- a/packages/hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c +++ b/packages/hal/arm/lpc2xxx/p2106/current/src/p2106_misc.c @@ -2,7 +2,7 @@ // // lpc_misc.c // -// HAL misc board support code for Keil P2106 +// HAL misc board support code for Olimex P2106 // //========================================================================== //####ECOSGPLCOPYRIGHTBEGIN####