6 files changed, 3 insertions, 12 deletions
diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload
index 313290ed..cdd6c0f0 100644
--- a/config/grub/default/config/payload
+++ b/config/grub/default/config/payload
@@ -53,7 +53,7 @@ set default="0"
 if [ -f (cbfsdisk)/timeout.cfg ]; then
 	source (cbfsdisk)/timeout.cfg
 else	
-	set timeout=5
+	set timeout=8
 fi
 set grub_scan_disk="ahci ata"
 if [ -f (cbfsdisk)/scan.cfg ]; then
diff --git a/config/grub/default/target.cfg b/config/grub/default/target.cfg
index fa5735e9..e6ed598b 100644
--- a/config/grub/default/target.cfg
+++ b/config/grub/default/target.cfg
@@ -1,5 +1,2 @@
 tree="default"
 rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
diff --git a/config/grub/nvme/config/payload b/config/grub/nvme/config/payload
index d7a3c57d..2f9c7114 100644
--- a/config/grub/nvme/config/payload
+++ b/config/grub/nvme/config/payload
@@ -53,7 +53,7 @@ set default="0"
 if [ -f (cbfsdisk)/timeout.cfg ]; then
 	source (cbfsdisk)/timeout.cfg
 else	
-	set timeout=5
+	set timeout=8
 fi
 set grub_scan_disk="nvme ahci ata"
 if [ -f (cbfsdisk)/scan.cfg ]; then
diff --git a/config/grub/nvme/target.cfg b/config/grub/nvme/target.cfg
index a85c97f5..97a0deb5 100644
--- a/config/grub/nvme/target.cfg
+++ b/config/grub/nvme/target.cfg
@@ -1,5 +1,2 @@
 tree="nvme"
 rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
diff --git a/config/grub/xhci/config/payload b/config/grub/xhci/config/payload
index cd5b49b3..923e3551 100644
--- a/config/grub/xhci/config/payload
+++ b/config/grub/xhci/config/payload
@@ -54,7 +54,7 @@ set default="0"
 if [ -f (cbfsdisk)/timeout.cfg ]; then
 	source (cbfsdisk)/timeout.cfg
 else	
-	set timeout=5
+	set timeout=8
 fi
 set grub_scan_disk="nvme ahci ata"
 if [ -f (cbfsdisk)/scan.cfg ]; then
diff --git a/config/grub/xhci/target.cfg b/config/grub/xhci/target.cfg
index 34ab2d24..61ee9757 100644
--- a/config/grub/xhci/target.cfg
+++ b/config/grub/xhci/target.cfg
@@ -1,5 +1,2 @@
 tree="xhci"
 rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""