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>
master
Masahiro Yamada 10 years ago
parent 0d8c7f747e
commit 4f25481b83
  1. 1
      arch/arm/cpu/armv7/uniphier/Makefile
  2. 6
      arch/arm/cpu/armv7/uniphier/board_postclk_init.c
  3. 4
      arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile
  4. 4
      arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile
  5. 41
      arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c
  6. 4
      arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile
  7. 1
      arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c

@ -8,6 +8,7 @@ obj-$(CONFIG_SPL_BUILD) += spl.o
obj-y += timer.o
obj-y += reset.o
obj-y += cache_uniphier.o
obj-$(CONFIG_BOARD_POSTCLK_INIT) += board_postclk_init.o
obj-y += dram_init.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o

@ -5,11 +5,13 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <linux/compiler.h>
#include <asm/arch/led.h>
#include <asm/arch/board.h>
void bcu_init(void);
void __weak bcu_init(void)
{
};
void sbc_init(void);
void sg_init(void);
void pll_init(void);

@ -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

@ -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 sbc_init.o \
sg_init.o pll_init.o clkrst_init.o pinctrl.o
obj-$(CONFIG_BOARD_POSTCLK_INIT) += sbc_init.o sg_init.o \
pll_init.o clkrst_init.o pinctrl.o
obj-$(CONFIG_DRAM_INIT) += pll_spectrum.o umc_init.o

@ -1,41 +0,0 @@
/*
* Copyright (C) 2012-2014 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/arch/led.h>
#include <asm/arch/board.h>
void sbc_init(void);
void sg_init(void);
void pll_init(void);
void pin_init(void);
void clkrst_init(void);
int board_postclk_init(void)
{
sbc_init();
sg_init();
uniphier_board_reset();
pll_init();
uniphier_board_init();
led_write(B, 1, , );
clkrst_init();
led_write(B, 2, , );
pin_init();
led_write(B, 3, , );
return 0;
}

@ -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

@ -1 +0,0 @@
#include "../ph1-ld4/board_postclk_init.c"
Loading…
Cancel
Save