mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-29 12:24:11 +02:00
9f5cbb6e8b
Commit21f460a5db("ath25: fix duplicate LZMA compression") changed the way kernel images are generated, affecting initramfs images instead. Initramfs images were previously ELF images, and by mistake this change caused the raw kernel image to be used as a source. This caused them to be non-loadable by bootloaders. Restore the previous KERNEL_INITRAMFS recipe and adjust KERNEL_INITRAMFS_NAME to point at the correct source artifact. While at that, adjust KERNEL_INITRAMFS_SUFFIX to -kernel.elf, so it matches the suffix of non-initramfs kernel artifact. Fixes:21f460a5db("ath25: fix duplicate LZMA compression") Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
119 lines
3.1 KiB
Makefile
119 lines
3.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# Copyright (C) 2006-2010 OpenWrt.org
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
include $(INCLUDE_DIR)/image.mk
|
|
|
|
define Build/mkfwimage
|
|
$(STAGING_DIR_HOST)/bin/mkfwimage \
|
|
-B $(1).$(VERSION_DIST).$(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 $@.elf
|
|
endef
|
|
|
|
define Build/elf-kernel
|
|
cp $(IMAGE_KERNEL).elf $@
|
|
endef
|
|
|
|
|
|
define Device/Default
|
|
PROFILES = Default $$(DEVICE_NAME)
|
|
KERNEL := copy-kernel | lzma-kernel
|
|
KERNEL_INITRAMFS = kernel-bin
|
|
KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf
|
|
KERNEL_INITRAMFS_SUFFIX := -kernel.elf
|
|
IMAGES := sysupgrade.bin
|
|
FILESYSTEMS := squashfs
|
|
endef
|
|
|
|
define Device/generic
|
|
DEVICE_VENDOR := Atheros
|
|
DEVICE_MODEL := Generic AR2xxx board
|
|
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
|
|
DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(if $$(findstring kernel,$$(2)),,$$(1)-)$$(2)
|
|
endef
|
|
TARGET_DEVICES += generic
|
|
|
|
define Device/ubnt_picostation-2
|
|
DEVICE_VENDOR := Ubiquiti
|
|
DEVICE_MODEL := Picostation 2 (XS2-8)
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2-8 -v XS2.ar2316
|
|
endef
|
|
TARGET_DEVICES += ubnt_picostation-2
|
|
|
|
define Device/ubnt_nanostation-2
|
|
DEVICE_VENDOR := Ubiquiti
|
|
DEVICE_MODEL := Nanostation 2 (XS2)
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2 -v XS2.ar2316
|
|
DEFAULT := n
|
|
endef
|
|
TARGET_DEVICES += ubnt_nanostation-2
|
|
|
|
define Device/ubnt_nanostation-5
|
|
DEVICE_VENDOR := Ubiquiti
|
|
DEVICE_MODEL := Nanostation 5 (XS5)
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS5 -v XS5.ar2313
|
|
DEFAULT := n
|
|
endef
|
|
TARGET_DEVICES += ubnt_nanostation-5
|
|
|
|
define Device/compex_np25g
|
|
DEVICE_VENDOR := Compex
|
|
DEVICE_MODEL := NP25G
|
|
KERNEL := kernel-bin | gzip-kernel
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw np25g
|
|
BROKEN := y
|
|
endef
|
|
TARGET_DEVICES += compex_np25g
|
|
|
|
define Device/compex_wpe53g
|
|
DEVICE_VENDOR := Compex
|
|
DEVICE_MODEL := WPE53G
|
|
KERNEL := kernel-bin | gzip-kernel
|
|
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw wpe53g
|
|
BROKEN := y
|
|
endef
|
|
TARGET_DEVICES += compex_wpe53g
|
|
|
|
$(eval $(call BuildImage))
|