summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/uboot-extlinux-config.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes-recipe/uboot-extlinux-config.bbclass b/meta/classes-recipe/uboot-extlinux-config.bbclass
index a7f325ff2d..30bbea57de 100644
--- a/meta/classes-recipe/uboot-extlinux-config.bbclass
+++ b/meta/classes-recipe/uboot-extlinux-config.bbclass
@@ -23,6 +23,8 @@
23# Measured in 1/10 of a second. 23# Measured in 1/10 of a second.
24# UBOOT_EXTLINUX_DEFAULT_LABEL - Target to be selected by default after 24# UBOOT_EXTLINUX_DEFAULT_LABEL - Target to be selected by default after
25# the timeout period. 25# the timeout period.
26# UBOOT_EXTLINUX_MENU_TITLE - Menu title. If empty, MENU TITLE entry
27# will not be added to the output file.
26# UBOOT_EXTLINUX_CONFIG - Output file. 28# UBOOT_EXTLINUX_CONFIG - Output file.
27# 29#
28# If there's only one label system will boot automatically and menu won't be 30# If there's only one label system will boot automatically and menu won't be
@@ -68,6 +70,7 @@ UBOOT_EXTLINUX_FDTDIR ??= "../"
68UBOOT_EXTLINUX_KERNEL_IMAGE ??= "../${KERNEL_IMAGETYPE}" 70UBOOT_EXTLINUX_KERNEL_IMAGE ??= "../${KERNEL_IMAGETYPE}"
69UBOOT_EXTLINUX_KERNEL_ARGS ??= "rootwait rw" 71UBOOT_EXTLINUX_KERNEL_ARGS ??= "rootwait rw"
70UBOOT_EXTLINUX_MENU_DESCRIPTION:linux ??= "${DISTRO_NAME}" 72UBOOT_EXTLINUX_MENU_DESCRIPTION:linux ??= "${DISTRO_NAME}"
73UBOOT_EXTLINUX_MENU_TITLE ??= "Select the boot mode"
71 74
72UBOOT_EXTLINUX_CONFIG = "${B}/extlinux.conf" 75UBOOT_EXTLINUX_CONFIG = "${B}/extlinux.conf"
73 76
@@ -95,8 +98,9 @@ python do_create_extlinux_config() {
95 with open(cfile, 'w') as cfgfile: 98 with open(cfile, 'w') as cfgfile:
96 cfgfile.write('# Generic Distro Configuration file generated by OpenEmbedded\n') 99 cfgfile.write('# Generic Distro Configuration file generated by OpenEmbedded\n')
97 100
98 if len(labels.split()) > 1: 101 menu_title = localdata.getVar('UBOOT_EXTLINUX_MENU_TITLE')
99 cfgfile.write('MENU TITLE Select the boot mode\n') 102 if len(labels.split()) > 1 and menu_title:
103 cfgfile.write('MENU TITLE %s\n' % (menu_title))
100 104
101 timeout = localdata.getVar('UBOOT_EXTLINUX_TIMEOUT') 105 timeout = localdata.getVar('UBOOT_EXTLINUX_TIMEOUT')
102 if timeout: 106 if timeout: