diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /board/socrates | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip | |
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>
Diffstat (limited to 'board/socrates')
| -rw-r--r-- | board/socrates/ddr.c | 1 | ||||
| -rw-r--r-- | board/socrates/law.c | 2 | ||||
| -rw-r--r-- | board/socrates/nand.c | 2 | ||||
| -rw-r--r-- | board/socrates/sdram.c | 2 | ||||
| -rw-r--r-- | board/socrates/socrates.c | 2 | ||||
| -rw-r--r-- | board/socrates/tlb.c | 3 |
6 files changed, 6 insertions, 6 deletions
diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c index bf4894eff6..3a94f7becc 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> diff --git a/board/socrates/law.c b/board/socrates/law.c index 446fdbcaba..e4427ecff1 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> diff --git a/board/socrates/nand.c b/board/socrates/nand.c index 517a4a0af6..b1e38c511e 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> diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index d0415d26ce..61402a554b 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> diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 6e6e276cc7..1d63c81a9c 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> diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c index 0cc675781d..631f6c3407 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 */ |