autoboot.c: Remove CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2

These defines for a 2nd autoboot stop and delay string are nearly unused. Only
sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely
unmaintained board is also posted to the list.

By removing these defines the code will become cleaner and moving the remaining
compile options to Kconfig will get easier.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Heiko Schocher <hs@denx.de>

diff --git a/README b/README
index 119bbc9..3b406c2 100644 (file)
--- a/README
+++ b/README
@@ -977,8 +977,6 @@ The following options need to be configured:
                CONFIG_AUTOBOOT_PROMPT
                CONFIG_AUTOBOOT_DELAY_STR
                CONFIG_AUTOBOOT_STOP_STR
                CONFIG_AUTOBOOT_PROMPT
                CONFIG_AUTOBOOT_DELAY_STR
                CONFIG_AUTOBOOT_STOP_STR

-               CONFIG_AUTOBOOT_DELAY_STR2
-               CONFIG_AUTOBOOT_STOP_STR2

                CONFIG_ZERO_BOOTDELAY_CHECK
                CONFIG_RESET_TO_RETRY
 
                CONFIG_ZERO_BOOTDELAY_CHECK
                CONFIG_RESET_TO_RETRY
 

diff --git a/common/autoboot.c b/common/autoboot.c
index c27cc2c..7c92f3e 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -42,9 +42,7 @@ static int abortboot_keyed(int bootdelay)
        }
        delaykey[] = {
                { .str = getenv("bootdelaykey"),  .retry = 1 },
        }
        delaykey[] = {
                { .str = getenv("bootdelaykey"),  .retry = 1 },

-               { .str = getenv("bootdelaykey2"), .retry = 1 },

                { .str = getenv("bootstopkey"),   .retry = 0 },
                { .str = getenv("bootstopkey"),   .retry = 0 },

-               { .str = getenv("bootstopkey2"),  .retry = 0 },

        };
 
        char presskey[MAX_DELAY_STOP_STR];
        };
 
        char presskey[MAX_DELAY_STOP_STR];


@@ -65,17 +63,9 @@ static int abortboot_keyed(int bootdelay)
        if (delaykey[0].str == NULL)
                delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
 #  endif
        if (delaykey[0].str == NULL)
                delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
 #  endif

-#  ifdef CONFIG_AUTOBOOT_DELAY_STR2
-       if (delaykey[1].str == NULL)
-               delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2;
-#  endif

 #  ifdef CONFIG_AUTOBOOT_STOP_STR
 #  ifdef CONFIG_AUTOBOOT_STOP_STR

-       if (delaykey[2].str == NULL)
-               delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR;
-#  endif
-#  ifdef CONFIG_AUTOBOOT_STOP_STR2
-       if (delaykey[3].str == NULL)
-               delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2;
+       if (delaykey[1].str == NULL)
+               delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR;

 #  endif
 
        for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) {
 #  endif
 
        for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) {

diff --git a/doc/README.autoboot b/doc/README.autoboot
index 14e3660..227e3b5 100644 (file)
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -78,13 +78,9 @@ What they do
   CONFIG_AUTOBOOT_PROMPT
   CONFIG_AUTOBOOT_DELAY_STR
   CONFIG_AUTOBOOT_STOP_STR
   CONFIG_AUTOBOOT_PROMPT
   CONFIG_AUTOBOOT_DELAY_STR
   CONFIG_AUTOBOOT_STOP_STR

-  CONFIG_AUTOBOOT_DELAY_STR2
-  CONFIG_AUTOBOOT_STOP_STR2

 
   "bootdelaykey"  environment variable
   "bootstopkey"          environment variable
 
   "bootdelaykey"  environment variable
   "bootstopkey"          environment variable

-  "bootdelaykey2" environment variable
-  "bootstopkey2"  environment variable

 
        These options give more control over stopping autoboot. When
        they are used a specific character or string is required to
 
        These options give more control over stopping autoboot. When
        they are used a specific character or string is required to


@@ -130,12 +126,6 @@ What they do
        character of a key string does not appear in the rest of the
        string.
 
        character of a key string does not appear in the rest of the
        string.
 

-       Using the CONFIG_AUTOBOOT_DELAY_STR2 #define or the
-       "bootdelaykey2" environment variable and/or the
-       CONFIG_AUTOBOOT_STOP_STR2 #define or the "bootstopkey"
-       environment variable you can specify a second, alternate
-       string (which allows you to have two "password" strings).
-

        The CONFIG_AUTOBOOT_KEYED_CTRLC #define allows for the boot
        sequence to be interrupted by ctrl-c, in addition to the
        "bootdelaykey" and "bootstopkey". Setting this variable
        The CONFIG_AUTOBOOT_KEYED_CTRLC #define allows for the boot
        sequence to be interrupted by ctrl-c, in addition to the
        "bootdelaykey" and "bootstopkey". Setting this variable