Embedded/elua
1
0
Fork 0
mirror of https://github.com/elua/elua.git synced 2025-01-25 01:02:54 +08:00
Code Issues Projects Releases Wiki Activity

XMC45: Fix compilation on relax and protocard targets

Browse Source
This commit is contained in:
Raman 2019-01-20 10:15:07 +05:30
parent 5536736595
commit fbf9974f4d
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/known/xmc4500-protocard-v2.lua
View File

@ -30,14 +30,15 @@ return {
shell = true,
term = { lines = 25, cols = 80 },
linenoise = { shell_lines = 10, lua_lines = 50 },
xmodem = false
xmodem = false,
niffs = false,
},
config = {
egc = { mode = "alloc" },
ram = { internal_rams = 3 },
},
modules = {
generic = { 'all', '-i2c', '-net', '-adc', '-spi', '-uart', '-can', '-pwm', '-rpc' },
generic = { 'all', '-tmr', '-i2c', '-net', '-adc', '-spi', '-uart', '-can', '-pwm', '-rpc' },
platform = 'all',
}
}

3
boards/known/xmc4500-relax.lua
View File

@ -40,13 +40,14 @@ return {
term = { lines = 25, cols = 80 },
linenoise = { shell_lines = 10, lua_lines = 50 },
xmodem = false,
niffs = false,
},
config = {
egc = { mode = "alloc" },
ram = { internal_rams = 3 },
},
modules = {
generic = { 'all', '-i2c', '-net', '-adc', '-spi', '-uart', '-can', '-pwm', '-rpc' },
generic = { 'all', '-tmr', '-i2c', '-net', '-adc', '-spi', '-uart', '-can', '-pwm', '-rpc' },
platform = 'all',
}
}

2
src/platform/xmc4000/cpu_xmc4500f144k1024.h
View File

@ -3,6 +3,7 @@
#define __CPU_XMC4500F144K1024_H__
#include "stacks.h"
#include "DAVE.h"
// Number of resources (0 if not available/not implemented)
#define NUM_PIO 16
@ -12,6 +13,7 @@
#define NUM_PWM 0
#define NUM_ADC 0
#define NUM_CAN 0
#define NUM_DAC 2
// CPU frequency (needed by the CPU module and MMCFS code, 0 if not used)
#define CPU_FREQUENCY 120000000

4
src/platform/xmc4000/disp.c
View File

@ -5,7 +5,7 @@
// Taken from platform/lm3s/disp.c. Adapted for Infineon XMC4500 Hexagonal
// kit by Raman
#if !defined( XMC4700_F144x2048 )
#if defined( ELUA_BOARD_XMC4500HEXAGON )
#include "lua.h"
#include "lualib.h"
@ -84,4 +84,4 @@ const LUA_REG_TYPE disp_map[] =
{ LNILKEY, LNILVAL }
};
#endif /* #if !defined( XMC4700_F144x2048 ) */
#endif /* #if !defined( XMC4700_F144x2048 ) */

6
src/platform/xmc4000/platform.c
View File

@ -16,7 +16,6 @@
// Platform includes
#include "DAVE.h"
#include "xmc_dac.h"
#if defined ( XMC4500_F144k1024 )
# include "XMC4500.h"
@ -26,6 +25,9 @@
# include "XMC4700.h"
#endif
// Peripheral includes
#include "xmc_dac.h"
// Handles uart receive
uint8_t recv_byte;
@ -69,7 +71,7 @@ int platform_init()
// ****************************************************************************
// PIO
#if defined ( XMC4700_F144x2048 )
#if defined ( ELUA_CPU_XMC4700F144K2048 ) || defined ( ELUA_CPU_XMC4500F144K1024 )
static XMC_GPIO_PORT_t *const pio_port[] =
{