diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/system-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/system_console.xml.in | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i index 55764fc40..f29226c03 100644 --- a/interface-definitions/include/version/system-version.xml.i +++ b/interface-definitions/include/version/system-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/system-version.xml.i --> -<syntaxVersion component='system' version='31'></syntaxVersion> +<syntaxVersion component='system' version='32'></syntaxVersion> <!-- include end --> diff --git a/interface-definitions/system_console.xml.in b/interface-definitions/system_console.xml.in index 78df0a6af..8ae98291e 100644 --- a/interface-definitions/system_console.xml.in +++ b/interface-definitions/system_console.xml.in @@ -12,12 +12,16 @@ <properties> <help>Serial console device name</help> <completionHelp> - <script>ls -1 /dev | grep -e ttyS -e hvc</script> + <script>ls -1 /dev | grep -e ttyS -e ttyAMA -e hvc</script> <script>if [ -d /dev/serial/by-bus ]; then ls -1 /dev/serial/by-bus; fi</script> </completionHelp> <valueHelp> <format>ttySN</format> - <description>TTY device name, regular serial port</description> + <description>TTY device name, ttyS based</description> + </valueHelp> + <valueHelp> + <format>ttyAMAN</format> + <description>TTY device name, ttyAMA based</description> </valueHelp> <valueHelp> <format>usbNbXpY</format> @@ -28,10 +32,16 @@ <description>Xen console</description> </valueHelp> <constraint> - <regex>(ttyS[0-9]+|ttyAMA[0-9]+|hvc[0-9]+|usb[0-9]+b.*)</regex> + <regex>(ttyS[0-9]+|ttyAMA[0-9]+|hvc[0-9]+|usb[0-9]+b.*)</regex> </constraint> </properties> <children> + <leafNode name="kernel"> + <properties> + <help>Use the console as an output for kernel messages</help> + <valueless/> + </properties> + </leafNode> <leafNode name="speed"> <properties> <help>Console baud rate</help> |
