From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 15 Mar 2016 23:14:50 +0100
Subject: [U-Boot] [PATCH] spl: arm: Make sure to include
	u_boot_list_*_part_disk_*
In-Reply-To: <1458079113-21823-1-git-send-email-trini@konsulko.com>
References: <1458079113-21823-1-git-send-email-trini@konsulko.com>
Message-ID: <56E8895A.6070804@xilinx.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 15.3.2016 22:58, Tom Rini wrote:
> Starting with 96e5b03 we use a linker list for partition table
> information.  However since we use this in SPL we need to make sure that
> the SPL linker scripts include these as well.
> 
> Cc: Nishanth Menon <nm@ti.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Simon Glass <sjg@chromium.org>
> Reported-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/cpu/armv7/omap-common/u-boot-spl.lds |    1 +
>  arch/arm/cpu/u-boot-spl.lds                   |    1 +
>  arch/arm/mach-zynq/u-boot-spl.lds             |    5 +++--
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
> index ccd0c83..9dccdc0 100644
> --- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
> +++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
> @@ -35,6 +35,7 @@ SECTIONS
>  
>  	. = ALIGN(4);
>  	.u_boot_list : {
> +		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
>  		KEEP(*(SORT(.u_boot_list*_i2c_*)));
>  	} >.sram
>  
> diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
> index c5b4f7c..1805043 100644
> --- a/arch/arm/cpu/u-boot-spl.lds
> +++ b/arch/arm/cpu/u-boot-spl.lds
> @@ -40,6 +40,7 @@ SECTIONS
>  #endif
>  	. = .;
>  	.u_boot_list : {
> +		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
>  		KEEP(*(SORT(.u_boot_list*_i2c_*)));
>  	}
>  
> diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds
> index ecdf6a0..6ea7996 100644
> --- a/arch/arm/mach-zynq/u-boot-spl.lds
> +++ b/arch/arm/mach-zynq/u-boot-spl.lds
> @@ -38,14 +38,15 @@ SECTIONS
>  	} > .sram
>  
>  	. = ALIGN(4);
> -#ifdef CONFIG_SPL_DM
>  	.u_boot_list : {
> +		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
> +#ifdef CONFIG_SPL_DM

Please remove this CONFIG. Zynq defines them by default.

Thanks,
Michal