lpcmanager

Updated include paths, CFLAGS and LDFLAGS for MC9 target to reflect new Xenomai3 way.
revamp
2018-03-19, Edouard Tisserant
3990ee40f9f6
Parents b16f66e429e5
Children 63d015d37528
Updated include paths, CFLAGS and LDFLAGS for MC9 target to reflect new Xenomai3 way.
4 files changed, 10 insertions(+), 10 deletions(-)
  • +3 -3
    LPCBus/MC9_Devices_decl.c
  • +3 -3
    LPCBus/MC9_OnBoard_decl.c
  • +2 -2
    MC9target/XSD
  • +2 -2
    MC9target/plc_MC9_main_retain.c
    • --- a/LPCBus/MC9_Devices_decl.c Mon Mar 19 15:24:08 2018 +0100
    +++ b/LPCBus/MC9_Devices_decl.c Mon Mar 19 16:17:40 2018 +0100
    @@ -5,9 +5,9 @@
    #include <fcntl.h>
    #include <sys/select.h>
    -#include <native/task.h>
    -#include <native/mutex.h>
    -#include <native/timer.h>
    +#include <alchemy/task.h>
    +#include <alchemy/mutex.h>
    +#include <alchemy/timer.h>
    #include "beremiz.h"
    --- a/LPCBus/MC9_OnBoard_decl.c Mon Mar 19 15:24:08 2018 +0100
    +++ b/LPCBus/MC9_OnBoard_decl.c Mon Mar 19 16:17:40 2018 +0100
    @@ -1,7 +1,7 @@
    -#include <native/task.h>
    -#include <native/mutex.h>
    -#include <native/timer.h>
    +#include <alchemy/task.h>
    +#include <alchemy/mutex.h>
    +#include <alchemy/timer.h>
    #include <unistd.h>
    #include <fcntl.h>
    #include <rtdm/rtdm.h>
    --- a/MC9target/XSD Mon Mar 19 15:24:08 2018 +0100
    +++ b/MC9target/XSD Mon Mar 19 16:17:40 2018 +0100
    @@ -1,9 +1,9 @@
    <xsd:element name="MC9">
    <xsd:complexType>
    <xsd:attribute name="Compiler" type="xsd:string" use="optional" default="arm-linux-gnueabi-gcc"/>
    - <xsd:attribute name="CFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-linux-gnueabi-apf28 -I../arm-linux-gnueabi-apf28/usr/include/xenomai -D_GNU_SOURCE -D_REENTRANT -DHAVE_RETAIN -Wall -pipe -D__XENO__ -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-variable"/>
    + <xsd:attribute name="CFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-linux-gnueabi-apf28 -DHAVE_RETAIN -pipe -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-variable -I../arm-linux-gnueabi-apf28/usr/include/xenomai/cobalt -I../arm-linux-gnueabi-apf28/usr/include/xenomai -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -D_REENTRANT -fasynchronous-unwind-tables -D__COBALT__ -I../arm-linux-gnueabi-apf28/usr/include/xenomai/alchemy -D__COBALT_WRAP__ "/>
    <xsd:attribute name="Linker" type="xsd:string" use="optional" default="arm-linux-gnueabi-gcc"/>
    - <xsd:attribute name="LDFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-linux-gnueabi-apf28 -lnative -lxenomai -lpthread -lrtdm"/>
    + <xsd:attribute name="LDFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-linux-gnueabi-apf28 -lpthread -Wl,--no-as-needed -Wl,@../arm-linux-gnueabi-apf28/usr/lib/cobalt.wrappers -Wl,@../arm-linux-gnueabi-apf28/usr/lib/modechk.wrappers -lalchemy -lcopperplate ../arm-linux-gnueabi-apf28/usr/lib/xenomai/bootstrap.o -Wl,--wrap=main -Wl,--dynamic-list=../arm-linux-gnueabi-apf28/usr/lib/dynlist.ld -L../arm-linux-gnueabi-apf28/usr/lib -lcobalt -lmodechk -lpthread -lrt "/>
    <xsd:attribute name="XenoConfig" type="xsd:string" use="optional"/>
    </xsd:complexType>
    </xsd:element>
    --- a/MC9target/plc_MC9_main_retain.c Mon Mar 19 15:24:08 2018 +0100
    +++ b/MC9target/plc_MC9_main_retain.c Mon Mar 19 16:17:40 2018 +0100
    @@ -1,6 +1,6 @@
    -#include <native/event.h>
    -#include <native/mutex.h>
    +#include <alchemy/event.h>
    +#include <alchemy/mutex.h>
    #include <rtdm/rtdm.h>
    #include <rtdm/spi_apf28_rtdm_ioctl.h>