diff options
author | Konrad Scherer <Konrad.Scherer@windriver.com> | 2014-03-28 17:43:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 10:10:35 +0100 |
commit | e1876b67156ef3151d797bf8e8d33594ea15291e (patch) | |
tree | 31cfdd6fd6a396428d70a4be338c7c6807a43002 | |
parent | 23f26b563765915dcc5ecfa53bd917d9192bac77 (diff) | |
download | poky-e1876b67156ef3151d797bf8e8d33594ea15291e.tar.gz |
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.
(From OE-Core rev: d78c4d51ed266c14b0425f6abf553392c6ebe408)
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.bbclass | 5 |
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 @@ | |||
15 | # ${SYSLINUX_DEFAULT_CONSOLE} - set to "console=ttyX" to change kernel boot default console | 15 | # ${SYSLINUX_DEFAULT_CONSOLE} - set to "console=ttyX" to change kernel boot default console |
16 | # ${SYSLINUX_SERIAL} - Set an alternate serial port or turn off serial with empty string | 16 | # ${SYSLINUX_SERIAL} - Set an alternate serial port or turn off serial with empty string |
17 | # ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument | 17 | # ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument |
18 | # ${SYSLINUX_KERNEL_ARGS} - Add additional kernel arguments | ||
18 | 19 | ||
19 | do_bootimg[depends] += "syslinux:do_populate_sysroot \ | 20 | do_bootimg[depends] += "syslinux:do_populate_sysroot \ |
20 | syslinux-native:do_populate_sysroot" | 21 | syslinux-native:do_populate_sysroot" |
@@ -162,6 +163,10 @@ python build_syslinux_cfg () { | |||
162 | for btype in btypes: | 163 | for btype in btypes: |
163 | cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label)) | 164 | cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label)) |
164 | 165 | ||
166 | exargs = d.getVar('SYSLINUX_KERNEL_ARGS', True) | ||
167 | if exargs: | ||
168 | btype[1] += " " + exargs | ||
169 | |||
165 | append = localdata.getVar('APPEND', True) | 170 | append = localdata.getVar('APPEND', True) |
166 | initrd = localdata.getVar('INITRD', True) | 171 | initrd = localdata.getVar('INITRD', True) |
167 | 172 | ||