diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index aa8eea0450..233570feb2 100644 --- a/package/kernel/mwlwifi/Makefile +++ b/package/kernel/mwlwifi/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwlwifi -PKG_RELEASE=2 +PKG_RELEASE=3 PKG_LICENSE:=ISC PKG_LICENSE_FILES:= diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index 1688065a5c..a920f6db7d 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -12,7 +12,7 @@ FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part SUBTARGETS:=cortexa9 cortexa53 cortexa72 MAINTAINER:=Imre Kaloz -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index ce1344a547..b4b77b70b4 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -13,10 +13,12 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR := 0x00008000 +SIGNATURE:=$(shell printf "%.8s" $(SOURCE_DATE_EPOCH)) + define Build/boot-scr rm -f $@-boot.scr sed \ - -e 's#@ROOT@#$(IMG_PART_SIGNATURE)#g' \ + -e 's#@ROOT@#$(SIGNATURE)#g' \ -e 's#@DTB@#$(firstword $(DEVICE_DTS))#g' \ $(BOOT_SCRIPT).bootscript > $@-new.bootscript mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $@-new.bootscript $@-boot.scr @@ -36,11 +38,11 @@ define Build/boot-img-ext4 $(foreach dts,$(DEVICE_DTS), $(CP) $(KDIR)/image-$(dts).dtb $@.boot/$(dts).dtb;) $(CP) $(IMAGE_KERNEL) $@.boot/$(KERNEL_NAME) -$(CP) $@-boot.scr $@.boot/boot.scr - make_ext4fs -J -L kernel -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M $@.bootimg $@.boot + make_ext4fs -J -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M $@.bootimg $@.boot endef define Build/sdcard-img - SIGNATURE="$(IMG_PART_SIGNATURE)" \ + SIGNATURE="$(SIGNATURE)" \ ./gen_mvebu_sdcard_img.sh $@ \ $(if $(UBOOT),$(STAGING_DIR_IMAGE)/$(UBOOT)) \ c $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ @@ -48,7 +50,7 @@ define Build/sdcard-img endef define Build/sdcard-img-ext4 - SIGNATURE="$(IMG_PART_SIGNATURE)" \ + SIGNATURE="$(SIGNATURE)" \ ./gen_mvebu_sdcard_img.sh $@ \ $(if $(UBOOT),$(STAGING_DIR_IMAGE)/$(UBOOT)) \ 83 $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.bootimg \ diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk index f5313429af..e0b2b5e186 100644 --- a/target/linux/mvebu/image/cortex-a53.mk +++ b/target/linux/mvebu/image/cortex-a53.mk @@ -2,64 +2,42 @@ ifeq ($(SUBTARGET),cortexa53) define Device/globalscale_espressobin $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := ESPRESSObin - DEVICE_VARIANT := Non-eMMC - DEVICE_ALT0_VENDOR := Marvell - DEVICE_ALT0_MODEL := Armada 3700 Community Board - DEVICE_ALT0_VARIANT := Non-eMMC + DEVICE_TITLE := ESPRESSObin (Marvell Armada 3700 Community Board) DEVICE_DTS := armada-3720-espressobin endef TARGET_DEVICES += globalscale_espressobin define Device/globalscale_espressobin-emmc $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := ESPRESSObin - DEVICE_VARIANT := eMMC - DEVICE_ALT0_VENDOR := Marvell - DEVICE_ALT0_MODEL := Armada 3700 Community Board - DEVICE_ALT0_VARIANT := eMMC + DEVICE_TITLE := ESPRESSObin eMMC (Marvell Armada 3700 Community Board) DEVICE_DTS := armada-3720-espressobin-emmc endef TARGET_DEVICES += globalscale_espressobin-emmc define Device/globalscale_espressobin-v7 $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := ESPRESSObin - DEVICE_VARIANT := V7 Non-eMMC - DEVICE_ALT0_VENDOR := Marvell - DEVICE_ALT0_MODEL := Armada 3700 Community Board - DEVICE_ALT0_VARIANT := V7 Non-eMMC + DEVICE_TITLE := ESPRESSObin V7 (Marvell Armada 3700 Community Board) DEVICE_DTS := armada-3720-espressobin-v7 endef TARGET_DEVICES += globalscale_espressobin-v7 define Device/globalscale_espressobin-v7-emmc $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := ESPRESSObin - DEVICE_VARIANT := V7 eMMC - DEVICE_ALT0_VENDOR := Marvell - DEVICE_ALT0_MODEL := Armada 3700 Community Board - DEVICE_ALT0_VARIANT := V7 eMMC + DEVICE_TITLE := ESPRESSObin V7 eMMC (Marvell Armada 3700 Community Board) DEVICE_DTS := armada-3720-espressobin-v7-emmc endef TARGET_DEVICES += globalscale_espressobin-v7-emmc define Device/marvell_armada-3720-db $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 3720 Development Board (DB-88F3720-DDR3) + DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 DEVICE_DTS := armada-3720-db endef TARGET_DEVICES += marvell_armada-3720-db define Device/methode_udpu $(call Device/Default-arm64) - DEVICE_VENDOR := Methode - DEVICE_MODEL := micro-DPU (uDPU) + DEVICE_TITLE := Methode micro-DPU (uDPU) DEVICE_DTS := armada-3720-uDPU KERNEL_LOADADDR := 0x00080000 KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk index 5e619804e8..73dc67b60a 100644 --- a/target/linux/mvebu/image/cortex-a72.mk +++ b/target/linux/mvebu/image/cortex-a72.mk @@ -2,10 +2,7 @@ ifeq ($(SUBTARGET),cortexa72) define Device/marvell_macchiatobin $(call Device/Default-arm64) - DEVICE_VENDOR := SolidRun - DEVICE_MODEL := MACCHIATObin - DEVICE_ALT0_VENDOR := SolidRun - DEVICE_ALT0_MODEL := Armada 8040 Community Board + DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin SUPPORTED_DEVICES := marvell,armada8040-mcbin @@ -14,8 +11,7 @@ TARGET_DEVICES += marvell_macchiatobin define Device/marvell_armada8040-db $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 8040 Development Board + DEVICE_TITLE := Marvell Armada 8040 DB board DEVICE_DTS := armada-8040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata endef @@ -23,8 +19,7 @@ TARGET_DEVICES += marvell_armada8040-db define Device/marvell_armada7040-db $(call Device/Default-arm64) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 7040 Development Board + DEVICE_TITLE := Marvell Armada 7040 DB board DEVICE_DTS := armada-7040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata endef diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index c2ada75c2d..17d950d595 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -10,17 +10,14 @@ ifeq ($(SUBTARGET),cortexa9) define Device/linksys $(Device/NAND-128K) - DEVICE_VENDOR := Linksys + DEVICE_TITLE := Linksys $(1) DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic IMAGES += factory.img KERNEL_SIZE := 6144k endef define Device/linksys_wrt1200ac - $(call Device/linksys) - DEVICE_MODEL := WRT1200AC - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := Caiman + $(call Device/linksys,WRT1200AC (Caiman)) DEVICE_DTS := armada-385-linksys-caiman DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-caiman linksys,caiman @@ -28,11 +25,7 @@ endef TARGET_DEVICES += linksys_wrt1200ac define Device/linksys_wrt1900acv2 - $(call Device/linksys) - DEVICE_MODEL := WRT1900AC - DEVICE_VARIANT := v2 - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := Cobra + $(call Device/linksys,WRT1900ACv2 (Cobra)) DEVICE_DTS := armada-385-linksys-cobra DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-cobra linksys,cobra @@ -40,10 +33,7 @@ endef TARGET_DEVICES += linksys_wrt1900acv2 define Device/linksys_wrt3200acm - $(call Device/linksys) - DEVICE_MODEL := WRT3200ACM - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := Rango + $(call Device/linksys,WRT3200ACM (Rango)) DEVICE_DTS := armada-385-linksys-rango DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 SUPPORTED_DEVICES := armada-385-linksys-rango linksys,rango @@ -51,14 +41,7 @@ endef TARGET_DEVICES += linksys_wrt3200acm define Device/linksys_wrt1900acs - $(call Device/linksys) - DEVICE_MODEL := WRT1900ACS - DEVICE_VARIANT := v1 - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := WRT1900ACS - DEVICE_ALT0_VARIANT := v2 - DEVICE_ALT1_VENDOR := Linksys - DEVICE_ALT1_MODEL := Shelby + $(call Device/linksys,WRT1900ACS (Shelby)) DEVICE_DTS := armada-385-linksys-shelby DEVICE_PACKAGES += mwlwifi-firmware-88w8864 SUPPORTED_DEVICES := armada-385-linksys-shelby linksys,shelby @@ -66,10 +49,7 @@ endef TARGET_DEVICES += linksys_wrt1900acs define Device/linksys_wrt32x - $(call Device/linksys) - DEVICE_MODEL := WRT32X - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := Venom + $(call Device/linksys,WRT32X (Venom)) DEVICE_DTS := armada-385-linksys-venom DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 KERNEL_SIZE := 3072k @@ -79,11 +59,7 @@ endef TARGET_DEVICES += linksys_wrt32x define Device/linksys_wrt1900ac - $(call Device/linksys) - DEVICE_MODEL := WRT1900AC - DEVICE_VARIANT := v1 - DEVICE_ALT0_VENDOR := Linksys - DEVICE_ALT0_MODEL := Mamba + $(call Device/linksys,WRT1900AC (Mamba)) DEVICE_DTS := armada-xp-linksys-mamba DEVICE_PACKAGES += mwlwifi-firmware-88w8864 KERNEL_SIZE := 3072k @@ -92,33 +68,29 @@ endef TARGET_DEVICES += linksys_wrt1900ac define Device/plathome_openblocks-ax3-4 - DEVICE_VENDOR := Plat'Home - DEVICE_MODEL := OpenBlocks AX3 - DEVICE_VARIANT := 4 ports DEVICE_DTS := armada-xp-openblocks-ax3-4 SUPPORTED_DEVICES += openblocks-ax3-4 BLOCKSIZE := 128k PAGESIZE := 1 IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi + DEVICE_TITLE := Plat'Home OpenBlocks AX3 endef TARGET_DEVICES += plathome_openblocks-ax3-4 define Device/marvell_a385-db-ap $(Device/NAND-256K) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 385 Development Board AP (DB-88F6820-AP) DEVICE_DTS := armada-385-db-ap IMAGES += factory.img KERNEL_SIZE := 8192k + DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP) SUPPORTED_DEVICES += armada-385-db-ap endef TARGET_DEVICES += marvell_a385-db-ap define Device/marvell_a370-db $(Device/NAND-512K) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 370 Development Board (DB-88F6710-BP-DDR3) + DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3) DEVICE_DTS := armada-370-db SUPPORTED_DEVICES += armada-370-db endef @@ -126,8 +98,7 @@ TARGET_DEVICES += marvell_a370-db define Device/marvell_a370-rd $(Device/NAND-512K) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 370 RD (RD-88F6710-A1) + DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1) DEVICE_DTS := armada-370-rd SUPPORTED_DEVICES += armada-370-rd endef @@ -135,8 +106,7 @@ TARGET_DEVICES += marvell_a370-rd define Device/marvell_axp-db $(Device/NAND-512K) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada XP Development Board (DB-78460-BP) + DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP) DEVICE_DTS := armada-xp-db SUPPORTED_DEVICES += armada-xp-db endef @@ -144,16 +114,14 @@ TARGET_DEVICES += marvell_axp-db define Device/marvell_axp-gp $(Device/NAND-512K) - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada Armada XP GP (DB-MV784MP-GP) + DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP) DEVICE_DTS := armada-xp-gp SUPPORTED_DEVICES += armada-xp-gp endef TARGET_DEVICES += marvell_axp-gp define Device/marvell_a388-rd - DEVICE_VENDOR := Marvell - DEVICE_MODEL := Armada 388 RD (RD-88F6820-AP) + DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP) DEVICE_DTS := armada-388-rd IMAGES := firmware.bin IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs @@ -162,10 +130,9 @@ endef TARGET_DEVICES += marvell_a388-rd define Device/solidrun_clearfog-pro-a1 - DEVICE_VENDOR := SolidRun - DEVICE_MODEL := ClearFog Pro KERNEL_INSTALL := 1 KERNEL := kernel-bin + DEVICE_TITLE := SolidRun ClearFog Pro DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils swconfig IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata @@ -177,10 +144,9 @@ endef TARGET_DEVICES += solidrun_clearfog-pro-a1 define Device/solidrun_clearfog-base-a1 - DEVICE_VENDOR := SolidRun - DEVICE_MODEL := ClearFog Base KERNEL_INSTALL := 1 KERNEL := kernel-bin + DEVICE_TITLE := SolidRun ClearFog Base DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata @@ -193,19 +159,17 @@ TARGET_DEVICES += solidrun_clearfog-base-a1 define Device/globalscale_mirabox $(Device/NAND-512K) - DEVICE_VENDOR := Globalscale - DEVICE_MODEL := Mirabox DEVICE_DTS := armada-370-mirabox SUPPORTED_DEVICES += mirabox + DEVICE_TITLE := Globalscale Mirabox endef TARGET_DEVICES += globalscale_mirabox define Device/cznic_turris-omnia - DEVICE_VENDOR := CZ.NIC - DEVICE_MODEL := Turris Omnia KERNEL_INSTALL := 1 KERNEL := kernel-bin KERNEL_INITRAMFS := kernel-bin + DEVICE_TITLE := Turris Omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \