diff --git a/dslmngr/Makefile b/dslmngr/Makefile index 492f31b73..d041c57ab 100644 --- a/dslmngr/Makefile +++ b/dslmngr/Makefile @@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_PLATFORM=BROADCOM else $(info Unexpected CONFIG_TARGET) diff --git a/easy-qos/Makefile b/easy-qos/Makefile index 4d7314218..6ed6e21be 100644 --- a/easy-qos/Makefile +++ b/easy-qos/Makefile @@ -19,7 +19,7 @@ define Package/easy-qos SECTION:=net CATEGORY:=Network TITLE:=Easy QoS - DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_airoha) + DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) endef define Package/easy-qos/description diff --git a/easy-soc-events/Makefile b/easy-soc-events/Makefile index c4f29e04c..eb57de455 100755 --- a/easy-soc-events/Makefile +++ b/easy-soc-events/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/.config -ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),) +ifneq ($(CONFIG_TARGET_brcmbca),) LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1 LINUX_VERSION := 4.1.52 LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include @@ -85,7 +85,7 @@ define Build/Compile endef -ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),) +ifneq ($(CONFIG_TARGET_brcmbca),) define KernelPackage/easy-soc-events/install-extra cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra endef diff --git a/easy-soc-libs/Makefile b/easy-soc-libs/Makefile index 38e87153d..af574e71a 100644 --- a/easy-soc-libs/Makefile +++ b/easy-soc-libs/Makefile @@ -36,7 +36,7 @@ define Package/easy-soc-libs MENU:=1 endef -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_PLATFORM=BROADCOM TARGET_WIFI_TYPE=BROADCOM CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID)) diff --git a/easy-soc-libs/wifi.mk b/easy-soc-libs/wifi.mk index a0b8af60a..0bcab1f28 100644 --- a/easy-soc-libs/wifi.mk +++ b/easy-soc-libs/wifi.mk @@ -2,7 +2,7 @@ define Package/libwifi $(call Package/easy-soc-libs) TITLE:= WiFi library (libwifi) - DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel + DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcmkernel endef define Package/libwifi/config diff --git a/evoice/Makefile b/evoice/Makefile index cb8577d1c..acfcade42 100644 --- a/evoice/Makefile +++ b/evoice/Makefile @@ -33,7 +33,7 @@ define Package/$(PKG_NAME) TITLE:=Ensemble Voice URL:= DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\ - +TARGET_iopsys_brcm63xx_arm:bcmkernel\ + +TARGET_brcmbca:bcmkernel\ +TARGET_airoha:kmod-voip_driver\ +TARGET_airoha:voip_app +libbbf_api endef @@ -56,7 +56,7 @@ endif IDIR = $(STAGING_DIR)/usr/include TONES_INI_REQUIRED= -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_PLATFORM=BROADCOM BDIR = bcm963xx/userspace/private/apps/voice CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\ diff --git a/gryphon-led-module/Makefile b/gryphon-led-module/Makefile index fcd574083..d22a0e6d8 100644 --- a/gryphon-led-module/Makefile +++ b/gryphon-led-module/Makefile @@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME) FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME)) - DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel + DEPENDS:= +(TARGET_brcmbca):bcmkernel PKG_LICENSE:=GPLv2 PKG_LICENSE_URL:= endef @@ -42,7 +42,7 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m MODULE_INCLUDE=-I$(PKG_BUILD_DIR) -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19 # This assumes that the MODULES_SUBDIR set by OpenWrt is of the form # lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel diff --git a/ponmngr/Makefile b/ponmngr/Makefile index cd2c5d93a..9e6f96c1d 100644 --- a/ponmngr/Makefile +++ b/ponmngr/Makefile @@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ponmngr CATEGORY:=Utilities TITLE:=PON Manager - DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_airoha) + DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) endef define Package/ponmngr/description @@ -34,7 +34,7 @@ endef define Package/ponmngr/install $(CP) ./files/common/* $(1)/ -ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),) +ifneq ($(CONFIG_TARGET_brcmbca),) $(CP) ./files/broadcom/* $(1)/ else ifneq ($(CONFIG_TARGET_airoha),) $(CP) ./files/airoha/* $(1)/ diff --git a/qosmngr/Makefile b/qosmngr/Makefile index 71b857cfb..a2be1bb43 100644 --- a/qosmngr/Makefile +++ b/qosmngr/Makefile @@ -27,7 +27,7 @@ define Package/qosmngr SECTION:=utils CATEGORY:=Utilities TITLE:=QoS Manager - DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_airoha) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos + DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos endef define Package/qosmngr/description @@ -47,7 +47,7 @@ define Package/qosmngr/install/common $(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin endef -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) define Package/qosmngr/install $(CP) ./files/broadcom/* $(1)/ $(call Package/qosmngr/install/common,$(1)) diff --git a/voicemngr/Makefile b/voicemngr/Makefile index b048b1947..40c55447c 100644 --- a/voicemngr/Makefile +++ b/voicemngr/Makefile @@ -26,7 +26,7 @@ endif PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD TARGET_PLATFORM:= -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_PLATFORM:=BROADCOM else ifeq ($(CONFIG_TARGET_iopsys_qualcomm),y) TARGET_PLATFORM:=QUALCOMM @@ -44,7 +44,7 @@ define Package/voicemngr CATEGORY:=Utilities TITLE:=IOPSYS Voice Manager URL:= - DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_qualcomm:vtsp + DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_brcmbca:bcmkernel +TARGET_iopsys_qualcomm:vtsp endef define Package/voicemngr/description