Skip to contentSkip to conversation

arm: bcm7445: Fix parallel make race condition

PATCH In review Thomas Fitzsimmons 2 participants 2 messages Jul 27, 2018 – Aug 13, 2018

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Thomas Fitzsimmons

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/mach-bcmstb/include/mach/prior_stage.h | 30 -------------------------
 include/configs/bcmstb.h                        | 20 ++++++++++++++++-
 2 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 arch/arm/mach-bcmstb/include/mach/prior_stage.h
arch/arm/mach-bcmstb/include/mach/prior_stage.h deleted +0 -30
deleted file mode 100644
index 6c36c68..0000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2018  Cisco Systems, Inc.
- *
- * Author: Thomas Fitzsimmons <[email protected]>
- */
-
-#ifndef _BCMSTB_PRIOR_STAGE_H
-#define _BCMSTB_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__ */
-
-#endif /* _BCMSTB_PRIOR_STAGE_H */
include/configs/bcmstb.h +19 -1
index 8c61780..262ef54 100644
@@ -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.
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 5 lines · Thomas Fitzsimmons

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180813/d90f5d84/attachment.sig>