Skip to content

M
mkimage-profiles
Commit 1c1612e9 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

uboot: Add UBOOT_BOOTARGS instead BASE_BOOTARGS

When loading u-boot + extlinux.conf, needs specific arguments that are not needed when using grub-efi
parent 2614e192
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
features.in/uboot/config.mk
View file @ 1c1612e9
...@@ -14,8 +14,9 @@ use/uboot: use/kernel/initrd-setup $(UBOOT_TTY) ...@@ -14,8 +14,9 @@ use/uboot: use/kernel/initrd-setup $(UBOOT_TTY)
@$(call add_feature) @$(call add_feature)
@$(call add,THE_LISTS,singleboard-tools) @$(call add,THE_LISTS,singleboard-tools)
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
@$(call add,BASE_BOOTARGS,cma=192M) @$(call add,UBOOT_BOOTARGS,cma=192M)
endif endif
ifeq (,$(filter-out riscv64,$(ARCH))) 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 endif
@$(call xport,UBOOT_BOOTARGS)
features.in/uboot/image-scripts.d/00-uboot-prepare
View file @ 1c1612e9
...@@ -17,5 +17,5 @@ label linux ...@@ -17,5 +17,5 @@ label linux
kernel /boot/vmlinuz kernel /boot/vmlinuz
initrd /boot/initrd.img initrd /boot/initrd.img
fdtdir /boot/dtb 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 EOF
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