Revert "ODROID-COMMON: Add selfinstall status at boot and scripts."

This reverts commit I017f4b84881ebb0a3266b78f3636de81ae9f1ecc. Change-Id: I60b9c55be3bd42bf172e8448802c2afad07b7553
hardkernel · Dec 9, 2020 · 90ebb70 · 90ebb70
1 parent 0b3595e
commit 90ebb70
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/arch/arm/include/asm/reboot.h b/arch/arm/include/asm/reboot.h
@@ -54,7 +54,6 @@ Reboot reason AND corresponding env setting:
 #define	AMLOGIC_CRASH_REBOOT			11
 #define AMLOGIC_KERNEL_PANIC			12
 #define AMLOGIC_WATCHDOG_REBOOT			13
-#define AMLOGIC_SELFINSTALL				14
 
 /*
 old version env

diff --git a/board/hardkernel/odroid-common/recovery.c b/board/hardkernel/odroid-common/recovery.c
@@ -65,7 +65,7 @@ int board_get_recovery_message(void)
 
 	message.recovery[strlen(misc_magic)] = 0;
 	if (0 == strncmp(message.recovery, misc_magic, strlen(misc_magic))) {
-		return AMLOGIC_SELFINSTALL;
+		return AMLOGIC_FACTORY_RESET_REBOOT;
 	}
 
 	return AMLOGIC_REBOOT_UNKNOWN;

diff --git a/common/cmd_reboot.c b/common/cmd_reboot.c
@@ -110,11 +110,6 @@ int do_get_rebootmode (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
 			setenv("reboot_mode","rpmbp");
 			break;
 		}
-		case AMLOGIC_SELFINSTALL:
-		{
-			setenv("reboot_mode","selfinstall");
-			break;
-		}
 		default:
 		{
 			setenv("reboot_mode","charging");

diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h
@@ -178,8 +178,6 @@
             "get_rebootmode;" \
             "if test ${reboot_mode} = factory_reset; then " \
                 "run boot_default;" \
-            "else if test ${reboot_mode} = selfinstall; then " \
-                "run boot_default;" \
             "else if test ${reboot_mode} = cold_boot; then " \
                 /*"run try_auto_burn; "*/ \
             "else if test ${reboot_mode} = fastboot; then " \