aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-03-20 14:41:17 +0000
committerJohn Crispin <john@openwrt.org>2016-03-20 14:41:17 +0000
commit174bc392ffcae5d3759a73ebafad7f63953493c3 (patch)
tree00b6ef19bd43c266dedd52cd5ed1cb6cbfa25ba1
parent3cea0747d6ffd0d791f9c32e4d1c09f58aed0fac (diff)
downloadupstream-174bc392ffcae5d3759a73ebafad7f63953493c3.tar.gz
upstream-174bc392ffcae5d3759a73ebafad7f63953493c3.tar.bz2
upstream-174bc392ffcae5d3759a73ebafad7f63953493c3.zip
oxnas: switch to new image generation template
Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 49041
-rw-r--r--target/linux/oxnas/image/Makefile130
1 files changed, 44 insertions, 86 deletions
diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile
index 5a96bad51b..548fa62da4 100644
--- a/target/linux/oxnas/image/Makefile
+++ b/target/linux/oxnas/image/Makefile
@@ -1,113 +1,71 @@
#
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2016 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
-STG212_UBI_OPTS = -m 2048 -p 128KiB -s 512
STG212_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
-
-KD20_UBI_OPTS = -m 2048 -p 128KiB -s 512
KD20_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
-
-POGOPLUG_PRO_UBI_OPTS = -m 2048 -p 128KiB -s 512
POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
-
-POGOPLUG_V3_UBI_OPTS = -m 2048 -p 128KiB -s 512
POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
-VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
-UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
+DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
+DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS
+
+KERNEL_LOADADDR := 0x60008000
+TARGET_DEVICES = kd20 pogoplug-pro pogoplug-v3 stg212
+
+define Device/Default
+ KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
+ KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+ KERNEL_NAME := zImage
+ KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | ubootable
+ KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-u-boot-initramfs
+ BLOCKSIZE := 128KiB
+ PAGESIZE := 2048
+ SUBPAGESIZE := 512
+ FILESYSTEMS := squashfs ubifs
+ PROFILES := Default
+ IMAGES := ubinized.bin sysupgrade.tar
+ IMAGE/ubinized.bin := append-ubi
+ IMAGE/sysupgrade.tar := sysupgrade-nand
+ KERNEL_IN_UBI := 1
+ UBOOTENV_IN_UBI := 1
+endef
-define Image/BuildKernel/Template
- $(CP) $(DTS_DIR)/ox820-$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb
-
- $(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x60008000,0x60008000)
- $(CP) $(KDIR)/fit-$(1).itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage.itb
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
- $(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage-initramfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x60008000,0x60008000,-initramfs)
- $(CP) $(KDIR)/fit-$(1)-initramfs.itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage-initramfs.itb
- if [ -e "$(KDIR)/u-boot.bin" ]; then \
- ( dd if=$(KDIR)/u-boot.bin bs=128k conv=sync ; dd if=$(KDIR)/fit-$(1)-initramfs.itb bs=128k conv=sync ) \
- > $(BIN_DIR)/$(IMG_PREFIX)-$(1)-u-boot-initramfs.bin; \
- fi
- endif
-
- $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
- $(call Image/BuildKernel/MkuImage, \
- none, 0x60008000, 0x60008000, \
- $(BIN_DIR)/$(IMG_PREFIX)-zImage, \
- $(BIN_DIR)/$(IMG_PREFIX)-uImage \
- )
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
- $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
- $(call Image/BuildKernel/MkuImage, \
- none, 0x60008000, 0x60008000, \
- $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
- $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
- )
- endif
+define Device/kd20
+ PROFILES := Default KD20
+ DEVICE_DTS := ox820-kd20
endef
-define Image/InstallKernel/Template
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
- $(INSTALL_DIR) $(TARGET_DIR)/boot
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
- $(CP) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/
- ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage
- endif
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
- $(CP) $(BIN_DIR)/$(IMG_PREFIX)-zImage $(TARGET_DIR)/boot/
- ln -sf $(IMG_PREFIX)-zImage $(TARGET_DIR)/boot/zImage
- endif
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_FIT),)
- $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage.itb $(TARGET_DIR)/boot/
- ln -sf $(IMG_PREFIX)-$(1)-fit-uImage.itb $(TARGET_DIR)/boot/uImage.itb
- endif
- endif
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
- $(INSTALL_DIR) $(TARGET_DIR)/boot
- ifneq ($(1),)
- $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb $(TARGET_DIR)/boot/
- ln -sf $(IMG_PREFIX)-$(1).dtb $(TARGET_DIR)/boot/$(1).dtb
- endif
- endif
+define Device/pogoplug-pro
+ PROFILES := Default POGOPLUG_PRO
+ DEVICE_DTS := ox820-pogoplug-pro
endef
-define Image/Build/squashfs
- $(call Image/Build/SysupgradeNAND,$(PROFILE_SANITIZED),$(1),$(KDIR)/fit-$(PROFILE_SANITIZED).itb)
- $(call Image/Build/UbinizeImage,$(PROFILE_SANITIZED),--uboot-env --kernel $(KDIR)/fit-$(PROFILE_SANITIZED).itb,$(1),$($(PROFILE)_UBI_OPTS))
- cp $(KDIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-squashfs-ubinized.bin $(BIN_DIR)
+define Device/pogoplug-v3
+ PROFILES := Default POGOPLUG_V3
+ DEVICE_DTS := ox820-pogoplug-v3
endef
-define Image/Build/ubifs
-
- ifneq ($($(PROFILE)_UBIFS_OPTS),)
- $(call Image/Build/SysupgradeNAND,$(PROFILE_SANITIZED),ubifs,$(KDIR)/fit-$(PROFILE_SANITIZED).itb)
- $(call Image/Build/UbinizeImage,$(PROFILE_SANITIZED),--uboot-env --kernel $(KDIR)/fit-$(PROFILE_SANITIZED).itb,ubifs,$($(PROFILE)_UBI_OPTS))
- cp $(KDIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-ubifs-ubinized.bin $(BIN_DIR)
- endif
-
+define Device/stg212
+ PROFILES := Default STG212
+ DEVICE_DTS := ox820-stg212
endef
-Image/BuildKernel/Template/POGOPLUG_PRO=$(call Image/BuildKernel/Template,pogoplug-pro)
-Image/InstallKernel/Template/POGOPLUG_PRO=$(call Image/InstallKernel/Template,pogoplug-pro)
-
-Image/BuildKernel/Template/POGOPLUG_V3=$(call Image/BuildKernel/Template,pogoplug-v3)
-Image/InstallKernel/Template/POGOPLUG_V3=$(call Image/InstallKernel/Template,pogoplug-v3)
-
-Image/BuildKernel/Template/STG212=$(call Image/BuildKernel/Template,stg212)
-Image/InstallKernel/Template/STG212=$(call Image/InstallKernel/Template,stg212)
+VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
+UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
-Image/BuildKernel/Template/KD20=$(call Image/BuildKernel/Template,kd20)
-Image/InstallKernel/Template/KD20=$(call Image/InstallKernel/Template,kd20)
+define Build/ubootable
+ (dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
+ dd if="$@" bs=128k conv=sync ) >> $@.new
+ @mv "$@.new" "$@"
+endef
define Image/BuildKernel
$(call Image/BuildKernel/Template/$(PROFILE))