leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: merge board init functions into board_init()

Browse Source 
Currently, the UniPhier platform calls several init functions in the
following order:

  [1] spl_board_init()
  [2] board_early_init_f()
  [3] board_init()
  [4] board_early_init_r()
  [5] board_late_init()

The serial console is not ready at the point of [2], so we want to
avoid using [2] from the view point of debuggability.  Fortunately,
all of the initialization in [2] can be delayed until [3].  I see no
good reason to split into [3] and [4].  So, merge [2] through [4].

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-09-14 01:06:08 +09:00
parent 43a8cc905d
commit b291671232
6 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-uniphier/Makefile
View File

@ -9,11 +9,9 @@ obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
else else
obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
obj-y += dram_init.o obj-y += dram_init.o
obj-y += board_common.o obj-y += board_init.o
obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += reset.o obj-y += reset.o

20
arch/arm/mach-uniphier/board_common.c
View File

@ -1,20 +0,0 @@
/*
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include "micro-support-card.h"
void uniphier_smp_kick_all_cpus(void);
int board_init(void)
{
led_puts("Uboo");
#ifdef CONFIG_ARM64
uniphier_smp_kick_all_cpus();
#endif
return 0;
}

15
arch/arm/mach-uniphier/board_early_init_r.c
View File

@ -1,15 +0,0 @@
/*
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include "micro-support-card.h"
int board_early_init_r(void)
{
support_card_late_init();
return 0;
}

16
arch/arm/mach-uniphier/board_early_init_f.c → arch/arm/mach-uniphier/board_init.c
View File

@ -1,5 +1,7 @@
/* /*
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2012-2015 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -45,7 +47,7 @@ static void uniphier_setup_xirq(void)
writel(tmp, 0x55000090); writel(tmp, 0x55000090);
} }
int board_early_init_f(void) int board_init(void)
{ {
led_puts("U0"); led_puts("U0");
@ -122,5 +124,15 @@ int board_early_init_f(void)
led_puts("U2"); led_puts("U2");
support_card_late_init();
led_puts("U3");
#ifdef CONFIG_ARM64
uniphier_smp_kick_all_cpus();
#endif
led_puts("Uboo");
return 0; return 0;
} }

1
arch/arm/mach-uniphier/init.h
View File

@ -115,6 +115,7 @@ void uniphier_pxs2_clk_init(void);
void uniphier_ld11_clk_init(void); void uniphier_ld11_clk_init(void);
void uniphier_ld20_clk_init(void); void uniphier_ld20_clk_init(void);
void uniphier_smp_kick_all_cpus(void);
void cci500_init(int nr_slaves); void cci500_init(int nr_slaves);
#define pr_err(fmt, args...) printf(fmt, ##args) #define pr_err(fmt, args...) printf(fmt, ##args)

2
include/configs/uniphier.h
View File

@ -31,8 +31,6 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)