summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3cf57ca)
raw | patch | inline | side by side (parent: 3cf57ca)
author | Vitaly Andrianov <vitalya@ti.com> | |
Thu, 3 Aug 2017 17:44:32 +0000 (13:44 -0400) | ||
committer | Vitaly Andrianov <vitalya@ti.com> | |
Wed, 30 Aug 2017 12:30:19 +0000 (08:30 -0400) |
remove unused SPI, GPIO etc calls and remove appropriate libraries
Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
rtos/ethercat_slave_demo/Makefile | patch | blob | history | |
rtos/ethercat_slave_demo/bios/am572x_app.cfg | patch | blob | history | |
rtos/ethercat_slave_demo/src/board_jh.c | [new file with mode: 0644] | patch | blob |
rtos/ethercat_slave_demo/src/board_spi_jh.c | [new file with mode: 0644] | patch | blob |
index d368e1922c5612c400be596f9df6c3bade6a0a89..40816a12bc72474ab3063c35d0b43bca9928b5a4 100644 (file)
-Dxdc_target_name__=A15F
CFLAGS = $(GCCOPT) -g $(INCDIRS) $(XDC_OPT) -mcpu=cortex-a15 \
- $(CCS_COPT) -mfpu=neon
+ $(CCS_COPT) -mfpu=neon -D_JAILHOUSE_INMATE
LDFLAGS= $(GCCOPT) -Dam5728 -Dcore0 \
$(CCS_L) \
$(IA_SDK_HOME)/examples/board/common \
$(IA_SDK_HOME)/examples/ethercat_slave \
$(IA_SDK_HOME)/protocols/ethercat_slave/ecat_appl/idkAM57x \
- $(IA_SDK_HOME)/protocols/ethercat_slave/ecat_appl/EcatStack
+ $(IA_SDK_HOME)/protocols/ethercat_slave/ecat_appl/EcatStack \
+ ./src
CSRCS = pruicss_soc.c GPIO_soc.c I2C_soc.c SPI_soc.c UART_soc.c \
- board_gpioLed.c board_i2cLed.c board_spi.c board_phy.c \
+ board_phy.c \
board_misc.c board_tlk105.c board_tlkphy.c tiescutils.c \
tiescappl.c tiesc_soc.c tiescphy_tlk105l.c delay_us.c \
- tiesc_fw_cir_buff.c tiescbsp.c tieschw.c
+ tiesc_fw_cir_buff.c tiescbsp.c tieschw.c \
+ board_jh.c
LDS = ./bios/configPkg/linker.cmd
diff --git a/rtos/ethercat_slave_demo/bios/am572x_app.cfg b/rtos/ethercat_slave_demo/bios/am572x_app.cfg
index a525c35500fea926dc552352d6e6995cc872a7b6..8f27413e103e41024d1ef8d06a20c504aa9cbed3 100644 (file)
var SysMin = xdc.useModule('xdc.runtime.SysMin');
var System = xdc.useModule('xdc.runtime.System');
var Text = xdc.useModule('xdc.runtime.Text');
- //var LoggerBuf = xdc.useModule('xdc.runtime.LoggerBuf');
+//var LoggerBuf = xdc.useModule('xdc.runtime.LoggerBuf');
var BIOS = xdc.useModule('ti.sysbios.BIOS');
var Clock = xdc.useModule('ti.sysbios.knl.Clock');
var Swi = xdc.useModule('ti.sysbios.knl.Swi');
Osal.osType = osType;
var Uart = xdc.loadPackage('ti.drv.uart');
-var I2c = xdc.loadPackage('ti.drv.i2c');
var Pruss = xdc.loadPackage('ti.drv.pruss');
-var Gpio = xdc.loadPackage('ti.drv.gpio');
+// var Gpio = xdc.loadPackage('ti.drv.gpio');
var deviceType = "am572x";
var Csl = xdc.loadPackage('ti.csl');
Csl.Settings.deviceType = deviceType;
-
-/* Load the board package */
-var Board = xdc.loadPackage('ti.board');
-Board.Settings.boardName = "idkAM572x";
-
-
-/* Load the spi package */
-var socType = "am572x";
-var Spi = xdc.loadPackage('ti.drv.spi');
-Spi.Settings.socType = socType;
/*
* Program.argSize sets the size of the .args section.
* The examples don't use command line args so argSize is set to 0.
*/
Program.argSize = 0x0;
-
/*
* Uncomment this line to globally disable Asserts.
* All modules inherit the default from the 'Defaults' module. You
Mmu.setSecondLevelDescMeta(i, i, attrs1);
}
-Program.sectMap["BOARD_IO_DELAY_DATA"] = "OCMC_RAM1";
-Program.sectMap["BOARD_IO_DELAY_CODE"] = "OCMC_RAM1";
\ No newline at end of file
+/* ================= Inmate ====================================== */
+var Cache = xdc.useModule("ti.sysbios.family.arm.a15.Cache");
+Cache.errata798870 = false;
+
+var Hwi = xdc.useModule('ti.sysbios.family.arm.gic.Hwi');
+Hwi.initGicd = false;
+
+var TimerSupport = xdc.module('ti.sysbios.family.shared.vayu.TimerSupport');
+TimerSupport.availMask = 0x0080;
diff --git a/rtos/ethercat_slave_demo/src/board_jh.c b/rtos/ethercat_slave_demo/src/board_jh.c
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2017, Texas Instruments Incorporated
+ * All rights reserved.
+ */
+
+#include <ti/csl/csl_types.h>
+#include <ti/csl/cslr_device.h>
+
+#include <ti/drv/uart/UART.h>
+#include <ti/drv/uart/UART_stdio.h>
+#include <ti/board/board.h>
+
+/**************** I2C stubs *********************************************/
+void Board_setDigOutput(unsigned char ledData)
+{
+ static unsigned char old_val = 0xff;
+
+ if (ledData != old_val) {
+ old_val = ledData;
+ UART_printf("Board_setDigOutput - 0x%02x\n", old_val);
+ }
+}
+
+Board_STATUS Board_getIDInfo(Board_IDInfo *info)
+{
+ *info = (Board_IDInfo) {
+ .header = "Jailhouse",
+ .boardName = "AM572x Inmate",
+ .version = "v0.7",
+ .serialNum = "0001"
+ };
+
+ return BOARD_SOK;
+}
+
+Board_STATUS Board_moduleClockInit()
+{
+ CSL_l4per_cm_core_componentRegs *l4PerCmReg =
+ (CSL_l4per_cm_core_componentRegs *) CSL_MPU_L4PER_CM_CORE_REGS;
+
+ CSL_FINST(l4PerCmReg->CM_L4PER2_PRUSS1_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS1_CLKCTRL_REG_MODULEMODE, DISABLED);
+
+ CSL_FINST(l4PerCmReg->CM_L4PER2_PRUSS1_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS1_CLKCTRL_REG_MODULEMODE, ENABLE);
+
+ while(CSL_L4PER_CM_CORE_COMPONENT_CM_L4PER2_L4_PER2_CLKCTRL_REG_IDLEST_FUNC !=
+ CSL_FEXT(l4PerCmReg->CM_L4PER2_PRUSS1_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS1_CLKCTRL_REG_IDLEST));
+
+ CSL_FINST(l4PerCmReg->CM_L4PER2_PRUSS2_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS2_CLKCTRL_REG_MODULEMODE, DISABLED);
+
+ CSL_FINST(l4PerCmReg->CM_L4PER2_PRUSS2_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS2_CLKCTRL_REG_MODULEMODE, ENABLE);
+
+ while(CSL_L4PER_CM_CORE_COMPONENT_CM_L4PER2_L4_PER2_CLKCTRL_REG_IDLEST_FUNC !=
+ CSL_FEXT(l4PerCmReg->CM_L4PER2_PRUSS2_CLKCTRL_REG,
+ L4PER_CM_CORE_COMPONENT_CM_L4PER2_PRUSS2_CLKCTRL_REG_IDLEST));
+
+ return BOARD_SOK;
+}
+
+Board_STATUS Board_init(Board_initCfg cfg)
+{
+ Board_STATUS ret = BOARD_SOK;
+
+ if (cfg & BOARD_INIT_MODULE_CLOCK)
+ ret = Board_moduleClockInit();
+ if (ret != BOARD_SOK)
+ return ret;
+
+ if (cfg & BOARD_INIT_UART_STDIO)
+ UART_stdioInit(2);
+
+ return ret;
+}
+
+/*************** GPIO stubs **********************/
+void Board_setTriColorLED(uint32_t gpioLeds, uint8_t value)
+{
+ // UART_printf("GPIO_OUT %d - %d\n", gpioLeds, value);
+}
+
+void Board_readHVS(uint8_t *switches)
+{
+ *switches = 0x53;
+}
diff --git a/rtos/ethercat_slave_demo/src/board_spi_jh.c b/rtos/ethercat_slave_demo/src/board_spi_jh.c
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017, Texas Instruments Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Texas Instruments Incorporated nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ **/
+#include <stdbool.h>
+#include <ti/csl/soc.h>
+#include <examples/board/include/board_spi.h>
+#include <ti/drv/uart/UART.h>
+#include <ti/drv/uart/UART_stdio.h>
+
+#define PR_FOO_NAME UART_printf("__%s__\n", __func__);
+
+void Board_readHVS(uint8_t *switches)
+{
+ *switches = 0x53;
+}