diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-23 00:07:29 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-24 00:15:48 +0900 |
| commit | def3feb8cbfd44f2cfec73db4cf54760eaa97ed6 (patch) | |
| tree | 30fc001f65c646d9652c87081abe06aa038ff9a1 | |
| parent | 8cddc27965e45993b7579ede119147c2640dc44a (diff) | |
| download | talos-obmc-uboot-def3feb8cbfd44f2cfec73db4cf54760eaa97ed6.tar.gz talos-obmc-uboot-def3feb8cbfd44f2cfec73db4cf54760eaa97ed6.zip | |
ARM: UniPhier: add empty lowlevel_init to U-boot proper
To remove the ifdef conditional of CONFIG_SKIP_LOWLEVEL_INIT,
add late_lowlevel_init.S to U-Boot proper.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/mach-uniphier/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/late_lowlevel_init.S | 12 | ||||
| -rw-r--r-- | include/configs/uniphier.h | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index e7a801b2ac..f191aa3d76 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -12,6 +12,7 @@ obj-y += ddrphy_training.o else +obj-y += late_lowlevel_init.o obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o obj-$(CONFIG_MISC_INIT_F) += print_misc_info.o diff --git a/arch/arm/mach-uniphier/late_lowlevel_init.S b/arch/arm/mach-uniphier/late_lowlevel_init.S new file mode 100644 index 0000000000..22be2a21da --- /dev/null +++ b/arch/arm/mach-uniphier/late_lowlevel_init.S @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2015 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <linux/linkage.h> + +ENTRY(lowlevel_init) + mov pc, lr +ENDPROC(lowlevel_init) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index ba89a425a8..d4688c54ba 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -276,10 +276,6 @@ #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) |
