X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2FMakefile;h=804532b55cb145134acf47accd095bbb24dee059;hb=30c07a56752ee6fd5f82022e05c80721ce0e7092;hp=9209aa8d9f56792510c90e3b56d0b1c1dde05929;hpb=dcc2ea3cf59a8a6b3da5c152af3b38c561c53710;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 9209aa8d9f..804532b55c 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -5,47 +5,33 @@
 # See /LICENSE for more information.
 #
 
-JFFS2_BLOCKSIZE = 64k 128k 256k
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default)
-
 KERNEL_LOADADDR = 0x80060000
 
-DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS LOADER_TYPE
+DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE
 
 ifeq ($(SUBTARGET),generic)
-include ./tp-link.mk
-include ./ubnt.mk
 include ./generic.mk
+include ./generic-legacy-devices.mk
+include ./generic-tp-link.mk
+include ./generic-ubnt.mk
+endif
+ifeq ($(SUBTARGET),tiny)
+include ./tiny.mk
+include ./tiny-tp-link.mk
+include ./tiny-legacy-devices.mk
+include ./tiny-senao.mk
+endif
+ifeq ($(SUBTARGET),nand)
+include ./nand.mk
+endif
+ifeq ($(SUBTARGET),mikrotik)
+include ./mikrotik.mk
 endif
 include ./legacy.mk
 
-define Build/netgear-squashfs
-	rm -rf $@.fs $@.squashfs
-	mkdir -p $@.fs/image
-	cp $@ $@.fs/image/uImage
-	$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
-		$@.fs $@.squashfs \
-		-noappend -root-owned -be -b 65536 \
-		$(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
-
-	dd if=/dev/zero bs=1k count=1 >> $@.squashfs
-	mkimage \
-		-A mips -O linux -T filesystem -C none \
-		-M $(NETGEAR_KERNEL_MAGIC) \
-		-a 0xbf070000 -e 0xbf070000 \
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $@.squashfs $@
-	rm -rf $@.squashfs $@.fs
-endef
-
-define Build/netgear-uImage
-	$(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
-endef
-
 define Build/loader-common
 	rm -rf $@.src
 	$(MAKE) -C lzma-loader \
@@ -58,10 +44,6 @@ define Build/loader-common
 	rm -rf $@.src
 endef
 
-define Build/loader-okli-compile
-	$(call Build/loader-common,FLASH_OFFS=$(LOADER_FLASH_OFFS) FLASH_MAX=0 KERNEL_CMDLINE="$(CMDLINE)")
-endef
-
 define Build/loader-kernel
 	$(call Build/loader-common,LOADER_DATA="$@")
 endef
@@ -70,54 +52,18 @@ define Build/loader-kernel-cmdline
 	$(call Build/loader-common,LOADER_DATA="$@" KERNEL_CMDLINE="$(CMDLINE)")
 endef
 
-define Build/loader-okli
-	dd if=$(KDIR)/loader-$(1).gz bs=7680 conv=sync of="$@.new"
-	cat "$@" >> "$@.new"
-	mv "$@.new" "$@"
-endef
-
-define Build/copy-file
-	cat "$(1)" > "$@"
-endef
-
 define Device/Default
   BOARDNAME :=
   DEVICE_PROFILE = $$(BOARDNAME)
   PROFILES = Default Minimal $$(DEVICE_PROFILE)
   MTDPARTS :=
-  IMAGES := sysupgrade.bin
   BLOCKSIZE := 64k
-  FILESYSTEMS = $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-$$(BLOCKSIZE)
-  CONSOLE = ttyS0,115200
+  CONSOLE := ttyS0,115200
   CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE))
   KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
   COMPILE :=
   IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
+  IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
 endef
 
-ifeq ($(SUBTARGET),nand)
-
-define Build/MerakiNAND
-	-$(STAGING_DIR_HOST)/bin/mkmerakifw \
-		-B $(BOARDNAME) -s \
-		-i $@ \
-		-o $@.new
-	@mv $@.new $@
-endef
-
-define Device/mr18
-  BOARDNAME = MR18
-  BLOCKSIZE := 64k
-  CONSOLE = ttyS0,115200
-  MTDPARTS = ar934x-nfc:512k(nandloader)ro,8M(kernel),8M(recovery),113664k(ubi),128k@130944k(odm-caldata)ro
-  IMAGES := sysupgrade.tar
-  KERNEL := kernel-bin | patch-cmdline | MerakiNAND
-  KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND
-  IMAGE/sysupgrade.tar := sysupgrade-nand
-endef
-TARGET_DEVICES += mr18
-
-endif # ifeq ($(SUBTARGET),nand)
-
 $(eval $(call BuildImage))