diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-09-22 00:27:39 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-09-25 00:58:38 +0900 |
commit | 323d1f9d5bebfe55e97e23c8094055685665afef (patch) | |
tree | 4fe6b5ffd3aab68a945de9750d145514271d2321 /arch/arm/mach-uniphier/spl.c | |
parent | 5451b777de392043c03626f6cbbc3940c49c3417 (diff) | |
download | talos-obmc-uboot-323d1f9d5bebfe55e97e23c8094055685665afef.tar.gz talos-obmc-uboot-323d1f9d5bebfe55e97e23c8094055685665afef.zip |
ARM: uniphier: allow to enable multiple SoCs
Before this commit, the Kconfig menu in mach-uniphier only allowed us
to choose one SoC to be compiled. Each SoC has its own defconfig file
for the build-test coverage. Consequently, some defconfig files are
duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and
CONFIG_{SOC_NAME}=y.
Now, most of board-specific parameters have been moved to device trees,
so it makes sense to include init code of multiple SoCs into a single
image as long as the SoCs have similar architecture. In fact, some
SoCs of UniPhier family are very similar:
- PH1-LD4 and PH1-sLD8
- PH1-LD6b and ProXstream2 (will be added in the upcoming commit)
This commit will be helpful to merge some defconfig files for better
maintainability.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/spl.c')
-rw-r--r-- | arch/arm/mach-uniphier/spl.c | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c deleted file mode 100644 index 4c3cad3b88..0000000000 --- a/arch/arm/mach-uniphier/spl.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <spl.h> -#include <linux/compiler.h> -#include <mach/micro-support-card.h> - -void __weak bcu_init(void) -{ -}; - -void __weak sbc_init(void) -{ -}; - -void __weak sg_init(void) -{ -}; - -void __weak early_pin_init(void) -{ -}; - -void sbc_init(void); -void sg_init(void); -void pll_init(void); -void pin_init(void); -void memconf_init(void); -void early_clkrst_init(void); -void early_pin_init(void); -int umc_init(void); -void enable_dpll_ssc(void); - -void spl_board_init(void) -{ - bcu_init(); - - sbc_init(); - - sg_init(); - - support_card_reset(); - - pll_init(); - - support_card_init(); - - led_puts("L0"); - - memconf_init(); - - led_puts("L1"); - - early_clkrst_init(); - - led_puts("L2"); - - early_pin_init(); - - led_puts("L3"); - -#ifdef CONFIG_SPL_SERIAL_SUPPORT - preloader_console_init(); -#endif - - led_puts("L4"); - - { - int res; - - res = umc_init(); - if (res < 0) { - while (1) - ; - } - } - - led_puts("L5"); - - enable_dpll_ssc(); - - led_puts("L6"); -} |