From 83a18aefbdead8088f693917174ff01b8ae33650 Mon Sep 17 00:00:00 2001 From: Vincent Wiemann Date: Tue, 13 Aug 2019 01:26:45 +0200 Subject: [PATCH] ath79: add support for YunCore TFTP image generation YunCore QCA9k based devices released in 2019 require a custom TFTP image for U-Boot built-in recovery mode (triggered with reset button). Image has to be prepended with 'YUNCORE' keyword followed by U-Boot CLI commands which will be executed later. Images without the custom header will be ignored by U-Boot. To be able to support both the vendor firmware (QSDK) and OpenWrt flash layouts, used here commands change the 'bootcmd' before flashing image. This commit adds generic helper script for YunCore devices with 16 MB of flash and enables TFTP image generation for A770 model. Signed-off-by: Vincent Wiemann [pepe2k@gmail.com: commit description reworded, recipe renamed] Signed-off-by: Piotr Dymacz (cherry picked from commit 8016f648640e8f73f0dc4fc307fb6bebd12afb88) --- target/linux/ath79/image/common-yuncore.mk | 12 ++++++++++++ target/linux/ath79/image/generic.mk | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 target/linux/ath79/image/common-yuncore.mk diff --git a/target/linux/ath79/image/common-yuncore.mk b/target/linux/ath79/image/common-yuncore.mk new file mode 100644 index 0000000000..a71d930d80 --- /dev/null +++ b/target/linux/ath79/image/common-yuncore.mk @@ -0,0 +1,12 @@ +define Build/yuncore-tftp-header-16m + ( \ + echo -n -e \ + "YUNCOREsetenv bootcmd \"bootm 0x9f050000 || bootm 0x9fe80000\"" \ + "&& saveenv" \ + "&& erase 0x9f050000 +0xfa0000" \ + "&& cp.b 0x800600c0 0x9f050000 0xfa0000" |\ + dd bs=192 count=1 conv=sync; \ + dd if=$@; \ + ) > $@.new + mv $@.new $@ +endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 5a56a4760e..fd931a64c7 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1,5 +1,6 @@ include ./common-buffalo.mk include ./common-netgear.mk +include ./common-yuncore.mk DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK @@ -717,6 +718,8 @@ define Device/yuncore_a770 DEVICE_TITLE := YunCore A770 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k + IMAGES += tftp.bin + IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m endef TARGET_DEVICES += yuncore_a770