uboot: Use BASE_BOOTARGS

features.in/uboot/config.mk

@@ -9,5 +9,4 @@ endif
 use/uboot: use/kernel/initrd-setup $(UBOOT_TTY)
 	@$(call add_feature)
 	@$(call add,THE_LISTS,singleboard-tools)
-	@$(call try,TTY_DEV,tty1)
-	@$(call xport,TTY_DEV)
+	@$(call add,BASE_BOOTARGS,cma=192M)

features.in/uboot/image-scripts.d/00-uboot-prepare

 #!/bin/sh
 
-if [ -n "$GLOBAL_TTY_RATE" ] ;then
-	TTY="$GLOBAL_TTY_DEV","$GLOBAL_TTY_RATE"
-else
-	TTY="$GLOBAL_TTY_DEV"
-fi
+TTY=
+echo $GLOBAL_BASE_BOOTARGS | grep console= ||
+  TTY='console=tty1'
 
 # installkernel relies on existing extlinux.conf
 # with filled in `default' label
@@ -19,5 +17,5 @@ label linux
 	kernel /boot/vmlinuz
 	initrd /boot/initrd.img
 	fdtdir /boot/dtb
-	append root=LABEL=ROOT ro cma=192M console=$TTY
+	append root=LABEL=ROOT ro $TTY $GLOBAL_BASE_BOOTARGS
 EOF