aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@fitzsim.org>2018-07-26 22:55:37 -0400
committerTom Rini <trini@konsulko.com>2018-08-13 14:03:57 -0400
commitdc7685e2c59d8f11b9347302dd34d73b7d9c3981 (patch)
treee8ca5fffedaed262425e742a085618c6a3f93c21 /include
parent7ac1a432a1373c887f6bf7b38ec238c641728479 (diff)
downloadu-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.zip
u-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.tar.gz
u-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.tar.bz2
arm: bcm7445: Fix parallel make race condition
Move the contents of prior_stage.h into bcmstb.h to prevent a build failure when bcmstb.h is #include'ed before the asm/arch symbolic link is present. Signed-off-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/bcmstb.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 8c61780..262ef54 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -12,7 +12,25 @@
#include "version.h"
#include <linux/sizes.h>
-#include <asm/arch/prior_stage.h>
+
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+struct bcmstb_boot_parameters {
+ u32 r0;
+ u32 r1;
+ u32 r2;
+ u32 r3;
+ u32 sp;
+ u32 lr;
+};
+
+extern struct bcmstb_boot_parameters bcmstb_boot_parameters;
+
+extern phys_addr_t prior_stage_fdt_address;
+
+#endif /* __ASSEMBLY__ */
/*
* Generic board configuration.