Makefile: drop unused cpp_cfg macro

[u-boot] / common / autoboot.c

diff --git a/common/autoboot.c b/common/autoboot.c
index 223e06274025bea71afd2b15052ca2337d07d7bb..94133eaeda782eeccbc0ac63a8581552dc7893c3 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -14,6 +13,7 @@
 #include <menu.h>
 #include <post.h>
 #include <u-boot/sha256.h>
+#include <bootcount.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -50,14 +50,14 @@ static int slow_equals(u8 *a, u8 *b, int len)
 
 static int passwd_abort(uint64_t etime)
 {
-       const char *sha_env_str = getenv("bootstopkeysha256");
+       const char *sha_env_str = env_get("bootstopkeysha256");
        u8 sha_env[SHA256_SUM_LEN];
        u8 sha[SHA256_SUM_LEN];
        char presskey[MAX_DELAY_STOP_STR];
        const char *algo_name = "sha256";
        u_int presskey_len = 0;
        int abort = 0;
-       int size;
+       int size = sizeof(sha);
        int ret;
 
        if (sha_env_str == NULL)
@@ -109,8 +109,8 @@ static int passwd_abort(uint64_t etime)
                int retry;
        }
        delaykey[] = {
-               { .str = getenv("bootdelaykey"),  .retry = 1 },
-               { .str = getenv("bootstopkey"),   .retry = 0 },
+               { .str = env_get("bootdelaykey"),  .retry = 1 },
+               { .str = env_get("bootstopkey"),   .retry = 0 },
        };
 
        char presskey[MAX_DELAY_STOP_STR];
@@ -182,16 +182,11 @@ static int passwd_abort(uint64_t etime)
  * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
  * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
  */
-static int abortboot_keyed(int bootdelay)
+static int __abortboot(int bootdelay)
 {
        int abort;
        uint64_t etime = endtick(bootdelay);
 
-#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
-       if (bootdelay == 0)
-               return 0;
-#endif
-
 #  ifdef CONFIG_AUTOBOOT_PROMPT
        /*
         * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
@@ -204,11 +199,6 @@ static int abortboot_keyed(int bootdelay)
        if (!abort)
                debug_bootkeys("key timeout\n");
 
-#ifdef CONFIG_SILENT_CONSOLE
-       if (abort)
-               gd->flags &= ~GD_FLG_SILENT;
-#endif
-
        return abort;
 }
 
@@ -218,7 +208,7 @@ static int abortboot_keyed(int bootdelay)
 static int menukey;
 #endif
 
-static int abortboot_normal(int bootdelay)
+static int __abortboot(int bootdelay)
 {
        int abort = 0;
        unsigned long ts;
@@ -226,23 +216,17 @@ static int abortboot_normal(int bootdelay)
 #ifdef CONFIG_MENUPROMPT
        printf(CONFIG_MENUPROMPT);
 #else
-       if (bootdelay >= 0)
-               printf("Hit any key to stop autoboot: %2d ", bootdelay);
+       printf("Hit any key to stop autoboot: %2d ", bootdelay);
 #endif
 
-#if defined CONFIG_ZERO_BOOTDELAY_CHECK
        /*
         * Check if key already pressed
-        * Don't check if bootdelay < 0
         */
-       if (bootdelay >= 0) {
-               if (tstc()) {   /* we got a key press   */
-                       (void) getc();  /* consume input        */
-                       puts("\b\b\b 0");
-                       abort = 1;      /* don't auto boot      */
-               }
+       if (tstc()) {   /* we got a key press   */
+               (void) getc();  /* consume input        */
+               puts("\b\b\b 0");
+               abort = 1;      /* don't auto boot      */
        }
-#endif
 
        while ((bootdelay > 0) && (!abort)) {
                --bootdelay;
@@ -267,22 +251,23 @@ static int abortboot_normal(int bootdelay)
 
        putc('\n');
 
-#ifdef CONFIG_SILENT_CONSOLE
-       if (abort)
-               gd->flags &= ~GD_FLG_SILENT;
-#endif
-
        return abort;
 }
 # endif        /* CONFIG_AUTOBOOT_KEYED */
 
 static int abortboot(int bootdelay)
 {
-#ifdef CONFIG_AUTOBOOT_KEYED
-       return abortboot_keyed(bootdelay);
-#else
-       return abortboot_normal(bootdelay);
+       int abort = 0;
+
+       if (bootdelay >= 0)
+               abort = __abortboot(bootdelay);
+
+#ifdef CONFIG_SILENT_CONSOLE
+       if (abort)
+               gd->flags &= ~GD_FLG_SILENT;
 #endif
+
+       return abort;
 }
 
 static void process_fdt_options(const void *blob)
@@ -293,12 +278,12 @@ static void process_fdt_options(const void *blob)
        /* Add an env variable to point to a kernel payload, if available */
        addr = fdtdec_get_config_int(gd->fdt_blob, "kernel-offset", 0);
        if (addr)
-               setenv_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
+               env_set_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
 
        /* Add an env variable to point to a root disk, if available */
        addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0);
        if (addr)
-               setenv_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
+               env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
 #endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */
 }
 
@@ -306,20 +291,10 @@ const char *bootdelay_process(void)
 {
        char *s;
        int bootdelay;
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-       unsigned long bootcount = 0;
-       unsigned long bootlimit = 0;
-#endif /* CONFIG_BOOTCOUNT_LIMIT */
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-       bootcount = bootcount_load();
-       bootcount++;
-       bootcount_store(bootcount);
-       setenv_ulong("bootcount", bootcount);
-       bootlimit = getenv_ulong("bootlimit", 10, 0);
-#endif /* CONFIG_BOOTCOUNT_LIMIT */
-
-       s = getenv("bootdelay");
+
+       bootcount_inc();
+
+       s = env_get("bootdelay");
        bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
 
 #ifdef CONFIG_OF_CONTROL
@@ -336,17 +311,13 @@ const char *bootdelay_process(void)
 
 #ifdef CONFIG_POST
        if (gd->flags & GD_FLG_POSTFAIL) {
-               s = getenv("failbootcmd");
+               s = env_get("failbootcmd");
        } else
 #endif /* CONFIG_POST */
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-       if (bootlimit && (bootcount > bootlimit)) {
-               printf("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n",
-                      (unsigned)bootlimit);
-               s = getenv("altbootcmd");
-       } else
-#endif /* CONFIG_BOOTCOUNT_LIMIT */
-               s = getenv("bootcmd");
+       if (bootcount_error())
+               s = env_get("altbootcmd");
+       else
+               s = env_get("bootcmd");
 
        process_fdt_options(gd->fdt_blob);
        stored_bootdelay = bootdelay;
@@ -372,7 +343,7 @@ void autoboot_command(const char *s)
 
 #ifdef CONFIG_MENUKEY
        if (menukey == CONFIG_MENUKEY) {
-               s = getenv("menucmd");
+               s = env_get("menucmd");
                if (s)
                        run_command_list(s, -1, 0);
        }