瀏覽代碼

ath25: fix duplicate LZMA compression

The conversion to the new image building code accidentally caused the kernel
image to get compressed twice, leading to boot failures when kernel and rootfs
are flashed separately.

The sysupgrade images have been unaffected by this. Also restore the elf
kernel build artifact while we're at it.

Signed-off-by: Jo-Philipp Wich <[email protected]>
Jo-Philipp Wich 9 年之前
父節點
當前提交
21f460a5db
共有 1 個文件被更改,包括 15 次插入4 次删除
  1. 15 4
      target/linux/ath25/image/Makefile

+ 15 - 4
target/linux/ath25/image/Makefile

@@ -42,19 +42,30 @@ define Build/lzma-kernel
 	dd [email protected] of=$@ bs=65536 conv=sync
 endef
 
+define Build/copy-kernel
+	rm -f $@ [email protected]
+	cp $< $@
+	cp $< [email protected]
+endef
+
+define Build/elf-kernel
+	cp $(IMAGE_KERNEL).elf $@
+endef
+
 
 define Device/Default
   PROFILES = Default $$(DEVICE_NAME)
-  KERNEL := kernel-bin | lzma-kernel
+  KERNEL := copy-kernel | lzma-kernel
   IMAGES := sysupgrade.bin
   FILESYSTEMS := squashfs
 endef
 
 define Device/generic
   DEVICE_TITLE := Generic Images
-  IMAGES := kernel.lzma kernel.gz rootfs.bin sysupgrade.bin
-  IMAGE/kernel.gz := append-kernel | gzip-kernel
-  IMAGE/kernel.lzma := append-kernel | lzma-kernel
+  IMAGES := kernel.lzma kernel.elf kernel.gz rootfs.bin sysupgrade.bin
+  IMAGE/kernel.gz := elf-kernel | gzip-kernel
+  IMAGE/kernel.elf := elf-kernel
+  IMAGE/kernel.lzma := elf-kernel | lzma-kernel
   IMAGE/rootfs.bin := append-rootfs | pad-rootfs | pad-to 128k
   IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | combined-image
   IMAGE_NAME = $$(IMAGE_PREFIX)-$$(if $$(findstring kernel,$$(2)),,$$(1)-)$$(2)