summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-19 15:47:36 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-19 15:47:36 +0000
commiteb970796247f0ae41e7229d981bce329b778660e (patch)
treef9f7c68831fe938c04cc026b97a4c82f907a4de9
parentdf954d1fc8ff59121eeaaf4c83b2090c92d5ece3 (diff)
parent3dd0115a4ddc267c7018298c659947100d278012 (diff)
merge of '5245fa92de31b9af071626ab0aa8ee1699126429'
and 'd589ae71d47d05c2754a75c5d7d6af2d12e8c58f'
-rw-r--r--packages/kexecboot/linux-kexecboot.inc9
-rw-r--r--packages/kexecboot/linux-kexecboot_2.6.24.bb2
-rw-r--r--packages/kexecboot/linux-kexecboot_2.6.26.bb2
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/kexecboot/linux-kexecboot.inc b/packages/kexecboot/linux-kexecboot.inc
index 96c7489fb6..93207e4332 100644
--- a/packages/kexecboot/linux-kexecboot.inc
+++ b/packages/kexecboot/linux-kexecboot.inc
@@ -5,10 +5,11 @@ SRC_URI = "file://defconfig"
DONT_CHECK_KERNELSIZE = ""
INITRAMFS_IMAGE = "initramfs-kexecboot-image"
-# uncomment the following lines if you use u-boot as bootloader
-#KERNEL_IMAGETYPE_c7x0="uImage"
-#KERNEL_IMAGETYPE_akita="uImage"
-#KERNEL_IMAGETYPE_spitz="uImage"
+CMDLINE = "console=ttyS0,115200n8 console=tty1"
+CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
+CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
+CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1"
+CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
PACKAGES = ""
PROVIDES = ""
diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb
index 2b2a73b0b5..903245ef7f 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb
@@ -1,6 +1,6 @@
require linux-kexecboot.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "-1"
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index d42ba94c17..3a8727155a 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-kexecboot.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"