common: board_r: enable initr_serial() anyway
If we don't enable initr_serial(), even after relocation done, the
serial driver always use no relocation address of ns16550_serial_ops
which is setup in serial_init(). This makes abort issue when arm64 kernel
is load to overlap the ram area.
fixes: 064eb49314
(serial: ns16550: support using pre-loader serial)
Change-Id: Iab67010ba3712754c036ecb2aee76c13a0b200b6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
parent
f935b6dc55
commit
8c2a7835d0
|
|
@ -172,22 +172,7 @@ static int initr_reloc_global_data(void)
|
||||||
|
|
||||||
static int initr_serial(void)
|
static int initr_serial(void)
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
* 1. Serial has been initialized in board_f.c => serial_init(), there is
|
|
||||||
* no special reason to init it again;
|
|
||||||
*
|
|
||||||
* 2. Pre-serial works depending on aliases to get pre-serial phandle when
|
|
||||||
* parse dtb. If CONFIG_USING_KERNEL_DTB is enabled, there are both kernel
|
|
||||||
* dtb and U-Boot dtb aliases added into aliases_lookup, these nodes have
|
|
||||||
* same names but different phanles(U-Boot nodes has high prior), this may
|
|
||||||
* lead a wrong aliases node finding if try to get a node after kenrel dtb
|
|
||||||
* unflattened, i.e. using U-Boot phandle to get kernel dtb node!!
|
|
||||||
*
|
|
||||||
* Notice: of_alias_dump() is provided to dump all aliases node.
|
|
||||||
*/
|
|
||||||
#ifndef CONFIG_USING_KERNEL_DTB
|
|
||||||
serial_initialize();
|
serial_initialize();
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue