os: Move board specific build rules into board specific Makefiles

There are some rules in the mk files of os folder which perform board specific operation. Move these lines to board specific Makefiles in arch folder. Verified libwlan and libwps libraries for rtk board with new implementation. Signed-off-by: Kishore S N <[email protected]>
r-prabu · Jun 27, 2022 · 089fb28 · 089fb28
1 parent 623954e
commit 089fb28
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 114 deletions.
diff --git a/os/FlatLibs.mk b/os/FlatLibs.mk
@@ -161,37 +161,6 @@ TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libtuv$(LIBEXT)
 TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libjerry-libm$(LIBEXT)
 endif
 
-# Add library for external bcm support.
-# External WICED Lib builds
-ifeq ($(CONFIG_WL_BCM4390X),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libbcmexternal$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_RTK_WLAN),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)librtl$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_AMEBAD_WIFI),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT)
-endif
-
-# Add library for external esp32 wifi support.
-ifeq ($(CONFIG_ESP32_WIFI_SUPPORT),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libcore$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)librtc$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libnet80211$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libpp$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libwpa$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libsmartconfig$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libcoexist$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libwps$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libwpa2$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libespnow$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libphy$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libmesh$(LIBEXT)
-endif
-
 # Export all libraries
 EXPORTLIBS = $(TINYARALIBS)
 
diff --git a/os/KernelLibs.mk b/os/KernelLibs.mk
@@ -134,15 +134,6 @@ ifeq ($(CONFIG_BINFMT_ENABLE),y)
 TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libbinfmt$(LIBEXT)
 endif
 
-ifeq ($(CONFIG_RTK_WLAN),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)librtl$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_AMEBAD_WIFI),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT)
-endif
-
 # Add library for wifi driver
 TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libwifidriver$(LIBEXT)
 # Add library for wifi stack

diff --git a/os/LibTargets.mk b/os/LibTargets.mk
@@ -274,68 +274,3 @@ $(ARCH_SRC)$(DELIM)libarch$(LIBEXT): context
 $(LIBRARIES_DIR)$(DELIM)libarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libarch$(LIBEXT)
 	$(Q) install $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libarch$(LIBEXT)
 
-# External WICED Lib builds
-ifeq ($(CONFIG_WL_BCM4390X),y)
-$(LIBRARIES_DIR)$(DELIM)libbcmexternal$(LIBEXT): $(EXTDIR)$(DELIM)WICED$(DELIM)libbcmexternal$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)WICED$(DELIM)libbcmexternal$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libbcmexternal$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_RTK_WLAN),y)
-$(LIBRARIES_DIR)$(DELIM)librtl$(LIBEXT): $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)realtek$(DELIM)librtl$(LIBEXT)
-	$(Q) install $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)realtek$(DELIM)librtl$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)librtl$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_AMEBAD_WIFI),y)
-ifeq ($(CONFIG_ARCH_FPU),y)
-$(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT): $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wlan_fpu$(LIBEXT)
-	$(Q) install $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wlan_fpu$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT): $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wps_fpu$(LIBEXT)
-	$(Q) install $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wps_fpu$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT)
-else
-$(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT): $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wlan$(LIBEXT)
-	$(Q) install $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wlan$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT): $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wps$(LIBEXT)
-	$(Q) install $(TOPDIR)$(DELIM)board$(DELIM)rtl8721csm$(DELIM)src$(DELIM)libs$(DELIM)lib_wps$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT)
-endif
-endif
-
-# External esp32 wifi static Lib builds
-ifeq ($(CONFIG_ESP32_WIFI_SUPPORT),y)
-$(LIBRARIES_DIR)$(DELIM)libcoexist$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libcoexist$(LIBEXT)
-	$(Q)install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libcoexist$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libcoexist$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libcore$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libcore$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libcore$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libcore$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libespnow$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libespnow$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libespnow$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libespnow$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libmesh$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libmesh$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libmesh$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libmesh$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libnet80211$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libnet80211$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libnet80211$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libnet80211$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libphy$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libphy$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libphy$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libphy$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libpp$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libpp$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libpp$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libpp$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)librtc$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)librtc$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)librtc$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)librtc$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libsmartconfig$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libsmartconfig$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libsmartconfig$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libsmartconfig$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libwpa2$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwpa2$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwpa2$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libwpa2$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libwpa$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwpa$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwpa$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libwpa$(LIBEXT)
-
-$(LIBRARIES_DIR)$(DELIM)libwps$(LIBEXT): $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwps$(LIBEXT)
-	$(Q) install $(EXTDIR)$(DELIM)esp_idf_port/esp32$(DELIM)lib$(DELIM)libwps$(LIBEXT) $(LIBRARIES_DIR)$(DELIM)libwps$(LIBEXT)
-endif
diff --git a/os/ProtectedLibs.mk b/os/ProtectedLibs.mk
@@ -143,14 +143,6 @@ ifeq ($(CONFIG_BINFMT_ENABLE),y)
 TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)libbinfmt$(LIBEXT)
 endif
 
-ifeq ($(CONFIG_RTK_WLAN),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)librtl$(LIBEXT)
-endif
-
-ifeq ($(CONFIG_AMEBAD_WIFI),y)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wlan$(LIBEXT)
-TINYARALIBS += $(LIBRARIES_DIR)$(DELIM)lib_wps$(LIBEXT)
-endif
 # Add libraries for iotjs support
 
 ifeq ($(CONFIG_ENABLE_IOTJS),y)

diff --git a/os/arch/arm/src/amebad/Make.defs b/os/arch/arm/src/amebad/Make.defs
@@ -199,3 +199,17 @@ else
 EXTRA_LIBS += ${TOPDIR}/board/rtl8721csm/src/libs/cmse_implib.a
 endif
 endif
+
+ifeq ($(CONFIG_RTK_WLAN),y)
+EXTRA_LIBS += $(TOPDIR)/drivers/wireless/realtek/librtl.a
+endif
+
+ifeq ($(CONFIG_AMEBAD_WIFI),y)
+ifeq ($(CONFIG_ARCH_FPU),y)
+EXTRA_LIBS += $(TOPDIR)/board/rtl8721csm/src/libs/lib_wlan_fpu.a
+EXTRA_LIBS += $(TOPDIR)/board/rtl8721csm/src/libs/lib_wps_fpu.a
+else
+EXTRA_LIBS += $(TOPDIR)/board/rtl8721csm/src/libs/lib_wlan.a
+EXTRA_LIBS += $(TOPDIR)/board/rtl8721csm/src/libs/lib_wps.a
+endif
+endif
diff --git a/os/arch/arm/src/bcm4390x/Make.defs b/os/arch/arm/src/bcm4390x/Make.defs
@@ -107,3 +107,8 @@ CFLAGS += -I$(TOPDIR)/../external/WICED/bcm4390x/include
 
 VPATH += chip
 EXTRA_LIBS += chip/libbcmarch.a
+
+# External WICED Lib builds
+ifeq ($(CONFIG_WL_BCM4390X),y)
+EXTRA_LIBS += $(EXTDIR)/WICED/libbcmexternal.a
+endif
diff --git a/os/arch/xtensa/src/Makefile b/os/arch/xtensa/src/Makefile
@@ -146,7 +146,7 @@ GCC_LIBDIR := ${shell dirname $(LIBGCC)}
 VPATH += chip
 VPATH += $(ARCH_SUBDIR)
 
-all: $(STARTUP_OBJS) libarch$(LIBEXT)
+all: $(STARTUP_OBJS) libarch$(LIBEXT) install
 
 .PHONY: board/libboard$(LIBEXT)
 
@@ -173,6 +173,23 @@ ifneq ($(CONFIG_WINDOWS_NATIVE),y)
 	sort > $(TOPDIR)/$(OUTBIN_DIR)/System.map
 endif
 
+install:
+# External esp32 wifi static Lib builds
+ifeq ($(CONFIG_ESP32_WIFI_SUPPORT),y)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libcoexist$(LIBEXT) $(LIBRARIES_DIR)/libcoexist$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libcore$(LIBEXT) $(LIBRARIES_DIR)/libcore$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libespnow$(LIBEXT) $(LIBRARIES_DIR)/libespnow$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libmesh$(LIBEXT) $(LIBRARIES_DIR)/libmesh$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libnet80211$(LIBEXT) $(LIBRARIES_DIR)/libnet80211$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libphy$(LIBEXT) $(LIBRARIES_DIR)/libphy$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libpp$(LIBEXT) $(LIBRARIES_DIR)/libpp$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/librtc$(LIBEXT) $(LIBRARIES_DIR)/librtc$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libsmartconfig$(LIBEXT) $(LIBRARIES_DIR)/libsmartconfig$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libwpa2$(LIBEXT) $(LIBRARIES_DIR)/libwpa2$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libwpa$(LIBEXT) $(LIBRARIES_DIR)/libwpa$(LIBEXT)
+	$(Q) cp $(EXTDIR)/esp_idf_port/esp32/lib/libwps$(LIBEXT) $(LIBRARIES_DIR)/libwps$(LIBEXT)
+endif
+
 # This is part of the top-level export target
 
 export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)