Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: bcm7445: Fix parallel make race condition

Browse source 
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>
This commit is contained in:
Thomas Fitzsimmons 2018-07-26 22:55:37 -04:00 committed by Tom Rini
parent 7ac1a432a1
commit dc7685e2c5
2 changed files with 19 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
arch/arm/mach-bcmstb/include/mach/prior_stage.h
View file

@ -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 */

20
include/configs/bcmstb.h
View file

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