mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-15 07:02:09 +00:00
50cb934142
The definition for the netgear_wndr4700 had two different
DEVICE_COMPAT_VERSION definitions.
In commit 5815884c3a2 ("apm821xx: migrate to DSA"), an additional
DEVICE_COMPAT_VERSION := 3.0 attribute was added to the device
definition. The old one with version 2.0 stayed and was defined later
overwriting the new one.
Replace the old version 2.0 with the new version 3.0
Fixes: 5815884c3a2a ("apm821xx: migrate to DSA")
Link: https://forum.openwrt.org/t/openwrt-24-10-0-rc6-sixth-release-candidate/222466/43
Link: https://github.com/openwrt/openwrt/pull/17741
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit dab52c00d712a421d6e61eebc51359e5d38ad347)
129 lines
4.5 KiB
Makefile
129 lines
4.5 KiB
Makefile
define Build/create-uImage-dtb
|
|
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
|
|
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
|
|
-O linux -T kernel -C none \
|
|
-n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
|
|
-d "$(KDIR)/image-$(firstword $(DEVICE_DTS)).dtb" "$@.dtb.uimage"
|
|
endef
|
|
|
|
define Build/prepend-dtb-uImage
|
|
cat "$@.dtb.uimage" "$@" > "$@.new"
|
|
mv "$@.new" "$@"
|
|
endef
|
|
|
|
define Build/meraki-header
|
|
-$(STAGING_DIR_HOST)/bin/mkmerakifw \
|
|
-B $(BOARD_NAME) -s \
|
|
-i $@ \
|
|
-o $@.new
|
|
@cp $@.new $@
|
|
endef
|
|
|
|
|
|
define Device/meraki_mr24
|
|
DEVICE_VENDOR := Cisco Meraki
|
|
DEVICE_MODEL := MR24
|
|
DEVICE_PACKAGES := kmod-spi-gpio -swconfig
|
|
BOARD_NAME := mr24
|
|
IMAGES := sysupgrade.bin
|
|
DEVICE_DTC_FLAGS := --space 64512
|
|
IMAGE_SIZE := 8191k
|
|
KERNEL := kernel-bin | lzma | uImage lzma | prepend-dtb | meraki-header
|
|
KERNEL_INITRAMFS := kernel-bin | lzma | MuImage-initramfs lzma
|
|
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
|
UBINIZE_OPTS := -E 5
|
|
SUPPORTED_DEVICES += mr24
|
|
endef
|
|
TARGET_DEVICES += meraki_mr24
|
|
|
|
define Device/meraki_mx60
|
|
DEVICE_VENDOR := Cisco Meraki
|
|
DEVICE_MODEL := MX60
|
|
DEVICE_ALT0_VENDOR := Cisco Meraki
|
|
DEVICE_ALT0_MODEL := MX60W
|
|
DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
|
|
kmod-usb-storage block-mount
|
|
BLOCKSIZE := 128k
|
|
IMAGES := sysupgrade.bin
|
|
DEVICE_DTC_FLAGS := --space 20480
|
|
IMAGE_SIZE := 1021m
|
|
KERNEL := kernel-bin | libdeflate-gzip | MuImage-initramfs gzip
|
|
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
|
UBINIZE_OPTS := -E 5
|
|
DEVICE_COMPAT_VERSION := 3.0
|
|
DEVICE_COMPAT_MESSAGE := uboot's bootcmd has to be updated to support standard multi-image uImages. \
|
|
Network swconfig configuration cannot be upgraded to DSA. \
|
|
Upgrade via sysupgrade mechanism is not possible.
|
|
endef
|
|
TARGET_DEVICES += meraki_mx60
|
|
|
|
define Device/netgear_wndap6x0
|
|
DEVICE_VENDOR := NETGEAR
|
|
DEVICE_PACKAGES := kmod-eeprom-at24
|
|
SUBPAGESIZE := 256
|
|
PAGESIZE := 512
|
|
BLOCKSIZE := 16k
|
|
DEVICE_DTC_FLAGS := --space 32768
|
|
IMAGE_SIZE := 27392k
|
|
IMAGES := sysupgrade.bin factory.img
|
|
KERNEL_SIZE := 6080k
|
|
KERNEL := kernel-bin | libdeflate-gzip | MuImage-initramfs gzip
|
|
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
|
IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
|
|
UBINIZE_OPTS := -E 5
|
|
DEVICE_COMPAT_VERSION := 2.0
|
|
DEVICE_COMPAT_MESSAGE := kernel and ubi partitions had to be resized. \
|
|
Upgrade via sysupgrade mechanism is not possible.
|
|
endef
|
|
|
|
define Device/netgear_wndap620
|
|
$(Device/netgear_wndap6x0)
|
|
DEVICE_MODEL := WNDAP620 (Premium Wireless-N)
|
|
endef
|
|
TARGET_DEVICES += netgear_wndap620
|
|
|
|
define Device/netgear_wndap660
|
|
$(Device/netgear_wndap6x0)
|
|
DEVICE_MODEL := WNDAP660 (Dual Radio Dual Band Wireless-N)
|
|
endef
|
|
TARGET_DEVICES += netgear_wndap660
|
|
|
|
define Device/netgear_wndr4700
|
|
DEVICE_VENDOR := NETGEAR
|
|
DEVICE_MODEL := Centria N900 WNDR4700
|
|
DEVICE_ALT0_VENDOR := NETGEAR
|
|
DEVICE_ALT0_MODEL := Centria N900 WNDR4720
|
|
DEVICE_PACKAGES := badblocks block-mount e2fsprogs kmod-hwmon-drivetemp \
|
|
kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \
|
|
kmod-md-mod kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-iso8859-15 \
|
|
kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \
|
|
partx-utils kmod-ata-dwc
|
|
BOARD_NAME := wndr4700
|
|
PAGESIZE := 2048
|
|
SUBPAGESIZE := 512
|
|
BLOCKSIZE := 128k
|
|
DEVICE_DTC_FLAGS := --space 131008
|
|
IMAGE_SIZE := 24960k
|
|
IMAGES := factory.img sysupgrade.bin
|
|
ARTIFACTS := device-tree.dtb
|
|
KERNEL_SIZE := 4608k
|
|
# append a fake/empty rootfs to fool netgear's uboot
|
|
# CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg()
|
|
KERNEL := kernel-bin | lzma -d16 | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | \
|
|
append-uImage-fakehdr filesystem | create-uImage-dtb | prepend-dtb-uImage
|
|
KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | MuImage-initramfs gzip
|
|
IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
|
|
netgear-dni | check-size
|
|
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
|
ARTIFACT/device-tree.dtb := export-dtb | uImage none
|
|
NETGEAR_BOARD_ID := WNDR4700
|
|
NETGEAR_HW_ID := 29763875+128+256
|
|
UBINIZE_OPTS := -E 5
|
|
SUPPORTED_DEVICES += wndr4700
|
|
DEVICE_COMPAT_VERSION := 3.0
|
|
DEVICE_COMPAT_MESSAGE := kernel and ubi partitions had to be resized. \
|
|
Network swconfig configuration cannot be upgraded to DSA. \
|
|
Upgrade via sysupgrade mechanism is not possible.
|
|
endef
|
|
TARGET_DEVICES += netgear_wndr4700
|