X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=blobdiff_plain;f=target%2Flinux%2Fgemini%2Fimage%2FMakefile;h=a55a89070076d70e85474f77bb47d1d1ab7243b0;hp=80fb59e249b522342a1fdb79f8ef4eb9b2577bb3;hb=10dab9b0986cda87060f8a2bf28bbac468488734;hpb=e814e946a62e04eb76f08d09dc338ad6097d71db

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index 80fb59e249..a55a890700 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2014 OpenWrt.org
+# Copyright (C) 2009-2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,80 +7,154 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-ifeq ($(SUBTARGET),wiligear)
-define Image/Prepare
-# WBD111: mach id 1690 (0x69a)
-	echo -en "\x06\x1c\xa0\xe3\x9a\x10\x81\xe3" > $(KDIR)/$(IMG_PREFIX)-wbd111-zImage
-	cat $(KDIR)/zImage >> $(KDIR)/$(IMG_PREFIX)-wbd111-zImage
-# WBD222: mach id 2753 (0xAC1)
-	echo -en "\x0a\x1c\xa0\xe3\xc1\x10\x81\xe3" > $(KDIR)/$(IMG_PREFIX)-wbd222-zImage
-	cat $(KDIR)/zImage >> $(KDIR)/$(IMG_PREFIX)-wbd222-zImage
+# Cook a "WRGG" image, this board is apparently one in the D-Link
+# WRGG family and uses the exact same firmware format as other
+# D-Link devices.
+define Build/dir685-images
+	mkwrggimg -i $(IMAGE_KERNEL) \
+	-o $@.new \
+	-d /dev/mtdblock/1 \
+	-s wrgns01_dlwbr_dir685RBWW \
+	-v 'N/A' \
+	-m dir685 \
+	-B 96bb
+
+	mv $@.new $@
+endef
+
+# Build D-Link DNS-313 images using the special header tool.
+# rootfs.tgz and rd.tgz contains nothing, we only need them
+# to satisfy the boot loader on the device. The zImage is
+# the only real content.
+define Build/dns313-images
+	mkdir -p $@.tmp/.boot
+
+	echo "dummy" > $@.tmp/dummyfile
+
+	dns313-header $@.tmp/dummyfile \
+		$@.tmp/.boot/rootfs.tgz
+	dns313-header $@.tmp/dummyfile \
+		$@.tmp/.boot/rd.gz
+	dns313-header $(IMAGE_KERNEL) \
+		$@.tmp/.boot/zImage
+
+	tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ \
+		-C $@.tmp .boot \
+		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)")
+
+	rm -rf $@.tmp
+endef
+
+# Create the special NAS4220B and Itian Square One SQ201 image
+# format with the squashfs and overlay inside the "rd.gz" file.
+# We pad it out to 6144K which is the size of the initramfs partition.
+#
+# The "application" partition is just blank. You can put anything
+# there when using OpenWRT. We just use that to create the
+# "sysupgrade" firmware image.
+define Build/nas4220b-sq201-images
+	mkdir -p $@.tmp
+
+	mv $@ $@.tmp/rd.gz
+	dd if=/dev/zero of=$@.tmp/hddapp.tgz bs=6144k count=1
+	cp $(IMAGE_KERNEL) $@.tmp/zImage
+	cp ./ImageInfo-$(1) $@.tmp/ImageInfo
+
+	(cd $@.tmp; tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ * \
+		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)"))
+
+	rm -rf $@.tmp
+endef
+
+# WBD-111 and WBD-222:
+# work around the bootloader's bug with extra nops
+# FIXME: is this really needed now that we no longer append the code
+# to change the machine ID number? Needs testing on Wiliboard.
+define Build/wbd-nops
+	mv $@ $@.tmp
+	echo -en "\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1" > $@
+	cat $@.tmp >> $@
+	rm -f $@.tmp
 endef
-endif
 
-ifeq ($(SUBTARGET),raidsonic)
-define Image/Prepare
-# NAS4220: mach id 2038 (0x7F6)
-	echo -en "\x07\x1c\xa0\xe3\xf6\x10\x81\xe3" > $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage
-	cat $(KDIR)/zImage >> $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage
+# All DTB files are prefixed with "gemini-"
+define Device/Default
+	PROFILES := Default
+	DEVICE_DTS := $(patsubst %.dtb,%,$(notdir $(wildcard $(if $(IB),$(KDIR),$(DTS_DIR))/*-$(1).dtb)))
+	KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
+	KERNEL_NAME := zImage
+	KERNEL := kernel-bin | append-dtb
+	FILESYSTEMS := squashfs
+	IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
 endef
-endif
-
-ifeq ($(SUBTARGET),wiligear)
-define Image/BuildKernel
-# workaround the bootloader's bug with extra nops
-	echo -en "\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1" > $(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage
-	cat $(KDIR)/$(IMG_PREFIX)-wbd111-zImage >> $(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage
-	echo -en "\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1" > $(BIN_DIR)/$(IMG_PREFIX)-wbd222-zImage
-	cat $(KDIR)/$(IMG_PREFIX)-wbd222-zImage >> $(BIN_DIR)/$(IMG_PREFIX)-wbd222-zImage
+
+# A reasonable set of default packages handling the NAS type
+# of devices out of the box (former NAS42x0 IcyBox defaults)
+GEMINI_NAS_PACKAGES:=kmod-md-mod kmod-md-linear kmod-md-multipath \
+		kmod-md-raid0 kmod-md-raid1 kmod-md-raid10 kmod-md-raid456 \
+		kmod-fs-btrfs kmod-fs-cifs kmod-fs-nfs \
+		kmod-fs-nfsd kmod-fs-ntfs kmod-fs-reiserfs kmod-fs-vfat \
+		kmod-nls-utf8 kmod-usb-storage-extras \
+		samba36-server mdadm cfdisk fdisk e2fsprogs badblocks
+
+define Device/dlink-dir-685
+	DEVICE_TITLE := D-Link DIR-685 Xtreme N Storage Router
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) \
+			kmod-switch-rtl8366rb swconfig \
+			rt2800-pci
+	IMAGES := fwupdate.bin
+	IMAGE/fwupdate.bin := dir685-images
 endef
-endif
+TARGET_DEVICES += dlink-dir-685
 
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=64k conv=sync
+define Device/dlink-dns-313
+	DEVICE_TITLE := D-Link DNS-313 1-Bay Network Storage Enclosure
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
+	IMAGES := dns313-bootpart.tar.gz
+	IMAGE/dns313-bootpart.tar.gz := dns313-images
 endef
+TARGET_DEVICES += dlink-dns-313
 
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
+define Device/nas4220b-sq201
+	ARTIFACTS := zImage
+	ARTIFACT/zImage := append-kernel
+	IMAGES += rd.gz sysupgrade.tar.gz
+	IMAGE/rd.gz := append-rootfs | pad-to 6144k
+	IMAGE/sysupgrade.tar.gz := append-rootfs | pad-to 6144k | nas4220b-sq201-images $(1)
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
 endef
 
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
+define Device/nas4220b
+	$(Device/nas4220b-sq201)
+	DEVICE_TITLE := Raidsonic NAS IB-4220-B
 endef
+TARGET_DEVICES += nas4220b
 
-ifeq ($(SUBTARGET),wiligear)
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-	-$(STAGING_DIR_HOST)/bin/mkfwimage2 \
-		-m GEOS -f 0x30000000 -z \
-		-v WILI-S.WILIBOARD.v5.00.SL3512.OpenWrt.00000.000000.000000 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-wbd111-$(1).bin \
-		-p Kernel:0x020000:0x100000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage \
-		-p Ramdisk:0x120000:0x500000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img
-
-	-$(STAGING_DIR_HOST)/bin/mkfwimage2 \
-		-m GEOS -f 0x30000000 -z \
-		-v WILI-S.WBD222.v5.00.SL3512.OpenWrt.00000.000000.000000 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-wbd222-$(1).bin \
-		-p Kernel:0x020000:0x100000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-wbd222-zImage \
-		-p Ramdisk:0x120000:0x500000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+define Device/rut1xx
+	DEVICE_TITLE := Teltonika RUT1xx
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
 endef
-endif
-
-ifeq ($(SUBTARGET),raidsonic)
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-	dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img of=$(BIN_DIR)/rd.gz bs=6144k count=1
-#	dd if=/dev/zero of=$(BIN_DIR)/hddapp.tgz bs=6144k count=1
-	dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img of=$(BIN_DIR)/hddapp.tgz bs=6144k count=1 seek=1
-	cp $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage $(BIN_DIR)/zImage
-	cp ./ImageInfo-ib4220 $(BIN_DIR)/ImageInfo
-	(cd $(BIN_DIR); tar -czf $(IMG_PREFIX)-sysupgrade-ib4220.tar.gz ImageInfo zImage rd.gz hddapp.tgz)
-	mv $(BIN_DIR)/rd.gz $(BIN_DIR)/$(IMG_PREFIX)-nas4220-rd.gz
-	mv $(BIN_DIR)/hddapp.tgz $(BIN_DIR)/$(IMG_PREFIX)-nas4220-hddapp.tgz
-	rm -f $(BIN_DIR)/zImage $(BIN_DIR)/ImageInfo
+TARGET_DEVICES += rut1xx
+
+define Device/sq201
+	$(Device/nas4220b-sq201)
+	DEVICE_TITLE := ITian Square One SQ201
+	DEVICE_PACKAGES += rt61-pci usb2-pci
+endef
+TARGET_DEVICES += sq201
+
+define Device/wbd111
+	DEVICE_TITLE := Wiliboard WBD-111
+	KERNEL := kernel-bin | append-dtb | wbd-nops
+endef
+TARGET_DEVICES += wbd111
+
+define Device/wbd222
+	DEVICE_TITLE := Wiliboard WBD-222
+	KERNEL := kernel-bin | append-dtb | wbd-nops
 endef
-endif
+TARGET_DEVICES += wbd222
 
 $(eval $(call BuildImage))