commit 0e1d7b7eb42d5e0ba69adaf542e071b798476e3e
author Alistair Strachan <astrachan@google.com> Wed Dec 26 10:39:23 2018 -0800
committer Alistair Strachan <astrachan@google.com> Fri Dec 28 21:17:37 2018 +0000
tree cb274a92d1b17c411482307adac46dca5597a31b
parent 2580354eb8b478f93e34e15e6b318c5de55cdac2

Staging changes for u-boot 2019.01-rc2 upgrade.

Change-Id: I1adfa5c99e1712e3a85565e8e2db0522066c3237
Signed-off-by: Alistair Strachan <astrachan@google.com>

uboot_config/common.config

diff --git a/uboot_config/common.config b/uboot_config/common.config
index 60a2626..4cc1d3a 100644
--- a/uboot_config/common.config
+++ b/uboot_config/common.config
@@ -23,7 +23,6 @@
 
 # Add support for Android Images.
 CONFIG_ANDROID_BOOT_IMAGE=y
-CONFIG_CMD_LOAD_ANDROID=y
 
 # Support for Android Bootloader is required.
 CONFIG_ANDROID_BOOTLOADER=y
@@ -31,7 +30,10 @@
 
 # Support for selecting the A/B slot.
 CONFIG_ANDROID_AB=y
-CONFIG_CMD_ANDROID_AB_SELECT=y
+
+# FIXME: Turn off A/B select until we update the device project for A/B
+#        and figure out an efficient partitioing scheme
+#CONFIG_CMD_AB_SELECT=y
 
 # Fastboot and Android image support should be enabled.
 CONFIG_FASTBOOT=y