summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Strachan2018-12-26 12:39:23 -0600
committerAlistair Strachan2018-12-28 15:17:37 -0600
commit0e1d7b7eb42d5e0ba69adaf542e071b798476e3e (patch)
treecb274a92d1b17c411482307adac46dca5597a31b
parent2580354eb8b478f93e34e15e6b318c5de55cdac2 (diff)
downloaddevice-ti-beagle-x15-0e1d7b7eb42d5e0ba69adaf542e071b798476e3e.tar.gz
device-ti-beagle-x15-0e1d7b7eb42d5e0ba69adaf542e071b798476e3e.tar.xz
device-ti-beagle-x15-0e1d7b7eb42d5e0ba69adaf542e071b798476e3e.zip
Staging changes for u-boot 2019.01-rc2 upgrade.
Change-Id: I1adfa5c99e1712e3a85565e8e2db0522066c3237 Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--uboot_config/common.config6
1 files changed, 4 insertions, 2 deletions
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 @@ CONFIG_AUTOBOOT=y
23 23
24# Add support for Android Images. 24# Add support for Android Images.
25CONFIG_ANDROID_BOOT_IMAGE=y 25CONFIG_ANDROID_BOOT_IMAGE=y
26CONFIG_CMD_LOAD_ANDROID=y
27 26
28# Support for Android Bootloader is required. 27# Support for Android Bootloader is required.
29CONFIG_ANDROID_BOOTLOADER=y 28CONFIG_ANDROID_BOOTLOADER=y
@@ -31,7 +30,10 @@ CONFIG_CMD_BOOT_ANDROID=y
31 30
32# Support for selecting the A/B slot. 31# Support for selecting the A/B slot.
33CONFIG_ANDROID_AB=y 32CONFIG_ANDROID_AB=y
34CONFIG_CMD_ANDROID_AB_SELECT=y 33
34# FIXME: Turn off A/B select until we update the device project for A/B
35# and figure out an efficient partitioing scheme
36#CONFIG_CMD_AB_SELECT=y
35 37
36# Fastboot and Android image support should be enabled. 38# Fastboot and Android image support should be enabled.
37CONFIG_FASTBOOT=y 39CONFIG_FASTBOOT=y