Skip to content

ext: simplelink: Restructure CC3220SDK as SimpleLink SDK #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2017
Merged

ext: simplelink: Restructure CC3220SDK as SimpleLink SDK #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CONFIG_UART_CC32XX=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y

# Enable CC3220 SDK
# Enable SimpleLink CC3220 SDK
CONFIG_HAS_CC3220SDK=y

# Enable DTS parsing
Expand Down
2 changes: 1 addition & 1 deletion ext/hal/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ obj-$(CONFIG_HAS_MCUX) += nxp/mcux/
obj-$(CONFIG_QMSI_BUILTIN) += qmsi/
obj-$(CONFIG_HAS_STM32CUBE) += st/stm32cube/
obj-$(CONFIG_HAS_CC3200SDK) += ti/cc3200sdk/
obj-$(CONFIG_HAS_CC3220SDK) += ti/cc3220sdk/
obj-$(CONFIG_HAS_CC3220SDK) += ti/simplelink/
obj-$(CONFIG_HAS_NORDIC_HAL) += nordic/
obj-$(CONFIG_HAS_NORDIC_DRIVERS) += nordic/drivers/
2 changes: 1 addition & 1 deletion ext/hal/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ source "ext/hal/st/stm32cube/Kconfig"

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

source "ext/hal/ti/cc3220sdk/Kconfig"
source "ext/hal/ti/simplelink/Kconfig"

endmenu
2 changes: 1 addition & 1 deletion ext/hal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ include $(srctree)/ext/hal/st/stm32cube/Makefile

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

include $(srctree)/ext/hal/ti/cc3220sdk/Makefile
include $(srctree)/ext/hal/ti/simplelink/Makefile
4 changes: 2 additions & 2 deletions ext/hal/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ http://www.st.com/en/ecosystems/stm32cube.html

ti
-------
Texas Instruments CC3200 SDK provides a peripheral driver library for
the SimpleLink WiFi family of SoCs.
Texas Instruments SimpleLink SDKs provide peripheral and WiFi driver libraries
for the SimpleLink family of SoCs.
4 changes: 0 additions & 4 deletions ext/hal/ti/cc3220sdk/Kbuild
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ext/hal/ti/cc3220sdk/Makefile
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ext/hal/ti/simplelink/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ccflags-$(CONFIG_HAS_CC3220SDK) += -D$(COMPILER)
# Need to build prcm and utils for PRCMCC3220MCUInit, which is not in ROM
obj-$(CONFIG_HAS_CC3220SDK) += source/ti/devices/cc32xx/driverlib/utils.o
obj-$(CONFIG_HAS_CC3220SDK) += source/ti/devices/cc32xx/driverlib/prcm.o
0 ext/hal/ti/cc3220sdk/Kconfig → ext/hal/ti/simplelink/Kconfig
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions ext/hal/ti/simplelink/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ifdef CONFIG_HAS_CC3220SDK
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx/inc
ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/ti/simplelink/source/ti/devices/cc32xx/driverlib
KBUILD_CFLAGS += -DUSE_CC3220_ROM_DRV_API
endif # CONFIG_HAS_CC3220SDK
18 changes: 11 additions & 7 deletions ext/hal/ti/cc3220sdk/README → ext/hal/ti/simplelink/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
The CC3220 SDK provides a peripheral driver library and hardware
register access header files for the Texas Instruments SimpleLink
CC3220S and CC3220SF SoCs.
The SimpleLink SDKs provide peripheral driver and WiFi libraries
and hardware register access header files for the Texas Instruments
SimpleLink SoCs.

The current version supported in Zephyr is CC3220 SDK 1.30.01.03,
downloaded from:
For an explanation of the SimpleLink family SDK directory structure, see:
http://dev.ti.com/tirex/content/simplelink_cc13x0_sdk_1_30_00_06/docs/simplelink_mcu_sdk/Users_Guide.html#directory-structure

The current version supported in Zephyr is the SimpleLink CC3220 SDK
1.30.01.03, downloaded from:

http://www.ti.com/tool/download/SIMPLELINK-CC3220-SDK

A subset of the files in driverlib/ and inc/ are copied from a
Linux CC3220 SDK installation without modification.
A subset of the files in the source/ti/devices/cc32xx/driverlib/ and inc/
directories are copied from a Linux CC3220 SDK installation without
modification.

TI provides the driver library functions burned into ROM at the factory,
or updated via a service pack patch, thus saving application code space.
Expand Down
0 ext/hal/ti/cc3220sdk/driverlib/cpu.h → .../source/ti/devices/cc32xx/driverlib/cpu.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/flash.h → ...ource/ti/devices/cc32xx/driverlib/flash.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/gpio.h → ...source/ti/devices/cc32xx/driverlib/gpio.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/interrupt.h → ...e/ti/devices/cc32xx/driverlib/interrupt.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/pin.h → .../source/ti/devices/cc32xx/driverlib/pin.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/prcm.c → ...source/ti/devices/cc32xx/driverlib/prcm.c
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/prcm.h → ...source/ti/devices/cc32xx/driverlib/prcm.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/rom.h → .../source/ti/devices/cc32xx/driverlib/rom.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/rom_map.h → ...rce/ti/devices/cc32xx/driverlib/rom_map.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/rom_patch.h → ...e/ti/devices/cc32xx/driverlib/rom_patch.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/uart.h → ...source/ti/devices/cc32xx/driverlib/uart.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/utils.c → ...ource/ti/devices/cc32xx/driverlib/utils.c
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/driverlib/utils.h → ...ource/ti/devices/cc32xx/driverlib/utils.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_apps_rcm.h → ...ource/ti/devices/cc32xx/inc/hw_apps_rcm.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_common_reg.h → ...rce/ti/devices/cc32xx/inc/hw_common_reg.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_gpio.h → ...nk/source/ti/devices/cc32xx/inc/hw_gpio.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_gprcm.h → ...k/source/ti/devices/cc32xx/inc/hw_gprcm.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_hib1p2.h → .../source/ti/devices/cc32xx/inc/hw_hib1p2.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_hib3p3.h → .../source/ti/devices/cc32xx/inc/hw_hib3p3.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_ints.h → ...nk/source/ti/devices/cc32xx/inc/hw_ints.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_memmap.h → .../source/ti/devices/cc32xx/inc/hw_memmap.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_ocp_shared.h → ...rce/ti/devices/cc32xx/inc/hw_ocp_shared.h
View file
Open in desktop
File renamed without changes.
0 ext/hal/ti/cc3220sdk/inc/hw_types.h → ...k/source/ti/devices/cc32xx/inc/hw_types.h
View file
Open in desktop
File renamed without changes.