diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2018-07-26 22:55:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-13 14:03:57 -0400 |
| commit | dc7685e2c59d8f11b9347302dd34d73b7d9c3981 (patch) | |
| tree | e8ca5fffedaed262425e742a085618c6a3f93c21 | |
| parent | 7ac1a432a1373c887f6bf7b38ec238c641728479 (diff) | |
| download | u-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.tar.gz u-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.tar.xz u-boot-dc7685e2c59d8f11b9347302dd34d73b7d9c3981.zip | |
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>
| -rw-r--r-- | arch/arm/mach-bcmstb/include/mach/prior_stage.h | 30 | ||||
| -rw-r--r-- | include/configs/bcmstb.h | 20 |
2 files changed, 19 insertions, 31 deletions
diff --git a/arch/arm/mach-bcmstb/include/mach/prior_stage.h b/arch/arm/mach-bcmstb/include/mach/prior_stage.h deleted file mode 100644 index 6c36c6810a..0000000000 --- a/arch/arm/mach-bcmstb/include/mach/prior_stage.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2018 Cisco Systems, Inc. - * - * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org> - */ - -#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 */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 8c6178042e..262ef54638 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. |