[U-Boot] [PATCH 3/3] dm: sf: Add support for all targets which requires MANUAL_RELOC

[Michal Simek]

On 10/27/2015 04:01 PM, Michal Simek wrote:
> It is follow up patch based on
> "dm: Add support for all targets which requires MANUAL_RELOC"
> (sha1: 484fdf5ba058b07be5ca82763aa2b72063540ef3)
> to update function pointers for DM.
> 
> Using post_bind is not ideal but it is one on current option what can be
> used. Variable reloc_done has to be used do not call relocation after
> every bind. Maybe new core functions should be introduced for this case.
> 
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
> 
>  drivers/mtd/spi/sf-uclass.c | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
> index 350e21aa7d65..07204094cfce 100644
> --- a/drivers/mtd/spi/sf-uclass.c
> +++ b/drivers/mtd/spi/sf-uclass.c
> @@ -11,6 +11,8 @@
>  #include <dm/device-internal.h>
>  #include "sf_internal.h"
>  
> +DECLARE_GLOBAL_DATA_PTR;
> +
>  int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len, void *buf)
>  {
>  	return sf_get_ops(dev)->read(dev, offset, len, buf);
> @@ -72,8 +74,28 @@ int spi_flash_remove(struct udevice *dev)
>  	return device_remove(dev);
>  }
>  
> +static int reloc_done;
> +
> +static int spi_flash_post_bind(struct udevice *dev)
> +{
> +	struct dm_spi_flash_ops *ops = sf_get_ops(dev);
> +
> +	if (!reloc_done) {
> +		if (ops->read)
> +			ops->read += gd->reloc_off;
> +		if (ops->write)
> +			ops->write += gd->reloc_off;
> +		if (ops->erase)
> +			ops->erase += gd->reloc_off;
> +
> +		reloc_done++;
> +	}
> +	return 0;
> +}
> +

This is missing some #if defined(CONFIG_NEEDS_MANUAL_RELOC) around.
Will fix it in v2 but would like to know if this is the best way how to
call this because I am not convinced about it.
That solution with static variable is not the best one.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151028/45006417/attachment.sig>