summaryrefslogtreecommitdiff
path: root/board/google
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-15 08:19:40 -0500
committerTom Rini <trini@konsulko.com>2021-02-15 10:16:45 -0500
commit2ae80437fbe0181184ae4b188b89629b902702c6 (patch)
tree846f70a5df9c80ef76284c39f0da58b8c3eba96f /board/google
parent76b7936e6f781c86b0d3159f67f1506d01c196ce (diff)
parent401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff)
downloadu-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz
u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.bz2
u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.zip
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'board/google')
-rw-r--r--board/google/imx8mq_phanbell/imx8mq_phanbell.c1
-rw-r--r--board/google/imx8mq_phanbell/spl.c1
-rw-r--r--board/google/veyron/veyron.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index 746071b415..d0a740dd3f 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <malloc.h>
#include <errno.h>
+#include <asm/global_data.h>
#include <asm/io.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 06a3f4c1aa..eec3f3d931 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <hang.h>
+#include <asm/global_data.h>
#include <asm/io.h>
#include <errno.h>
#include <init.h>
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
index 391d973c0b..32dbcdc4d1 100644
--- a/board/google/veyron/veyron.c
+++ b/board/google/veyron/veyron.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <asm/arch-rockchip/clock.h>
+#include <asm/global_data.h>
#include <dt-bindings/clock/rk3288-cru.h>
#include <linux/delay.h>
#include <linux/err.h>