diff --git a/include/toplevel.mk b/include/toplevel.mk index 4003b48241..d3500ef58f 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -19,7 +19,6 @@ else SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) endif -HOSTCC ?= $(CC) export REVISION export SOURCE_DATE_EPOCH export GIT_CONFIG_PARAMETERS='core.autocrlf=false' @@ -59,13 +58,6 @@ export PATH:=$(path) unexport TAR_OPTIONS -ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),) - export HOSTCC_REAL?=$(HOSTCC) - export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper -else - export HOSTCC_WRAPPER:=$(HOSTCC) -endif - ifeq ($(FORCE),) .config scripts/config/conf scripts/config/mconf: staging_dir/host/.prereq-build endif @@ -115,7 +107,7 @@ endif scripts/config/%onf: CFLAGS+= -O2 scripts/config/%onf: @$(_SINGLE)$(SUBMAKE) $(if $(findstring s,$(OPENWRT_VERBOSE)),,-s) \ - -C scripts/config $(notdir $@) CC="$(HOSTCC_WRAPPER)" + -C scripts/config $(notdir $@) $(eval $(call rdep,scripts/config,scripts/config/mconf)) diff --git a/scripts/clang-gcc-wrapper b/scripts/clang-gcc-wrapper deleted file mode 100755 index 9e668418a9..0000000000 --- a/scripts/clang-gcc-wrapper +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -_cc="${HOSTCC_REAL:-gcc}" -case "$1" in - -print-file-name=*) - dirs="$($_cc -print-search-dirs | grep -m1 libraries | sed -e 's,:, ,' -e 's,.* =,,')" - dirs="$dirs /usr/lib /usr/local/lib" - find $dirs -name "${1#*=}" | head -n1 - ;; - *) - exec $_cc "$@" - ;; -esac diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts index e5bdc32114..48dc116e99 100644 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts @@ -46,7 +46,7 @@ }; ledgeneral { - label = "ledswitch"; + label = "led-enable"; gpios = <&qcom_pinmux 53 GPIO_ACTIVE_LOW>; linux,code = ; }; @@ -63,18 +63,23 @@ }; usb1 { - label = "blue:usb_1"; + label = "blue:usb1"; gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; }; + wlan5g { + label = "blue:wlan5g"; + gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>; + }; + usb3 { - label = "blue:usb_3"; + label = "blue:usb3"; gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>; }; - wps { - label = "blue:wps"; - gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; + wlan2g { + label = "blue:wlan2g"; + gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>; }; wan_orange { @@ -87,27 +92,20 @@ gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>; }; - power: status { - label = "blue:status"; - gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>; - }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>; - - }; - - wlan5g { - label = "blue:wlan5g"; - gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>; - + wps { + label = "blue:wps"; + gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; }; wlan60g { label = "blue:wlan60g"; gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>; }; + + power: status { + label = "blue:status"; + gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>; + }; }; }; @@ -196,155 +194,155 @@ spi-max-frequency = <50000000>; reg = <0>; - SBL1@0 { + partition@0 { label = "SBL1"; reg = <0x0 0x20000>; read-only; }; - MIBIB@20000 { + partition@20000 { label = "MIBIB"; reg = <0x20000 0x20000>; read-only; }; - SBL2@40000 { + partition@40000 { label = "SBL2"; reg = <0x40000 0x20000>; read-only; }; - SBL3@60000 { + partition@60000 { label = "SBL3"; reg = <0x60000 0x30000>; read-only; }; - DDRCONFIG@90000 { + partition@90000 { label = "DDRCONFIG"; reg = <0x90000 0x10000>; read-only; }; - SSD@a0000 { + partition@a0000 { label = "SSD"; reg = <0xa0000 0x10000>; read-only; }; - TZ@b0000 { + partition@b0000 { label = "TZ"; reg = <0xb0000 0x30000>; read-only; }; - RPM@e0000 { + partition@e0000 { label = "RPM"; reg = <0xe0000 0x20000>; read-only; }; - fs-uboot@100000 { + partition@100000 { label = "fs-uboot"; reg = <0x100000 0x70000>; read-only; }; - uboot-env@170000 { + partition@170000 { label = "uboot-env"; reg = <0x170000 0x40000>; read-only; }; - radio@1b0000 { + partition@1b0000 { label = "radio"; reg = <0x1b0000 0x40000>; read-only; }; - os-image@1f0000 { + partition@1f0000 { label = "os-image"; reg = <0x1f0000 0x400000>; }; - rootfs@5f0000 { + partition@5f0000 { label = "rootfs"; reg = <0x5f0000 0x1900000>; }; - defaultmac: default-mac@1ef0000 { + defaultmac: partition@1ef0000 { label = "default-mac"; reg = <0x1ef0000 0x00200>; read-only; }; - pin@1ef0200 { + partition@1ef0200 { label = "pin"; reg = <0x1ef0200 0x00200>; read-only; }; - device-id@1ef0400 { + partition@1ef0400 { label = "device-id"; reg = <0x1ef0400 0x00200>; read-only; }; - product-info@1ef0600 { + partition@1ef0600 { label = "product-info"; reg = <0x1ef0600 0x0fa00>; read-only; }; - partition-table@1f00000 { + partition@1f00000 { label = "partition-table"; reg = <0x1f00000 0x10000>; read-only; }; - soft-version@1f10000 { + partition@1f10000 { label = "soft-version"; reg = <0x1f10000 0x10000>; read-only; }; - support-list@1f20000 { + partition@1f20000 { label = "support-list"; reg = <0x1f20000 0x10000>; read-only; }; - profile@1f30000 { + partition@1f30000 { label = "profile"; reg = <0x1f30000 0x10000>; read-only; }; - default-config@1f40000 { + partition@1f40000 { label = "default-config"; reg = <0x1f40000 0x10000>; read-only; }; - user-config@1f50000 { + partition@1f50000 { label = "user-config"; reg = <0x1f50000 0x40000>; read-only; }; - qos-db@1f90000 { + partition@1f90000 { label = "qos-db"; reg = <0x1f90000 0x40000>; read-only; }; - usb-config@1fd0000 { + partition@1fd0000 { label = "usb-config"; reg = <0x1fd0000 0x10000>; read-only; }; - log@1fe0000 { + partition@1fe0000 { label = "log"; reg = <0x1fe0000 0x20000>; read-only; diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 876f337bba..b006757478 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -342,7 +342,6 @@ define Device/tplink_ad7200 BLOCKSIZE := 128k PAGESIZE := 2048 BOARD_NAME := ad7200 - SUPPORTED_DEVICES += ad7200 TPLINK_BOARD_ID := AD7200 DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct kmod-wil6210 endef diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index da58b53482..21cbce7545 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -6,13 +6,13 @@ # define Device/friendlyarm_nanopi-r2s - $(call Device/FitImageLzma) DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R2S SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-usb-net-rtl8152 + $(call Device/FitImageLzma) endef TARGET_DEVICES += friendlyarm_nanopi-r2s