summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Scherer <Konrad.Scherer@windriver.com>2014-03-28 17:43:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:03:23 +0100
commitd78c4d51ed266c14b0425f6abf553392c6ebe408 (patch)
tree498066bf78aabab90706518d4e3cfb49cb43be91
parentfaa86f0cda47f3ea6eeaf4c3fd3cf95a286f4571 (diff)
downloadopenembedded-core-contrib-d78c4d51ed266c14b0425f6abf553392c6ebe408.tar.gz
openembedded-core-contrib-d78c4d51ed266c14b0425f6abf553392c6ebe408.tar.bz2
openembedded-core-contrib-d78c4d51ed266c14b0425f6abf553392c6ebe408.zip
syslinux.bbclass: Enable additional kernel parameters for syslinux
Add additional parameter 'SYSLINUX_KERNEL_ARGS' in order to allow for specific kernel parameters to be set when using syslinux. The extra kernel parameters are added to btype[1] and then written out as part of the APPEND field. Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/syslinux.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 62d4b7a87a..8964d3ff5e 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -15,6 +15,7 @@
# ${SYSLINUX_DEFAULT_CONSOLE} - set to "console=ttyX" to change kernel boot default console
# ${SYSLINUX_SERIAL} - Set an alternate serial port or turn off serial with empty string
# ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument
+# ${SYSLINUX_KERNEL_ARGS} - Add additional kernel arguments
do_bootimg[depends] += "syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot"
@@ -162,6 +163,10 @@ python build_syslinux_cfg () {
for btype in btypes:
cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label))
+ exargs = d.getVar('SYSLINUX_KERNEL_ARGS', True)
+ if exargs:
+ btype[1] += " " + exargs
+
append = localdata.getVar('APPEND', True)
initrd = localdata.getVar('INITRD', True)