From 1451655ede01749bd88aab45f5714a11a9fc0eee Mon Sep 17 00:00:00 2001 From: asterix Date: Mon, 8 Nov 2010 14:32:03 +0000 Subject: [PATCH] Merge board updates from trunk. git-svn-id: https://src.develer.com/svnoss/bertos/branches/2.6@4541 38d2e660-2303-0410-9eaa-f027e97ec537 --- .../examples/sd_fat/cfg/cfg_usb.h | 64 +++++++++++++++ .../examples/sd_fat/cfg/cfg_usbmouse.h | 78 +++++++++++++++++++ .../examples/sd_fat/cfg/cfg_usbser.h | 78 +++++++++++++++++++ .../benchmark/context_switch/cfg/cfg_adc.h | 9 ++- .../context_switch/cfg/cfg_context_switch.h | 2 +- .../benchmark/context_switch/cfg/cfg_debug.h | 16 ++++ .../context_switch/cfg/cfg_emb_flash.h | 73 +++++++++++++++++ .../benchmark/context_switch/cfg/cfg_fat.h | 17 ++++ .../context_switch/cfg/cfg_lcd_hd44.h | 14 ++++ .../benchmark/context_switch/cfg/cfg_sd.h | 75 ++++++++++++++++++ .../benchmark/context_switch/cfg/cfg_usb.h | 64 +++++++++++++++ .../benchmark/context_switch/cfg/cfg_usbkbd.h | 78 +++++++++++++++++++ .../context_switch/cfg/cfg_usbmouse.h | 78 +++++++++++++++++++ .../benchmark/context_switch/cfg/cfg_usbser.h | 78 +++++++++++++++++++ .../context_switch/context_switch.mk | 22 +++--- .../benchmark/context_switch/project.bertos | 38 ++++----- 16 files changed, 752 insertions(+), 32 deletions(-) create mode 100644 boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usb.h create mode 100644 boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbmouse.h create mode 100644 boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbser.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_emb_flash.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_sd.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_usb.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbkbd.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbmouse.h create mode 100644 boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbser.h diff --git a/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usb.h b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usb.h new file mode 100644 index 00000000..e5a282b1 --- /dev/null +++ b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usb.h @@ -0,0 +1,64 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the USB driver module + */ + +#ifndef CFG_USB_H +#define CFG_USB_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_LOG_FORMAT LOG_FMT_TERSE + +/** + * Size of the USB buffer used for endpoint transfers [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = 2 + */ +#define CONFIG_USB_BUFSIZE 64 + +#endif /* CFG_USB_H */ diff --git a/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbmouse.h b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbmouse.h new file mode 100644 index 00000000..73143284 --- /dev/null +++ b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbmouse.h @@ -0,0 +1,78 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the usbmouse driver module + */ + +#ifndef CFG_USBMOUSE_H +#define CFG_USBMOUSE_H + +/** + * Enable the usbmouse module. + * + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_USBMOUSE 0 + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_MOUSE_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_MOUSE_LOG_FORMAT LOG_FMT_TERSE + +/** + * USB vendor ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_MOUSE_VENDOR_ID 0xffff + +/** + * USB product ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_MOUSE_PRODUCT_ID 0x0000 + +#endif /* CFG_USBMOUSE_H */ diff --git a/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbser.h b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbser.h new file mode 100644 index 00000000..1fa44e73 --- /dev/null +++ b/boards/at91sam7x-ek/examples/sd_fat/cfg/cfg_usbser.h @@ -0,0 +1,78 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the USB serial driver module + */ + +#ifndef CFG_USBSER_H +#define CFG_USBSER_H + +/** + * Enable the usb-serial module. + * + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_USBSER 0 + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_SERIAL_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_SERIAL_LOG_FORMAT LOG_FMT_TERSE + +/** + * USB vendor ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_SERIAL_VENDOR_ID 0x05f9 + +/** + * USB product ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_SERIAL_PRODUCT_ID 0xffff + +#endif /* CFG_USBSER_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_adc.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_adc.h index 90aeb7bd..df2587be 100644 --- a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_adc.h +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_adc.h @@ -56,9 +56,12 @@ /** * Clock Frequency for ADC conversion. + * This frequency will be rounded down to an integer + * submultiple of CPU_FREQ. * * $WIZ$ type = "int" * $WIZ$ supports = "at91" + * $WIZ$ max = 5000000 */ #define CONFIG_ADC_CLOCK 4800000UL @@ -66,16 +69,16 @@ * Minimum time for starting up a conversion [us]. * * $WIZ$ type = "int" - * $WIZ$ min = 0 + * $WIZ$ min = 20 * $WIZ$ supports = "at91" */ #define CONFIG_ADC_STARTUP_TIME 20 /** - * Minimum time for sample and hold [us]. + * Minimum time for sample and hold [ns]. * * $WIZ$ type = "int" - * $WIZ$ min = 0 + * $WIZ$ min = 600 * $WIZ$ supports = "at91" */ #define CONFIG_ADC_SHTIME 834 diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_context_switch.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_context_switch.h index 2633f958..be15cf2f 100644 --- a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_context_switch.h +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_context_switch.h @@ -45,7 +45,7 @@ * $WIZ$ module= "boolean" * $WIZ$ conditional_deps = "ser" */ -#define CONFIG_USE_HP_TIMER 0 +#define CONFIG_USE_HP_TIMER 1 /** diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_debug.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_debug.h index 7ea52a0b..10639848 100644 --- a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_debug.h +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_debug.h @@ -51,4 +51,20 @@ */ #define CONFIG_KDEBUG_BAUDRATE 115200UL +/** + * Clock source for the UART module. You need to write the code to reprogram the respective clock at the required frequency in your project before calling kdbg_init(). + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "kdbg_clk_src" + * $WIZ$ supports = "msp430" + */ +#define CONFIG_KDEBUG_CLOCK_SOURCE KDBG_UART_SMCLK + +/** + * Clock frequency. (Only if different from MCLK's frequency, otherwise leave it zero) + * $WIZ$ type = "int"; min = 0 + * $WIZ$ supports = "msp430" + */ +#define CONFIG_KDEBUG_CLOCK_FREQ 0UL + #endif /* CFG_DEBUG_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_emb_flash.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_emb_flash.h new file mode 100644 index 00000000..82d96e52 --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_emb_flash.h @@ -0,0 +1,73 @@ +/** + * \file + * + * + * \author Daniele Basile + * + * \brief Configuration file for embedded flash module. + */ + +#ifndef CFG_EMB_FLASH_H +#define CFG_EMB_FLASH_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define CONFIG_FLASH_EMB_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define CONFIG_FLASH_EMB_LOG_FORMAT LOG_FMT_TERSE + + +/** + * Write emb flash timeout. + * For how many milliseconds the cpu wait + * to complete write operation. + * + * $WIZ$ type = "int" + */ +#define CONFIG_FLASH_WR_TIMEOUT 100 + +/** + * Check this to disable embedded flash deprecated API support. + * + * $WIZ$ type = "boolean" + */ +#define CONFIG_FLASH_DISABLE_OLD_API 0 + +#endif /* CFG_FLASH_AT91_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_fat.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_fat.h index 83772f45..fcd717af 100644 --- a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_fat.h +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_fat.h @@ -40,6 +40,23 @@ #ifndef CFG_FAT_H #define CFG_FAT_H +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define FAT_LOG_LEVEL LOG_LVL_ERR + +/** + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define FAT_LOG_FORMAT LOG_FMT_VERBOSE + + /** * Use word alignment to access FAT structure. * $WIZ$ type = "boolean" diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_lcd_hd44.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_lcd_hd44.h index 78f1f20b..7bea4376 100644 --- a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_lcd_hd44.h +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_lcd_hd44.h @@ -51,5 +51,19 @@ */ #define CONFIG_LCD_ADDRESS_FAST 1 +/** + * Number of columns in LCD display. + * $WIZ$ type = "enum" + * $WIZ$ value_list = "lcd_hd44_cols" + */ +#define CONFIG_LCD_COLS LCD_HD44_COLS_16 + +/** + * Number of rows in LCD display. + * $WIZ$ type = "enum" + * $WIZ$ value_list = "lcd_hd44_rows" + */ +#define CONFIG_LCD_ROWS LCD_HD44_ROWS_2 + #endif /* CFG_LCD_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_sd.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_sd.h new file mode 100644 index 00000000..8c40f827 --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_sd.h @@ -0,0 +1,75 @@ +/** + * \file + * + * + * \brief Configuration file Secure Digital module. + * + * + * \author Francesco Sacchi + */ + +#ifndef CFG_SD_H +#define CFG_SD_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define SD_LOG_LEVEL LOG_LVL_ERR + +/** + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define SD_LOG_FORMAT LOG_FMT_VERBOSE + + +/** + * Enable autoassignment of SD driver to disk drive number 0 of FatFs module. + * $WIZ$ type = "boolean" + * $WIZ$ conditional_deps = "fat" + */ +#define CONFIG_SD_AUTOASSIGN_FAT 1 + +/** + * Enable backward compatibility for sd_init(). + * If enabled, sd_init() will allocate internally an Sd context, + * otherwise sd_init() will need the context to be passed explicitly. + * + * $WIZ$ type = "boolean" + */ +#define CONFIG_SD_OLD_INIT 1 + +#endif /* CFG_SD_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usb.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usb.h new file mode 100644 index 00000000..e5a282b1 --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usb.h @@ -0,0 +1,64 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the USB driver module + */ + +#ifndef CFG_USB_H +#define CFG_USB_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_LOG_FORMAT LOG_FMT_TERSE + +/** + * Size of the USB buffer used for endpoint transfers [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = 2 + */ +#define CONFIG_USB_BUFSIZE 64 + +#endif /* CFG_USB_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbkbd.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbkbd.h new file mode 100644 index 00000000..5b6fb65a --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbkbd.h @@ -0,0 +1,78 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the usbkbd driver module + */ + +#ifndef CFG_USBKBD_H +#define CFG_USBKBD_H + +/** + * Enable the usbkbd module. + * + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_USBKBD 0 + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_KEYBOARD_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_KEYBOARD_LOG_FORMAT LOG_FMT_TERSE + +/** + * USB vendor ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_KEYBOARD_VENDOR_ID 0x046d + +/** + * USB product ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_KEYBOARD_PRODUCT_ID 0xffff + +#endif /* CFG_USB_KEYBOARD_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbmouse.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbmouse.h new file mode 100644 index 00000000..73143284 --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbmouse.h @@ -0,0 +1,78 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the usbmouse driver module + */ + +#ifndef CFG_USBMOUSE_H +#define CFG_USBMOUSE_H + +/** + * Enable the usbmouse module. + * + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_USBMOUSE 0 + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_MOUSE_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_MOUSE_LOG_FORMAT LOG_FMT_TERSE + +/** + * USB vendor ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_MOUSE_VENDOR_ID 0xffff + +/** + * USB product ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_MOUSE_PRODUCT_ID 0x0000 + +#endif /* CFG_USBMOUSE_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbser.h b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbser.h new file mode 100644 index 00000000..1fa44e73 --- /dev/null +++ b/boards/stm32-p103/benchmark/context_switch/cfg/cfg_usbser.h @@ -0,0 +1,78 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the USB serial driver module + */ + +#ifndef CFG_USBSER_H +#define CFG_USBSER_H + +/** + * Enable the usb-serial module. + * + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_USBSER 0 + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define USB_SERIAL_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define USB_SERIAL_LOG_FORMAT LOG_FMT_TERSE + +/** + * USB vendor ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_SERIAL_VENDOR_ID 0x05f9 + +/** + * USB product ID (please change this in your project, using a valid ID number!). + * + * $WIZ$ type = "hex" + */ +#define USB_SERIAL_PRODUCT_ID 0xffff + +#endif /* CFG_USBSER_H */ diff --git a/boards/stm32-p103/benchmark/context_switch/context_switch.mk b/boards/stm32-p103/benchmark/context_switch/context_switch.mk index 02d93cc4..cf44068a 100644 --- a/boards/stm32-p103/benchmark/context_switch/context_switch.mk +++ b/boards/stm32-p103/benchmark/context_switch/context_switch.mk @@ -13,24 +13,25 @@ context_switch_PREFIX = "arm-none-eabi-" context_switch_SUFFIX = "" -context_switch_SRC_PATH = boards/stm32-p103/benchmark/context_switch +context_switch_SRC_PATH = boards/stm32-p103/benchmark context_switch_HW_PATH = boards/stm32-p103 # Files automatically generated by the wizard. DO NOT EDIT, USE context_switch_USER_CSRC INSTEAD! context_switch_WIZARD_CSRC = \ - bertos/benchmark/context_switch.c \ + bertos/cpu/cortex-m3/drv/ser_stm32.c \ bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \ - bertos/kern/kfile.c \ + bertos/mware/event.c \ bertos/cpu/cortex-m3/drv/timer_cm3.c \ bertos/struct/heap.c \ + bertos/benchmark/context_switch.c \ + bertos/io/kfile.c \ bertos/mware/formatwr.c \ - bertos/cpu/arm/drv/timer_arm.c \ bertos/drv/timer.c \ - bertos/mware/event.c \ + bertos/kern/signal.c \ bertos/kern/proc.c \ + bertos/drv/ser.c \ bertos/mware/hex.c \ - bertos/kern/signal.c \ # # Files automatically generated by the wizard. DO NOT EDIT, USE context_switch_USER_PCSRC INSTEAD! @@ -40,6 +41,7 @@ context_switch_WIZARD_PCSRC = \ # Files automatically generated by the wizard. DO NOT EDIT, USE context_switch_USER_CPPASRC INSTEAD! context_switch_WIZARD_CPPASRC = \ + \ # # Files automatically generated by the wizard. DO NOT EDIT, USE context_switch_USER_CXXSRC INSTEAD! @@ -77,12 +79,12 @@ context_switch_ASRC = $(context_switch_CPU_ASRC) $(context_switch_WIZARD_ASRC) $ # CPU specific flags and options, defined in the CPU definition files. # Automatically generated by the wizard. PLEASE DO NOT EDIT! -context_switch_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S +context_switch_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S context_switch_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork -context_switch_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_STM32P103__ -context_switch_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/gpio_stm32.c bertos/cpu/cortex-m3/drv/clock_stm32.c +context_switch_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_STM32F103RB__ +context_switch_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/gpio_stm32.c bertos/cpu/cortex-m3/drv/clock_stm32.c context_switch_PROGRAMMER_CPU = stm32 -context_switch_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -T bertos/cpu/cortex-m3/scripts/stm32p103_rom.ld +context_switch_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -T bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld context_switch_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh context_switch_CPU = cortex-m3 context_switch_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh diff --git a/boards/stm32-p103/benchmark/context_switch/project.bertos b/boards/stm32-p103/benchmark/context_switch/project.bertos index 16feb574..c3b87859 100644 --- a/boards/stm32-p103/benchmark/context_switch/project.bertos +++ b/boards/stm32-p103/benchmark/context_switch/project.bertos @@ -39,41 +39,43 @@ VSourcery G++ Lite 2010q1-188 p19 sVpath p20 -V/opt/sourcery/bin/arm-none-eabi-gcc +V/localhome/toolchain/arm/bin/arm-none-eabi-gcc p21 ssS'ENABLED_MODULES' p22 (lp23 -S'kernel' +S'signal' p24 -aS'formatwr' +aS'kernel' p25 -aS'kfile' +aS'ser' p26 -aS'context_switch' +aS'kfile' p27 -aS'heap' +aS'context_switch' p28 -aS'signal' -p29 aS'timer' +p29 +aS'formatwr' p30 -asS'CPU_NAME' +aS'heap' p31 -VSTM32F103RB +asS'CPU_NAME' p32 -sS'PROJECT_HW_PATH' +VSTM32F103RB p33 -S'../..' +sS'PROJECT_HW_PATH' p34 -sS'PROJECT_SRC_PATH' +S'../..' p35 -S'.' +sS'PROJECT_SRC_PATH' p36 -sS'PRESET' +S'.' p37 +sS'PRESET' +p38 I01 sS'OUTPUT' -p38 -(lp39 -s. +p39 +(lp40 +s. \ No newline at end of file -- 2.25.1