Message ID | 1458079113-21823-1-git-send-email-trini@konsulko.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On 15 March 2016 at 15:58, Tom Rini <trini@konsulko.com> 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(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 03/15/2016 04:58 PM, 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> Tested-by: Nishanth Menon <nm@ti.com> Thanks for the patch..
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
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 KEEP(*(SORT(.u_boot_list_*_driver_*))); KEEP(*(SORT(.u_boot_list_*_uclass_*))); +#endif } > .sram . = ALIGN(4); -#endif . = .;
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(-)