ath79/mikrotik: create shared device definitions for nor and nand

Move the image preparation and nand-utils package selection into
common device definitions for NOR/NAND devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 2020-08-01 17:39:33 +02:00
parent 48a9d99a21
commit 8a8ef4ed86
2 changed files with 19 additions and 13 deletions

View File

@ -4,3 +4,17 @@ define Device/mikrotik
KERNEL := kernel-bin | append-dtb | lzma | loader-kernel KERNEL := kernel-bin | append-dtb | lzma | loader-kernel
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel
endef endef
define Device/mikrotik_nor
$(Device/mikrotik)
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \
append-metadata | check-size
endef
define Device/mikrotik_nand
$(Device/mikrotik)
IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 2048 -e -c | \
sysupgrade-tar kernel=$$$$@ | append-metadata
DEVICE_PACKAGES := nand-utils
endef

View File

@ -1,36 +1,28 @@
include ./common-mikrotik.mk include ./common-mikrotik.mk
define Device/mikrotik_routerboard-493g define Device/mikrotik_routerboard-493g
$(Device/mikrotik) $(Device/mikrotik_nand)
SOC := ar7161 SOC := ar7161
DEVICE_MODEL := RouterBOARD 493G DEVICE_MODEL := RouterBOARD 493G
IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 2048 -e -c | \ DEVICE_PACKAGES += kmod-usb-ohci kmod-usb2
sysupgrade-tar kernel=$$$$@ | append-metadata
DEVICE_PACKAGES += kmod-usb-ohci kmod-usb2 nand-utils
SUPPORTED_DEVICES += rb-493g SUPPORTED_DEVICES += rb-493g
endef endef
TARGET_DEVICES += mikrotik_routerboard-493g TARGET_DEVICES += mikrotik_routerboard-493g
define Device/mikrotik_routerboard-922uags-5hpacd define Device/mikrotik_routerboard-922uags-5hpacd
$(Device/mikrotik) $(Device/mikrotik_nand)
SOC := qca9558 SOC := qca9558
DEVICE_MODEL := RouterBOARD 922UAGS-5HPacD DEVICE_MODEL := RouterBOARD 922UAGS-5HPacD
IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 2048 -e -c | \ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2
sysupgrade-tar kernel=$$$$@ | append-metadata
DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct \
kmod-usb2 nand-utils
SUPPORTED_DEVICES += rb-922uags-5hpacd SUPPORTED_DEVICES += rb-922uags-5hpacd
endef endef
TARGET_DEVICES += mikrotik_routerboard-922uags-5hpacd TARGET_DEVICES += mikrotik_routerboard-922uags-5hpacd
define Device/mikrotik_routerboard-wap-g-5hact2hnd define Device/mikrotik_routerboard-wap-g-5hact2hnd
$(Device/mikrotik) $(Device/mikrotik_nor)
SOC := qca9556 SOC := qca9556
DEVICE_MODEL := RouterBOARD wAP G-5HacT2HnD (wAP AC) DEVICE_MODEL := RouterBOARD wAP G-5HacT2HnD (wAP AC)
IMAGE_SIZE := 16256k IMAGE_SIZE := 16256k
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \
append-metadata | check-size
DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
SUPPORTED_DEVICES += rb-wapg-5hact2hnd SUPPORTED_DEVICES += rb-wapg-5hact2hnd
endef endef