diff --git a/features.in/uboot/config.mk b/features.in/uboot/config.mk
index fc86fcce..1e74dca0 100644
--- a/features.in/uboot/config.mk
+++ b/features.in/uboot/config.mk
@@ -14,8 +14,9 @@ use/uboot: use/kernel/initrd-setup $(UBOOT_TTY)
 	@$(call add_feature)
 	@$(call add,THE_LISTS,singleboard-tools)
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-	@$(call add,BASE_BOOTARGS,cma=192M)
+	@$(call add,UBOOT_BOOTARGS,cma=192M)
 endif
 ifeq (,$(filter-out riscv64,$(ARCH)))
-	@$(call add,BASE_BOOTARGS,earlyprintk debug no_alt_virt_keyboard)
+	@$(call add,UBOOT_BOOTARGS,earlyprintk debug no_alt_virt_keyboard)
 endif
+	@$(call xport,UBOOT_BOOTARGS)
diff --git a/features.in/uboot/image-scripts.d/00-uboot-prepare b/features.in/uboot/image-scripts.d/00-uboot-prepare
index d1ec0e62..b685d051 100755
--- a/features.in/uboot/image-scripts.d/00-uboot-prepare
+++ b/features.in/uboot/image-scripts.d/00-uboot-prepare
@@ -17,5 +17,5 @@ label linux
 	kernel /boot/vmlinuz
 	initrd /boot/initrd.img
 	fdtdir /boot/dtb
-	append root=LABEL=ROOT ro $GLOBAL_BASE_BOOTARGS $TTY
+	append root=LABEL=ROOT ro $GLOBAL_BASE_BOOTARGS $GLOBAL_UBOOT_BOOTARGS $TTY
 EOF