| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117 |
- --- a/rules.mk
- +++ b/rules.mk
- @@ -136,8 +136,12 @@ else
- TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
- endif
-
- -ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
- - iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
- +ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
- + ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
- + iremap = -fmacro-prefix-map=$(1)=$(2)
- + else
- + iremap = -iremap$(1):$(2)
- + endif
- endif
-
- PACKAGE_DIR:=$(BIN_DIR)/packages
- --- a/include/image.mk
- +++ b/include/image.mk
- @@ -159,9 +159,6 @@ DTC_WARN_FLAGS := \
- -Wno-graph_port \
- -Wno-unique_unit_address
-
- -DTC_FLAGS += $(DTC_WARN_FLAGS)
- -DTCO_FLAGS += $(DTC_WARN_FLAGS)
- -
- define Image/pad-to
- dd if=$(1) of=$(1).new bs=$(2) conv=sync
- mv $(1).new $(1)
- --- a/package/network/utils/iptables/Makefile
- +++ b/package/network/utils/iptables/Makefile
- @@ -784,7 +784,6 @@ $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
- $(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
- $(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
- $(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
- -$(eval $(call BuildPlugin,iptables-mod-socket,$(IPT_SOCKET-m)))
- $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
- $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
- $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))
- --- a/include/target.mk
- +++ b/include/target.mk
- @@ -147,10 +147,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
- endif
-
- GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
- +ifeq ($(CONFIG_TARGET_ipq60xx),y)
- +GENERIC_BACKPORT_DIR :=
- +GENERIC_PATCH_DIR :=
- +GENERIC_HACK_DIR :=
- +GENERIC_FILES_DIR :=
- +else
- GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
- +endif
-
- __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
- __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
- --- a/package/kernel/mac80211/ath.mk
- +++ b/package/kernel/mac80211/ath.mk
- @@ -282,7 +282,7 @@ define KernelPackage/ath11k
- TITLE:=Atheros 802.11ax wireless cards support
- URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k
- DEPENDS+= @TARGET_ipq60xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT \
- - +@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv
- + +@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv +kmod-hwmon-core
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k.ko
- endef
- --- a/target/linux/ipq60xx/Makefile
- +++ b/target/linux/ipq60xx/Makefile
- @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/target.mk
- DEFAULT_PACKAGES += \
- kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
- kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-ssdk \
- - kmod-ath11k-ahb qca-ssdk-shell wpad-openssl \
- + kmod-ath11k-ahb qca-ssdk-shell wpad-basic-mbedtls \
- ath11k-firmware-ipq6018 nss-firmware-ipq6018 \
- kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm uboot-envtools
-
- --- a/target/linux/ipq60xx/image/Makefile
- +++ b/target/linux/ipq60xx/image/Makefile
- @@ -104,7 +104,7 @@ define Device/qihoo_v6
- PAGESIZE := 2048
- DEVICE_DTS := qcom-ipq6018-qihoo-v6
- DEVICE_DTS_CONFIG := config@cp03-c1
- - DEVICE_TITLE := Qihoo V6
- + DEVICE_TITLE := Qihoo 360 V6
- DEVICE_PACKAGES := ath11k-wifi-qihoo-v6 kmod-usb3 kmod-usb-phy-msm
- endef
- TARGET_DEVICES += qihoo_v6
- --- a/target/linux/ipq60xx/files-4.4/arch/arm64/boot/dts/qcom/qcom-ipq6018-zn-m2.dts
- +++ b/target/linux/ipq60xx/files-4.4/arch/arm64/boot/dts/qcom/qcom-ipq6018-zn-m2.dts
- @@ -70,3 +70,15 @@
- };
- };
- };
- +
- +&qusb_phy_0 {
- +status = "ok";
- +};
- +
- +&ssphy_0 {
- +status = "ok";
- +};
- +
- +&usb3 {
- +status = "ok";
- +};
|
