From 7717c2faf8984505a72962bac582ce65fb2a4641 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 17 Aug 2022 21:37:58 +0200 Subject: [PATCH] board: lsxl: automatically select CONFIG_MISC_INIT_R The board code needs this to be set. Otherwise, the recovery mechanism doesn't work. Therefore, select this option automatically with the board. Signed-off-by: Michael Walle Reviewed-by: Stefan Roese --- arch/arm/mach-kirkwood/Kconfig | 1 + board/buffalo/lsxl/lsxl.c | 2 -- configs/lschlv2_defconfig | 1 - configs/lsxhl_defconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 98bb10c2de..f5460f3bd3 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -45,6 +45,7 @@ config TARGET_LSXL bool "lsxl Board" select FEROCEON_88FR131 select KW88F6281 + select MISC_INIT_R config TARGET_POGO_E02 bool "pogo_e02 Board" diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index 42221eef3a..eca7da2f6d 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -172,7 +172,6 @@ int board_init(void) return 0; } -#ifdef CONFIG_MISC_INIT_R static void check_power_switch(void) { if (kw_gpio_get_value(GPIO_POWER_SWITCH)) { @@ -259,7 +258,6 @@ int misc_init_r(void) return 0; } -#endif #if CONFIG_IS_ENABLED(BOOTSTAGE) void show_boot_progress(int progress) diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 87dc1be61b..081a2448fc 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -28,7 +28,6 @@ CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_FLASH is not set CONFIG_CMD_SATA=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 35e414f059..33bec60147 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -29,7 +29,6 @@ CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_FLASH is not set CONFIG_CMD_SATA=y -- 2.39.5