From: Jo-Philipp Wich Date: Sun, 19 Oct 2014 17:46:37 +0000 (+0000) Subject: x86_64: use default block2mtd timeout of 5s X-Git-Tag: reboot~5608 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1a376e9f1ce93b3fbe24aa875a7f4c64bc997b5d;p=openwrt%2Fstaging%2Flynxis.git x86_64: use default block2mtd timeout of 5s If the underlying block device is a USB device it might require some time to settle, observed when booting a squashfs image from sd card on an Alix APU board. Signed-off-by: Jo-Philipp Wich SVN-Revision: 42966 --- diff --git a/target/linux/x86_64/image/Makefile b/target/linux/x86_64/image/Makefile index aacdab0ff6..e8d9ac1158 100644 --- a/target/linux/x86_64/image/Makefile +++ b/target/linux/x86_64/image/Makefile @@ -55,15 +55,15 @@ ifneq ($(CONFIG_GRUB_IMAGES),) endef define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait + block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait endef define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait + block2mtd.block2mtd=$(ROOTPART),131072,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait endef define Image/cmdline/squashfs - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait + block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=squashfs rootwait endef define Image/Build/grub2