diff options
| author | Maik Goette <github@beeit.de> | 2023-01-08 18:35:10 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-02 23:01:44 +0200 |
| commit | 50d707e34474771d9ec189d39311b1c6f667329b (patch) | |
| tree | 01488c7727377bf00798939a7898104730ad3ae8 | |
| parent | fea7478f2d44da539f7ebbabeb58cde7ef23275e (diff) | |
| download | openwrt-50d707e34474771d9ec189d39311b1c6f667329b.tar.gz openwrt-50d707e34474771d9ec189d39311b1c6f667329b.tar.bz2 openwrt-50d707e34474771d9ec189d39311b1c6f667329b.zip | |
lantiq: fix lzma-loader for Netgear DGN 3500(B)
Fixes Uncompressing Kernel Image ... ERROR: LzmaDecode.c, 561
Fixes: #11701 for both 3500(B)
Signed-off-by: Maik Goette <github@beeit.de>
(cherry picked from commit 4d9c38d654fdfb72ef641573bbf5b0f73f638f2e)
| -rw-r--r-- | target/linux/lantiq/image/Makefile | 19 | ||||
| -rw-r--r-- | target/linux/lantiq/image/ar9.mk | 4 |
2 files changed, 18 insertions, 5 deletions
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index facc3fbe09..9fdb949392 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -49,22 +49,31 @@ define Build/fullimage rm $@.tmp endef -define Build/loader-okli-compile +define Build/loader-common rm -rf $@.src $(MAKE) -C lzma-loader \ PKG_BUILD_DIR="$@.src" \ TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \ - PLATFORM="lantiq" \ + BOARD="$(BOARDNAME)" PLATFORM="lantiq" \ LZMA_TEXT_START=0x82000000 \ LOADADDR=0x80002000 \ - FLASH_START=0x10000000 \ - FLASH_OFFS=$(LOADER_FLASH_OFFS) \ - FLASH_MAX=0x0 \ $(1) compile loader.bin mv "$@.bin" "$@" rm -rf $@.src endef +define Build/loader-kernel + $(call Build/loader-common,LOADER_DATA="$@") +endef + +define Build/loader-okli-compile + $(call Build/loader-common, \ + FLASH_START=0x10000000 \ + FLASH_OFFS=$(LOADER_FLASH_OFFS) \ + FLASH_MAX=0x0 \ + ) +endef + define Build/prepend-loader-okli cat "$(KDIR)/loader-$(word 1,$(1)).bin" "$@" >> "$@.new" mv "$@.new" "$@" diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 434dacb121..a1795b3552 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -88,6 +88,8 @@ define Device/netgear_dgn3500 DEVICE_MODEL := DGN3500 SOC := ar9 IMAGE_SIZE := 16000k + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | uImage none + KERNEL_INITRAMFS := $$(KERNEL) IMAGES := \ sysupgrade-na.bin sysupgrade.bin \ factory-na.img factory.img @@ -119,6 +121,8 @@ define Device/netgear_dgn3500b DEVICE_MODEL := DGN3500B SOC := ar9 IMAGE_SIZE := 16000k + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | uImage none + KERNEL_INITRAMFS := $$(KERNEL) IMAGES += factory.img IMAGE/sysupgrade.bin := \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ |