21f460a5db
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 <jo@mein.io>
108 lines
2.7 KiB
Makefile
108 lines
2.7 KiB
Makefile
#
|
|
# Copyright (C) 2006-2010 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
include $(TOPDIR)/rules.mk
|
|
include $(INCLUDE_DIR)/image.mk
|
|
|
|
define Build/mkfwimage
|
|
$(STAGING_DIR_HOST)/bin/mkfwimage \
|
|
-B $(1).OpenWrt.$(REVISION) \
|
|
-k $(IMAGE_KERNEL) \
|
|
-r $(IMAGE_ROOTFS) \
|
|
-o $@.new && \
|
|
mv $@.new $@
|
|
endef
|
|
|
|
define Build/combined-image
|
|
-sh $(TOPDIR)/scripts/combined-image.sh \
|
|
"$(IMAGE_KERNEL)" \
|
|
"$(IMAGE_ROOTFS)" \
|
|
"$@.new" && \
|
|
mv $@.new $@
|
|
endef
|
|
|
|
define Build/mkmylofw
|
|
$(STAGING_DIR_HOST)/bin/mkmylofw -B $(1) \
|
|
-p0x020000:0x130000:ah:0x80041000:linux:$(IMAGE_KERNEL) \
|
|
-p0x150000:0x2a0000:::rootfs:$(IMAGE_ROOTFS) \
|
|
$@.new && \
|
|
mv $@.new $@
|
|
endef
|
|
|
|
define Build/gzip-kernel
|
|
gzip -9n -c $@ > $@.gz
|
|
dd if=$@.gz of=$@ bs=65536 conv=sync
|
|
endef
|
|
|
|
define Build/lzma-kernel
|
|
$(STAGING_DIR_HOST)/bin/lzma e $@ $@.l7
|
|
dd if=$@.l7 of=$@ bs=65536 conv=sync
|
|
endef
|
|
|
|
define Build/copy-kernel
|
|
rm -f $@ $@.elf
|
|
cp $< $@
|
|
cp $< $@.elf
|
|
endef
|
|
|
|
define Build/elf-kernel
|
|
cp $(IMAGE_KERNEL).elf $@
|
|
endef
|
|
|
|
|
|
define Device/Default
|
|
PROFILES = Default $$(DEVICE_NAME)
|
|
KERNEL := copy-kernel | lzma-kernel
|
|
IMAGES := sysupgrade.bin
|
|
FILESYSTEMS := squashfs
|
|
endef
|
|
|
|
define Device/generic
|
|
DEVICE_TITLE := Generic Images
|
|
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)
|
|
endef
|
|
TARGET_DEVICES += generic
|
|
|
|
define Device/ubnt2-pico2
|
|
DEVICE_TITLE := Ubiquiti XS2-8
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2-8 -v XS2.ar2316
|
|
endef
|
|
TARGET_DEVICES += ubnt2-pico2
|
|
|
|
define Device/ubnt2
|
|
DEVICE_TITLE := Ubiquiti XS2
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2 -v XS2.ar2316
|
|
endef
|
|
TARGET_DEVICES += ubnt2
|
|
|
|
define Device/ubnt5
|
|
DEVICE_TITLE := Ubiquiti XS5
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS5 -v XS5.ar2313
|
|
endef
|
|
TARGET_DEVICES += ubnt5
|
|
|
|
define Device/np25g
|
|
DEVICE_TITLE := np25g
|
|
KERNEL := kernel-bin | gzip-kernel
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw np25g
|
|
endef
|
|
#TARGET_DEVICES += np25g
|
|
|
|
define Device/wpe53g
|
|
DEVICE_TITLE := wpe53g
|
|
KERNEL := kernel-bin | gzip-kernel
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw wpe53g
|
|
endef
|
|
#TARGET_DEVICES += wpe53g
|
|
|
|
$(eval $(call BuildImage))
|