V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: uniphier: use checkboard() instead of misc_init_f() 

We can use checkboard() stub to show additional board information,
so misc_init_f() should not be used for this purpose.

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

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

@ -11,7 +11,6 @@ else
obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o 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-$(CONFIG_MISC_INIT_F) += print_misc_info.o
obj-y += dram_init.o obj-y += dram_init.o
obj-y += board_common.o obj-y += board_common.o
obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o

2
arch/arm/mach-uniphier/micro-support-card.c
View File

@ -49,7 +49,7 @@ static int support_card_show_revision(void)
return 0; return 0;
} }
int check_support_card(void) int checkboard(void)
{ {
printf("SC: Micro Support Card "); printf("SC: Micro Support Card ");
return support_card_show_revision(); return support_card_show_revision();

16
arch/arm/mach-uniphier/micro-support-card.h
View File

@ -1,17 +1,18 @@
/* /*
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2012-2014 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+
*/ */
#ifndef ARCH_BOARD_H #ifndef MICRO_SUPPORT_CARD_H
#define ARCH_BOARD_H #define MICRO_SUPPORT_CARD_H
#if defined(CONFIG_MICRO_SUPPORT_CARD) #if defined(CONFIG_MICRO_SUPPORT_CARD)
void support_card_reset(void); void support_card_reset(void);
void support_card_init(void); void support_card_init(void);
void support_card_late_init(void); void support_card_late_init(void);
int check_support_card(void);
void led_puts(const char *s); void led_puts(const char *s);
#else #else
static inline void support_card_reset(void) static inline void support_card_reset(void)
@ -26,14 +27,9 @@ static inline void support_card_late_init(void)
{ {
} }
static inline int check_support_card(void)
{
return 0;
}
static inline void led_puts(const char *s) static inline void led_puts(const char *s)
{ {
} }
#endif #endif
#endif /* ARCH_BOARD_H */ #endif /* MICRO_SUPPORT_CARD_H */

12
arch/arm/mach-uniphier/print_misc_info.c
View File

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

1
include/configs/uniphier.h
View File

@ -31,7 +31,6 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_F
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT