aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-07-29 15:03:19 +0200
committerJo-Philipp Wich <jo@mein.io>2016-07-29 16:53:03 +0200
commitfccc4298df79b72a5715910ac3a6f03c84f4949d (patch)
treecf81e8760da85dff45a03415d0ddf97699fffefa /target/linux
parenta1681ce39bbbab20c46150ee28b63351396662c2 (diff)
downloadupstream-fccc4298df79b72a5715910ac3a6f03c84f4949d.tar.gz
upstream-fccc4298df79b72a5715910ac3a6f03c84f4949d.tar.bz2
upstream-fccc4298df79b72a5715910ac3a6f03c84f4949d.zip
octeon: clean up image build code
Use the generic "sysupgrade-nand" build step to pack the sysupgrade file, it performs the same steps as the inline "tar-file" macro. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/octeon/image/Makefile15
1 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile
index e2d6539ad3..3d1bdf7b17 100644
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@@ -7,25 +7,14 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-DEVICE_VARS += KERNEL_PREFIX FILESYSTEMS
-
define Device/Default
PROFILES = Default $$(DEVICE_NAME)
+ BOARD_NAME := $(BOARD)
KERNEL_NAME := vmlinux.elf
KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf
KERNEL := kernel-bin | strip-kernel | patch-cmdline
IMAGES := sysupgrade.tar
- FILESYSTEMS := squashfs
- IMAGE/sysupgrade.tar := tar-file $$$$(FILESYSTEMS)
-endef
-
-define Build/tar-file
- mkdir -p $(KDIR)/sysupgrade-$(DEVICE_NAME)/
- echo "BOARD=$(BOARD)" > $(KDIR)/sysupgrade-$(DEVICE_NAME)/CONTROL
- $(CP) $(KDIR_KERNEL_IMAGE) $(KDIR)/sysupgrade-$(DEVICE_NAME)/kernel
- $(CP) $(KDIR)/root.$(1) $(KDIR)/sysupgrade-$(DEVICE_NAME)/root
- (cd $(KDIR); $(TAR) cvf \
- $@ sysupgrade-$(DEVICE_NAME))
+ IMAGE/sysupgrade.tar := sysupgrade-nand
endef
define Build/strip-kernel