octeon: increase block2mtd rootfs probe timeout on ER

[openwrt/openwrt.git] / target / linux / octeon / image / Makefile

diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile
index 043058b06f16a9e7dec0004d5ae5afbcee66afff..ab91d066c620446e3d18868e17786f2b8a029893 100644 (file)
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@@ -7,25 +7,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-DEVICE_VARS += KERNEL_PREFIX FILESYSTEMS
-
 define Device/Default
   PROFILES = Default $$(DEVICE_NAME)
   KERNEL_NAME := vmlinux.elf
   KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf
   KERNEL := kernel-bin | strip-kernel | patch-cmdline
   IMAGES := sysupgrade.tar
+  IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@
+  IMAGE/sysupgrade.tar := 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))
 endef
 
 define Build/strip-kernel
@@ -39,7 +29,7 @@ define Device/generic
 endef
 TARGET_DEVICES += generic
 
-ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro block2mtd.block2mtd=/dev/mmcblk0p2,65536,rootfs,5 root=/dev/mtdblock3 rootfstype=squashfs rootwait
+ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro block2mtd.block2mtd=/dev/mmcblk0p2,65536,rootfs,15 root=/dev/mtdblock3 rootfstype=squashfs rootwait
 define Device/er
   CMDLINE := $(ER_CMDLINE) 
   DEVICE_TITLE := Ubiquiti EdgeRouter