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

vexpress64: use DM for all vexpress64 boards 

Commit d8bafe1310
"ARMv8: enable DM in vexpress64 board" only enabled DM
for the simulated vexpress64 board (FVP) with the
hardcoded clock value for the simulated board, causing
a console regression on the Juno board which was using
a different clock setting.

Fix this by enabling DM for all vexpress64 boards,
defining the clock frequency per-board, deleting the
static array of PL01x ports from the config file and
relying solely on the port defined in the boardfile
using platform data.

Cc: David Feng <fenghua@phytium.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-04-14 10:01:35 +02:00 committed by Tom Rini
parent e0e3aa50b5
commit d280ea00ef
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/armltd/vexpress64/vexpress64.c
View File

@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
static const struct pl01x_serial_platdata serial_platdata = { static const struct pl01x_serial_platdata serial_platdata = {
.base = V2M_UART0, .base = V2M_UART0,
.type = TYPE_PL011, .type = TYPE_PL011,
.clock = 2400 * 1000, .clock = CONFIG_PL011_CLOCK,
}; };
U_BOOT_DEVICE(vexpress_serials) = { U_BOOT_DEVICE(vexpress_serials) = {

20
include/configs/vexpress_aemv8a.h
View File

@ -8,10 +8,9 @@
#ifndef __VEXPRESS_AEMV8A_H #ifndef __VEXPRESS_AEMV8A_H
#define __VEXPRESS_AEMV8A_H #define __VEXPRESS_AEMV8A_H
#define CONFIG_DM /* We use generic board and device manager for v8 Versatile Express */
/* We use generic board for v8 Versatile Express */
#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DM
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
#ifndef CONFIG_SEMIHOSTING #ifndef CONFIG_SEMIHOSTING
@ -134,27 +133,16 @@
#endif #endif
/* PL011 Serial Configuration */ /* PL011 Serial Configuration */
#define CONFIG_BAUDRATE 115200
#ifdef CONFIG_DM
#define CONFIG_DM_SERIAL #define CONFIG_DM_SERIAL
#define CONFIG_PL01X_SERIAL #define CONFIG_BAUDRATE 115200
#else
#define CONFIG_SYS_SERIAL0 V2M_UART0
#define CONFIG_SYS_SERIAL1 V2M_UART1
#define CONFIG_CONS_INDEX 0 #define CONFIG_CONS_INDEX 0
#define CONFIG_PL01X_SERIAL
#define CONFIG_PL011_SERIAL #define CONFIG_PL011_SERIAL
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
#define CONFIG_PL011_CLOCK 7273800 #define CONFIG_PL011_CLOCK 7273800
#else #else
#define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL011_CLOCK 24000000
#endif #endif
#define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0, \
(void *)CONFIG_SYS_SERIAL1}
#endif
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_SERIAL0 V2M_UART0
#define CONFIG_SYS_SERIAL1 V2M_UART1
/* Command line configuration */ /* Command line configuration */
#define CONFIG_MENU #define CONFIG_MENU