[PATCH v3 1/2] arm/cpu/start.c: Distil some common code in __start().

Sascha Hauer s.hauer at pengutronix.de
Sun Nov 1 23:33:06 PST 2015


On Fri, Oct 30, 2015 at 08:12:22PM -0700, Andrey Smirnov wrote:
> Both barebox_boarddata and barebox_boot_dtb perform essentially the
> same function -- hold a pointer to a chunk of private data. Since only
> one variable is ever used at any given time we may as well merge those
> two variable into one. This also allows us to share more code between
> two boot paths (board data vs. device tree)
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>

Applied with a small change.

> ---
> 
> Changes since v2:
> 
> 	- Restored original function semantics for
>           barebox_arm_machine() and barebox_arm_boot_dtb()
> 
> 	- Removed now unnecessary swith statement and auxiliary
>           function that was needed to support its usage
> 
> 
>  arch/arm/cpu/start.c | 65 +++++++++++++++++++++++++++++++---------------------
>  1 file changed, 39 insertions(+), 26 deletions(-)
> 
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index 8e5097b..bfe08cc 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -32,25 +32,37 @@
>  #include "mmu-early.h"
> 
>  unsigned long arm_stack_top;
> -static void *barebox_boarddata;
> +static void *barebox_private_data;

I renamed this back to barebox_boarddata since it's data that comes
from the board code.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list