Skip to content

M
mkimage-profiles
Commit 2a7fe968 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

uboot: do not set console=tty0, when is not set in BASE_BOOTARGS

Most often, the serial console is configured in dtb, so let the output be there. The screen may not work.
parent 13027245
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
features.in/uboot/image-scripts.d/00-uboot-prepare
View file @ 2a7fe968
#!/bin/sh #!/bin/sh
TTY=
echo $GLOBAL_BASE_BOOTARGS | grep console= ||
TTY='console=tty0'
# installkernel relies on existing extlinux.conf # installkernel relies on existing extlinux.conf
# with filled in `default' label # with filled in `default' label
mkdir -p /boot/extlinux mkdir -p /boot/extlinux
...@@ -17,7 +13,7 @@ label linux ...@@ -17,7 +13,7 @@ label linux
kernel ../vmlinuz kernel ../vmlinuz
initrd ../initrd.img initrd ../initrd.img
fdtdir ../dtb fdtdir ../dtb
append root=LABEL=ROOT ro $GLOBAL_BASE_BOOTARGS $GLOBAL_UBOOT_BOOTARGS $TTY append root=LABEL=ROOT ro $GLOBAL_BASE_BOOTARGS $GLOBAL_UBOOT_BOOTARGS
EOF EOF
[ -z "${GLOBAL_UBOOT_NOFDTDIR:-}" ] || sed -i -e '/^[\t]*fdtdir \/boot\/dtb$/d' /boot/extlinux/extlinux.conf [ -z "${GLOBAL_UBOOT_NOFDTDIR:-}" ] || sed -i -e '/^[\t]*fdtdir \/boot\/dtb$/d' /boot/extlinux/extlinux.conf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment