Nokia RX-51: Convert to CONFIG_DM_SERIAL
PATCH 1/1 Nokia RX-51: Convert to CONFIG_DM_SERIAL
For CONFIG_DM_SERIAL it is required to increase CONFIG_SYS_MALLOC_F_LEN as default value is not enough for memory hungry CONFIG_DM_SERIAL code.
---
Who has serial console on the real device, please test this patch if serial console is still working. I do not have adapter for serial console so I tested this patch only in qemu.
--- board/nokia/rx51/rx51.c | 12 ++++++++++++ configs/nokia_rx51_defconfig | 5 ++--- include/configs/nokia_rx51.h | 1 - 3 files changed, 14 insertions(+), 4 deletions(-)
board/nokia/rx51/rx51.c +12 -0
@@ -32,6 +32,7 @@#include <i2c.h> #include <video.h> #include <keyboard.h> +#include <ns16550.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/setup.h>
@@ -788,3 +789,14 @@ U_BOOT_DRVINFOS(rx51_video) = {U_BOOT_DRVINFOS (rx51_kp) = { {"rx51_kp" }, }; + +static const struct ns16550_plat rx51_serial = { + .base =CONFIG_SYS_NS16550_COM3 , + .reg_shift =2 , + .clock =CONFIG_SYS_NS16550_CLK , + .fcr =UART_FCR_DEFVAL , +}; + +U_BOOT_DRVINFOS (rx51_uart) = { + {"omap_serial" , &rx51_serial }, +};
configs/nokia_rx51_defconfig +2 -3
@@ -11,12 +11,12 @@ CONFIG_STATIC_MACH_TYPE=y CONFIG_MACH_TYPE=1955 CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_SYS_MALLOC_LEN=0xc0000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NOKIA_RX51=y CONFIG_SYS_LOAD_ADDR=0x80000000 CONFIG_OPTIMIZE_INLINING=y CONFIG_LTO=y -# CONFIG_SYS_MALLOC_F is not set # CONFIG_FIT is not set CONFIG_BOOTDELAY=30 CONFIG_AUTOBOOT_KEYED=y
@@ -70,8 +70,7 @@ CONFIG_DM_KEYBOARD=y # CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y -CONFIG_CONS_INDEX=3 -CONFIG_SYS_NS16550=y +CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y
include/configs/nokia_rx51.h +0 -1
@@ -43,7 +43,6 @@#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4)#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK/*
Signature · 1 line
2.20.1
Hi Pali, Tom,
Quoted 8 lines · Pali Rohár
For
CONFIG_DM_SERIALit is required to increaseCONFIG_SYS_MALLOC_F_LENas default value is not enough for memory hungryCONFIG_DM_SERIALcode.Signed-off-by Pali Rohár <[email protected]>---
Who has serial console on the real device, please test this patch if serial console is still working. I do not have adapter for serial console so I tested this patch only in qemu.
I can confirm this works on my serial adapter. The patch didn't apply on latest master (2ad8d0cb950da2233a2ec030533f4e54c6d04126), but I just updated it to apply without problems locally.
Regards,
Merlijn
Quoted 12 lines · Merlijn Wajer
Hi Pali, Tom,
Quoted 8 lines · Pali Rohár
For
CONFIG_DM_SERIALit is required to increaseCONFIG_SYS_MALLOC_F_LENas default value is not enough for memory hungryCONFIG_DM_SERIALcode.Signed-off-by Pali Rohár <[email protected]>---
Who has serial console on the real device, please test this patch if serial console is still working. I do not have adapter for serial console so I tested this patch only in qemu.
Quoted 3 lines
I can confirm this works on my serial adapter. The patch didn't apply on latest master (
2ad8d0cb950da2233a2ec030533f4e54c6d04126), but I just updated it to apply without problems locally.
Thanks, can you please reply with a Tested-by?
Signature · 1 line
Tom
Hi Pali, Tom,
Quoted 4 lines · Pali Rohár
For
CONFIG_DM_SERIALit is required to increaseCONFIG_SYS_MALLOC_F_LENas default value is not enough for memory hungryCONFIG_DM_SERIALcode.Signed-off-by Pali Rohár <[email protected]>
Regards,
Merlijn
Quoted 5 lines · Pali Rohár
For
CONFIG_DM_SERIALit is required to increaseCONFIG_SYS_MALLOC_F_LENas default value is not enough for memory hungryCONFIG_DM_SERIALcode.Signed-off-by Pali Rohár <[email protected]>Tested-by Merlijn Wajer <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom