From d678a59d2d719da9e807495b4b021501f2836ca5 Mon Sep 17 00:00:00 2001
From: Tom Rini
Date: Sat, 18 May 2024 20:20:43 -0600
Subject: Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay
 Ethernet""

When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.

This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.

Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/microblaze/cpu/spl.c                 | 1 +
 arch/microblaze/include/asm/global_data.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'arch/microblaze')

diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 52177670578..cb224bd2542 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/stringify.h>
 
 void board_boot_order(u32 *spl_boot_list)
diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h
index bb4112f22a3..93506dec894 100644
--- a/arch/microblaze/include/asm/global_data.h
+++ b/arch/microblaze/include/asm/global_data.h
@@ -9,7 +9,6 @@
 #define __ASM_GBL_DATA_H
 
 #include <asm/cpuinfo.h>
-#include <asm/u-boot.h>
 
 /* Architecture-specific global data */
 struct arch_global_data {
-- 
cgit v1.2.3