From 1c986c672b734d71c78c39a2016e3c273eed98b4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 9 Jan 2023 10:32:11 -0800 Subject: machines: Remove LOADADDR from kernel args The arguments will be added by gen-machine-conf, if the user requires them. The default configurations do not use these. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/soc-zynq.inc | 4 ---- meta-xilinx-core/conf/machine/versal-generic.conf | 1 - meta-xilinx-core/conf/machine/zynqmp-generic.conf | 1 - 3 files changed, 6 deletions(-) diff --git a/meta-xilinx-core/conf/machine/include/soc-zynq.inc b/meta-xilinx-core/conf/machine/include/soc-zynq.inc index 88d48a92..eea02a6c 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynq.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc @@ -14,10 +14,6 @@ require soc-tune-include.inc KERNEL_IMAGETYPE ?= "uImage" KERNEL_IMAGETYPES += "zImage" -# Set default load address. -# Override with KERNEL_EXTRA_ARGS_ += "..." in machine file if required -KERNEL_EXTRA_ARGS:zynq += "UIMAGE_LOADADDR=0x8000" - # WIC Specific dependencies WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin" diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index eb06426f..102a7117 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -30,7 +30,6 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" # Yocto Versal KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" # Versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index e7b47003..e3ec2482 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -41,7 +41,6 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" # Yocto ZynqMP KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" # ZynqMP Serial Console SERIAL_CONSOLES ?= "115200;ttyPS0" -- cgit v1.2.3-54-g00ecf