diff options
Diffstat (limited to 'bsp/ls2kdev')
| -rw-r--r-- | bsp/ls2kdev/SConstruct | 1 | ||||
| -rw-r--r-- | bsp/ls2kdev/drivers/board.c | 1 | ||||
| -rw-r--r-- | bsp/ls2kdev/drivers/drv_gpio.c | 2 | ||||
| -rw-r--r-- | bsp/ls2kdev/drivers/drv_rtc.c | 4 | ||||
| -rw-r--r-- | bsp/ls2kdev/ls2k_ram.lds | 17 | ||||
| -rw-r--r-- | bsp/ls2kdev/rtconfig.py | 1 |
6 files changed, 25 insertions, 1 deletions
diff --git a/bsp/ls2kdev/SConstruct b/bsp/ls2kdev/SConstruct index 69373ed71f..6fd6fc67f9 100644 --- a/bsp/ls2kdev/SConstruct +++ b/bsp/ls2kdev/SConstruct @@ -15,6 +15,7 @@ DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) diff --git a/bsp/ls2kdev/drivers/board.c b/bsp/ls2kdev/drivers/board.c index 20b7a84516..6a66777121 100644 --- a/bsp/ls2kdev/drivers/board.c +++ b/bsp/ls2kdev/drivers/board.c @@ -12,6 +12,7 @@ #include <rthw.h> #include "mips_regs.h" +#include "mips_fpu.h" #include "exception.h" #include "drv_uart.h" #include "board.h" diff --git a/bsp/ls2kdev/drivers/drv_gpio.c b/bsp/ls2kdev/drivers/drv_gpio.c index e1c5d61331..155807461f 100644 --- a/bsp/ls2kdev/drivers/drv_gpio.c +++ b/bsp/ls2kdev/drivers/drv_gpio.c @@ -73,7 +73,7 @@ static int loongson_pin_read(struct rt_device *device, rt_base_t pin) gpio = (void *)device->user_data; rt_uint64_t m; - m = gpio->GPIO1_I; + m = gpio->GPIO0_I; m &= (rt_uint64_t)1 << pin; rc = !!m; diff --git a/bsp/ls2kdev/drivers/drv_rtc.c b/bsp/ls2kdev/drivers/drv_rtc.c index 3a873cc6fc..ee125122e3 100644 --- a/bsp/ls2kdev/drivers/drv_rtc.c +++ b/bsp/ls2kdev/drivers/drv_rtc.c @@ -17,6 +17,8 @@ #include <rtthread.h> #include "ls2k1000.h" +#ifdef RT_USING_RTC + struct loongson_rtc { rt_uint32_t sys_toytrim; rt_uint32_t sys_toywrite0; @@ -176,3 +178,5 @@ int rt_hw_rtc_init(void) } INIT_DEVICE_EXPORT(rt_hw_rtc_init); + +#endif /*RT_USING_RTC*/ diff --git a/bsp/ls2kdev/ls2k_ram.lds b/bsp/ls2kdev/ls2k_ram.lds index 8bec1e855b..313a52969c 100644 --- a/bsp/ls2kdev/ls2k_ram.lds +++ b/bsp/ls2kdev/ls2k_ram.lds @@ -78,6 +78,23 @@ SECTIONS *(.sdata.*) } + . = ALIGN(4); + .ctors : + { + PROVIDE(__ctors_start__ = .); + KEEP(*(SORT(.ctors.*))) + KEEP(*(.ctors)) + PROVIDE(__ctors_end__ = .); + } + + .dtors : + { + PROVIDE(__dtors_start__ = .); + KEEP(*(SORT(.dtors.*))) + KEEP(*(.dtors)) + PROVIDE(__dtors_end__ = .); + } + .stack : { . = ALIGN(8); diff --git a/bsp/ls2kdev/rtconfig.py b/bsp/ls2kdev/rtconfig.py index d932bf985b..0988198426 100644 --- a/bsp/ls2kdev/rtconfig.py +++ b/bsp/ls2kdev/rtconfig.py @@ -31,6 +31,7 @@ BUILD = 'debug' PREFIX = 'mips-sde-elf-' CC = PREFIX + 'gcc' +CXX = PREFIX + 'g++' AS = PREFIX + 'gcc' AR = PREFIX + 'ar' LINK = PREFIX + 'gcc' |