[sherlock] 20.20240530.3.236 u-boot source
GitOrigin-RevId: d6d61229098fdec0536ed9e559d7ac2a6cd7d663
Change-Id: I79c7aa1c88e25d7135746fb2d93dc0f50853bb9b
Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/881197
Reviewed-by: David Pursell <dpursell@google.com>
diff --git a/Kconfig b/Kconfig
index f7f493e..6b551f7 100644
--- a/Kconfig
+++ b/Kconfig
@@ -69,7 +69,6 @@
config DISTRO_DEFAULTS
bool "Select defaults suitable for booting general purpose Linux distributions"
imply USE_BOOTCOMMAND
- select CMD_BOOTZ if ARM && !ARM64
select CMD_DHCP if CMD_NET
select CMD_PING if CMD_NET
select CMD_ENV_EXISTS
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 2517454..19d7d67 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -271,7 +271,7 @@
config CMD_GO
bool "go"
- default y
+ default n
help
Start an application at a given address.
diff --git a/configs/g12b_newman_bx_zircon_defconfig b/configs/g12b_newman_bx_zircon_defconfig
index 5df275e..b780416 100644
--- a/configs/g12b_newman_bx_zircon_defconfig
+++ b/configs/g12b_newman_bx_zircon_defconfig
@@ -225,3 +225,4 @@
CONFIG_NET=n
CONFIG_AML_GPT_SYNC_ENTIRE_ENTRY=y
CONFIG_OPTEE_RAW_PARTITION_IO=y
+CONFIG_CMD_BOOTZ=n
diff --git a/include/configs/g12b_newman_bx.h b/include/configs/g12b_newman_bx.h
index aba1267..535c9f3 100755
--- a/include/configs/g12b_newman_bx.h
+++ b/include/configs/g12b_newman_bx.h
@@ -90,9 +90,7 @@
"fb_addr=0x76800000\0" \
"fb_width=800\0" \
"fb_height=1280\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" \
@@ -155,8 +153,6 @@
"fi;" \
"\0" \
"update="\
- /*first usb burning, second sdc_burn, third ext-sd autoscr/recovery, last udisk autoscr/recovery*/\
- "run usb_burning; "\
"run recovery_from_flash;"\
"\0"\
"recovery_from_flash="\
