summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1140350)
raw | patch | inline | side by side (parent: 1140350)
author | Gerardo Gomez Martinez <gerardo@ti.com> | |
Thu, 27 Aug 2020 21:48:13 +0000 (14:48 -0700) | ||
committer | Gal Milner <gal-milner@ti.com> | |
Thu, 5 Nov 2020 13:14:10 +0000 (05:14 -0800) |
This commit consolidates work done for the Plugin for AWS IoT 4.30
release. It is based on TI's SimpleLink 4.30 SDKs, and
Amazon's AWS IoT C SDK v3.0.1.
Support the SimpleLink 4.30 (Q3 2020) SDKs
(AWSIOT-87)
Add SNTP module to SysConfig
(AWSIOT-90)
Add GenLibs support to examples
Signed-off-by: Gal Milner <gal-milner@ti.com>
release. It is based on TI's SimpleLink 4.30 SDKs, and
Amazon's AWS IoT C SDK v3.0.1.
Support the SimpleLink 4.30 (Q3 2020) SDKs
(AWSIOT-87)
Add SNTP module to SysConfig
(AWSIOT-90)
Add GenLibs support to examples
Signed-off-by: Gal Milner <gal-milner@ti.com>
19 files changed:
diff --git a/.gitignore b/.gitignore
index 438226ab9760ce1d4ec91123e5bbafc1708031ee..bcc01e3222b734c95932159ac3a447f991ee416e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
ti_drivers_net_wifi_config.c
ti_net_config.c
ti_ndk_config.c
+ti_utils_*
diff --git a/README_CC32XX.md b/README_CC32XX.md
index ebd7fd2b0aa633ea20d63287e07200f488b5e78d..68a975969eb05f8795713b46f56b87a5b30c06ab 100644 (file)
--- a/README_CC32XX.md
+++ b/README_CC32XX.md
## TI Software Installation
The following TI software products must be installed in order to build and run the example applications. While not strictly required, we recommend that you install these products into a common directory and that you use directory names without any whitespace. This documentation assumes that you haved installed everything into a directory named `C:/ti`.
-- Install [Code Composer Studio (CCS) IDE, v10.0 or compatible](http://processors.wiki.ti.com/index.php/Download_CCS)
-- Install [TI SimpleLink Wi-Fi CC32XX Software Development Kit (SDK), v4.10 or compatible](http://www.ti.com/tool/simplelink-cc3220-sdk)
+- Install [Code Composer Studio (CCS) IDE, v10.1 or compatible](http://processors.wiki.ti.com/index.php/Download_CCS)
+- Install [TI SimpleLink Wi-Fi CC32XX Software Development Kit (SDK), v4.30 or compatible](http://www.ti.com/tool/simplelink-cc3220-sdk)
- Install [Uniflash Tool](http://www.ti.com/tool/uniflash)
<a name="Enviro-Setup"></a>
@@ -55,10 +55,10 @@ The following TI software products must be installed in order to build and run t
1. Note that the variable `SIMPLELINK_MSP432E4_SDK_INSTALL_DIR` *does not* need to be updated, as it is used for a different hardware platform.
1. After modification, these variable definitions should look similar to the following if you are working in Windows. (Windows users: note the use of "/" in the path).
```
- SIMPLELINK_CC32XX_SDK_INSTALL_DIR = C:/ti/simplelink_cc32xx_sdk_4_10_xx_xx
- XDC_INSTALL_DIR = C:/ti/xdctools_3_61_00_16_core
- TI_ARM_CODEGEN_INSTALL_DIR = C:/ti/ccs1000/ccs/tools/compiler/ti-cgt-arm_20.2.0.LTS
- SYSCONFIG_TOOL = C:/ti/ccs1000/ccs/utils/sysconfig_1.4.0/sysconfig_cli.bat
+ SIMPLELINK_CC32XX_SDK_INSTALL_DIR = C:/ti/simplelink_cc32xx_sdk_4_30_xx_xx
+ XDC_INSTALL_DIR = C:/ti/xdctools_3_61_02_27_core
+ TI_ARM_CODEGEN_INSTALL_DIR = C:/ti/ccs1011/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS
+ SYSCONFIG_TOOL = C:/ti/ccs1011/ccs/utils/sysconfig_1.6.0/sysconfig_cli.bat
```
### Notes On The gmake Utiltity
@@ -120,7 +120,7 @@ Before flashing the certificates make sure to rename the files to match the valu
On the command line, enter the following commands to build the application:
cd <AWS_INSTALL_DIR>/samples/tirtos/subscribe_publish_sample/cc3220sf
- C:/ti/xdctools_3_61_00_16_core/gmake all
+ C:/ti/xdctools_3_61_02_27_core/gmake all
<a name="Setup-CCS"></a>
## Setting Up Code Composer Studio Before Running The Examples
diff --git a/products.mak b/products.mak
index be1f646d975ef68b12c1ee0dda6047ce72826b4f..d4f1d0e7947ff3e89c97c52a4a4cd07b33e441c3 100644 (file)
--- a/products.mak
+++ b/products.mak
XDC_INSTALL_DIR = /path/to/xdctools_installation
TI_ARM_CODEGEN_INSTALL_DIR = /path/to/TI_ARM_compiler
SYSCONFIG_TOOL = /path/to/sysconfig_tool
-
-###### Below are assigned automatically (and only used on CC32XX) ######
-TIRTOS_INSTALL_DIR := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220s/aws_iot.syscfg b/samples/tirtos/subscribe_publish_sample/cc3220s/aws_iot.syscfg
index 6b41aa9102ef53256dfb1439fe012db785ee1d20..805ce1e6e46444518e528344cdcf92c15ba97087 100644 (file)
/*
- * Copyright (c) 2018-2019, Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated - http://www.ti.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
var interface1 = SlNet.addInstance();
interface1.id = 1;
+/* ======== SNTP ======== */
+scripting.addModule("/ti/net/SNTP");
+
/* ======== Display ======== */
var Display = scripting.addModule("/ti/display/Display");
var display = Display.addInstance();
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235s/CC3235S_LAUNCHXL_TIRTOS.cmd b/samples/tirtos/subscribe_publish_sample/cc3220s/cc32xxs_tirtos.cmd
similarity index 82%
rename from samples/tirtos/subscribe_publish_sample/cc3235s/CC3235S_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3220s/cc32xxs_tirtos.cmd
index ffc0bdd1a9e72ab1a20f870ff478964af94ebb52..82094523f2d9c850da860fdde5c654df3b2148e4 100644 (file)
rename from samples/tirtos/subscribe_publish_sample/cc3235s/CC3235S_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3220s/cc32xxs_tirtos.cmd
index ffc0bdd1a9e72ab1a20f870ff478964af94ebb52..82094523f2d9c850da860fdde5c654df3b2148e4 100644 (file)
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * ======== CC3235S_LAUNCHXL.cmd ========
- */
-
/*
* The starting address of the application. Normally the interrupt vectors
* must be located at the beginning of the application.
{
SRAM0 (RWX) : origin = 0x20000000, length = 0x4000
SRAM (RWX) : origin = 0x20004000, length = 0x00040000 - 0x4000
+ /* Explicitly placed off target for the storage of logging data.
+ * The data placed here is NOT loaded onto the target device.
+ * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
+ * ARM memory map can be found here:
+ * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
+ */
+ LOG_DATA (R) : origin = 0x90000000, length = 0x40000
}
/* Section allocation in memory */
+--retain "*(.resetVecs)"
+
SECTIONS
{
+ .resetVecs : > 0x20004000
.text : > SRAM
.bss : > SRAM
.TI.ramfunc : > SRAM
.const : > SRAM
.rodata : > SRAM
+ .vecs : > 0x20000000
.sysmem : > SRAM
.cinit : > SRAM
.pinit : > SRAM
} > SRAM align 8
.stack : > SRAM0(HIGH)
+ .log_data : > LOG_DATA, type = COPY
}
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220s/makedefs b/samples/tirtos/subscribe_publish_sample/cc3220s/makedefs
index bfd63a9434b624fc4ba18b0a90ec81cf252dbe80..78740f0f79127a691ace41713995639fc7f789cd 100644 (file)
#
-# Copyright (c) 2017-2018, Texas Instruments Incorporated
+# Copyright (c) 2017-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
LD = $(CODEGEN_INSTALL_DIR)/bin/armcl -z
AR = $(CODEGEN_INSTALL_DIR)/bin/armar
-KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/CC3220S_LAUNCHXL/release
+KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/cc32xx/release
CONFIGPKG = $(KERNEL_BUILD)/ccs
CFLAGS = -eo=.o -mv7M4 --float_support=vfplib --abi=eabi -me -ms --c99 -I. -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/net/bsd -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/posix/ccs -I$(CODEGEN_INSTALL_DIR)/include -DNET_SL
LFLAGS = --rom_model --warn_sections -i$(CODEGEN_INSTALL_DIR)/lib \
- -l$(CONFIGPKG)/linker.cmd \
-i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source \
- -lti/net/lib/ccs/m4/slnetsock_release.a \
- -lti/net/sntp/lib/ccs/m4/sntp_release.a \
- -lti/drivers/net/wifi/slnetif/ccs/Release/slnetifwifi.a \
- -lti/display/lib/display.aem4 \
- -lti/drivers/net/wifi/ccs/rtos/simplelink.a \
- -lti/drivers/lib/drivers_cc32xx.aem4 \
- -l$(TIRTOS_INSTALL_DIR)/packages/ti/dpl/lib/dpl_cc32xx.aem4 \
+ -i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/packages \
+ ti_utils_build_linker.cmd.genlibs \
+ -l$(CONFIGPKG)/linker.cmd \
-lti/devices/cc32xx/driverlib/ccs/Release/driverlib.a \
- CC3220S_LAUNCHXL_TIRTOS.cmd -llibc.a
+ cc32xxs_tirtos.cmd -llibc.a
%.o : %.c
$(CC) $(CFLAGS) -c $<
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220s/makefile b/samples/tirtos/subscribe_publish_sample/cc3220s/makefile
index 17adbebe945d1bace7fbc8932454de5b519c1d66..df10f51f8cd872fbd4a4e19c05a356af3a2df26d 100644 (file)
#
-# Copyright (c) 2017-2019, Texas Instruments Incorporated
+# Copyright (c) 2017-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
clean:
@echo cleaning ..
- $(RM) *.o *.out *.map *.rov.xs
- @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_drivers_config.h
- $(RMDIR) $(APP)
+ @ $(RM) *.o *.out *.map *.rov.xs
+ @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_utils_build_linker.cmd.genlibs ti_drivers_config.h
+ @ $(RMDIR)
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220sf/aws_iot.syscfg b/samples/tirtos/subscribe_publish_sample/cc3220sf/aws_iot.syscfg
index 6b41aa9102ef53256dfb1439fe012db785ee1d20..805ce1e6e46444518e528344cdcf92c15ba97087 100644 (file)
/*
- * Copyright (c) 2018-2019, Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated - http://www.ti.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
var interface1 = SlNet.addInstance();
interface1.id = 1;
+/* ======== SNTP ======== */
+scripting.addModule("/ti/net/SNTP");
+
/* ======== Display ======== */
var Display = scripting.addModule("/ti/display/Display");
var display = Display.addInstance();
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235sf/CC3235SF_LAUNCHXL_TIRTOS.cmd b/samples/tirtos/subscribe_publish_sample/cc3220sf/cc32xxsf_tirtos.cmd
similarity index 83%
rename from samples/tirtos/subscribe_publish_sample/cc3235sf/CC3235SF_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3220sf/cc32xxsf_tirtos.cmd
index fd2123045b700cf97eb351e9d069af03844f69c4..25fdba784abc2565015a606014406d21147a77ab 100644 (file)
rename from samples/tirtos/subscribe_publish_sample/cc3235sf/CC3235SF_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3220sf/cc32xxsf_tirtos.cmd
index fd2123045b700cf97eb351e9d069af03844f69c4..25fdba784abc2565015a606014406d21147a77ab 100644 (file)
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * ======== CC3235SF_LAUNCHXL.cmd ========
- */
-
/*
* The starting address of the application. Normally the interrupt vectors
* must be located at the beginning of the application.
FLASH_HDR (RX) : origin = 0x01000000, length = 0x7FF /* 2 KB */
FLASH (RX) : origin = 0x01000800, length = 0x0FF800 /* 1022KB */
SRAM (RWX) : origin = 0x20000000, length = 0x00040000 /* 256KB */
+ /* Explicitly placed off target for the storage of logging data.
+ * The data placed here is NOT loaded onto the target device.
+ * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
+ * ARM memory map can be found here:
+ * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
+ */
+ LOG_DATA (R) : origin = 0x90000000, length = 0x40000
+
}
/* Section allocation in memory */
+--retain "*(.resetVecs)"
+
SECTIONS
{
.dbghdr : > FLASH_HDR
+ .resetVecs : > 0x01000800
.text : > FLASH
.TI.ramfunc : {} load=FLASH, run=SRAM, table(BINIT)
.const : > FLASH
.pinit : > FLASH
.init_array : > FLASH
+ .vecs : > 0x20000000
.data : > SRAM
.bss : > SRAM
.sysmem : > SRAM
} > SRAM align 8
.stack : > SRAM(HIGH)
+ .log_data : > LOG_DATA, type = COPY
}
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220sf/makedefs b/samples/tirtos/subscribe_publish_sample/cc3220sf/makedefs
index f3008eed7ad6590f06a5f593159bd338113feb7d..d3075d5994e2d3d30e5518dfb4732b6f23a3cc0f 100644 (file)
#
-# Copyright (c) 2017-2018, Texas Instruments Incorporated
+# Copyright (c) 2017-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
LD = $(CODEGEN_INSTALL_DIR)/bin/armcl -z
AR = $(CODEGEN_INSTALL_DIR)/bin/armar
-KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/CC3220SF_LAUNCHXL/release
+KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/cc32xx/release
CONFIGPKG = $(KERNEL_BUILD)/ccs
CFLAGS = -eo=.o -mv7M4 --float_support=vfplib --abi=eabi -me -ms --c99 -I. -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/net/bsd -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/posix/ccs -I$(CODEGEN_INSTALL_DIR)/include -DNET_SL
LFLAGS = --rom_model --warn_sections -i$(CODEGEN_INSTALL_DIR)/lib \
- -l$(CONFIGPKG)/linker.cmd \
-i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source \
- -lti/net/lib/ccs/m4/slnetsock_release.a \
- -lti/net/sntp/lib/ccs/m4/sntp_release.a \
- -lti/drivers/net/wifi/slnetif/ccs/Release/slnetifwifi.a \
- -lti/display/lib/display.aem4 \
- -lti/drivers/net/wifi/ccs/rtos/simplelink.a \
- -lti/drivers/lib/drivers_cc32xx.aem4 \
- -l$(TIRTOS_INSTALL_DIR)/packages/ti/dpl/lib/dpl_cc32xx.aem4 \
+ -i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/packages \
+ ti_utils_build_linker.cmd.genlibs \
+ -l$(CONFIGPKG)/linker.cmd \
-lti/devices/cc32xx/driverlib/ccs/Release/driverlib.a \
- CC3220SF_LAUNCHXL_TIRTOS.cmd -llibc.a
+ cc32xxsf_tirtos.cmd -llibc.a
%.o : %.c
$(CC) $(CFLAGS) -c $<
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220sf/makefile b/samples/tirtos/subscribe_publish_sample/cc3220sf/makefile
index d430eb111f78d66e438bc83cece969c3c989d3b0..20b7d1aa9ed408ef9aa93684736737778be64a0f 100644 (file)
#
-# Copyright (c) 2017-2019, Texas Instruments Incorporated
+# Copyright (c) 2017-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
clean:
@echo cleaning ..
- $(RM) *.o *.out *.map *.rov.xs
- @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_drivers_config.h
- $(RMDIR) $(APP)
+ @ $(RM) *.o *.out *.map *.rov.xs
+ @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_utils_build_linker.cmd.genlibs ti_drivers_config.h
+ @ $(RMDIR)
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235s/aws_iot.syscfg b/samples/tirtos/subscribe_publish_sample/cc3235s/aws_iot.syscfg
index 6b41aa9102ef53256dfb1439fe012db785ee1d20..805ce1e6e46444518e528344cdcf92c15ba97087 100644 (file)
/*
- * Copyright (c) 2018-2019, Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated - http://www.ti.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
var interface1 = SlNet.addInstance();
interface1.id = 1;
+/* ======== SNTP ======== */
+scripting.addModule("/ti/net/SNTP");
+
/* ======== Display ======== */
var Display = scripting.addModule("/ti/display/Display");
var display = Display.addInstance();
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220s/CC3220S_LAUNCHXL_TIRTOS.cmd b/samples/tirtos/subscribe_publish_sample/cc3235s/cc32xxs_tirtos.cmd
similarity index 80%
rename from samples/tirtos/subscribe_publish_sample/cc3220s/CC3220S_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3235s/cc32xxs_tirtos.cmd
index 53ff0c80f78a645349ddec7eaeda4b07cff5706a..82094523f2d9c850da860fdde5c654df3b2148e4 100644 (file)
rename from samples/tirtos/subscribe_publish_sample/cc3220s/CC3220S_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3235s/cc32xxs_tirtos.cmd
index 53ff0c80f78a645349ddec7eaeda4b07cff5706a..82094523f2d9c850da860fdde5c654df3b2148e4 100644 (file)
/*
- * Copyright (c) 2016-2020, Texas Instruments Incorporated
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * ======== CC3220S_LAUNCHXL.cmd ========
- */
-
/*
* The starting address of the application. Normally the interrupt vectors
* must be located at the beginning of the application.
{
SRAM0 (RWX) : origin = 0x20000000, length = 0x4000
SRAM (RWX) : origin = 0x20004000, length = 0x00040000 - 0x4000
+ /* Explicitly placed off target for the storage of logging data.
+ * The data placed here is NOT loaded onto the target device.
+ * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
+ * ARM memory map can be found here:
+ * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
+ */
+ LOG_DATA (R) : origin = 0x90000000, length = 0x40000
}
/* Section allocation in memory */
+--retain "*(.resetVecs)"
+
SECTIONS
{
+ .resetVecs : > 0x20004000
.text : > SRAM
.bss : > SRAM
.TI.ramfunc : > SRAM
.const : > SRAM
.rodata : > SRAM
+ .vecs : > 0x20000000
.sysmem : > SRAM
.cinit : > SRAM
.pinit : > SRAM
} > SRAM align 8
.stack : > SRAM0(HIGH)
+ .log_data : > LOG_DATA, type = COPY
}
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235s/makedefs b/samples/tirtos/subscribe_publish_sample/cc3235s/makedefs
index b7e8e65f411030be17b27689d7dd0972041fb5a8..c2f59b896173e346fb069fc07204154e58a310e7 100644 (file)
#
-# Copyright (c) 2019, Texas Instruments Incorporated
+# Copyright (c) 2019-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
LD = $(CODEGEN_INSTALL_DIR)/bin/armcl -z
AR = $(CODEGEN_INSTALL_DIR)/bin/armar
-KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/CC3235S_LAUNCHXL/release
+KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/cc32xx/release
CONFIGPKG = $(KERNEL_BUILD)/ccs
CFLAGS = -eo=.o -mv7M4 --float_support=vfplib --abi=eabi -me -ms --c99 -I. -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/net/bsd -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/posix/ccs -I$(CODEGEN_INSTALL_DIR)/include -DNET_SL
LFLAGS = --rom_model --warn_sections -i$(CODEGEN_INSTALL_DIR)/lib \
- -l$(CONFIGPKG)/linker.cmd \
-i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source \
- -lti/net/lib/ccs/m4/slnetsock_release.a \
- -lti/net/sntp/lib/ccs/m4/sntp_release.a \
- -lti/drivers/net/wifi/slnetif/ccs/Release/slnetifwifi.a \
- -lti/display/lib/display.aem4 \
- -lti/drivers/net/wifi/ccs/rtos/simplelink.a \
- -lti/drivers/lib/drivers_cc32xx.aem4 \
- -l$(TIRTOS_INSTALL_DIR)/packages/ti/dpl/lib/dpl_cc32xx.aem4 \
+ -i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/packages \
+ ti_utils_build_linker.cmd.genlibs \
+ -l$(CONFIGPKG)/linker.cmd \
-lti/devices/cc32xx/driverlib/ccs/Release/driverlib.a \
- CC3235S_LAUNCHXL_TIRTOS.cmd -llibc.a
+ cc32xxs_tirtos.cmd -llibc.a
%.o : %.c
$(CC) $(CFLAGS) -c $<
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235s/makefile b/samples/tirtos/subscribe_publish_sample/cc3235s/makefile
index a6f58d9e490b88e3f0be928bdc6e29c813f3696c..2a6bdd37110fa80796d6910d15d825590a2e94d4 100644 (file)
#
-# Copyright (c) 2019, Texas Instruments Incorporated
+# Copyright (c) 2019-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
clean:
@echo cleaning ..
- $(RM) *.o *.out *.map *.rov.xs
- @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_drivers_config.h
- $(RMDIR) $(APP)
+ @ $(RM) *.o *.out *.map *.rov.xs
+ @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_utils_build_linker.cmd.genlibs ti_drivers_config.h
+ @ $(RMDIR)
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235sf/aws_iot.syscfg b/samples/tirtos/subscribe_publish_sample/cc3235sf/aws_iot.syscfg
index 6b41aa9102ef53256dfb1439fe012db785ee1d20..805ce1e6e46444518e528344cdcf92c15ba97087 100644 (file)
/*
- * Copyright (c) 2018-2019, Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated - http://www.ti.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
var interface1 = SlNet.addInstance();
interface1.id = 1;
+/* ======== SNTP ======== */
+scripting.addModule("/ti/net/SNTP");
+
/* ======== Display ======== */
var Display = scripting.addModule("/ti/display/Display");
var display = Display.addInstance();
diff --git a/samples/tirtos/subscribe_publish_sample/cc3220sf/CC3220SF_LAUNCHXL_TIRTOS.cmd b/samples/tirtos/subscribe_publish_sample/cc3235sf/cc32xxsf_tirtos.cmd
similarity index 82%
rename from samples/tirtos/subscribe_publish_sample/cc3220sf/CC3220SF_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3235sf/cc32xxsf_tirtos.cmd
index 0ba49b5e2c3ce454e5b8be4b9e7eb7ec03b80696..25fdba784abc2565015a606014406d21147a77ab 100644 (file)
rename from samples/tirtos/subscribe_publish_sample/cc3220sf/CC3220SF_LAUNCHXL_TIRTOS.cmd
rename to samples/tirtos/subscribe_publish_sample/cc3235sf/cc32xxsf_tirtos.cmd
index 0ba49b5e2c3ce454e5b8be4b9e7eb7ec03b80696..25fdba784abc2565015a606014406d21147a77ab 100644 (file)
/*
- * Copyright (c) 2016-2020, Texas Instruments Incorporated
+ * Copyright (c) 2018-2020, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * ======== CC3220SF_LAUNCHXL.cmd ========
- */
-
/*
* The starting address of the application. Normally the interrupt vectors
* must be located at the beginning of the application.
FLASH_HDR (RX) : origin = 0x01000000, length = 0x7FF /* 2 KB */
FLASH (RX) : origin = 0x01000800, length = 0x0FF800 /* 1022KB */
SRAM (RWX) : origin = 0x20000000, length = 0x00040000 /* 256KB */
+ /* Explicitly placed off target for the storage of logging data.
+ * The data placed here is NOT loaded onto the target device.
+ * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
+ * ARM memory map can be found here:
+ * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
+ */
+ LOG_DATA (R) : origin = 0x90000000, length = 0x40000
+
}
/* Section allocation in memory */
+--retain "*(.resetVecs)"
+
SECTIONS
{
.dbghdr : > FLASH_HDR
+ .resetVecs : > 0x01000800
.text : > FLASH
.TI.ramfunc : {} load=FLASH, run=SRAM, table(BINIT)
.const : > FLASH
.pinit : > FLASH
.init_array : > FLASH
+ .vecs : > 0x20000000
.data : > SRAM
.bss : > SRAM
.sysmem : > SRAM
} > SRAM align 8
.stack : > SRAM(HIGH)
+ .log_data : > LOG_DATA, type = COPY
}
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235sf/makedefs b/samples/tirtos/subscribe_publish_sample/cc3235sf/makedefs
index ea8c4eadd482dceba0524e5c0a43839cae067c49..38444046bae3e13ce8e4a2acfcff9080c7045512 100644 (file)
#
-# Copyright (c) 2019, Texas Instruments Incorporated
+# Copyright (c) 2019-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
LD = $(CODEGEN_INSTALL_DIR)/bin/armcl -z
AR = $(CODEGEN_INSTALL_DIR)/bin/armar
-KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/CC3235SF_LAUNCHXL/release
+KERNEL_BUILD := $(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/builds/cc32xx/release
CONFIGPKG = $(KERNEL_BUILD)/ccs
CFLAGS = -eo=.o -mv7M4 --float_support=vfplib --abi=eabi -me -ms --c99 -I. -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/net/bsd -I$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source/ti/posix/ccs -I$(CODEGEN_INSTALL_DIR)/include -DNET_SL
LFLAGS = --rom_model --warn_sections -i$(CODEGEN_INSTALL_DIR)/lib \
- -l$(CONFIGPKG)/linker.cmd \
-i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/source \
- -lti/net/lib/ccs/m4/slnetsock_release.a \
- -lti/net/sntp/lib/ccs/m4/sntp_release.a \
- -lti/drivers/net/wifi/slnetif/ccs/Release/slnetifwifi.a \
- -lti/display/lib/display.aem4 \
- -lti/drivers/net/wifi/ccs/rtos/simplelink.a \
- -lti/drivers/lib/drivers_cc32xx.aem4 \
- -l$(TIRTOS_INSTALL_DIR)/packages/ti/dpl/lib/dpl_cc32xx.aem4 \
+ -i$(SIMPLELINK_CC32XX_SDK_INSTALL_DIR)/kernel/tirtos/packages \
+ ti_utils_build_linker.cmd.genlibs \
+ -l$(CONFIGPKG)/linker.cmd \
-lti/devices/cc32xx/driverlib/ccs/Release/driverlib.a \
- CC3235SF_LAUNCHXL_TIRTOS.cmd -llibc.a
+ cc32xxsf_tirtos.cmd -llibc.a
%.o : %.c
$(CC) $(CFLAGS) -c $<
diff --git a/samples/tirtos/subscribe_publish_sample/cc3235sf/makefile b/samples/tirtos/subscribe_publish_sample/cc3235sf/makefile
index 923ee86f041467070f5a3af56139adbd4aa3963d..58d9cee69c98c6064d8513d59aa65b9ef9d820de 100644 (file)
#
-# Copyright (c) 2019, Texas Instruments Incorporated
+# Copyright (c) 2019-2020, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
clean:
@echo cleaning ..
- $(RM) *.o *.out *.map *.rov.xs
- @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_drivers_config.h
- $(RMDIR) $(APP)
+ @ $(RM) *.o *.out *.map *.rov.xs
+ @ $(RM) ti_drivers_config.c ti_net_config.c ti_drivers_net_wifi_config.c ti_utils_build_linker.cmd.genlibs ti_drivers_config.h
+ @ $(RMDIR)