[astro] 20.20240530.3.236 u-boot source GitOrigin-RevId: d52578380f448b766229038674db014f7bcec1cb Change-Id: Ib08754db4f9e118271bd6d26db830fde2e0ea482 Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/881196 Reviewed-by: David Pursell <dpursell@google.com>
diff --git a/board/amlogic/configs/g12a_estelle_bx.h b/board/amlogic/configs/g12a_estelle_bx.h index 9def690..5639f1a 100755 --- a/board/amlogic/configs/g12a_estelle_bx.h +++ b/board/amlogic/configs/g12a_estelle_bx.h
@@ -139,9 +139,7 @@ "fb_addr=0x5f800000\0" \ "fb_width=608\0" \ "fb_height=1024\0" \ - "usb_burning=update 1000\0" \ "fdt_high=0x20000000\0" \ - "try_auto_burn=update 700 750;\0" \ "sdcburncfg=aml_sdc_burn.ini\0" \ "sdc_burning=sdc_burn ${sdcburncfg}\0" \ "wipe_data=successful\0" \ @@ -167,7 +165,7 @@ "else if test ${reboot_mode} = update; then " \ "run update;" \ "else if test ${reboot_mode} = cold_boot; then " \ - /* "run try_auto_burn;" */ \ + \ "else if test ${reboot_mode} = fastboot; then " \ "fastboot;" \ "fi;fi;fi;fi;" \ @@ -198,7 +196,6 @@ "fi;" \ "\0" \ "update=" \ - "run usb_burning;" \ "run recovery_from_flash;" \ "\0" \ /* load and boot an image from 'recovery' partition to restore the device. */ \ @@ -488,17 +485,14 @@ /* commands */ #define CONFIG_CMD_CACHE 1 -#define CONFIG_CMD_BOOTI 1 #define CONFIG_CMD_EFUSE 1 #define CONFIG_CMD_I2C 1 -#define CONFIG_CMD_MEMORY 1 #define CONFIG_CMD_FAT 1 #define CONFIG_CMD_GPIO 1 #define CONFIG_CMD_RUN #define CONFIG_CMD_REBOOT 1 #define CONFIG_CMD_FACTORY_BOOT 1 #define CONFIG_CMD_ECHO 1 -#define CONFIG_CMD_AUTOSCRIPT 1 #define CONFIG_CMD_MISC 1 /*file system*/
diff --git a/common/Kconfig b/common/Kconfig index fd84fa0..6f47192 100644 --- a/common/Kconfig +++ b/common/Kconfig
@@ -55,7 +55,7 @@ config CMD_GO bool "go" - default y + default n help Start an application at a given address.