diff options
| author | David Bauer <mail@david-bauer.net> | 2020-07-22 00:00:36 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2020-07-22 17:18:55 +0200 |
| commit | 9a9cdc65c4fd3b25d04e8f08efd5ec6fc7903988 (patch) | |
| tree | ca7e73b6f59329758bd8959e84891b00a81388c6 /target/linux/ath79/image/nand.mk | |
| parent | 9b9726aeb4c96b1c6dc1fa75b5b6ba56dd3c7755 (diff) | |
| download | upstream-9a9cdc65c4fd3b25d04e8f08efd5ec6fc7903988.tar.gz upstream-9a9cdc65c4fd3b25d04e8f08efd5ec6fc7903988.tar.bz2 upstream-9a9cdc65c4fd3b25d04e8f08efd5ec6fc7903988.zip | |
ath79: re-enable image generation for GL-AR750S
The bootloader only writes the first 2MB of the image to the NOR flash
when installing the NAND factory image. The bootloader is capable of
booting larger kernels as it boots from the memory mapped SPI flash.
Disable the NAND factory image. The NAND can be bootstrapped by writing
the NAND initramfs image using the NOR upgrade method in the bootloader
web-recovery and sysupgrading from there. The NOR variant is not
affected.
Also refactor the partition definitions in the DTS to make them less
annoying to read.
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/ath79/image/nand.mk')
| -rw-r--r-- | target/linux/ath79/image/nand.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index f7fc71d65e..420c62a5db 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -117,24 +117,15 @@ define Device/glinet_gl-ar750s-common DEVICE_MODEL := GL-AR750S DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \ kmod-usb-storage block-mount - KERNEL_SIZE := 2048k IMAGE_SIZE := 16000k - PAGESIZE := 2048 - VID_HDR_OFFSET := 2048 endef -# NB: The kernel size is intentionally restricted at this time; see commit message define Device/glinet_gl-ar750s-nor-nand $(Device/glinet_gl-ar750s-common) DEVICE_VARIANT := NOR/NAND - BLOCKSIZE := 128k - GL_UBOOT_UBI_OFFSET := 2048k - IMAGES += factory.img - IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \ - append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET) + KERNEL_SIZE := 4096k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata SUPPORTED_DEVICES += glinet,gl-ar750s-nor - DEFAULT := n endef TARGET_DEVICES += glinet_gl-ar750s-nor-nand @@ -143,7 +134,6 @@ define Device/glinet_gl-ar750s-nor DEVICE_VARIANT := NOR BLOCKSIZE := 64k SUPPORTED_DEVICES += gl-ar750s glinet,gl-ar750s glinet,gl-ar750s-nor-nand - DEFAULT := n endef TARGET_DEVICES += glinet_gl-ar750s-nor |