diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /board/armltd | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-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/armltd')
-rw-r--r-- | board/armltd/corstone1000/corstone1000.c | 1 | ||||
-rw-r--r-- | board/armltd/integrator/integrator.c | 2 | ||||
-rw-r--r-- | board/armltd/integrator/timer.c | 2 | ||||
-rw-r--r-- | board/armltd/total_compute/total_compute.c | 2 | ||||
-rw-r--r-- | board/armltd/vexpress/vexpress_common.c | 2 | ||||
-rw-r--r-- | board/armltd/vexpress64/pcie.c | 1 | ||||
-rw-r--r-- | board/armltd/vexpress64/vexpress64.c | 2 |
7 files changed, 5 insertions, 7 deletions
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c index 01c80aaf9d..3ad77f5194 100644 --- a/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c @@ -6,7 +6,6 @@ */ #include <blk.h> -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <env.h> diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index ad02cf16da..eaf87e3bfe 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -16,7 +16,7 @@ * Philippe Robin, <philippe.robin@arm.com> */ -#include <common.h> +#include <config.h> #include <bootstage.h> #include <cpu_func.h> #include <dm.h> diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index 9db5135a8f..f4101b649e 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -16,7 +16,7 @@ * Philippe Robin, <philippe.robin@arm.com> */ -#include <common.h> +#include <config.h> #include <div64.h> #include <time.h> #include <linux/delay.h> diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 53941b5f5f..e1b4f49d04 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -4,7 +4,7 @@ * Usama Arif <usama.arif@arm.com> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <dm/platform_data/serial_pl01x.h> #include <asm/armv8/mmu.h> diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 763131c217..6c374e25e3 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -15,7 +15,7 @@ * ARM Ltd. * Philippe Robin, <philippe.robin@arm.com> */ -#include <common.h> +#include <config.h> #include <bootstage.h> #include <cpu_func.h> #include <init.h> diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index e553da86e0..1045c905f7 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -5,7 +5,6 @@ * Author: Liviu Dudau <Liviu.Dudau@arm.com> */ -#include <common.h> #include <init.h> #include <log.h> #include <asm/io.h> diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index ee65a59683..0119f54f0d 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -4,7 +4,7 @@ * David Feng <fenghua@phytium.com.cn> * Sharma Bhupesh <bhupesh.sharma@freescale.com> */ -#include <common.h> +#include <config.h> #include <cpu_func.h> #include <dm.h> #include <init.h> |