diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-11 22:18:21 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-12 00:29:19 +0900 |
| commit | 4f25481b839454f0f7b1818fdba07ded4a6b1fe1 (patch) | |
| tree | dd23e4b7bf6a168da993cca609ad21b69827c4a8 /arch/arm/cpu/armv7/uniphier/ph1-sld8 | |
| parent | 0d8c7f747ee508c13a7a1682013de8e7b3f1f32e (diff) | |
| download | u-boot-imx-4f25481b839454f0f7b1818fdba07ded4a6b1fe1.zip u-boot-imx-4f25481b839454f0f7b1818fdba07ded4a6b1fe1.tar.gz u-boot-imx-4f25481b839454f0f7b1818fdba07ded4a6b1fe1.tar.bz2 | |
ARM: UniPhier: consolidate board_postclk_init() function
This commit merges
arch/arm/cpu/armv7/uniphier/ph1-*/board_postclk_init.c
to
arch/arm/cpu/armv7/uniphier/board_postclk_init.c
Because PH1-Pro4 does not have the BCU block, add __weak to
bcu_init().
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier/ph1-sld8')
| -rw-r--r-- | arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile index 5722ee2..4f42aec 100644 --- a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile +++ b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile @@ -5,6 +5,6 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-y += platdevice.o obj-y += boot-mode.o -obj-$(CONFIG_BOARD_POSTCLK_INIT) += board_postclk_init.o bcu_init.o \ - sbc_init.o sg_init.o pll_init.o clkrst_init.o pinctrl.o +obj-$(CONFIG_BOARD_POSTCLK_INIT) += bcu_init.o sbc_init.o sg_init.o \ + pll_init.o clkrst_init.o pinctrl.o obj-$(CONFIG_DRAM_INIT) += pll_spectrum.o umc_init.o diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c b/arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c deleted file mode 100644 index 287b33c..0000000 --- a/arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c +++ /dev/null @@ -1 +0,0 @@ -#include "../ph1-ld4/board_postclk_init.c" |