diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2011-03-04 00:22:33 +0100 |
---|---|---|
committer | Andrea Adami <andrea.adami@gmail.com> | 2011-03-04 00:26:08 +0100 |
commit | e8a78acb1e428a58d9f6ef9b3e8882fc6796faf2 (patch) | |
tree | 97ec16f508dea9f8bf5d9078444de7c9e900ed39 /recipes/kexecboot/kexecboot-cfg_0.1.bb | |
parent | 60ede7b913a2398039f482839b6636e05ea7a400 (diff) | |
download | openembedded-e8a78acb1e428a58d9f6ef9b3e8882fc6796faf2.tar.gz |
kexecboot_cfg: update boot.cfg example to sync with kexecboot.
* clean some cmdline cruft
* bump PR
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes/kexecboot/kexecboot-cfg_0.1.bb')
-rw-r--r-- | recipes/kexecboot/kexecboot-cfg_0.1.bb | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index 32e5881628..de9d38c44d 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -1,39 +1,32 @@ DESCRIPTION = "Configuration file for kexecboot" SECTION = "base" LICENSE = "GPL" -PR = "r10" +PR = "r11" SRC_URI = "file://icon.xpm" -CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" -CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw" -CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" -CMDLINE_CON_ben-nanonote = "console=ttyS0,57600n8 console=tty0" -CMDLINE_MEM = "" -CMDLINE_MEM_collie = "mem=64M" -CMDLINE_MEM_ben-nanonote = "mem=32M" -CMDLINE_ROTATE = "" -CMDLINE_ROTATE_spitz = "fbcon=rotate:1" -CMDLINE_ROTATE_akita = "fbcon=rotate:1" -CMDLINE_ROTATE_collie = "fbcon=rotate:1" -CMDLINE_ROTATE_poodle = "fbcon=rotate:1" -CMDLINE_OTHER = "" CMDLINE_DEBUG = "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}" -CMDLINE = "${CMDLINE_CON}" -CMDLINE += "${CMDLINE_MEM}" -CMDLINE += "${CMDLINE_ROTATE}" -CMDLINE += "${CMDLINE_OTHER}" -CMDLINE += "${CMDLINE_DEBUG}" + +CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_ben-nanonote = "console=ttyS0,57600n8 console=tty0 mem=32M ${CMDLINE_DEBUG}" +CMDLINE_c7x0 = "console=ttyS0,115200n8 console=tty1 ${CMDLINE_DEBUG}" +CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M ${CMDLINE_DEBUG}" +CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_qemuarm = "console=ttyAMA0,115200n8 console=tty1 ${CMDLINE_DEBUG}" +CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1 ${CMDLINE_DEBUG}" do_configure_prepend () { install -m 0644 ${WORKDIR}/icon.xpm ${S} } + do_install_prepend () { -echo '# Show this label in kexecboot menu. -LABEL=${DISTRO}-${MACHINE} -# +echo '# First kernel stanza. # Specify full kernel path on target. KERNEL=/boot/${KERNEL_IMAGETYPE} + +# Show this label in kexecboot menu. +LABEL=${DISTRO}-${MACHINE} # # Append this tags to the kernel cmdline. APPEND=${CMDLINE} @@ -41,7 +34,7 @@ APPEND=${CMDLINE} # Specify optional initrd/initramfs. # INITRD=/boot/initramfs.cpio.gz # -# Specify full path for a custom distro-icon for the menu-item. +# Specify full path for a custom icon for the menu-item. # If not set, use device-icons as default (NAND, SD, CF, ...). # ICON=/boot/icon.xpm # @@ -49,8 +42,15 @@ APPEND=${CMDLINE} # Items with highest priority will be shown at top of menu. # Default: 0 (lowest, ordered by device ordering) # PRIORITY=10 +# +# +# Second kernel stanza. +# KERNEL=/boot/${KERNEL_IMAGETYPE}-test +# LABEL=${DISTRO}-${MACHINE}-test +# APPEND=${CMDLINE} #' >> ${S}/boot.cfg } + do_install () { install -d ${D}/boot install -m 0644 boot.cfg ${D}/boot/boot.cfg |