From 6fdaa299c3a038596f86e13687daf7f813935389 Mon Sep 17 00:00:00 2001 From: gaoyang3513 Date: Sat, 7 Oct 2023 06:28:28 +0000 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20Netconsole=20=E5=BF=83?= =?UTF-8?q?=E8=B7=B3=E5=8C=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sysdrv/source/uboot/u-boot/configs/rv1106_defconfig | 4 +++- sysdrv/source/uboot/u-boot/drivers/net/netconsole.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sysdrv/source/uboot/u-boot/configs/rv1106_defconfig b/sysdrv/source/uboot/u-boot/configs/rv1106_defconfig index e79755343..0c2610c5a 100644 --- a/sysdrv/source/uboot/u-boot/configs/rv1106_defconfig +++ b/sysdrv/source/uboot/u-boot/configs/rv1106_defconfig @@ -10,6 +10,7 @@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_ROCKCHIP_FIT_IMAGE=y CONFIG_USING_KERNEL_DTB_V2=y CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y +CONFIG_ROCKCHIP_SFC_IOMUX=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_TARGET_EVB_RV1106=y @@ -29,7 +30,7 @@ CONFIG_SPL_FIT_HW_CRYPTO=y # CONFIG_SPL_SYS_DCACHE_OFF is not set CONFIG_SPL_FIT_IMAGE_KB=256 CONFIG_SPL_FIT_IMAGE_MULTIPLE=1 -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_ANDROID_BOOTLOADER=y @@ -79,6 +80,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rate CONFIG_OF_U_BOOT_REMOVE_PROPS="interrupt-parent" CONFIG_ENVF=y CONFIG_ENVF_LIST="blkdevparts mtdparts sys_bootargs app reserved ipaddr serverip netmask gatewayip ethaddr" +CONFIG_NETCONSOLE=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y diff --git a/sysdrv/source/uboot/u-boot/drivers/net/netconsole.c b/sysdrv/source/uboot/u-boot/drivers/net/netconsole.c index e9dbedf32..9f8a58360 100644 --- a/sysdrv/source/uboot/u-boot/drivers/net/netconsole.c +++ b/sysdrv/source/uboot/u-boot/drivers/net/netconsole.c @@ -48,9 +48,15 @@ static void nc_handler(uchar *pkt, unsigned dest, struct in_addr sip, net_set_state(NETLOOP_SUCCESS); /* got input - quit net loop */ } +static void nc_stdio_puts(struct stdio_dev *dev, const char *s); + static void nc_timeout_handler(void) { + struct stdio_dev *dev; + + dev = stdio_get_by_name("nc"); net_set_state(NETLOOP_SUCCESS); + nc_stdio_puts(dev, CONFIG_SYS_PROMPT); } static int is_broadcast(struct in_addr ip)