Skip to content

Commit 36a5782

Browse files
author
Gil Pitney
committed
ext: simplelink: Restructure CC3220SDK as SimpleLink SDK
The SimpleLink SDK actually encapsulates a family of devices, of which cc32xx is just one device. Other devices can fit under this SDK directory structure. This expansion will also allow the import of the WiFi host driver and its driver porting layer in the future, inserted at the correct levels in the SimpleLink SDK directory heirarchy. Follow the URL (ending in "#directory-structure") referenced in ext/hal/ti/simplelink/README which explains the SDK structure, and where devices fit in. Jira: ZEP-1958 Change-Id: I16515d3e3779de0d55d3b1b8e25029609d1f66c3 Signed-off-by: Gil Pitney <[email protected]>
1 parent c40239d commit 36a5782

File tree

34 files changed

+27
-23
lines changed

34 files changed

+27
-23
lines changed

boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_UART_CC32XX=y
2121
CONFIG_CONSOLE=y
2222
CONFIG_UART_CONSOLE=y
2323

24-
# Enable CC3220 SDK
24+
# Enable SimpleLink CC3220 SDK
2525
CONFIG_HAS_CC3220SDK=y
2626

2727
# Enable DTS parsing

ext/hal/Kbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ obj-$(CONFIG_HAS_MCUX) += nxp/mcux/
22
obj-$(CONFIG_QMSI_BUILTIN) += qmsi/
33
obj-$(CONFIG_HAS_STM32CUBE) += st/stm32cube/
44
obj-$(CONFIG_HAS_CC3200SDK) += ti/cc3200sdk/
5-
obj-$(CONFIG_HAS_CC3220SDK) += ti/cc3220sdk/
5+
obj-$(CONFIG_HAS_CC3220SDK) += ti/simplelink/
66
obj-$(CONFIG_HAS_NORDIC_HAL) += nordic/
77
obj-$(CONFIG_HAS_NORDIC_DRIVERS) += nordic/drivers/

ext/hal/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ source "ext/hal/st/stm32cube/Kconfig"
2424

2525
source "ext/hal/ti/cc3200sdk/Kconfig"
2626

27-
source "ext/hal/ti/cc3220sdk/Kconfig"
27+
source "ext/hal/ti/simplelink/Kconfig"
2828

2929
endmenu

ext/hal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ include $(srctree)/ext/hal/st/stm32cube/Makefile
1515

1616
include $(srctree)/ext/hal/ti/cc3200sdk/Makefile
1717

18-
include $(srctree)/ext/hal/ti/cc3220sdk/Makefile
18+
include $(srctree)/ext/hal/ti/simplelink/Makefile

ext/hal/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ http://www.st.com/en/ecosystems/stm32cube.html
4545

4646
ti
4747
-------
48-
Texas Instruments CC3200 SDK provides a peripheral driver library for
49-
the SimpleLink WiFi family of SoCs.
48+
Texas Instruments SimpleLink SDKs provide peripheral and WiFi driver libraries
49+
for the SimpleLink family of SoCs.

ext/hal/ti/cc3220sdk/Kbuild

Lines changed: 0 additions & 4 deletions
This file was deleted.

ext/hal/ti/cc3220sdk/Makefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

ext/hal/ti/simplelink/Kbuild

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ccflags-$(CONFIG_HAS_CC3220SDK) += -D$(COMPILER)
2+
# Need to build prcm and utils for PRCMCC3220MCUInit, which is not in ROM
3+
obj-$(CONFIG_HAS_CC3220SDK) += source/ti/devices/cc32xx/driverlib/utils.o
4+
obj-$(CONFIG_HAS_CC3220SDK) += source/ti/devices/cc32xx/driverlib/prcm.o
File renamed without changes.

ext/hal/ti/simplelink/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ifdef CONFIG_HAS_CC3220SDK
2+
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx
3+
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx/inc
4+
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx/driverlib
5+
KBUILD_CFLAGS += -DUSE_CC3200_ROM_DRV_API
6+
endif # CONFIG_HAS_CC3220SDK

0 commit comments

Comments
 (0)