diff options
| author | Fabio Estevam <festevam@gmail.com> | 2011-06-05 06:26:49 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2011-06-06 09:35:25 +0200 |
| commit | 4ac2e2d69fb028c7bd749a07346820a4fd38f65a (patch) | |
| tree | a8444f7abc6d96e6a330a4f39e9e78a5a89e8ff2 /board/freescale | |
| parent | 6f4dd40cddbd69c56fec1285fee02cbd5a3833d8 (diff) | |
| download | blackbird-obmc-uboot-4ac2e2d69fb028c7bd749a07346820a4fd38f65a.tar.gz blackbird-obmc-uboot-4ac2e2d69fb028c7bd749a07346820a4fd38f65a.zip | |
mx31ads: Use the new relocation scheme
This fixes the MX31ADS build by using the new relocation scheme.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Felix Radensky <felix@embedded-sol.com>
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/mx31ads/config.mk | 1 | ||||
| -rw-r--r-- | board/freescale/mx31ads/mx31ads.c | 19 | ||||
| -rw-r--r-- | board/freescale/mx31ads/u-boot.lds | 42 |
3 files changed, 48 insertions, 14 deletions
diff --git a/board/freescale/mx31ads/config.mk b/board/freescale/mx31ads/config.mk deleted file mode 100644 index 0131edfbe9..0000000000 --- a/board/freescale/mx31ads/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x87f00000 diff --git a/board/freescale/mx31ads/mx31ads.c b/board/freescale/mx31ads/mx31ads.c index a298e0530f..9bf9c18fd8 100644 --- a/board/freescale/mx31ads/mx31ads.c +++ b/board/freescale/mx31ads/mx31ads.c @@ -28,15 +28,21 @@ DECLARE_GLOBAL_DATA_PTR; -int dram_init (void) +int dram_init(void) +{ + /* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, + PHYS_SDRAM_1_SIZE); + return 0; +} + +void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - - return 0; } -int board_init (void) +int board_early_init_f(void) { int i; @@ -94,6 +100,11 @@ int board_init (void) readb(CS4_BASE + 8); readb(CS4_BASE + 7); + return 0; +} + +int board_init(void) +{ gd->bd->bi_arch_number = MACH_TYPE_MX31ADS; /* board id for linux */ gd->bd->bi_boot_params = 0x80000100; /* adress of boot parameters */ diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index b081b21946..79eb7aca38 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -48,23 +48,47 @@ SECTIONS *(.text) } - . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { *(.rodata) } . = ALIGN(4); - .data : { *(.data) } + .data : { + *(.data) + } . = ALIGN(4); - .got : { *(.got) } - - . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } - __bss_end__ = .; + + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + _end = .; + + .bss __rel_dyn_start (OVERLAY) : { + __bss_start = .; + *(.bss) + . = ALIGN(4); + __bss_end__ = .; + } + + /DISCARD/ : { *(.bss*) } + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynsym*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.hash*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } } |
