Merge branch 'master-aosp'

Change-Id: I245a6ebd825abaf8fc6b952e00383a7dc66d2917

5 files changed, 35 insertions, 91 deletions

diff --git a/README b/README
index d322fbed98..51e93c836a 100644
--- a/README
+++ b/README
@@ -1223,57 +1223,6 @@ The following options need to be configured:
 		"bootloader", which often means reboot to fastboot but may also
 		include a UI with a menu.
 
-		CONFIG_ANDROID_BOOT_IMAGE
-		This enables support for booting images which use the Android
-		image format header.
-
-- USB Device Android Fastboot support:
-		CONFIG_USB_FUNCTION_FASTBOOT
-		This enables the USB part of the fastboot gadget
-
-		CONFIG_CMD_FASTBOOT
-		This enables the command "fastboot" which enables the Android
-		fastboot mode for the platform's USB device. Fastboot is a USB
-		protocol for downloading images, flashing and device control
-		used on Android devices.
-		See doc/README.android-fastboot for more information.
-
-		CONFIG_FASTBOOT_BUF_ADDR
-		The fastboot protocol requires a large memory buffer for
-		downloads. Define this to the starting RAM address to use for
-		downloaded images.
-
-		CONFIG_FASTBOOT_BUF_SIZE
-		The fastboot protocol requires a large memory buffer for
-		downloads. This buffer should be as large as possible for a
-		platform. Define this to the size available RAM for fastboot.
-
-		CONFIG_FASTBOOT_FLASH
-		The fastboot protocol includes a "flash" command for writing
-		the downloaded image to a non-volatile storage device. Define
-		this to enable the "fastboot flash" command.
-
-		CONFIG_FASTBOOT_FLASH_MMC_DEV
-		The fastboot "flash" command requires additional information
-		regarding the non-volatile storage device. Define this to
-		the eMMC device that fastboot should use to store the image.
-
-		CONFIG_FASTBOOT_GPT_NAME
-		The fastboot "flash" command supports writing the downloaded
-		image to the Protective MBR and the Primary GUID Partition
-		Table. (Additionally, this downloaded image is post-processed
-		to generate and write the Backup GUID Partition Table.)
-		This occurs when the specified "partition name" on the
-		"fastboot flash" command line matches this value.
-		The default is "gpt" if undefined.
-
-		CONFIG_FASTBOOT_MBR_NAME
-		The fastboot "flash" command supports writing the downloaded
-		image to DOS MBR.
-		This occurs when the "partition name" specified on the
-		"fastboot flash" command line matches this value.
-		If not defined the default value "mbr" is used.
-
 - Journaling Flash filesystem support:
 		CONFIG_JFFS2_NAND
 		Define these for a default partition on a NAND device
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0912fb9933..3c62f0a01d 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -607,6 +607,27 @@ config CMD_ADC
 	  Shows ADC device info and permit printing one-shot analog converted
 	  data from a named Analog to Digital Converter.
 
+config CMD_ANDROID_AB_SELECT
+	bool "android_ab_select"
+	default n
+	depends on ANDROID_AB
+	help
+	  On Android devices with more than one boot slot (multiple copies of
+	  the kernel and system images) this provides a command to select which
+	  slot should be used to boot from and register the boot attempt. This
+	  is used by the new A/B update model where one slot is updated in the
+	  background while running from the other slot.
+
+config CMD_BOOT_ANDROID
+	bool "boot_android"
+	default n
+	depends on ANDROID_BOOTLOADER
+	help
+	  Performs the Android Bootloader boot flow, loading the appropriate
+	  Android image (normal kernel, recovery kernel or "bootloader" mode)
+	  and booting it. The boot mode is determined by the contents of the
+	  Android Bootloader Message.
+
 config CMD_CLK
 	bool "clk - Show clock frequencies"
 	help
@@ -829,34 +850,13 @@ config CMD_LOADS
 	  Load an S-Record file over serial line
 
 config CMD_LOAD_ANDROID
-	bool "load_android"
-	default n
-	depends on ANDROID_BOOT_IMAGE
-	help
-	  Load an Android Boot image from storage. The Android Boot images
-	  define the size and kernel address on the header, which are used by
-	  this command.
-
-config CMD_BOOT_ANDROID
-	bool "boot_android"
-	default n
-	depends on ANDROID_BOOTLOADER
-	help
-	  Performs the Android Bootloader boot flow, loading the appropriate
-	  Android image (normal kernel, recovery kernel or "bootloader" mode)
-	  and booting it. The boot mode is determined by the contents of the
-	  Android Bootloader Message.
-
-config CMD_ANDROID_AB_SELECT
-	bool "android_ab_select"
-	default n
-	depends on ANDROID_AB
-	help
-	  On Android devices with more than one boot slot (multiple copies of
-	  the kernel and system images) this provides a command to select which
-	  slot should be used to boot from and register the boot attempt. This
-	  is used by the new A/B update model where one slot is updated in the
-	  background while running from the other slot.
+       bool "load_android"
+       default n
+       depends on ANDROID_BOOT_IMAGE
+       help
+         Load an Android Boot image from storage. The Android Boot images
+         define the size and kernel address on the header, which are used by
+         this command.
 
 config CMD_MMC
 	bool "mmc"
diff --git a/common/Kconfig b/common/Kconfig
index 1e4db6095b..f68d929386 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -569,6 +569,13 @@ config DISPLAY_BOARDINFO
 	  when U-Boot starts up. The board function checkboard() is called
 	  to do this.
 
+config DISPLAY_BOARDINFO_LATE
+	bool "Display information about the board during late start up"
+	help
+	  Display information about the board that U-Boot is running on after
+	  the relocation phase. The board function checkboard() is called to do
+	  this.
+
 config ANDROID_BOOTLOADER
 	bool "Support for Android Bootloader boot flow"
 	default n
@@ -592,13 +599,6 @@ config ANDROID_AB
 	  allows a bootloader to try a new version of the system but roll back
 	  to previous version if the new one didn't boot all the way.
 
-config DISPLAY_BOARDINFO_LATE
-	bool "Display information about the board during late start up"
-	help
-	  Display information about the board that U-Boot is running on after
-	  the relocation phase. The board function checkboard() is called to do
-	  this.
-
 menu "Start-up hooks"
 
 config ARCH_EARLY_INIT_R
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 43106c7c89..2a5f256184 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -290,9 +290,6 @@ int pl01x_serial_probe(struct udevice *dev)
 	struct pl01x_serial_platdata *plat = dev_get_platdata(dev);
 	struct pl01x_priv *priv = dev_get_priv(dev);
 
-	if (plat->disabled)
-		return -ENODEV;
-
 	priv->regs = (struct pl01x_regs *)plat->base;
 	priv->type = plat->type;
 	if (!plat->skip_init)
diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
index 664f814edb..77d96c49f0 100644
--- a/include/dm/platform_data/serial_pl01x.h
+++ b/include/dm/platform_data/serial_pl01x.h
@@ -19,14 +19,12 @@ enum pl01x_type {
  * @clock: Input clock rate, used for calculating the baud rate divisor
  * @skip_init: Don't attempt to change port configuration (also means @clock
  * is ignored)
- * @disabled: Whether the driver should be disabled and not report any device.
  */
 struct pl01x_serial_platdata {
 	unsigned long base;
 	enum pl01x_type type;
 	unsigned int clock;
 	bool skip_init;
-	bool disabled;
 };
 
 #endif