ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-19 03:06:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

ipq40xx: add uboot-envtools to default packages

Browse Source 
When support for Luma WRTQ-329ACN was added, the instructions for
flashing this device include using tools from uboot-envtools package.
Unfortunately the OpenWrt buildroot system omits packages from
DEVICE_PACKAGES when CONFIG_TARGET_MULTI_PROFILE,
CONFIG_TARGET_PER_DEVICE_ROOTFS, CONFIG_TARGET_ALL_PROFILES are set. In
result the official images are without tools mentioned in the
instruction. The workoround for the fashing would be installing
uboot-envtools when booted with initramfs image, but not always the
access to internet is available. The other method would be to issue the
necesary command in U-Boot environment but some serial terminals default
configuration don't work well with pasting lines longer than 80 chars.
Therefore add uboot-envtools to default packages, which adds really
small flash footprint to rootfs, where increased size usually is not an
issue.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
(cherry picked from commit 1984a6bbca)
This commit is contained in:
Tomasz Maciej Nowak 2021-05-25 15:26:06 +02:00 committed by Hauke Mehrtens
parent 0753cd9853
commit f788dfdf55
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/ipq40xx/Makefile
View File

@ -18,6 +18,7 @@ DEFAULT_PACKAGES += \
kmod-usb-dwc3-qcom \ kmod-usb-dwc3-qcom \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ath10k-ct wpad-basic-wolfssl \ kmod-ath10k-ct wpad-basic-wolfssl \
kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \
uboot-envtools
$(eval $(call BuildTarget)) $(eval $(call BuildTarget))

28
target/linux/ipq40xx/image/generic.mk
View File

@ -121,8 +121,7 @@ define Device/alfa-network_ap120c-ac
DEVICE_VENDOR := ALFA Network DEVICE_VENDOR := ALFA Network
DEVICE_MODEL := AP120C-AC DEVICE_MODEL := AP120C-AC
SOC := qcom-ipq4018 SOC := qcom-ipq4018
DEVICE_PACKAGES := kmod-usb-acm \ DEVICE_PACKAGES := kmod-usb-acm kmod-tpm-i2c-atmel
kmod-tpm-i2c-atmel uboot-envtools
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
IMAGE_SIZE := 65536k IMAGE_SIZE := 65536k
@ -141,7 +140,6 @@ endef
define Device/aruba_ap-303 define Device/aruba_ap-303
$(call Device/aruba_glenmorangie) $(call Device/aruba_glenmorangie)
DEVICE_MODEL := AP-303 DEVICE_MODEL := AP-303
DEVICE_PACKAGES += uboot-envtools
endef endef
TARGET_DEVICES += aruba_ap-303 TARGET_DEVICES += aruba_ap-303
@ -154,7 +152,7 @@ TARGET_DEVICES += aruba_ap-303h
define Device/aruba_ap-365 define Device/aruba_ap-365
$(call Device/aruba_glenmorangie) $(call Device/aruba_glenmorangie)
DEVICE_MODEL := AP-365 DEVICE_MODEL := AP-365
DEVICE_PACKAGES += kmod-hwmon-ad7418 uboot-envtools DEVICE_PACKAGES += kmod-hwmon-ad7418
endef endef
TARGET_DEVICES += aruba_ap-365 TARGET_DEVICES += aruba_ap-365
@ -237,7 +235,7 @@ define Device/buffalo_wtr-m2133hp
DEVICE_VENDOR := Buffalo DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WTR-M2133HP DEVICE_MODEL := WTR-M2133HP
SOC := qcom-ipq4019 SOC := qcom-ipq4019
DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9984-ct ipq-wifi-buffalo_wtr-m2133hp DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-buffalo_wtr-m2133hp
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
endef endef
@ -318,7 +316,7 @@ define Device/devolo_magic-2-wifi-next
IMAGE_SIZE := 26624k IMAGE_SIZE := 26624k
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
DEVICE_PACKAGES := ipq-wifi-devolo_magic-2-wifi-next uboot-envtools DEVICE_PACKAGES := ipq-wifi-devolo_magic-2-wifi-next
endef endef
TARGET_DEVICES += devolo_magic-2-wifi-next TARGET_DEVICES += devolo_magic-2-wifi-next
@ -357,7 +355,7 @@ define Device/edgecore_ecw5211
SOC := qcom-ipq4018 SOC := qcom-ipq4018
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm
endef endef
TARGET_DEVICES += edgecore_ecw5211 TARGET_DEVICES += edgecore_ecw5211
@ -541,7 +539,6 @@ define Device/linksys_ea6350v3
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA6350v3 IMAGE/factory.bin := append-kernel | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA6350v3
DEVICE_PACKAGES := uboot-envtools
endef endef
TARGET_DEVICES += linksys_ea6350v3 TARGET_DEVICES += linksys_ea6350v3
@ -557,7 +554,7 @@ define Device/linksys_ea8300
UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA8300 IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA8300
DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9888-ct ipq-wifi-linksys_ea8300 kmod-usb-ledtrig-usbport DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-linksys_ea8300 kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += linksys_ea8300 TARGET_DEVICES += linksys_ea8300
@ -573,7 +570,7 @@ define Device/linksys_mr8300
UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=MR8300 IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=MR8300
DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9888-ct ipq-wifi-linksys_mr8300-v0 kmod-usb-ledtrig-usbport DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-linksys_mr8300-v0 kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += linksys_mr8300 TARGET_DEVICES += linksys_mr8300
@ -582,7 +579,7 @@ define Device/luma_wrtq-329acn
DEVICE_VENDOR := Luma Home DEVICE_VENDOR := Luma Home
DEVICE_MODEL := WRTQ-329ACN DEVICE_MODEL := WRTQ-329ACN
SOC := qcom-ipq4018 SOC := qcom-ipq4018
DEVICE_PACKAGES := ipq-wifi-luma_wrtq-329acn kmod-ath3k kmod-eeprom-at24 kmod-i2c-gpio uboot-envtools DEVICE_PACKAGES := ipq-wifi-luma_wrtq-329acn kmod-ath3k kmod-eeprom-at24 kmod-i2c-gpio
IMAGE_SIZE := 76632k IMAGE_SIZE := 76632k
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
@ -648,7 +645,6 @@ define Device/openmesh_a42
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42 IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := uboot-envtools
endef endef
TARGET_DEVICES += openmesh_a42 TARGET_DEVICES += openmesh_a42
@ -664,7 +660,7 @@ define Device/openmesh_a62
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62 IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct uboot-envtools DEVICE_PACKAGES := ath10k-firmware-qca9888-ct
endef endef
TARGET_DEVICES += openmesh_a62 TARGET_DEVICES += openmesh_a62
@ -680,7 +676,7 @@ define Device/plasmacloud_pa1200
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA1200 IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA1200
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := uboot-envtools ipq-wifi-plasmacloud-pa1200 DEVICE_PACKAGES := ipq-wifi-plasmacloud-pa1200
endef endef
TARGET_DEVICES += plasmacloud_pa1200 TARGET_DEVICES += plasmacloud_pa1200
@ -696,7 +692,7 @@ define Device/plasmacloud_pa2200
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA2200 IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA2200
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-plasmacloud-pa2200 uboot-envtools DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-plasmacloud-pa2200
endef endef
TARGET_DEVICES += plasmacloud_pa2200 TARGET_DEVICES += plasmacloud_pa2200
@ -790,7 +786,7 @@ define Device/zyxel_nbg6617
# this minimum-size. However, the larger image can be flashed both ways. # this minimum-size. However, the larger image can be flashed both ways.
IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k | check-size $$$$(ROOTFS_SIZE) | zyxel-ras-image separate-kernel IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k | check-size $$$$(ROOTFS_SIZE) | zyxel-ras-image separate-kernel
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | check-size $$$$(ROOTFS_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | check-size $$$$(ROOTFS_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := uboot-envtools kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += zyxel_nbg6617 TARGET_DEVICES += zyxel_nbg6617