summaryrefslogtreecommitdiff
path: root/board/socrates
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-05-20 13:35:03 -0600
committerTom Rini <trini@konsulko.com>2024-05-20 13:35:03 -0600
commit03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch)
tree57d5eac5f8efb015eb0415824512a29d5e20638e /board/socrates
parentd4781422d1268aa6deca3e49d2fb227e79c160b4 (diff)
downloadu-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz
u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2
u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow for all of these changes to exist here. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/socrates')
-rw-r--r--board/socrates/ddr.c1
-rw-r--r--board/socrates/law.c2
-rw-r--r--board/socrates/nand.c2
-rw-r--r--board/socrates/sdram.c2
-rw-r--r--board/socrates/socrates.c2
-rw-r--r--board/socrates/tlb.c3
6 files changed, 6 insertions, 6 deletions
diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c
index 3a94f7becc..bf4894eff6 100644
--- a/board/socrates/ddr.c
+++ b/board/socrates/ddr.c
@@ -3,7 +3,6 @@
* Copyright 2008 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/socrates/law.c b/board/socrates/law.c
index e4427ecff1..446fdbcaba 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -9,7 +9,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
+#include <config.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index b1e38c511e..517a4a0af6 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -4,7 +4,7 @@
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
*/
-#include <common.h>
+#include <config.h>
#if defined(CFG_SYS_NAND_BASE)
#include <nand.h>
diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index 61402a554b..d0415d26ce 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -4,7 +4,7 @@
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 1d63c81a9c..6e6e276cc7 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -10,7 +10,7 @@
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <env.h>
#include <init.h>
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index 631f6c3407..0cc675781d 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -9,8 +9,9 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
+#include <config.h>
#include <asm/mmu.h>
+#include <asm/ppc.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */