lpcmanager

Reflect xenomai3 fix in beremiz. Match beremiz changeset 9fa2f8ede5d6
revamp
2018-05-07, Edouard Tisserant
21fe998eea17
Parents 68faf0ff3869
Children c4244c0ad6c7
Reflect xenomai3 fix in beremiz. Match beremiz changeset 9fa2f8ede5d6
2 files changed, 1 insertions(+), 15 deletions(-)
  • +1 -1
    MC9target/XSD
  • +0 -14
    MC9target/plc_MC9_main_retain.c
    • --- a/MC9target/XSD Tue Apr 10 14:37:41 2018 +0200
    +++ b/MC9target/XSD Mon May 07 14:02:52 2018 +0200
    @@ -3,7 +3,7 @@
    <xsd:attribute name="Compiler" type="xsd:string" use="optional" default="arm-unknown-linux-gnueabi-gcc"/>
    <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-unknown-linux-gnueabi-gcc"/>
    - <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-pic.o -L../arm-linux-gnueabi-apf28/usr/lib -lcobalt -lmodechk -lpthread -lrt "/>
    + <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 -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 Tue Apr 10 14:37:41 2018 +0200
    +++ b/MC9target/plc_MC9_main_retain.c Mon May 07 14:02:52 2018 +0200
    @@ -6,8 +6,6 @@
    #include <xenomai/init.h>
    -#define TEST_SPI_BUS_NUMBER 2
    -
    /* SPI configurable parameters */
    /* --------------------------- */
    /* SPI CLK MODE */
    @@ -313,16 +311,4 @@
    memcpy(p, &priv.buf.vars[offset], count);
    }
    -__attribute__((constructor))
    -void _init_xenomai() {
    - int argc = 0;
    - char *const *argv;
    - xenomai_init(&argc, &argv);
    -}
    -/*
    -__attribute__((destructor))
    -void _cleanup_xenomai() {
    -}
    -*/
    -