diff options
| author | Tom Rini <[email protected]> | 2015-03-24 10:50:16 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-03-24 10:50:16 -0400 |
| commit | 3c0c1f02d55db6681141cc4b125a9ddd47f6d4f3 (patch) | |
| tree | 4ee35ca5dc011b61cfbeb6414ae2acdc717fe4d6 /include | |
| parent | 8a440b09f21ab8ec72b3aedf4d6f3f53494d7149 (diff) | |
| parent | 90e357efed06767d87c49280bc25272fdf378612 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index df89d14cc3a..d4688c54bab 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2012-2015 Panasonic Corporation - * Author: Masahiro Yamada <[email protected]> + * Copyright (C) 2015 Socionext Inc. + * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -275,20 +276,13 @@ #define CONFIG_SPL_TEXT_BASE 0x00100000 #endif -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif +#define CONFIG_SPL_STACK (0x0ff08000) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) -#define CONFIG_SYS_SPL_MALLOC_START (0x0ff00000) -#define CONFIG_SYS_SPL_MALLOC_SIZE (0x00004000) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_INIT_SP_ADDR (0x0ff08000) -#else -#define CONFIG_SYS_INIT_SP_ADDR ((CONFIG_SYS_TEXT_BASE) - 0x00001000) -#endif +#define CONFIG_PANIC_HANG #define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT /* for mem_malloc_init */ @@ -298,4 +292,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x10000 +#define CONFIG_SPL_MAX_FOOTPRINT 0x10000 + #endif /* __CONFIG_UNIPHIER_COMMON_H__ */ |