From 37304aaf60bf92a5dc3ef222ba520698bd862a44 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 20 Jul 2019 20:51:14 -0600 Subject: Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig This converts the following to Kconfig: CONFIG_USE_PREBOOT CONFIG_PREBOOT Both are together in one commit, since otherwise the former causes kconfig to define the latter, which gives duplicate symbol errors. Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the backslash lands in the wrong place. Similarly with socfpga_vining_fpga. Signed-off-by: Simon Glass --- include/configs/socfpga_vining_fpga.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'include/configs/socfpga_vining_fpga.h') diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 7fc1a95e8e..232536a763 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -33,17 +33,6 @@ * if button B is not pressed, boot normal Linux system immediatelly * if button B is pressed, wait $bootdelay and boot recovery system */ -#define CONFIG_USE_PREBOOT -#define CONFIG_PREBOOT \ - "setenv hostname vining-${unit_serial} ; " \ - "setenv PS1 \"${unit_ident} (${unit_serial}) => \" ; " \ - "if gpio input 78 ; then " \ - "setenv bootdelay 10 ; " \ - "setenv boottype rcvr ; " \ - "else " \ - "setenv bootdelay 5 ; " \ - "setenv boottype norm ; " \ - "fi" #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ -- cgit v1.2.1