summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke go <sangch.go@gmail.com>2020-12-09 10:41:57 +0300
committerLuke go <sangch.go@gmail.com>2020-12-09 10:41:57 +0300
commit90ebb7015c1bfbbf120b2b94273977f558a5da46 (patch)
tree77ffde5f4e4ff2a9e574127fb5326b25cdf09fd9
parent0b3595e1fbd67c6b5e7e25d111132bf0c070d35d (diff)
downloadu-boot-90ebb7015c1bfbbf120b2b94273977f558a5da46.tar.xz
Revert "ODROID-COMMON: Add selfinstall status at boot and scripts."travis/odroidn2-171travis/odroidc4-171g12_9.0.0_64_20210108g12_9.0.0_64_20201221
This reverts commit I017f4b84881ebb0a3266b78f3636de81ae9f1ecc. Change-Id: I60b9c55be3bd42bf172e8448802c2afad07b7553
-rw-r--r--arch/arm/include/asm/reboot.h1
-rw-r--r--board/hardkernel/odroid-common/recovery.c2
-rw-r--r--common/cmd_reboot.c5
-rw-r--r--include/configs/odroid-g12-common.h2
4 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/include/asm/reboot.h b/arch/arm/include/asm/reboot.h
index ff7a011c3f..647c29b302 100644
--- 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
index 49cc82a781..4c49f00ad0 100644
--- 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
index bb113fe7cb..47c055b7f7 100644
--- 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
index fe3688eca1..76d9da8e4e 100644
--- 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 " \