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 --- 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

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 6c36c68..0000000 --- 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 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.