X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fmain.c;h=06d7ff56d60c33cf4a31a02c5fa02ee34f75534b;hb=3988be5fd4369402c410336553bc0ca1920dbe6f;hp=1a2ef39cca9c1b9ec83c15f3a25e805fd11c673c;hpb=928f6054555618c9700bc5ebc16b9a661fd3ead7;p=oweals%2Fu-boot.git

diff --git a/common/main.c b/common/main.c
index 1a2ef39cca..06d7ff56d6 100644
--- 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	*/
@@ -10,34 +9,28 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
+#include <command.h>
 #include <console.h>
+#include <env.h>
+#include <init.h>
 #include <version.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Board-specific Platform code can reimplement show_boot_progress () if needed
- */
-__weak void show_boot_progress(int val) {}
-
 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 */
-# endif
+		int prev = 0;
+
+		if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+			prev = disable_ctrlc(1); /* disable Ctrl-C checking */
 
 		run_command_list(p, -1, 0);
 
-# ifdef CONFIG_AUTOBOOT_KEYED
-		disable_ctrlc(prev);	/* restore Control C checking */
-# endif
+		if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+			disable_ctrlc(prev);	/* restore Ctrl-C checking */
 	}
-#endif /* CONFIG_PREBOOT */
 }
 
 /* We come here after U-Boot is initialised and ready to process commands */
@@ -47,23 +40,16 @@ 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 */
-#endif /* CONFIG_VERSION_VARIABLE */
+	if (IS_ENABLED(CONFIG_VERSION_VARIABLE))
+		env_set("ver", version_string);  /* set version variable */
 
 	cli_init();
 
-	run_preboot_environment_command();
+	if (IS_ENABLED(CONFIG_USE_PREBOOT))
+		run_preboot_environment_command();
 
-#if defined(CONFIG_UPDATE_TFTP)
-	update_tftp(0UL, NULL, NULL);
-#endif /* CONFIG_UPDATE_TFTP */
+	if (IS_ENABLED(CONFIG_UPDATE_TFTP))
+		update_tftp(0UL, NULL, NULL);
 
 	s = bootdelay_process();
 	if (cli_process_fdt(&s))
@@ -72,4 +58,5 @@ void main_loop(void)
 	autoboot_command(s);
 
 	cli_loop();
+	panic("No CLI available");
 }