diff --git a/pkg/Kconfig b/pkg/Kconfig index 2de9bb54d2..ff003b45e1 100644 --- a/pkg/Kconfig +++ b/pkg/Kconfig @@ -21,7 +21,8 @@ rsource "driver_sx126x/Kconfig" rsource "elk/Kconfig" rsource "emlearn/Kconfig" rsource "esp32_sdk/Kconfig" -rsource "esp32_sdk_libs/Kconfig" +rsource "esp32_sdk_lib_phy/Kconfig" +rsource "esp32_sdk_lib_wifi/Kconfig" rsource "esp8266_sdk/Kconfig" rsource "etl/Kconfig" rsource "fff/Kconfig" diff --git a/pkg/esp32_sdk_libs/Kconfig b/pkg/esp32_sdk_lib_phy/Kconfig similarity index 64% rename from pkg/esp32_sdk_libs/Kconfig rename to pkg/esp32_sdk_lib_phy/Kconfig index fb210b0aec..8a795bdae2 100644 --- a/pkg/esp32_sdk_libs/Kconfig +++ b/pkg/esp32_sdk_lib_phy/Kconfig @@ -5,9 +5,9 @@ # directory for more details. # -config PACKAGE_ESP32_SDK_LIBS - bool "ESP32 SDK libraries for the ESP32 MCU support" +config PACKAGE_ESP32_SDK_LIB_PHY + bool "ESP32 SDK libraries for the ESP32 SoC support" depends on TEST_KCONFIG depends on HAS_ARCH_ESP32 help - Vendor SDK libraries for ESP32 MCU support by Espressif + Vendor SDK libraries for ESP32 SoC support by Espressif diff --git a/pkg/esp32_sdk_lib_phy/Makefile b/pkg/esp32_sdk_lib_phy/Makefile new file mode 100644 index 0000000000..8874aa1268 --- /dev/null +++ b/pkg/esp32_sdk_lib_phy/Makefile @@ -0,0 +1,10 @@ +PKG_NAME=esp32_sdk_lib_phy +PKG_URL=https://github.com/espressif/esp-phy-lib +# This is a version in the v4.4 release branch +PKG_VERSION=4779ddaaf29e1d6aa2d26980103a1c1bbaa29462 +PKG_LICENSE=Apache-2.0 + +include $(RIOTBASE)/pkg/pkg.mk + +# there is nothing to compile +all: diff --git a/pkg/esp32_sdk_libs/Makefile.dep b/pkg/esp32_sdk_lib_phy/Makefile.dep similarity index 100% rename from pkg/esp32_sdk_libs/Makefile.dep rename to pkg/esp32_sdk_lib_phy/Makefile.dep diff --git a/pkg/esp32_sdk_lib_phy/Makefile.include b/pkg/esp32_sdk_lib_phy/Makefile.include new file mode 100644 index 0000000000..1fd75b7a9e --- /dev/null +++ b/pkg/esp32_sdk_lib_phy/Makefile.include @@ -0,0 +1,3 @@ +export ESP32_SDK_LIB_PHY_DIR ?= $(PKGDIRBASE)/esp32_sdk_lib_phy + +PSEUDOMODULES += esp32_sdk_lib_phy diff --git a/pkg/esp32_sdk_lib_phy/doc.txt b/pkg/esp32_sdk_lib_phy/doc.txt new file mode 100644 index 0000000000..c40b10656c --- /dev/null +++ b/pkg/esp32_sdk_lib_phy/doc.txt @@ -0,0 +1,6 @@ +/** + * @defgroup pkg_esp32_sdk_lib_phy ESP32 SDK libraries for the ESP32 SoC support + * @ingroup pkg_esp32_sdk + * @brief Vendor SDK libraries for ESP32 SoC support by Espressif + * @see https://github.com/espressif/esp-phy-lib + */ diff --git a/pkg/esp32_sdk_lib_wifi/Kconfig b/pkg/esp32_sdk_lib_wifi/Kconfig new file mode 100644 index 0000000000..dd139418b5 --- /dev/null +++ b/pkg/esp32_sdk_lib_wifi/Kconfig @@ -0,0 +1,13 @@ +# Copyright (c) 2021 Gunar Schorcht +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config PACKAGE_ESP32_SDK_LIB_WIFI + bool "ESP32 SDK libraries for the ESP32 WiFi support" + depends on TEST_KCONFIG + depends on HAS_ARCH_ESP32 + help + Vendor SDK libraries for ESP32 WiFi support by Espressif diff --git a/pkg/esp32_sdk_lib_wifi/Makefile b/pkg/esp32_sdk_lib_wifi/Makefile new file mode 100644 index 0000000000..0d1d89c6dd --- /dev/null +++ b/pkg/esp32_sdk_lib_wifi/Makefile @@ -0,0 +1,10 @@ +PKG_NAME=esp32_sdk_lib_wifi +PKG_URL=https://github.com/espressif/esp32-wifi-lib +# This is a version in the v4.4 release branch +PKG_VERSION=cd7d14917f2c3d0ea4382f4a188cb290304faf47 +PKG_LICENSE=Apache-2.0 + +include $(RIOTBASE)/pkg/pkg.mk + +# there is nothing to compile +all: diff --git a/pkg/esp32_sdk_lib_wifi/Makefile.dep b/pkg/esp32_sdk_lib_wifi/Makefile.dep new file mode 100644 index 0000000000..607e8707ca --- /dev/null +++ b/pkg/esp32_sdk_lib_wifi/Makefile.dep @@ -0,0 +1,2 @@ +# This package can only be used with the ESP32 CPU +FEATURES_REQUIRED += arch_esp32 diff --git a/pkg/esp32_sdk_lib_wifi/Makefile.include b/pkg/esp32_sdk_lib_wifi/Makefile.include new file mode 100644 index 0000000000..e1c019cd58 --- /dev/null +++ b/pkg/esp32_sdk_lib_wifi/Makefile.include @@ -0,0 +1,3 @@ +export ESP32_SDK_LIB_WIFI_DIR ?= $(PKGDIRBASE)/esp32_sdk_lib_wifi + +PSEUDOMODULES += esp32_sdk_lib_wifi diff --git a/pkg/esp32_sdk_lib_wifi/doc.txt b/pkg/esp32_sdk_lib_wifi/doc.txt new file mode 100644 index 0000000000..ccfee7e299 --- /dev/null +++ b/pkg/esp32_sdk_lib_wifi/doc.txt @@ -0,0 +1,6 @@ +/** + * @defgroup pkg_esp32_sdk_lib_wifi ESP32 SDK libraries for the ESP32 WiFi support + * @ingroup pkg_esp32_sdk + * @brief Vendor SDK libraries for ESP32 WiFi support by Espressif + * @see https://github.com/espressif/esp32-wifi-lib + */ diff --git a/pkg/esp32_sdk_libs/Makefile b/pkg/esp32_sdk_libs/Makefile deleted file mode 100644 index 0ce50096dd..0000000000 --- a/pkg/esp32_sdk_libs/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -PKG_NAME=esp32_sdk_libs -PKG_URL=https://github.com/espressif/esp32-wifi-lib -# This is a version in the v3.1 beta1 release branch -PKG_VERSION=534a9b14101af90231d40a4f94924d67bc848d5f -PKG_LICENSE=Apache-2.0 - -include $(RIOTBASE)/pkg/pkg.mk - -ESP32_SDK_DIR = $(PKGDIRBASE)/esp32_sdk - -# Directory where we place the libraries and headers. -ESP32_SDK_BUILD_DIR = $(ESP32_SDK_DIR)/build-libs - -# We need to place all binary libraries shipped with the SDK in a common -# directory. -ESP32_SDK_COMPONENT_LIBS = \ - libcoexist.a \ - libcore.a \ - libespnow.a \ - libmesh.a \ - libnet80211.a \ - libphy.a \ - libpp.a \ - librtc.a \ - libsmartconfig.a \ - libwpa.a \ - libwpa2.a \ - libwps.a - -ESP32_SDK_LIBS = $(addprefix $(ESP32_SDK_BUILD_DIR)/, $(ESP32_SDK_COMPONENT_LIBS)) - -all: $(ESP32_SDK_LIBS) - -$(PKG_PREPARED): $(ESP32_SDK_BUILD_DIR) - -$(ESP32_SDK_BUILD_DIR): $(PKG_PATCHED) - $(Q)mkdir -p $(ESP32_SDK_BUILD_DIR) - -$(ESP32_SDK_BUILD_DIR)/lib%.a: \ - $(PKG_SOURCE_DIR)/lib%.a | $(ESP32_SDK_BUILD_DIR) - $(Q)cp $? $(ESP32_SDK_BUILD_DIR) diff --git a/pkg/esp32_sdk_libs/Makefile.include b/pkg/esp32_sdk_libs/Makefile.include deleted file mode 100644 index 911e72ae06..0000000000 --- a/pkg/esp32_sdk_libs/Makefile.include +++ /dev/null @@ -1,13 +0,0 @@ -# Directory with the SDK source checkout. Some modules in the cpu/esp32 use -# internal parts of the SDK and for that they need access to the -# ESP32_SDK_DIR path. -export ESP32_SDK_DIR = $(PKGDIRBASE)/esp32_sdk - -# Directory where we built the modified libraries and headers. -ESP32_SDK_BUILD_DIR ?= $(ESP32_SDK_DIR)/build-libs - -# Modified binary libraries are built here in the Makefile. -LINKFLAGS += -L$(ESP32_SDK_BUILD_DIR) - -# esp32_sdk_libs doesn't generate any .a -PSEUDOMODULES += esp32_sdk_libs diff --git a/pkg/esp32_sdk_libs/doc.txt b/pkg/esp32_sdk_libs/doc.txt deleted file mode 100644 index cc10b30871..0000000000 --- a/pkg/esp32_sdk_libs/doc.txt +++ /dev/null @@ -1,6 +0,0 @@ -/** - * @defgroup pkg_esp32_sdk_libs ESP32 SDK libraries for the ESP32 MCU support - * @ingroup pkg_esp32_sdk - * @brief Vendor SDK libraries for ESP32 MCU support by Espressif - * @see https://github.com/espressif/esp32-wifi-lib - */