commit abb9a04d0794c6d223d648898c021945de80a49a
author Tom Rini <trini@konsulko.com> Sat May 18 20:20:43 2024 -0600
committer Tom Rini <trini@konsulko.com> Sun May 19 08:16:36 2024 -0600
tree 313e5c32e3d02d3cf1904875b1655140973126e9
parent d4b57ec1d154916492fefd33ded0b3c2a7daff00

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>

board/socrates/ddr.c

diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c
index bf4894e..3a94f7b 100644
--- a/board/socrates/ddr.c
+++ b/board/socrates/ddr.c
@@ -3,6 +3,7 @@
  * Copyright 2008 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>

board/socrates/law.c

diff --git a/board/socrates/law.c b/board/socrates/law.c
index 446fdbc..e4427ec 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -9,7 +9,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 

board/socrates/nand.c

diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 517a4a0..b1e38c5 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -4,7 +4,7 @@
  * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
  */
 
-#include <config.h>
+#include <common.h>
 
 #if defined(CFG_SYS_NAND_BASE)
 #include <nand.h>

board/socrates/sdram.c

diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index d0415d2..61402a5 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -4,7 +4,7 @@
  * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
  */
 
-#include <config.h>
+#include <common.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>

board/socrates/socrates.c

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 6e6e276..1d63c81 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -10,7 +10,7 @@
  * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <env.h>
 #include <init.h>

board/socrates/tlb.c

diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index 0cc6757..631f6c3 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -9,9 +9,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/mmu.h>
-#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */