diff options
| author | Tom Rini <trini@ti.com> | 2013-01-09 08:13:22 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-09 08:13:22 -0700 |
| commit | 642ef40bdc95bef829ae3aadc217f829c4c298c4 (patch) | |
| tree | 57d6d5170b904176a2a7018e08a615b8725c8874 /include | |
| parent | 449485948e6de1869ec39c1559b7b78d85690ea7 (diff) | |
| parent | 61bdb9133593f0f881a57232039296f64bd662ed (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_cyclone5.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index d0bf1e8ab2..2f2578bef5 100644 --- a/include/common.h +++ b/include/common.h @@ -300,7 +300,7 @@ int abortboot(int bootdelay); extern char console_buffer[]; /* arch/$(ARCH)/lib/board.c */ -void board_init_f (ulong) __attribute__ ((noreturn)); +void board_init_f(ulong); void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); int checkboard (void); int checkflash (void); diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 42077bd6fd..5633d2a429 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -65,7 +65,7 @@ #define CONFIG_SYS_BOOTMAPSZ ((256*1024*1024) - (4*1024)) #define CONFIG_SPL_RAM_DEVICE -#define CONFIG_SPL_STACK (&__stack_start) +#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SYS_SPL_MALLOC_START ((unsigned long) (&__malloc_start)) #define CONFIG_SYS_SPL_MALLOC_SIZE (&__malloc_end - &__malloc_start) |