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

[Sascha Hauer]

On Wed, Oct 28, 2015 at 11:34:37AM -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>
> ---
> 
> Changes since v1:
> 	- Unified barebox_boarddata and barebox_boot_dtb into
>           barebox_private_data which allowed to simplify distilled code
>           and avoid using double star pointers
> 
> 
>  arch/arm/cpu/start.c | 58 +++++++++++++++++++++++++++++++++-------------------
>  1 file changed, 37 insertions(+), 21 deletions(-)
> 
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index 8e5097b..066dad8 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -32,25 +32,35 @@
>  #include "mmu-early.h"
> 
>  unsigned long arm_stack_top;
> -static void *barebox_boarddata;
> +static void *barebox_private_data;
> 
>  u32 barebox_arm_machine(void)
>  {
>  	struct barebox_arm_boarddata *bd;
> 
> -	if (!barebox_boarddata)
> +	if (!barebox_private_data)
>  		return 0;
> 
> -	bd = barebox_boarddata;
> +	bd = barebox_private_data;
> 
>  	return bd->machine;
>  }
> 
> -static void *barebox_boot_dtb;
> -
>  void *barebox_arm_boot_dtb(void)
>  {
> -	return barebox_boot_dtb;
> +	return barebox_private_data;
> +}

Previously we knew that the pointer barebox_arm_machine() works on is a
machine type entry and we knew that the pointer returned from
barebox_arm_boot_dtb() is a dtb. With this patch both are share the same
pointer so we would have to check if the result returned from
barebox_arm_boot_dtb() is actually a dtb. That's not so nice.

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 |