aboutsummaryrefslogtreecommitdiff
path: root/board/BuR
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-05-18 20:20:43 -0600
committerTom Rini <trini@konsulko.com>2024-05-19 08:16:36 -0600
commitd678a59d2d719da9e807495b4b021501f2836ca5 (patch)
tree313e5c32e3d02d3cf1904875b1655140973126e9 /board/BuR
parent3be9f399e911cfc437a37ac826441f1d96da1c9b (diff)
downloadu-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip
u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz
u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2
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/BuR')
-rw-r--r--board/BuR/brppt1/board.c2
-rw-r--r--board/BuR/brppt1/mux.c1
-rw-r--r--board/BuR/brppt2/board.c1
-rw-r--r--board/BuR/brsmarc1/board.c1
-rw-r--r--board/BuR/brsmarc1/mux.c1
-rw-r--r--board/BuR/brxre1/board.c1
-rw-r--r--board/BuR/brxre1/mux.c1
-rw-r--r--board/BuR/common/br_resetc.c1
-rw-r--r--board/BuR/common/common.c1
9 files changed, 9 insertions, 1 deletions
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 192a2fa..36945bb 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -9,7 +9,7 @@
*
*/
-#include <config.h>
+#include <common.h>
#include <bootcount.h>
#include <env.h>
#include <errno.h>
diff --git a/board/BuR/brppt1/mux.c b/board/BuR/brppt1/mux.c
index 8932b9a..5d2c7a2 100644
--- a/board/BuR/brppt1/mux.c
+++ b/board/BuR/brppt1/mux.c
@@ -8,6 +8,7 @@
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
*/
+#include <common.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/hardware.h>
#include <asm/arch/mux.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index 105fac8..ee006f0 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -6,6 +6,7 @@
* B&R Industrial Automation GmbH - http://www.br-automation.com/
*
*/
+#include <common.h>
#include <cpu_func.h>
#include <hang.h>
#include <init.h>
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 2d3f593..738a5d2 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -8,6 +8,7 @@
* B&R Industrial Automation GmbH - http://www.br-automation.com
*
*/
+#include <common.h>
#include <errno.h>
#include <init.h>
#include <spl.h>
diff --git a/board/BuR/brsmarc1/mux.c b/board/BuR/brsmarc1/mux.c
index b59d64f..33c214d 100644
--- a/board/BuR/brsmarc1/mux.c
+++ b/board/BuR/brsmarc1/mux.c
@@ -9,6 +9,7 @@
*
*/
+#include <common.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/hardware.h>
#include <asm/arch/mux.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index b9b595c..a909104 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -8,6 +8,7 @@
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
*
*/
+#include <common.h>
#include <env.h>
#include <errno.h>
#include <init.h>
diff --git a/board/BuR/brxre1/mux.c b/board/BuR/brxre1/mux.c
index e2e8ec5..6c5ad89 100644
--- a/board/BuR/brxre1/mux.c
+++ b/board/BuR/brxre1/mux.c
@@ -8,6 +8,7 @@
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
*/
+#include <common.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/hardware.h>
#include <asm/arch/mux.h>
diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c
index f5d09fe..32f32b6 100644
--- a/board/BuR/common/br_resetc.c
+++ b/board/BuR/common/br_resetc.c
@@ -5,6 +5,7 @@
* Copyright (C) 2019 Hannes Schmelzer <oe5hpm@oevsv.at>
* B&R Industrial Automation GmbH - http://www.br-automation.com/ *
*/
+#include <common.h>
#include <env.h>
#include <errno.h>
#include <i2c.h>
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 8aff821..3c78020 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -10,6 +10,7 @@
*/
#include <log.h>
#include <version.h>
+#include <common.h>
#include <env.h>
#include <fdtdec.h>
#include <i2c.h>