Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 14:38:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

board: lsxl: make last resort recovery more reliable

Browse source 
If something is wrong with the environment, we cannot rely on a proper
u-boot operation anymore. In fact, it is possible, that we never reach
misc_init_r() with a broken environment.

Also don't enable the netconsole by environment settings. This way the
user don't have to reconfigure the environment. Instead the network
console is only enabled when the push button is pressed during boot.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Michael Walle 2022-08-17 21:38:03 +02:00 • committed by Stefan Roese
parent 18794c192a
commit aa088beac3
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-kirkwood/Kconfig
View file

@ -45,6 +45,7 @@ config TARGET_LSXL
bool "lsxl Board"
select FEROCEON_88FR131
select KW88F6281
select BOARD_EARLY_INIT_R
select MISC_INIT_R
config TARGET_POGO_E02

14
board/buffalo/lsxl/lsxl.c
View file

@ -42,6 +42,8 @@
DECLARE_GLOBAL_DATA_PTR;
static bool force_rescue_mode;
int board_early_init_f(void)
{
/*
@ -247,14 +249,22 @@ static void check_push_button(void)
if (i >= 100)
erase_environment();
else if (i >= 10)
rescue_mode();
force_rescue_mode = true;
}
int board_early_init_r(void)
{
check_push_button();
return 0;
}
int misc_init_r(void)
{
check_power_switch();
check_enetaddr();
check_push_button();
if (force_rescue_mode)
rescue_mode();
return 0;
}

1
configs/lschlv2_defconfig
View file

@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
CONFIG_DEFAULT_FDT_FILE="kirkwood-lschlv2.dtb"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_MAXARGS=32

1
configs/lsxhl_defconfig
View file

@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
CONFIG_DEFAULT_FDT_FILE="kirkwood-lsxhl.dtb"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_MAXARGS=32

10
include/configs/lsxl.h
View file

@ -57,17 +57,7 @@
"&& setenv ncip " \
"&& setenv autoload ${autoload_old}; " \
"setenv autoload_old\0" \
"standard_env=setenv ipaddr; setenv netmask; setenv serverip; " \
"setenv ncip; setenv gatewayip; setenv ethact; " \
"setenv bootfile; setenv dnsip; " \
"setenv bootsource legacy; run ser\0" \
"restore_env=run standard_env; saveenv; reset\0" \
"ser=setenv stdin serial; setenv stdout serial; " \
"setenv stderr serial\0" \
"nc=setenv stdin nc; setenv stdout nc; setenv stderr nc\0" \
"stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
/*
* Ethernet Driver configuration