diff --git a/Kconfig b/Kconfig
index cdc2d5a..42745e1 100644
--- a/Kconfig
+++ b/Kconfig
@@ -70,8 +70,6 @@
 	bool "Select defaults suitable for booting general purpose Linux distributions"
 	select AUTO_COMPLETE
 	select CMDLINE_EDITING
-	select CMD_BOOTI if ARM64
-	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/board/amlogic/sm1_elaine_common/zircon.c b/board/amlogic/sm1_elaine_common/zircon.c
index 2e45b00..3d5b57a 100644
--- a/board/amlogic/sm1_elaine_common/zircon.c
+++ b/board/amlogic/sm1_elaine_common/zircon.c
@@ -520,14 +520,14 @@
 static int add_panel_type(zbi_header_t *zbi, size_t capacity)
 {
 	enum {
-		// These values are shared with the Fuchsia GT6853 touch driver,
-		// and must be kept in sync.
+		// These values are shared with the Fuchsia Nelson board driver and
+		// the GT6853 touch driver, and must be kept in sync.
 		kPanelTypeKdFiti9364 = 1,
 		kPanelTypeBoeFiti9364 = 2,
 		kPanelTypeInxFiti9364 = 3,
 		kPanelTypeKdFiti9365 = 4,
 		kPanelTypeBoeFiti9365 = 5,
-		kPanelTypeBoeSit7703 = 6,
+		// 6 was for kPanelTypeBoeSit7703.
 	};
 
 	const char *panel_type = env_get("panel_type");
@@ -547,7 +547,8 @@
 	} else if (!strcmp(panel_type, "kd_fiti9365_7")) {
 		panel_type_id = kPanelTypeKdFiti9365;
 	} else if (!strcmp(panel_type, "boe_sit7703_7")) {
-		panel_type_id = kPanelTypeBoeSit7703;
+		printf("BOE TV070WSM with ST7703I DDIC is not supported on Fuchsia.\n");
+		return -1;
 	} else {
 		// This is expected on P0/P1 boards, which use different
 		// panel_type strings.
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0570def..89eb3e9 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -284,7 +284,7 @@
 
 config CMD_GO
 	bool "go"
-	default y
+	default n
 	help
 	  Start an application at a given address.
 
diff --git a/configs/sm1_elaine_bx_zircon_defconfig b/configs/sm1_elaine_bx_zircon_defconfig
index ebf4ec5..16111f6 100755
--- a/configs/sm1_elaine_bx_zircon_defconfig
+++ b/configs/sm1_elaine_bx_zircon_defconfig
@@ -227,3 +227,4 @@
 CONFIG_CMD_BENCHMARK=y=y
 CONFIG_LIBAVB_PREFER_HOST_SHA256=y
 CONFIG_AML_GPT_SYNC_ENTIRE_ENTRY=y
+CONFIG_CMD_BOOTZ=n
diff --git a/include/configs/sm1_elaine_bx.h b/include/configs/sm1_elaine_bx.h
index 5371353..6db8dbf 100644
--- a/include/configs/sm1_elaine_bx.h
+++ b/include/configs/sm1_elaine_bx.h
@@ -92,9 +92,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" \
@@ -166,7 +164,6 @@
 		"fi;" \
 		"\0" \
 	"update=" \
-		"run usb_burning;" \
 		"run recovery_from_flash;" \
 		"\0" \
 	"recovery_from_flash=" \