u-boot: Update 2023.2 to include u-boot settings

In upcoming 2024.1 version, the microblaze header will be obsolete and
removed.  Preemptively remove this from the shared microblaze file.

Signed-off-by: John Toomey <john.toomey@amd.com>

Refactored for upstream master branch

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
index a7b1c9dc..fba6fd22 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
@@ -15,3 +15,9 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+
+SRC_URI:append:microblaze = "file://microblaze-generic-top.h"
+
+do_configure:prepend:microblaze () {
+    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
+}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
index 2ef7b9cf..1f6781b6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-microblaze.inc
@@ -1,11 +1,6 @@
 SRC_URI += " \
     file://microblaze-generic.cfg \
-    file://microblaze-generic-top.h \
     "
 
-do_configure:prepend () {
-    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
-}
-
 # Disable buildpaths QA check warnings for u-boot-xlnx.elf.
 INSANE_SKIP:${PN}-elf += "buildpaths"