Message ID | 20120829134154.GA13606@elf.ucw.cz |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Aug 29, 2012 at 03:41:54PM +0200, Pavel Machek wrote: > Hi! > > > > diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds > > > > You should setup MEMORY declarations like the other u-boot-spl linker > > scripts do so we get build-time confirmation that we haven't exceeded > > our size limitations. > > Hmm, I tried, but I don't know socfpga memory layout by heart. > > Dinh, can you help here? I think once you get the answers you should be able to re-post the series cleanly and depend on my v5 (or v6) branch. Thanks!
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 8867e06..1d8efb2 100644 --- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds @@ -37,9 +37,9 @@ SECTIONS { .text : { - __start = .; - arch/arm/cpu/armv7/start.o (.text) - *(.text*) + __start = .; + arch/arm/cpu/armv7/start.o (.text) + *(.text*) } >.sram . = ALIGN(4); diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds index 2c90753..7cd409c 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds @@ -15,6 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +MEMORY { .sdram : ORIGIN = (0), LENGTH = (0xffffffff) } + OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) @@ -27,13 +29,13 @@ SECTIONS { arch/arm/cpu/armv7/start.o (.text) *(.text*) - } + } >.sdram . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } >.sdram . = ALIGN(4); - .data : { *(SORT_BY_ALIGNMENT(.data*)) } + .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sdram . = ALIGN(4); __image_copy_end = .; @@ -45,7 +47,7 @@ SECTIONS *(.bss*) . = ALIGN(4); __bss_end__ = .; - } + } >.sdram . = ALIGN(8); __malloc_start = .;