ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 15:02:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ath79: rework Netgear nand devices image recipe

Browse Source 
In Netgear u-boot GPL code, nand devices uses this formula to locate the
rootfs offset.

offset = (((128 + KERNEL_SIZE) / BLOCK_SIZE) + 1) * BLOCK_SIZE;

Howerver, WNDR4500 source code incorrectly define the nand block size to
64k. In some cases, it causes u-boot can't get the correct rootfs offset,
which result in boot failure. This patch workaround it by padding kernel
size to (128k * n - 128 - 1). The additional char '\0' is used to ensure
the (128 + KERNEL_SIZE) can't be divided by the BLOCK_SIZE.

Fixes: https://github.com/openwrt/openwrt/issues/13050
Fixes: 3c1512a25d ("ath79: optimize the firmware recipe for Netgear NAND devices")
Tested-by: Yousaf <yousaf465@gmail.com>
Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2023-07-09 22:10:53 +08:00 committed by Hauke Mehrtens
parent f3eb998e7e
commit 0f9b8aa3f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ath79/image/nand.mk
View File

@ -285,7 +285,7 @@ define Device/meraki_mr18
endef endef
TARGET_DEVICES += meraki_mr18 TARGET_DEVICES += meraki_mr18
# fake rootfs is mandatory, pad-offset 64 equals (1 * uimage_header) # fake rootfs is mandatory, pad-offset 129 equals (2 * uimage_header + '\0')
define Device/netgear_ath79_nand define Device/netgear_ath79_nand
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@ -293,8 +293,9 @@ define Device/netgear_ath79_nand
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
IMAGE_SIZE := 25600k IMAGE_SIZE := 25600k
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | \ KERNEL := kernel-bin | append-dtb | lzma | \
pad-offset $$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem $$(UIMAGE_MAGIC) pad-offset $$(BLOCKSIZE) 129 | uImage lzma | pad-extra 1 | \
append-uImage-fakehdr filesystem $$(UIMAGE_MAGIC)
IMAGES := sysupgrade.bin factory.img IMAGES := sysupgrade.bin factory.img
IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi | check-size | netgear-dni append-ubi | check-size | netgear-dni