From 1ed38fd943fb6c53e83e3cc4a18a88be0b58add4 Mon Sep 17 00:00:00 2001 From: Jaewon Lee Date: Thu, 7 Jan 2021 00:21:21 +0000 Subject: microblaze: Defining UBOOT_MACHINE and wiping UBOOT_INITIAL_ENV Defining UBOOT_MACHINE as microblaze-generic_defconfig and setting UBOOT_INITIAL_ENV to empty to be able to compile uboot as microblaze env/common.o doesn't have default_environment section Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 1 + .../conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf | 3 +++ meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf | 3 +++ 3 files changed, 7 insertions(+) diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index 73f5b046..411c13db 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf @@ -20,3 +20,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" UBOOT_MACHINE = "microblaze-generic_defconfig" +UBOOT_INITIAL_ENV = "" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf index ed4e2acb..270b74e3 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf @@ -15,3 +15,6 @@ KERNEL_IMAGETYPES = "" SERIAL_CONSOLES ?= "115200;ttyS0" EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" + +UBOOT_MACHINE = "microblaze-generic_defconfig" +UBOOT_INITIAL_ENV = "" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf index f154197a..9d8990c6 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf @@ -15,3 +15,6 @@ KERNEL_IMAGETYPES = "" SERIAL_CONSOLES ?= "115200;ttyS0" EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" + +UBOOT_MACHINE = "microblaze-generic_defconfig" +UBOOT_INITIAL_ENV = "" -- cgit v1.2.3-54-g00ecf