sunxi: Enable eMMC on Libre Computer Board ALL-H3-CC boards

[u-boot] / common / main.c

diff --git a/common/main.c b/common/main.c
index 1a2ef39cca9c1b9ec83c15f3a25e805fd11c673c..9802bed229c34a2931cf29d57f47083d96aa77fd 100644 (file)
--- a/common/main.c
+++ b/common/main.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+
  */
 
 /* #define     DEBUG   */
@@ -13,8 +12,6 @@
 #include <console.h>
 #include <version.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */
@@ -25,7 +22,7 @@ static void run_preboot_environment_command(void)
 #ifdef CONFIG_PREBOOT
        char *p;
 
-       p = getenv("preboot");
+       p = env_get("preboot");
        if (p != NULL) {
 # ifdef CONFIG_AUTOBOOT_KEYED
                int prev = disable_ctrlc(1);    /* disable Control C checking */
@@ -47,14 +44,8 @@ void main_loop(void)
 
        bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
 
-#ifndef CONFIG_SYS_GENERIC_BOARD
-       puts("Warning: Your board does not use generic board. Please read\n");
-       puts("doc/README.generic-board and take action. Boards not\n");
-       puts("upgraded by the late 2014 may break or be removed.\n");
-#endif
-
 #ifdef CONFIG_VERSION_VARIABLE
-       setenv("ver", version_string);  /* set version variable */
+       env_set("ver", version_string);  /* set version variable */
 #endif /* CONFIG_VERSION_VARIABLE */
 
        cli_init();
@@ -72,4 +63,5 @@ void main_loop(void)
        autoboot_command(s);
 
        cli_loop();
+       panic("No CLI available");
 }