From eaffdbf7352b2001eae26175209167930177dec1 Mon Sep 17 00:00:00 2001 From: asterix Date: Mon, 13 Jun 2011 09:32:41 +0000 Subject: [PATCH] Comply the prj to the new name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4953 38d2e660-2303-0410-9eaa-f027e97ec537 --- .../examples/sam3n-ek_display/cfg/cfg_adc.h | 37 ++++++ .../examples/sam3n-ek_display/cfg/cfg_dac.h | 88 ++++++++++++++ .../cfg/{cfg_menu.h => cfg_eeprom.h} | 39 +++--- .../sam3n-ek_display/cfg/cfg_led_7seg.h | 80 +++++++++++++ .../examples/sam3n-ek_display/cfg/cfg_lwip.h | 13 ++ .../examples/sam3n-ek_display/cfg/cfg_nand.h | 111 ++++++++++++++++++ .../sam3n-ek_display/cfg/cfg_parser.h | 20 ++++ .../examples/sam3n-ek_display/cfg/cfg_proc.h | 6 + .../examples/sam3n-ek_display/cfg/cfg_pwm.h | 8 ++ .../sam3n-ek_display/cfg/cfg_random.h | 65 ++++++++++ .../examples/sam3n-ek_display/cfg/cfg_tftp.h | 20 ++++ .../examples/sam3n-ek_display/cfg/cfg_usb.h | 21 ++++ .../examples/sam3n-ek_display/project.bertos | 84 ++++++------- .../sam3n-ek_display/sam3n-ek_display.mk | 76 ++++++------ .../sam3n-ek_display/sam3n-ek_display_user.mk | 24 ++-- 15 files changed, 574 insertions(+), 118 deletions(-) create mode 100644 boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_dac.h rename boards/sam3n-ek/examples/sam3n-ek_display/cfg/{cfg_menu.h => cfg_eeprom.h} (75%) create mode 100644 boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_led_7seg.h create mode 100644 boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_nand.h create mode 100644 boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_random.h create mode 100644 boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_tftp.h diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_adc.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_adc.h index df2587be..62ee6ed7 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_adc.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_adc.h @@ -109,4 +109,41 @@ */ #define CONFIG_ADC_STROBE 0 + +/** + * Start up timer[s] = startup value / ADCClock [Hz] + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "sam3_adc_sut" + * $WIZ$ supports = "sam3" + */ +#define CONFIG_ADC_SUT ADC_SUT512 + +/** + * Analog Settling Time[s] = settling value / ADCClock[Hz] + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "sam3_adc_stt" + * $WIZ$ supports = "sam3" + */ +#define CONFIG_ADC_STTLING ADC_AST17 + +/** + * Tracking Time[s] = (TRACKTIM + 1) / ADCClock[Hz] + * + * $WIZ$ type = "int" + * $WIZ$ min = 0 + * $WIZ$ supports = "sam3" + */ +#define CONFIG_ADC_TRACKTIM 0 + +/** + * Transfer Period[s] = (TRANSFER * 2 + 3) ADCClock[Hz] + * + * $WIZ$ type = "int" + * $WIZ$ min = 0 + * $WIZ$ supports = "sam3" + */ +#define CONFIG_ADC_TRANSFER 1 + #endif /* CFG_ADC_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_dac.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_dac.h new file mode 100644 index 00000000..1ae1e984 --- /dev/null +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_dac.h @@ -0,0 +1,88 @@ +/** + * \file + * + * + * \brief Configuration file for DAC module. + * + * + * \author Daniele Basile + */ + +#ifndef CFG_DAC_H +#define CFG_DAC_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define DAC_LOG_LEVEL LOG_LVL_WARN + +/** + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define DAC_LOG_FORMAT LOG_FMT_TERSE + +/** + * DAC Refresh Period = 1024*REFRESH/DACC Clock + * + * $WIZ$ type = "int" + * $WIZ$ supports = "sam3x" + * $WIZ$ min = 0 + * $WIZ$ max = 65536 + */ +#define CONFIG_DAC_REFRESH 16 + +/** + * DAC Startup Time Selection. + * see datasheet table. + * + * $WIZ$ type = "int" + * $WIZ$ supports = "sam3x" + * $WIZ$ min = 0 + * $WIZ$ max = 63 + */ +#define CONFIG_DAC_STARTUP 0 + +/** + * DAC Trigger Selection. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "sam3x_dac_tc" + * $WIZ$ supports = "sam3x" + */ +#define CONFIG_DAC_TIMER DACC_TRGSEL_TIO_CH0 + +#endif /* CFG_DAC_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_menu.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_eeprom.h similarity index 75% rename from boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_menu.h rename to boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_eeprom.h index bbfa1e76..b56c1f9c 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_menu.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_eeprom.h @@ -27,41 +27,38 @@ * the GNU General Public License. * * Copyright 2010 Develer S.r.l. (http://www.develer.com/) - * All Rights Reserved. + * * --> * - * \brief Configuration file for Menu module. + * \brief Configuration file for the Eeprom module. * * \author Daniele Basile */ -#ifndef CFG_MENU_H -#define CFG_MENU_H - -/** - * Enable button bar behind menus - * $WIZ$ type = "boolean" - */ -#define CONFIG_MENU_MENUBAR 0 +#ifndef CFG_EEPROM_H +#define CFG_EEPROM_H /** - * Level Edit Timeout - * $WIZ$ type = "boolean" + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" */ -#define CONFIG_LEVELEDIT_TIMEOUT 0 +#define EEPROM_LOG_LEVEL LOG_LVL_INFO /** - * Menu timeout - * $WIZ$ type = "boolean" + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" */ -#define CONFIG_MENU_TIMEOUT 0 +#define EEPROM_LOG_FORMAT LOG_FMT_TERSE /** - * Enable smooth scrolling in menus + * Check this to disable Eeprom deprecated API support. + * * $WIZ$ type = "boolean" */ -#define CONFIG_MENU_SMOOTH 1 - - -#endif /* CFG_MENU_H */ +#define CONFIG_EEPROM_DISABLE_OLD_API 0 +#endif /* CFG_EEPROM_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_led_7seg.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_led_7seg.h new file mode 100644 index 00000000..d854b11d --- /dev/null +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_led_7seg.h @@ -0,0 +1,80 @@ +/** + * \file cfg_led_7seg.h + * + * + * \brief Configuration file for led 7 segment display. + * + * \author Fabio Bizzi + * + * \addtogroup SevenSegDisplay 7 Segments LED Displays Driver + * \{ + * + */ + +#ifndef CFG_LED_7SEG_H +#define CFG_LED_7SEG_H + +/** + * Use a Common Cathode display. + * $WIZ$ type = "boolean" + */ +#define CONFIG_LED_7SEG_CCAT 0 + +/** + * Number of digit present in the LED display. + * $WIZ$ type = "int" + * $WIZ$ min = 1 + * $WIZ$ max = 8 + */ +#define CONFIG_LED_7SEG_DIGIT 4 + +/** + * Max lenght of the string to be displayed. + * $WIZ$ type = "int" + * $WIZ$ min = 16 + * $WIZ$ max = 255 + */ +#define CONFIG_LED_7SEG_STRLEN 255 + +/** + * Default scrolling speed (ms * CONFIG_LED_7SEG_RTIME). + * $WIZ$ type = "int" + */ +#define CONFIG_LED_7SEG_SSPEED 10 + +/** + * Default refresh time (ms). + * $WIZ$ type = "int" + */ +#define CONFIG_LED_7SEG_RTIME 5 + +#endif /* CFG_LED_7SEG_H */ + /** \} */ //defgroup drivers + diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_lwip.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_lwip.h index c9aa49f4..73acb913 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_lwip.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_lwip.h @@ -133,8 +133,10 @@ /** * MEM_ALIGNMENT: should be set to the alignment of the CPU + * \verbatim * 4 byte alignment -> #define MEM_ALIGNMENT 4 * 2 byte alignment -> #define MEM_ALIGNMENT 2 + * \endverbatim */ #ifndef MEM_ALIGNMENT #define MEM_ALIGNMENT 4 @@ -701,12 +703,16 @@ /** DNS_LOCAL_HOSTLIST: Implements a local host-to-address list. If enabled, * you have to define + * \code * #define DNS_LOCAL_HOSTLIST_INIT {{"host1", 0x123}, {"host2", 0x234}} + * \endcode * (an array of structs name/address, where address is an u32_t in network * byte order). * * Instead, you can also use an external function: + * \code * #define DNS_LOOKUP_LOCAL_EXTERN(x) extern u32_t my_lookup_function(const char *name) + * \endcode * that returns the IP address or INADDR_NONE if not found. */ #ifndef DNS_LOCAL_HOSTLIST @@ -1200,6 +1206,13 @@ * $WIZ$ type = "boolean" */ #define LWIP_SOCKET 1 +#if LWIP_SOCKET + /* + * The sockets.c file requires this macro to be defined to really + * set errno on errors. + */ + #define ERRNO +#endif /** * Enable BSD-style sockets functions names. diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_nand.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_nand.h new file mode 100644 index 00000000..bd3b2623 --- /dev/null +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_nand.h @@ -0,0 +1,111 @@ +/** + * \file + * + * + * \author Stefano Fedrigo + * + * \brief Configuration file for NAND driver module. + */ + +#ifndef CFG_NAND_H +#define CFG_NAND_H + +/** + * Page data size + * + * Size of the data section of a programmable page in bytes. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_DATA_SIZE 2048 + +/** + * Page spare area size + * + * Size of the spare section of a programmable page in bytes. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_SPARE_SIZE 64 + +/** + * Pages per block + * + * Number of pages in a erase block. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_PAGES_PER_BLOCK 64 + +/** + * Number of blocks + * + * Total number of erase blocks in one NAND chip. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_NUM_BLOCK 2048 + +/** + * Number of reserved blocks + * + * Blocks reserved for remapping defective NAND blocks. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_NUM_REMAP_BLOCKS 128 + +/** + * NAND operations timeout + * + * How many milliseconds the cpu waits for + * completion of NAND operations. + * + * $WIZ$ type = "int" + */ +#define CONFIG_NAND_TMOUT 100 + +/** + * Module logging level + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define CONFIG_NAND_LOG_LEVEL LOG_LVL_WARN + +/** + * Module logging format + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define CONFIG_NAND_LOG_FORMAT LOG_FMT_TERSE + +#endif /* CFG_NAND_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_parser.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_parser.h index 572b4a24..67e091a5 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_parser.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_parser.h @@ -38,7 +38,27 @@ #ifndef CFG_PARSER_H #define CFG_PARSER_H +/** + * Max number of arguments and results for each command + * $WIZ$ type = "int" + * $WIZ$ min = 0 + */ +#define CONFIG_PARSER_MAX_ARGS 4 + +/** + * Max number of commands + * $WIZ$ type = "int" + * $WIZ$ min = 8 + */ +#define CONFIG_MAX_COMMANDS_NUMBER 16 +/** + * Enable compatibility behaviour. + * + * Skip the first word from incoming commands. Don't enable in new projects. + * $WIZ$ type = "boolean" + */ +#define CONFIG_ENABLE_COMPAT_BEHAVIOUR 1 #endif /* CFG_PARSER_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_proc.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_proc.h index 67fd4f68..1ecf63eb 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_proc.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_proc.h @@ -74,6 +74,12 @@ */ #define CONFIG_KERN_PRI 1 +/** + * Priority-inheritance protocol. + * $WIZ$ type = "boolean" + */ +#define CONFIG_KERN_PRI_INHERIT 0 + /** * Dynamic memory allocation for processes. * $WIZ$ type = "boolean" diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_pwm.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_pwm.h index 595189e6..68d62837 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_pwm.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_pwm.h @@ -53,4 +53,12 @@ */ #define PWM_LOG_FORMAT LOG_FMT_VERBOSE +/** + * Enable the OLD pwm API. + * Not recommended for new projects. + * + * $WIZ$ type = "boolean" + */ +#define CFG_PWM_ENABLE_OLD_API 1 + #endif /* CFG_PWM_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_random.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_random.h new file mode 100644 index 00000000..5e3afdff --- /dev/null +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_random.h @@ -0,0 +1,65 @@ +/** + * \file + * + * + * \author Andrea Righi + * + * \brief Configuration file for the "random" module + */ + +#ifndef CFG_RANDOM_H +#define CFG_RANDOM_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define RANDOM_LOG_LEVEL LOG_LVL_INFO + +/** + * module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define RANDOM_LOG_FORMAT LOG_FMT_TERSE + +/** + * Random security level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "random_level" + */ +#define RANDOM_SECURITY_LEVEL RANDOM_SECURITY_MINIMUM + +#endif /* CFG_RANDOM_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_tftp.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_tftp.h new file mode 100644 index 00000000..36cc622c --- /dev/null +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_tftp.h @@ -0,0 +1,20 @@ +#ifndef CFG_TFTP_H +#define CFG_TFTP_H + +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define TFTP_LOG_LEVEL LOG_LVL_WARN + +/** + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define TFTP_LOG_FORMAT LOG_FMT_VERBOSE + +#endif /* CFG_TFTP_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_usb.h b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_usb.h index e5a282b1..dbfd6fe1 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_usb.h +++ b/boards/sam3n-ek/examples/sam3n-ek_display/cfg/cfg_usb.h @@ -61,4 +61,25 @@ */ #define CONFIG_USB_BUFSIZE 64 +/** + * Maximum number of USB device interfaces (default = 1). + * $WIZ$ type = "int" + * $WIZ$ min = 1 + */ +#define CONFIG_USB_INTERFACE_MAX 1 + +/** + * Maximum number of allocated endpoints (0 = auto). + * $WIZ$ type = "int" + * $WIZ$ min = 0 + */ +#define CONFIG_USB_EP_MAX 0 + +/** + * Maximum packet size of the control endpoint 0 [bytes]. + * $WIZ$ type = "int" + * $WIZ$ min = 8 + */ +#define CONFIG_EP0_MAX_SIZE 8 + #endif /* CFG_USB_H */ diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/project.bertos b/boards/sam3n-ek/examples/sam3n-ek_display/project.bertos index 315c7e97..111ee5df 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/project.bertos +++ b/boards/sam3n-ek/examples/sam3n-ek_display/project.bertos @@ -9,85 +9,75 @@ V48000000 p4 sS'WIZARD_VERSION' p5 -I3 +I4 sS'PROJECT_NAME' p6 -Vdisplay +Vsam3n-ek_display p7 sS'TOOLCHAIN' p8 (dp9 -Vtarget +S'path' p10 -Varm-none-eabi +Varm-none-eabi-gcc p11 -sVthread +ssS'PROJECT_SRC_PATH_FROM_MAKEFILE' p12 -Vsingle +Vboards/sam3n-ek/examples/sam3n-ek_display p13 -sVconfigured +sS'ENABLED_MODULES' p14 -V/scratch/julian/2010q1-release-eabi-lite/src/gcc-4.4-2010q1/configure --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu --target=arm-none-eabi --enable-threads --disable-libmudflap --disable-libssp --disable-libstdcxx-pch --enable-extra-sgxxlite-multilibs --with-gnu-as --with-gnu-ld --with-specs='%{O2:%{!fno-remove-local-statics: -fremove-local-statics}} %{O*:%{O|O0|O1|O2|Os:;:%{!fno-remove-local-statics: -fremove-local-statics}}}' --enable-languages=c,c++ --disable-shared --disable-lto --with-newlib --with-pkgversion='Sourcery G++ Lite 2010q1-188' --with-bugurl=https://support.codesourcery.com/GNUToolchain/ --disable-nls --prefix=/opt/codesourcery --with-headers=yes --with-sysroot=/opt/codesourcery/arm-none-eabi --with-build-sysroot=/scratch/julian/2010q1-release-eabi-lite/install/arm-none-eabi --with-gmp=/scratch/julian/2010q1-release-eabi-lite/obj/host-libs-2010q1-188-arm-none-eabi-i686-pc-linux-gnu/usr --with-mpfr=/scratch/julian/2010q1-release-eabi-lite/obj/host-libs-2010q1-188-arm-none-eabi-i686-pc-linux-gnu/usr --with-ppl=/scratch/julian/2010q1-release-eabi-lite/obj/host-libs-2010q1-188-arm-none-eabi-i686-pc-linux-gnu/usr --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' --with-cloog=/scratch/julian/2010q1-release-eabi-lite/obj/host-libs-2010q1-188-arm-none-eabi-i686-pc-linux-gnu/usr --disable-libgomp --enable-poison-system-directories --with-build-time-tools=/scratch/julian/2010q1-release-eabi-lite/install/arm-none-eabi/bin --with-build-time-tools=/scratch/julian/2010q1-release-eabi-lite/install/arm-none-eabi/bin -p15 -sVversion +(lp15 +S'debug' p16 -V4.4.1 +aS'formatwr' p17 -sVbuild +aS'gfx' p18 -VSourcery G++ Lite 2010q1-188 +aS'heap' p19 -sVpath +aS'kbd' p20 -V/usr/local/lottaviano/arm-2010q1/bin/arm-none-eabi-gcc +aS'kernel' p21 -ssS'ENABLED_MODULES' +aS'kfile' p22 -(lp23 -S'text' +aS'lcd_ili9225' +p23 +aS'menu' p24 -aS'kbd' +aS'signal' p25 -aS'menu' +aS'sprintf' p26 -aS'lcd_ili9225' +aS'text' p27 -aS'signal' +aS'text_format' p28 -aS'kernel' +aS'timer' p29 -aS'gfx' +asS'CPU_NAME' p30 -aS'kfile' +VSAM3N4 p31 -aS'text_format' +sS'PROJECT_HW_PATH' p32 -aS'sprintf' +S'../..' p33 -aS'debug' +sS'PROJECT_SRC_PATH' p34 -aS'timer' +S'.' p35 -aS'formatwr' +sS'PRESET' p36 -aS'heap' +I01 +sS'PROJECT_HW_PATH_FROM_MAKEFILE' p37 -asS'CPU_NAME' +Vboards/sam3n-ek p38 -VSAM3N4 +sS'OUTPUT' p39 -sS'PROJECT_HW_PATH' -p40 -S'../..' +(lp40 +S'codelite' p41 -sS'PROJECT_SRC_PATH' -p42 -S'.' -p43 -sS'PRESET' -p44 -I01 -sS'OUTPUT' -p45 -(lp46 -s. \ No newline at end of file +as. \ No newline at end of file diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display.mk b/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display.mk index 719c2db7..b4a8ddf0 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display.mk +++ b/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display.mk @@ -1,24 +1,24 @@ # # Wizard autogenerated makefile. -# DO NOT EDIT, use the display_user.mk file instead. +# DO NOT EDIT, use the sam3n-ek_display_user.mk file instead. # # Constants automatically defined by the selected modules -display_DEBUG = 1 +sam3n-ek_display_DEBUG = 1 # Our target application -TRG += display +TRG += sam3n-ek_display -display_PREFIX = "arm-none-eabi-" +sam3n-ek_display_PREFIX = "arm-none-eabi-" -display_SUFFIX = "" +sam3n-ek_display_SUFFIX = "" -display_SRC_PATH = boards/sam3n-ek/examples/display +sam3n-ek_display_SRC_PATH = boards/sam3n-ek/examples/sam3n-ek_display -display_HW_PATH = boards/sam3n-ek +sam3n-ek_display_HW_PATH = boards/sam3n-ek -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CSRC INSTEAD! -display_WIZARD_CSRC = \ +# Files automatically generated by the wizard. DO NOT EDIT, USE sam3n-ek_display_USER_CSRC INSTEAD! +sam3n-ek_display_WIZARD_CSRC = \ bertos/struct/heap.c \ bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \ bertos/mware/event.c \ @@ -40,61 +40,61 @@ display_WIZARD_CSRC = \ bertos/gui/menu.c \ # -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_PCSRC INSTEAD! -display_WIZARD_PCSRC = \ +# Files automatically generated by the wizard. DO NOT EDIT, USE sam3n-ek_display_USER_PCSRC INSTEAD! +sam3n-ek_display_WIZARD_PCSRC = \ \ # -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CPPASRC INSTEAD! -display_WIZARD_CPPASRC = \ +# Files automatically generated by the wizard. DO NOT EDIT, USE sam3n-ek_display_USER_CPPASRC INSTEAD! +sam3n-ek_display_WIZARD_CPPASRC = \ \ # -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CXXSRC INSTEAD! -display_WIZARD_CXXSRC = \ +# Files automatically generated by the wizard. DO NOT EDIT, USE sam3n-ek_display_USER_CXXSRC INSTEAD! +sam3n-ek_display_WIZARD_CXXSRC = \ \ # -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_ASRC INSTEAD! -display_WIZARD_ASRC = \ +# Files automatically generated by the wizard. DO NOT EDIT, USE sam3n-ek_display_USER_ASRC INSTEAD! +sam3n-ek_display_WIZARD_ASRC = \ \ # -display_CPPFLAGS = -D'CPU_FREQ=(48000000UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(display_HW_PATH) -I$(display_SRC_PATH) $(display_CPU_CPPFLAGS) $(display_USER_CPPFLAGS) +sam3n-ek_display_CPPFLAGS = -D'CPU_FREQ=(48000000UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(sam3n-ek_display_HW_PATH) -I$(sam3n-ek_display_SRC_PATH) $(sam3n-ek_display_CPU_CPPFLAGS) $(sam3n-ek_display_USER_CPPFLAGS) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_LDFLAGS = $(display_CPU_LDFLAGS) $(display_WIZARD_LDFLAGS) $(display_USER_LDFLAGS) +sam3n-ek_display_LDFLAGS = $(sam3n-ek_display_CPU_LDFLAGS) $(sam3n-ek_display_WIZARD_LDFLAGS) $(sam3n-ek_display_USER_LDFLAGS) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPPAFLAGS = $(display_CPU_CPPAFLAGS) $(display_WIZARD_CPPAFLAGS) $(display_USER_CPPAFLAGS) +sam3n-ek_display_CPPAFLAGS = $(sam3n-ek_display_CPU_CPPAFLAGS) $(sam3n-ek_display_WIZARD_CPPAFLAGS) $(sam3n-ek_display_USER_CPPAFLAGS) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CSRC = $(display_CPU_CSRC) $(display_WIZARD_CSRC) $(display_USER_CSRC) +sam3n-ek_display_CSRC = $(sam3n-ek_display_CPU_CSRC) $(sam3n-ek_display_WIZARD_CSRC) $(sam3n-ek_display_USER_CSRC) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_PCSRC = $(display_CPU_PCSRC) $(display_WIZARD_PCSRC) $(display_USER_PCSRC) +sam3n-ek_display_PCSRC = $(sam3n-ek_display_CPU_PCSRC) $(sam3n-ek_display_WIZARD_PCSRC) $(sam3n-ek_display_USER_PCSRC) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPPASRC = $(display_CPU_CPPASRC) $(display_WIZARD_CPPASRC) $(display_USER_CPPASRC) +sam3n-ek_display_CPPASRC = $(sam3n-ek_display_CPU_CPPASRC) $(sam3n-ek_display_WIZARD_CPPASRC) $(sam3n-ek_display_USER_CPPASRC) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CXXSRC = $(display_CPU_CXXSRC) $(display_WIZARD_CXXSRC) $(display_USER_CXXSRC) +sam3n-ek_display_CXXSRC = $(sam3n-ek_display_CPU_CXXSRC) $(sam3n-ek_display_WIZARD_CXXSRC) $(sam3n-ek_display_USER_CXXSRC) # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_ASRC = $(display_CPU_ASRC) $(display_WIZARD_ASRC) $(display_USER_ASRC) +sam3n-ek_display_ASRC = $(sam3n-ek_display_CPU_ASRC) $(sam3n-ek_display_WIZARD_ASRC) $(sam3n-ek_display_USER_ASRC) # CPU specific flags and options, defined in the CPU definition files. # Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S -display_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork -display_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_SAM3N4__ -display_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/clock_sam3.c -display_PROGRAMMER_CPU = sam3 -display_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -T bertos/cpu/cortex-m3/scripts/sam3n4_rom.ld -display_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh -display_CPU = cortex-m3 -display_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh -display_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh -display_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-sam3.sh - -include $(display_SRC_PATH)/display_user.mk +sam3n-ek_display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S +sam3n-ek_display_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork +sam3n-ek_display_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_SAM3N4__ +sam3n-ek_display_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/clock_sam3.c +sam3n-ek_display_PROGRAMMER_CPU = sam3 +sam3n-ek_display_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -T bertos/cpu/cortex-m3/scripts/sam3n4_rom.ld +sam3n-ek_display_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh +sam3n-ek_display_CPU = cortex-m3 +sam3n-ek_display_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh +sam3n-ek_display_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh +sam3n-ek_display_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-sam3.sh + +include $(sam3n-ek_display_SRC_PATH)/sam3n-ek_display_user.mk diff --git a/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display_user.mk b/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display_user.mk index 4fabfb74..5b3022df 100644 --- a/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display_user.mk +++ b/boards/sam3n-ek/examples/sam3n-ek_display/sam3n-ek_display_user.mk @@ -4,44 +4,44 @@ # # Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help -display_PROGRAMMER_TYPE = none -display_PROGRAMMER_PORT = none +sam3n-ek_display_PROGRAMMER_TYPE = none +sam3n-ek_display_PROGRAMMER_PORT = none # Files included by the user. -display_USER_CSRC = \ - $(display_SRC_PATH)/main.c \ - $(display_SRC_PATH)/bitmaps.c \ +sam3n-ek_display_USER_CSRC = \ + $(sam3n-ek_display_SRC_PATH)/main.c \ + $(sam3n-ek_display_SRC_PATH)/bitmaps.c \ bertos/icons/logo.c \ bertos/fonts/gohu.c \ bertos/cpu/cortex-m3/drv/spi_dma_sam3.c \ # # Files included by the user. -display_USER_PCSRC = \ +sam3n-ek_display_USER_PCSRC = \ # # Files included by the user. -display_USER_CPPASRC = \ +sam3n-ek_display_USER_CPPASRC = \ # # Files included by the user. -display_USER_CXXSRC = \ +sam3n-ek_display_USER_CXXSRC = \ # # Files included by the user. -display_USER_ASRC = \ +sam3n-ek_display_USER_ASRC = \ # # Flags included by the user. -display_USER_LDFLAGS = \ +sam3n-ek_display_USER_LDFLAGS = \ # # Flags included by the user. -display_USER_CPPAFLAGS = \ +sam3n-ek_display_USER_CPPAFLAGS = \ # # Flags included by the user. -display_USER_CPPFLAGS = \ +sam3n-ek_display_USER_CPPFLAGS = \ -fno-strict-aliasing \ -fwrapv \ -O2 \ -- 2.25.1