aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-05-12 15:04:32 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-05-13 17:12:28 +0100
commit61b3909d6000e15017fee7d8c64f59fd02973bd2 (patch)
tree46dda76d09a1309eeeddbd2245c67cd8e7766ae9
parent58e75b145d2ebb05b55c1aa20c66560faec63002 (diff)
downloadmeta-intel-quark-61b3909d6000e15017fee7d8c64f59fd02973bd2.tar.gz
meta-intel-quark-61b3909d6000e15017fee7d8c64f59fd02973bd2.tar.bz2
meta-intel-quark-61b3909d6000e15017fee7d8c64f59fd02973bd2.zip
grub-conf: fix grub config
* Add a working configuration for devkit images, default to it and drop the others that aren't as useful * Drop use of $EARLY_CON_ADDR_REPLACE since that doesn't appear to be working * Increase the timeout to allow you to change the selection if needed Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-bsp/grub-conf/files/grub.conf13
1 files changed, 4 insertions, 9 deletions
diff --git a/recipes-bsp/grub-conf/files/grub.conf b/recipes-bsp/grub-conf/files/grub.conf
index 4503266..260e216 100644
--- a/recipes-bsp/grub-conf/files/grub.conf
+++ b/recipes-bsp/grub-conf/files/grub.conf
@@ -1,17 +1,12 @@
default 1
-timeout 1
+timeout 5
color white/blue white/cyan
title Clanton SVP kernel-SPI initrd-SPI IMR-On IO-APIC/HPET NoEMU
- kernel --spi root=/dev/ram0 console=ttyS1,115200n8 earlycon=uart8250,mmio32,$EARLY_CON_ADDR_REPLACE,115200n8 vmalloc=384M reboot=efi,warm apic=debug rw
+ kernel --spi root=/dev/ram0 console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm apic=debug rw
initrd --spi
-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,$EARLY_CON_ADDR_REPLACE,115200n8 vmalloc=384M reboot=efi,warm apic=debug rw
-
-title Clanton SVP kernel-MassStorage initrd-MassStorage rootfs.img IMR-On IO-APIC/HPET NoEMU debug
+title Clanton SVP kernel-MassStorage iot-devkit on SD IMR-On IO-APIC/HPET NoEMU debug
root (hd0,0)
- kernel /bzImage root=/dev/ram0 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 reboot=efi,warm vmalloc=384M apic=debug rw LABEL=boot debugshell=5
- initrd /core-image-minimal-initramfs-clanton.cpio.gz
-
+ kernel /bzImage root=/dev/mmcblk0p2 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x8010f000,115200n8 vmalloc=384M reboot=efi,warm apic=debug rw LABEL=boot debugshell=5