aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-02-05 14:32:30 -0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-05-09 18:19:28 +0100
commitf0d6b50afd1d5a7e8ebd1f5241f6c88349d5156b (patch)
tree9fb1c61c8c5c873a2a5baff7587357f500bb8cfe
parentb5a33dba149705b5f885865cf87e927b189e8f6c (diff)
downloadmeta-intel-quark-f0d6b50afd1d5a7e8ebd1f5241f6c88349d5156b.tar.gz
meta-intel-quark-f0d6b50afd1d5a7e8ebd1f5241f6c88349d5156b.tar.bz2
meta-intel-quark-f0d6b50afd1d5a7e8ebd1f5241f6c88349d5156b.zip
grub.conf: Fix up default selection and timeout
(meta-clanton rev: 1b22a6ae39c6a81566717c23761aa449233885e1) Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--recipes-bsp/grub-conf/files/grub.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-bsp/grub-conf/files/grub.conf b/recipes-bsp/grub-conf/files/grub.conf
index 0c85f91..4f0c187 100644
--- a/recipes-bsp/grub-conf/files/grub.conf
+++ b/recipes-bsp/grub-conf/files/grub.conf
@@ -1,5 +1,5 @@
-default 2
-timeout 3
+default 3
+timeout 5
color white/blue white/cyan
@@ -10,12 +10,12 @@ title Clanton SVP kernel-SPI initrd-SPI IMR-On IO-APIC/HPET NoEMU
title Clanton SVP kernel-SPI image-full on SD IMR-On IO-APIC/HPET NoEMU
kernel --spi root=/dev/mmcblk0p2 console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw
-title Clanton SVP kernel-MassStorage initrd-MassStorage image-full IMR-On IO-APIC/HPET NoEMU debug
+title Clanton SVP kernel-MassStorage initrd-MassStorage rootfs.img IMR-On IO-APIC/HPET NoEMU debug
root (hd0,0)
- kernel /bzImage root=/dev/ram0 console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5
+ kernel /bzImage root=/dev/ram0 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5
initrd /core-image-minimal-initramfs-clanton.cpio.gz
title Clanton SVP kernel-MassStorage iot-devkit on SD IMR-On IO-APIC/HPET NoEMU debug
root (hd0,0)
- kernel /bzImage root=/dev/mmcblk0p2 console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5
+ kernel /bzImage root=/dev/mmcblk0p2 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5