diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:05:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:05:20 -0400 |
| commit | 674ca84d11391cd2e7faf8f638fc25ed4b782a91 (patch) | |
| tree | f24922da07018c656923d6c6a93f777738922662 /arch/arm/cpu | |
| parent | d0796defbe8eff6fc3c27c893dcbc47af59d4764 (diff) | |
| parent | 20cadbbe2e0425783855f6ae90ef82aa0db63155 (diff) | |
| download | u-boot-imx-674ca84d11391cd2e7faf8f638fc25ed4b782a91.zip u-boot-imx-674ca84d11391cd2e7faf8f638fc25ed4b782a91.tar.gz u-boot-imx-674ca84d11391cd2e7faf8f638fc25ed4b782a91.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/misc.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 0eab264..8c3e5f7 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -176,7 +176,7 @@ static void socfpga_nic301_slave_ns(void) static uint32_t iswgrp_handoff[8]; -int misc_init_r(void) +int arch_early_init_r(void) { int i; for (i = 0; i < 8; i++) /* Cache initial SW setting regs */ diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds index db9bdad..569fa41 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds @@ -42,13 +42,4 @@ SECTIONS . = ALIGN(4); __bss_end = .; } >.sdram - - . = ALIGN(8); - __malloc_start = .; - . = . + CONFIG_SPL_MALLOC_SIZE; - __malloc_end = .; - - . = . + CONFIG_SPL_STACK_SIZE; - . = ALIGN(8); - __stack_start = .; } |