From: Tomasz Maciej Nowak <[email protected]> No reason to keep SUNXI prefixed variables, since there are global equivalents.
Signed-off-by: Tomasz Maciej Nowak <[email protected]> --- target/linux/sunxi/image/Makefile | 10 ++++------ target/linux/sunxi/image/cortexa53.mk | 7 +++---- target/linux/sunxi/image/cortexa7.mk | 12 ++++++------ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 8c37bd0fd18d..8c14aec3bebb 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -9,8 +9,6 @@ include $(INCLUDE_DIR)/image.mk FAT32_BLOCK_SIZE=1024 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) -DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR - define Build/sunxi-sdcard rm -f [email protected] mkfs.fat [email protected] -C $(FAT32_BLOCKS) @@ -33,16 +31,16 @@ define Device/Default KERNEL := kernel-bin | uImage none IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip - SUNXI_DTS_DIR := allwinner/ - SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1))) + DEVICE_DTS_DIR := $$(DTS_DIR)/allwinner + DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) endef define Device/FitImageLzma - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(SUNXI_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb endef define Device/FitImageGzip - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(SUNXI_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb endef include $(SUBTARGET).mk diff --git a/target/linux/sunxi/image/cortexa53.mk b/target/linux/sunxi/image/cortexa53.mk index 50b286a98f4c..ef2aee63e99d 100644 --- a/target/linux/sunxi/image/cortexa53.mk +++ b/target/linux/sunxi/image/cortexa53.mk @@ -7,7 +7,6 @@ KERNEL_LOADADDR:=0x40080000 define Device/sun50i $(call Device/FitImageLzma) - SUNXI_DTS_DIR := allwinner/ KERNEL_NAME := Image endef @@ -66,7 +65,7 @@ define Device/libretech_all-h3-cc-h5 DEVICE_MODEL := ALL-H3-CC DEVICE_VARIANT := H5 $(Device/sun50i-h5) - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-libretech-all-h3-cc + DEVICE_DTS := $$(SOC)-libretech-all-h3-cc endef TARGET_DEVICES += libretech_all-h3-cc-h5 @@ -75,7 +74,7 @@ define Device/olimex_a64-olinuxino DEVICE_MODEL := A64-Olinuxino DEVICE_PACKAGES := kmod-rtl8723bs rtl8723bu-firmware $(Device/sun50i-a64) - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-olinuxino + DEVICE_DTS := $$(SOC)-olinuxino endef TARGET_DEVICES += olimex_a64-olinuxino @@ -85,7 +84,7 @@ define Device/olimex_a64-olinuxino-emmc DEVICE_VARIANT := eMMC DEVICE_PACKAGES := kmod-rtl8723bs rtl8723bu-firmware $(Device/sun50i-a64) - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-olinuxino-emmc + DEVICE_DTS := $$(SOC)-olinuxino-emmc endef TARGET_DEVICES += olimex_a64-olinuxino-emmc diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk index 2baa2a8397ce..3ef720a4298e 100644 --- a/target/linux/sunxi/image/cortexa7.mk +++ b/target/linux/sunxi/image/cortexa7.mk @@ -97,7 +97,7 @@ define Device/pine64_pinecube DEVICE_VENDOR := Pine64 DEVICE_MODEL := PineCube SOC := sun8i-s3 - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-pinecube + DEVICE_DTS := $$(SOC)-pinecube endef TARGET_DEVICES += pine64_pinecube @@ -109,7 +109,7 @@ define Device/sinovoip_bpi-m2-berry cypress-firmware-43430-sdio wpad-basic-mbedtls SUPPORTED_DEVICES += lemaker,bananapi-m2-berry SOC := sun8i-v40 - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-bananapi-m2-berry + DEVICE_DTS := $$(SOC)-bananapi-m2-berry endef TARGET_DEVICES += sinovoip_bpi-m2-berry @@ -121,7 +121,7 @@ define Device/sinovoip_bpi-m2-ultra brcmfmac-firmware-43430a0-sdio wpad-basic-mbedtls SUPPORTED_DEVICES += lemaker,bananapi-m2-ultra SOC := sun8i-r40 - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-bananapi-m2-ultra + DEVICE_DTS := $$(SOC)-bananapi-m2-ultra endef TARGET_DEVICES += sinovoip_bpi-m2-ultra @@ -235,7 +235,7 @@ define Device/sinovoip_bpi-m2-plus DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \ brcmfmac-firmware-43430a0-sdio wpad-basic-mbedtls SOC := sun8i-h3 - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-bananapi-m2-plus + DEVICE_DTS := $$(SOC)-bananapi-m2-plus endef TARGET_DEVICES += sinovoip_bpi-m2-plus @@ -246,7 +246,7 @@ define Device/sinovoip_bpi-m3 DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-rtc-ac100 \ kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-mbedtls SOC := sun8i-a83t - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-bananapi-m3 + DEVICE_DTS := $$(SOC)-bananapi-m3 endef TARGET_DEVICES += sinovoip_bpi-m3 @@ -257,7 +257,7 @@ define Device/sinovoip_bpi-p2-zero DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \ cypress-firmware-43430-sdio wpad-basic-mbedtls SOC := sun8i-h2-plus - SUNXI_DTS := $$(SUNXI_DTS_DIR)$$(SOC)-bananapi-p2-zero + DEVICE_DTS := $$(SOC)-bananapi-p2-zero endef TARGET_DEVICES += sinovoip_bpi-p2-zero -- 2.54.0 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
