preboot: Introduce CONFIG_USE_PREBOOT and migrate CONFIG_PREBOOT

This is the same migration path as commit b6251db8c3f0 ("Kconfig:
Introduce USE_BOOTCOMMAND and migrate BOOTCOMMAND").

I also moved the description in README to the Kconfig help.
I ripped off the sentence about 'LWMON' since it is gone already.

I only let my boards migrate, leaving the rest to platform maintainers.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/README b/README
index 128734134b6b056e52945ba58a764a1b82e7e028..6525b81e3f83a25cc74995e0c02ad08fd20cb9e9 100644 (file)
--- a/README
+++ b/README
@@ -687,22 +687,6 @@ The following options need to be configured:
                as a convenience, when switching between booting from
                RAM and NFS.
 
-- Pre-Boot Commands:
-               CONFIG_PREBOOT
-
-               When this option is #defined, the existence of the
-               environment variable "preboot" will be checked
-               immediately before starting the CONFIG_BOOTDELAY
-               countdown and/or running the auto-boot command resp.
-               entering interactive mode.
-
-               This feature is especially useful when "preboot" is
-               automatically generated or modified. For an example
-               see the LWMON board specific code: here "preboot" is
-               modified when the user holds down a certain
-               combination of keys on the (special) keyboard when
-               booting the systems
-
 - Serial Download Echo Mode:
                CONFIG_LOADS_ECHO
                If defined to 1, all characters received during a

diff --git a/common/Kconfig b/common/Kconfig
index e100c2294961944fcfbaeb9d174b79fe9a2b6812..1a1951f874ef1bf2122849f32ba2ced84e2dba1b 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -232,6 +232,24 @@ config BOOTCOMMAND
          This is the string of commands that will be used as bootcmd and if
          AUTOBOOT is set, automatically run.
 
+config USE_PREBOOT
+       bool "Enable preboot"
+       help
+         When this option is enabled, the existence of the environment
+         variable "preboot" will be checked immediately before starting the
+         CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp.
+         entering interactive mode.
+
+         This feature is especially useful when "preboot" is automatically
+         generated or modified. For example, the boot code can modify the
+         "preboot" when a user holds down a certain combination of keys.
+
+config PREBOOT
+       string "preboot default value"
+       depends on USE_PREBOOT
+       help
+         This is the default of "preboot" environment variable.
+
 menu "Console"
 
 config MENU

diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig
index 48f7ac4c87465d1b381f8062b78315b958a36c84..de9182eba3583bc80e53ca2e5f5ad6d5dc5e29db 100644 (file)
--- a/configs/uniphier_ld4_sld8_defconfig
+++ b/configs/uniphier_ld4_sld8_defconfig
@@ -10,6 +10,8 @@ CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_NR_DRAM_BANKS=3
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot"
 CONFIG_LOGLEVEL=6
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y

diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig
index f7abf05c524ae9383c204c7395d6447bf9578579..bb9ce1a59bb6c61cbdfb64955ef67ab1ddcd5f0c 100644 (file)
--- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@ -9,6 +9,8 @@ CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_NR_DRAM_BANKS=3
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot"
 CONFIG_LOGLEVEL=6
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y

diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig
index 1ba1c7d508d742cc9bedb68ae97c53f3e4daf3f8..08dfa240c1663eaa517f366a3759841ad069e3b2 100644 (file)
--- a/configs/uniphier_v8_defconfig
+++ b/configs/uniphier_v8_defconfig
@@ -8,6 +8,8 @@ CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_NR_DRAM_BANKS=3
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot"
 CONFIG_LOGLEVEL=6
 CONFIG_CMD_CONFIG=y
 CONFIG_CMD_IMLS=y

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 95d64525535aa3f99d9339f9553dc4b6aace33de..1e509ce9ad7bdd158e28e74a0c8dbe229dac3839 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -124,8 +124,6 @@
        "third_image=u-boot.bin\0"
 #endif
 
-#define CONFIG_PREBOOT                 "env exist ${bootdev}preboot && run ${bootdev}preboot"
-
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
 #define CONFIG_NFSBOOTCOMMAND                                          \
        "setenv bootargs $bootargs root=/dev/nfs rw "                   \