Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/806025/?format=api
{ "id": 806025, "url": "http://patchwork.ozlabs.org/api/1.2/patches/806025/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1503697827-6331-2-git-send-email-trini@konsulko.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/1.2/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503697827-6331-2-git-send-email-trini@konsulko.com>", "list_archive_url": null, "date": "2017-08-25T21:50:27", "name": "[U-Boot,2/2] Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs", "commit_ref": "48f6232e5897ff1002f2a5a929425da1968ac487", "pull_url": null, "state": "accepted", "archived": false, "hash": "4da136e18291df7d5349e09023d677e073cb37fa", "submitter": { "id": 65875, "url": "http://patchwork.ozlabs.org/api/1.2/people/65875/?format=api", "name": "Tom Rini", "email": "trini@konsulko.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/1.2/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1503697827-6331-2-git-send-email-trini@konsulko.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/806025/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806025/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xfFG944X4z9s7M\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 26 Aug 2017 07:50:40 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid D9725C21FC4; Fri, 25 Aug 2017 21:50:37 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id E347BC21F07;\n\tFri, 25 Aug 2017 21:50:21 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 9C43DC21F07; Fri, 25 Aug 2017 21:50:20 +0000 (UTC)", "from mail-yw0-f194.google.com (mail-yw0-f194.google.com\n\t[209.85.161.194])\n\tby lists.denx.de (Postfix) with ESMTPS id 6131EC21ED7\n\tfor <u-boot@lists.denx.de>; Fri, 25 Aug 2017 21:50:19 +0000 (UTC)", "by mail-yw0-f194.google.com with SMTP id h127so588281ywf.1\n\tfor <u-boot@lists.denx.de>; Fri, 25 Aug 2017 14:50:19 -0700 (PDT)", "from localhost.localdomain (cpe-174-106-0-58.ec.res.rr.com.\n\t[174.106.0.58]) by smtp.gmail.com with ESMTPSA id\n\tv187sm2864689ywb.78.2017.08.25.14.50.16 for <u-boot@lists.denx.de>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Aug 2017 14:50:16 -0700 (PDT)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H3,\n\tRCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no\n\tversion=3.4.0", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=UxTPTiet0pV5DEmwzyw1b83E8pm6blpwhDUBvpUjPz4=;\n\tb=GzXyr+okUKvHPdcWUXzxkHAbZgJsWxlvrw3ZaiDdU76MRwyIk9WPMRScFgjq/Z46Mc\n\tJ9ytLPBhLd5GgqkbahzKKPMia7jra2auZrrob6wZf/eMMlZZBR+bj4NIFn2H2lWXbUy1\n\tK2bcbhs+NaLDFkxgIJBDS4QDLqTGZAlbglZNB6XO6STVD1aHqw37pW5A6iu6b8PtaQ1T\n\tf+Vg+Q4wrZih3EDQ6LSb+3sSwIt5hJnVp23/LsunTd/d520gxE1OAqT0ZwoOw4yHi3fi\n\tKSiZJ0RIvvbSSjyfrbIHQXKL9lyYH38C8ltDdBFotP6wa6WXAbpzM3J9g+3zjeuW1NlN\n\tlyXw==", "X-Gm-Message-State": "AHYfb5gL0MTzVuWE+uLF84Omg4kudMZZr3u9oCQ4my7uxUZkKhry0zJU\n\tnYAG/rQps6vOCSXQ", "X-Received": "by 10.37.184.198 with SMTP id g6mr9526156ybm.32.1503697817219;\n\tFri, 25 Aug 2017 14:50:17 -0700 (PDT)", "From": "Tom Rini <trini@konsulko.com>", "To": "u-boot@lists.denx.de", "Date": "Fri, 25 Aug 2017 17:50:27 -0400", "Message-Id": "<1503697827-6331-2-git-send-email-trini@konsulko.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1503697827-6331-1-git-send-email-trini@konsulko.com>", "References": "<1503697827-6331-1-git-send-email-trini@konsulko.com>", "Subject": "[U-Boot] [PATCH 2/2] Kconfig: Migrate all of cmd/fastboot/Kconfig\n\tto defconfigs", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's\n not strictly part of fastboot.\n- Add some defaults for the fastboot buffer location and size\n- Migrate all options listed in cmd/fastboot/Kconfig\n- Cleanup the README\n\nSigned-off-by: Tom Rini <trini@konsulko.com>\n---\n Kconfig | 7 ++++\n README | 44 ------------------------\n arch/arm/Kconfig | 6 ++++\n cmd/fastboot/Kconfig | 23 +++++++++----\n configs/A13-OLinuXino_defconfig | 2 ++\n configs/A20-OLinuXino-Lime2-eMMC_defconfig | 2 ++\n configs/A20-OLinuXino-Lime2_defconfig | 2 ++\n configs/CHIP_defconfig | 1 +\n configs/CHIP_pro_defconfig | 1 +\n configs/Cubietruck_defconfig | 2 ++\n configs/Nintendo_NES_Classic_Edition_defconfig | 1 +\n configs/Sinlinx_SinA33_defconfig | 2 ++\n configs/am335x_boneblack_defconfig | 2 --\n configs/am335x_boneblack_vboot_defconfig | 2 --\n configs/am335x_evm_defconfig | 2 --\n configs/am335x_evm_nor_defconfig | 2 --\n configs/am335x_evm_norboot_defconfig | 2 --\n configs/am335x_evm_spiboot_defconfig | 2 --\n configs/am335x_evm_usbspl_defconfig | 3 +-\n configs/am335x_hs_evm_defconfig | 1 +\n configs/am57xx_evm_defconfig | 3 +-\n configs/am57xx_evm_nodt_defconfig | 3 +-\n configs/am57xx_hs_evm_defconfig | 3 +-\n configs/bcm23550_w1d_defconfig | 3 +-\n configs/bcm28155_ap_defconfig | 3 +-\n configs/birdland_bav335a_defconfig | 4 +++\n configs/birdland_bav335b_defconfig | 4 +++\n configs/cgtqmx6eval_defconfig | 4 +++\n configs/chromebit_mickey_defconfig | 3 ++\n configs/chromebook_jerry_defconfig | 3 ++\n configs/chromebook_minnie_defconfig | 3 ++\n configs/dra7xx_evm_defconfig | 3 +-\n configs/dra7xx_hs_evm_defconfig | 3 +-\n configs/evb-rk3036_defconfig | 3 ++\n configs/evb-rk3229_defconfig | 3 +-\n configs/evb-rk3288_defconfig | 3 ++\n configs/evb-rk3328_defconfig | 7 ++--\n configs/fennec-rk3288_defconfig | 3 ++\n configs/firefly-rk3288_defconfig | 3 ++\n configs/kc1_defconfig | 7 ++++\n configs/kylin-rk3036_defconfig | 3 ++\n configs/miqi-rk3288_defconfig | 3 ++\n configs/mx6qsabrelite_defconfig | 4 +++\n configs/nitrogen6dl2g_defconfig | 4 +++\n configs/nitrogen6dl_defconfig | 4 +++\n configs/nitrogen6q2g_defconfig | 4 +++\n configs/nitrogen6q_defconfig | 4 +++\n configs/nitrogen6s1g_defconfig | 4 +++\n configs/nitrogen6s_defconfig | 4 +++\n configs/omap3_beagle_defconfig | 4 +++\n configs/omap3_logic_defconfig | 3 ++\n configs/parrot_r16_defconfig | 2 ++\n configs/phycore-rk3288_defconfig | 3 ++\n configs/popmetal-rk3288_defconfig | 3 ++\n configs/rock2_defconfig | 3 ++\n configs/sandbox_defconfig | 1 +\n configs/sandbox_flattree_defconfig | 1 +\n configs/sandbox_noblk_defconfig | 1 +\n configs/sandbox_spl_defconfig | 1 +\n configs/sniper_defconfig | 7 ++++\n configs/tinker-rk3288_defconfig | 3 ++\n configs/xilinx_zynqmp_ep_defconfig | 5 +++\n configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 5 +++\n configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 4 +++\n configs/xilinx_zynqmp_zcu102_revA_defconfig | 5 +++\n configs/xilinx_zynqmp_zcu102_revB_defconfig | 5 +++\n include/configs/am335x_evm.h | 7 ----\n include/configs/am335x_shc.h | 4 ---\n include/configs/am335x_sl50.h | 4 ---\n include/configs/bav335x.h | 11 ------\n include/configs/cgtqmx6eval.h | 6 ----\n include/configs/dra7xx_evm.h | 9 -----\n include/configs/evb_rk3229.h | 1 -\n include/configs/kc1.h | 16 ---------\n include/configs/mx6sabre_common.h | 6 ----\n include/configs/nitrogen6x.h | 6 ----\n include/configs/omap3_beagle.h | 5 ---\n include/configs/omap3_logic.h | 5 ---\n include/configs/rk3036_common.h | 8 -----\n include/configs/rk322x_common.h | 8 -----\n include/configs/rk3288_common.h | 8 -----\n include/configs/sandbox.h | 1 -\n include/configs/sniper.h | 16 ---------\n include/configs/sunxi-common.h | 14 --------\n include/configs/xilinx_zynqmp.h | 10 ------\n 85 files changed, 187 insertions(+), 228 deletions(-)", "diff": "diff --git a/Kconfig b/Kconfig\nindex c48f00ea3695..238fa3e1ed46 100644\n--- a/Kconfig\n+++ b/Kconfig\n@@ -162,6 +162,13 @@ endmenu\t\t# General setup\n \n menu \"Boot images\"\n \n+config ANDROID_BOOT_IMAGE\n+\tbool \"Enable support for Android Boot Images\"\n+\tdefault y if FASTBOOT\n+\thelp\n+\t This enables support for booting images which use the Android\n+\t image format header.\n+\n config FIT\n \tbool \"Support Flattened Image Tree\"\n \tselect MD5\ndiff --git a/README b/README\nindex 392b5fdbbbba..1b31d0e58f5f 100644\n--- a/README\n+++ b/README\n@@ -1242,50 +1242,6 @@ The following options need to be configured:\n \t\tentering dfuMANIFEST state. Host waits this timeout, before\n \t\tsending again an USB request to the device.\n \n-- USB Device Android Fastboot support:\n-\t\tCONFIG_USB_FUNCTION_FASTBOOT\n-\t\tThis enables the USB part of the fastboot gadget\n-\n-\t\tCONFIG_ANDROID_BOOT_IMAGE\n-\t\tThis enables support for booting images which use the Android\n-\t\timage format header.\n-\n-\t\tCONFIG_FASTBOOT_BUF_ADDR\n-\t\tThe fastboot protocol requires a large memory buffer for\n-\t\tdownloads. Define this to the starting RAM address to use for\n-\t\tdownloaded images.\n-\n-\t\tCONFIG_FASTBOOT_BUF_SIZE\n-\t\tThe fastboot protocol requires a large memory buffer for\n-\t\tdownloads. This buffer should be as large as possible for a\n-\t\tplatform. Define this to the size available RAM for fastboot.\n-\n-\t\tCONFIG_FASTBOOT_FLASH\n-\t\tThe fastboot protocol includes a \"flash\" command for writing\n-\t\tthe downloaded image to a non-volatile storage device. Define\n-\t\tthis to enable the \"fastboot flash\" command.\n-\n-\t\tCONFIG_FASTBOOT_FLASH_MMC_DEV\n-\t\tThe fastboot \"flash\" command requires additional information\n-\t\tregarding the non-volatile storage device. Define this to\n-\t\tthe eMMC device that fastboot should use to store the image.\n-\n-\t\tCONFIG_FASTBOOT_GPT_NAME\n-\t\tThe fastboot \"flash\" command supports writing the downloaded\n-\t\timage to the Protective MBR and the Primary GUID Partition\n-\t\tTable. (Additionally, this downloaded image is post-processed\n-\t\tto generate and write the Backup GUID Partition Table.)\n-\t\tThis occurs when the specified \"partition name\" on the\n-\t\t\"fastboot flash\" command line matches this value.\n-\t\tThe default is \"gpt\" if undefined.\n-\n-\t\tCONFIG_FASTBOOT_MBR_NAME\n-\t\tThe fastboot \"flash\" command supports writing the downloaded\n-\t\timage to DOS MBR.\n-\t\tThis occurs when the \"partition name\" specified on the\n-\t\t\"fastboot flash\" command line matches this value.\n-\t\tIf not defined the default value \"mbr\" is used.\n-\n - Journaling Flash filesystem support:\n \t\tCONFIG_JFFS2_NAND\n \t\tDefine these for a default partition on a NAND device\ndiff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\nindex 53d0831935c4..65805f115279 100644\n--- a/arch/arm/Kconfig\n+++ b/arch/arm/Kconfig\n@@ -693,6 +693,8 @@ config ARCH_SUNXI\n \tselect USB_STORAGE if DISTRO_DEFAULTS\n \tselect USB_KEYBOARD if DISTRO_DEFAULTS\n \tselect USE_TINY_PRINTF\n+\timply CMD_FASTBOOT\n+\timply FASTBOOT\n \timply FAT_WRITE\n \timply PRE_CONSOLE_BUFFER\n \timply SPL_GPIO_SUPPORT\n@@ -702,6 +704,7 @@ config ARCH_SUNXI\n \timply SPL_MMC_SUPPORT if MMC\n \timply SPL_POWER_SUPPORT\n \timply SPL_SERIAL_SUPPORT\n+\timply USB_FUNCTION_FASTBOOT\n \n config TARGET_TS4600\n \tbool \"Support TS4600\"\n@@ -1080,7 +1083,10 @@ config ARCH_ROCKCHIP\n \tselect DM_USB if USB\n \tselect DM_PWM\n \tselect DM_REGULATOR\n+\timply CMD_FASTBOOT\n+\timply FASTBOOT\n \timply FAT_WRITE\n+\timply USB_FUNCTION_FASTBOOT\n \n config TARGET_THUNDERX_88XX\n \tbool \"Support ThunderX 88xx\"\ndiff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig\nindex b84529a3744a..fb0c5da94cdb 100644\n--- a/cmd/fastboot/Kconfig\n+++ b/cmd/fastboot/Kconfig\n@@ -2,6 +2,7 @@ comment \"FASTBOOT\"\n \n menuconfig FASTBOOT\n \tbool \"Fastboot support\"\n+\tdepends on USB_GADGET\n \n if FASTBOOT\n \n@@ -20,16 +21,20 @@ config CMD_FASTBOOT\n \n \t See doc/README.android-fastboot for more information.\n \n-config ANDROID_BOOT_IMAGE\n-\tbool \"Enable support for Android Boot Images\"\n-\thelp\n-\t This enables support for booting images which use the Android\n-\t image format header.\n-\n if USB_FUNCTION_FASTBOOT\n \n config FASTBOOT_BUF_ADDR\n \thex \"Define FASTBOOT buffer address\"\n+\tdefault 0x82000000 if MX6SX || MX6SL || MX6UL || MX6SLL\n+\tdefault 0x81000000 if ARCH_OMAP2PLUS\n+\tdefault 0x42000000 if ARCH_SUNXI && !MACH_SUN9I\n+\tdefault 0x22000000 if ARCH_SUNXI && MACH_SUN9I\n+\tdefault 0x60800800 if ROCKCHIP_RK3036 || ROCKCHIP_RK3188 || \\\n+\t\t\t\tROCKCHIP_RK322X\n+\tdefault 0x800800 if ROCKCHIP_RK3288 || ROCKCHIP_RK3329 || \\\n+\t\t\t\tROCKCHIP_RK3399\n+\tdefault 0x280000 if ROCKCHIP_RK3368\n+\tdefault 0x100000 if ARCH_ZYNQMP\n \thelp\n \t The fastboot protocol requires a large memory buffer for\n \t downloads. Define this to the starting RAM address to use for\n@@ -37,6 +42,10 @@ config FASTBOOT_BUF_ADDR\n \n config FASTBOOT_BUF_SIZE\n \thex \"Define FASTBOOT buffer size\"\n+\tdefault 0x8000000 if ARCH_ROCKCHIP\n+\tdefault 0x6000000 if ARCH_ZYNQMP\n+\tdefault 0x2000000 if ARCH_SUNXI\n+\tdefault 0x7000000\n \thelp\n \t The fastboot protocol requires a large memory buffer for\n \t downloads. This buffer should be as large as possible for a\n@@ -59,7 +68,7 @@ config FASTBOOT_FLASH\n \n config FASTBOOT_FLASH_MMC_DEV\n \tint \"Define FASTBOOT MMC FLASH default device\"\n-\tdepends on FASTBOOT_FLASH\n+\tdepends on FASTBOOT_FLASH && MMC\n \thelp\n \t The fastboot \"flash\" command requires additional information\n \t regarding the non-volatile storage device. Define this to\ndiff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig\nindex c6740317027a..fbacce07cf0c 100644\n--- a/configs/A13-OLinuXino_defconfig\n+++ b/configs/A13-OLinuXino_defconfig\n@@ -16,6 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE=\"sun5i-a13-olinuxino\"\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig\nindex 9ef94a9ce426..58aa988b2363 100644\n--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig\n+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig\n@@ -13,6 +13,8 @@ CONFIG_AHCI=y\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig\nindex f22b5738f453..6d7c58861373 100644\n--- a/configs/A20-OLinuXino-Lime2_defconfig\n+++ b/configs/A20-OLinuXino-Lime2_defconfig\n@@ -12,6 +12,8 @@ CONFIG_AHCI=y\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig\nindex 253e2a815d2c..83228bd10f05 100644\n--- a/configs/CHIP_defconfig\n+++ b/configs/CHIP_defconfig\n@@ -7,6 +7,7 @@ CONFIG_VIDEO_COMPOSITE=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sun5i-r8-chip\"\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n CONFIG_CMD_USB_MASS_STORAGE=y\ndiff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig\nindex 8c8003220af2..3a748fc27e07 100644\n--- a/configs/CHIP_pro_defconfig\n+++ b/configs/CHIP_pro_defconfig\n@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"sun5i-gr8-chip-pro\"\n CONFIG_SYS_EXTRA_OPTIONS=\"SYS_NAND_BLOCK_SIZE=0x40000,SYS_NAND_PAGE_SIZE=4096,SYS_NAND_OOBSIZE=256\"\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\n # CONFIG_CMD_FPGA is not set\ndiff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig\nindex 27327b83f3c4..f93ff0d6c463 100644\n--- a/configs/Cubietruck_defconfig\n+++ b/configs/Cubietruck_defconfig\n@@ -14,6 +14,8 @@ CONFIG_AHCI=y\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig\nindex 4ee0b6f1046c..d05375d0dbd5 100644\n--- a/configs/Nintendo_NES_Classic_Edition_defconfig\n+++ b/configs/Nintendo_NES_Classic_Edition_defconfig\n@@ -9,6 +9,7 @@ CONFIG_AXP_GPIO=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sun8i-r16-nintendo-nes-classic-edition\"\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n+CONFIG_FASTBOOT_FLASH=y\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\n # CONFIG_CMD_FPGA is not set\ndiff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig\nindex 4b99beddfffb..af00e5434763 100644\n--- a/configs/Sinlinx_SinA33_defconfig\n+++ b/configs/Sinlinx_SinA33_defconfig\n@@ -14,6 +14,8 @@ CONFIG_VIDEO_LCD_BL_PWM=\"PH0\"\n CONFIG_DEFAULT_DEVICE_TREE=\"sun8i-a33-sinlinx-sina33\"\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig\nindex 42d49e52bcb7..b8526fc15ed3 100644\n--- a/configs/am335x_boneblack_defconfig\n+++ b/configs/am335x_boneblack_defconfig\n@@ -19,8 +19,6 @@ CONFIG_AUTOBOOT_DELAY_STR=\"d\"\n CONFIG_AUTOBOOT_STOP_STR=\" \"\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig\nindex 17bcbf2ba25d..0a239bb73399 100644\n--- a/configs/am335x_boneblack_vboot_defconfig\n+++ b/configs/am335x_boneblack_vboot_defconfig\n@@ -22,8 +22,6 @@ CONFIG_AUTOBOOT_DELAY_STR=\"d\"\n CONFIG_AUTOBOOT_STOP_STR=\" \"\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig\nindex 9f88a42cdc98..00c1af43449d 100644\n--- a/configs/am335x_evm_defconfig\n+++ b/configs/am335x_evm_defconfig\n@@ -16,8 +16,6 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n CONFIG_CMD_SPL_NAND_OFS=0x00080000\ndiff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig\nindex 6cccf5e3649f..9f08edff4ca5 100644\n--- a/configs/am335x_evm_nor_defconfig\n+++ b/configs/am335x_evm_nor_defconfig\n@@ -15,8 +15,6 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n CONFIG_CMD_SPL_NAND_OFS=0x00080000\ndiff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig\nindex f8301041852b..c5e7425a7797 100644\n--- a/configs/am335x_evm_norboot_defconfig\n+++ b/configs/am335x_evm_norboot_defconfig\n@@ -13,8 +13,6 @@ CONFIG_ARCH_MISC_INIT=y\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_SETEXPR is not set\n CONFIG_CMD_MTDPARTS=y\ndiff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig\nindex 23a0d32b0614..501fb2b90f4d 100644\n--- a/configs/am335x_evm_spiboot_defconfig\n+++ b/configs/am335x_evm_spiboot_defconfig\n@@ -17,8 +17,6 @@ CONFIG_SPL_STACK_R=y\n CONFIG_SPL_MUSB_NEW_SUPPORT=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\n # CONFIG_CMD_SETEXPR is not set\ndiff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig\nindex 666b6323f034..7c351382d96c 100644\n--- a/configs/am335x_evm_usbspl_defconfig\n+++ b/configs/am335x_evm_usbspl_defconfig\n@@ -5,6 +5,7 @@ CONFIG_AM33XX=y\n # CONFIG_SPL_NAND_SUPPORT is not set\n CONFIG_SPL_STACK_R_ADDR=0x82000000\n CONFIG_DISTRO_DEFAULTS=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_VERSION_VARIABLE=y\n CONFIG_ARCH_MISC_INIT=y\n@@ -18,8 +19,6 @@ CONFIG_SPL_USBETH_SUPPORT=y\n # CONFIG_SPL_YMODEM_SUPPORT is not set\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x81000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x07000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n CONFIG_CMD_SPL_NAND_OFS=0x00080000\ndiff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig\nindex dabfcbb9ba5e..acdd56b43558 100644\n--- a/configs/am335x_hs_evm_defconfig\n+++ b/configs/am335x_hs_evm_defconfig\n@@ -8,6 +8,7 @@ CONFIG_ISW_ENTRY_ADDR=0x40300350\n CONFIG_SPL_STACK_R_ADDR=0x82000000\n CONFIG_DEFAULT_DEVICE_TREE=\"am335x-evm\"\n CONFIG_DISTRO_DEFAULTS=y\n+CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FIT_IMAGE_POST_PROCESS=y\n CONFIG_SPL_LOAD_FIT=y\n CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y\ndiff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig\nindex 008cdc542aaf..dfd7eb517ce7 100644\n--- a/configs/am57xx_evm_defconfig\n+++ b/configs/am57xx_evm_defconfig\n@@ -24,9 +24,8 @@ CONFIG_SPL_OS_BOOT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x2f000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000\n CONFIG_FASTBOOT_USB_DEV=1\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\ndiff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig\nindex 555e3cceee3a..2a340a144a73 100644\n--- a/configs/am57xx_evm_nodt_defconfig\n+++ b/configs/am57xx_evm_nodt_defconfig\n@@ -15,9 +15,8 @@ CONFIG_HUSH_PARSER=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n CONFIG_CMD_FASTBOOT=y\n-CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x2f000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000\n CONFIG_FASTBOOT_USB_DEV=1\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\ndiff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig\nindex 931d9649d135..372cd4dc9d18 100644\n--- a/configs/am57xx_hs_evm_defconfig\n+++ b/configs/am57xx_hs_evm_defconfig\n@@ -29,9 +29,8 @@ CONFIG_SPL_DMA_SUPPORT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x2f000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000\n CONFIG_FASTBOOT_USB_DEV=1\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\ndiff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig\nindex 4895449258cc..70918654f5ca 100644\n--- a/configs/bcm23550_w1d_defconfig\n+++ b/configs/bcm23550_w1d_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_ARM=y\n CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y\n CONFIG_TARGET_BCM23550_W1D=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_VERSION_VARIABLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n # CONFIG_DISPLAY_BOARDINFO is not set\n@@ -9,7 +10,7 @@ CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n CONFIG_CMD_FASTBOOT=y\n CONFIG_FASTBOOT_BUF_ADDR=0x80000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x1d000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x1D000000\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n CONFIG_CMD_BOOTZ=y\ndiff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig\nindex 10fa2981dd8c..db1ad401324f 100644\n--- a/configs/bcm28155_ap_defconfig\n+++ b/configs/bcm28155_ap_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_ARM=y\n CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y\n CONFIG_TARGET_BCM28155_AP=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_VERSION_VARIABLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n # CONFIG_DISPLAY_BOARDINFO is not set\n@@ -10,7 +11,7 @@ CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n CONFIG_CMD_FASTBOOT=y\n CONFIG_FASTBOOT_BUF_ADDR=0x80000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x7ff00000\n+CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n CONFIG_CMD_BOOTZ=y\ndiff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig\nindex 2e6c8a6fa675..44f4eac6f63b 100644\n--- a/configs/birdland_bav335a_defconfig\n+++ b/configs/birdland_bav335a_defconfig\n@@ -23,6 +23,10 @@ CONFIG_SPL_OS_BOOT=y\n CONFIG_SPL_POWER_SUPPORT=y\n CONFIG_SPL_YMODEM_SUPPORT=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\ndiff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig\nindex 868924e6ef47..1dffd1a1950d 100644\n--- a/configs/birdland_bav335b_defconfig\n+++ b/configs/birdland_bav335b_defconfig\n@@ -23,6 +23,10 @@ CONFIG_SPL_OS_BOOT=y\n CONFIG_SPL_POWER_SUPPORT=y\n CONFIG_SPL_YMODEM_SUPPORT=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\ndiff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig\nindex 2dd57642fe59..18f2ff848b44 100644\n--- a/configs/cgtqmx6eval_defconfig\n+++ b/configs/cgtqmx6eval_defconfig\n@@ -23,6 +23,10 @@ CONFIG_SPL_EXT_SUPPORT=y\n CONFIG_SPL_I2C_SUPPORT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_SYS_PROMPT=\"CGT-QMX6-Quad U-Boot > \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_DFU=y\ndiff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig\nindex b3438b5348f5..f40c0b9afa7d 100644\n--- a/configs/chromebit_mickey_defconfig\n+++ b/configs/chromebit_mickey_defconfig\n@@ -9,9 +9,12 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-veyron-mickey\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig\nindex 2b2cf490fe4e..cdeabaa12aa6 100644\n--- a/configs/chromebook_jerry_defconfig\n+++ b/configs/chromebook_jerry_defconfig\n@@ -9,11 +9,14 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-veyron-jerry\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig\nindex b281618298cc..c1e36fa8601d 100644\n--- a/configs/chromebook_minnie_defconfig\n+++ b/configs/chromebook_minnie_defconfig\n@@ -9,10 +9,13 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-veyron-minnie\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig\nindex 01b79397ce99..dbf14a9afeef 100644\n--- a/configs/dra7xx_evm_defconfig\n+++ b/configs/dra7xx_evm_defconfig\n@@ -24,9 +24,8 @@ CONFIG_SPL_OS_BOOT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x2f000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\n # CONFIG_CMD_IMLS is not set\ndiff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig\nindex 568136ea767f..97182e5c7413 100644\n--- a/configs/dra7xx_hs_evm_defconfig\n+++ b/configs/dra7xx_hs_evm_defconfig\n@@ -29,9 +29,8 @@ CONFIG_SPL_DMA_SUPPORT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_FASTBOOT=y\n CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n-CONFIG_FASTBOOT_BUF_SIZE=0x2f000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\n # CONFIG_CMD_IMLS is not set\ndiff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig\nindex 6e2f7bc877d5..5a53951314e2 100644\n--- a/configs/evb-rk3036_defconfig\n+++ b/configs/evb-rk3036_defconfig\n@@ -9,8 +9,11 @@ CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3036-sdk\"\n CONFIG_DEBUG_UART=y\n CONFIG_SPL_SYS_MALLOC_F_LEN=0x0\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPT=y\n CONFIG_CMD_I2C=y\ndiff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig\nindex 0e9cea784718..5a658a149522 100644\n--- a/configs/evb-rk3229_defconfig\n+++ b/configs/evb-rk3229_defconfig\n@@ -12,7 +12,8 @@ CONFIG_DEBUG_UART=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200\n-CONFIG_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPT=y\n CONFIG_CMD_MMC=y\ndiff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig\nindex 3bbb73275487..5294ba9f5feb 100644\n--- a/configs/evb-rk3288_defconfig\n+++ b/configs/evb-rk3288_defconfig\n@@ -7,10 +7,13 @@ CONFIG_TARGET_EVB_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-evb\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig\nindex 5fd8553f3fbc..7bec00178692 100644\n--- a/configs/evb-rk3328_defconfig\n+++ b/configs/evb-rk3328_defconfig\n@@ -3,13 +3,10 @@ CONFIG_ARCH_ROCKCHIP=y\n CONFIG_ROCKCHIP_RK3328=y\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3328-evb\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_FIT=y\n # CONFIG_DISPLAY_CPUINFO is not set\n-CONFIG_FASTBOOT=y\n-CONFIG_USB_FUNCTION_FASTBOOT=y\n-CONFIG_CMD_FASTBOOT=y\n-CONFIG_FASTBOOT_BUF_ADDR=0x00800800\n-CONFIG_FASTBOOT_BUF_SIZE=0x08000000\n+CONFIG_FASTBOOT_BUF_ADDR=0x800800\n CONFIG_FASTBOOT_FLASH=y\n CONFIG_FASTBOOT_FLASH_MMC_DEV=1\n CONFIG_CMD_BOOTZ=y\ndiff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig\nindex a52f1f5beb0b..e00b62db307f 100644\n--- a/configs/fennec-rk3288_defconfig\n+++ b/configs/fennec-rk3288_defconfig\n@@ -7,11 +7,14 @@ CONFIG_TARGET_FENNEC_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-fennec\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n CONFIG_CONSOLE_MUX=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig\nindex 2e12c06284fa..930d6d8dcbf1 100644\n--- a/configs/firefly-rk3288_defconfig\n+++ b/configs/firefly-rk3288_defconfig\n@@ -7,10 +7,13 @@ CONFIG_TARGET_FIREFLY_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-firefly\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/kc1_defconfig b/configs/kc1_defconfig\nindex e252d579a1ca..d9c2efcf7cbe 100644\n--- a/configs/kc1_defconfig\n+++ b/configs/kc1_defconfig\n@@ -11,6 +11,13 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y\n CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2\n CONFIG_HUSH_PARSER=y\n CONFIG_SYS_PROMPT=\"kc1 # \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2000000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig\nindex 100e73abcc60..ab36b48db751 100644\n--- a/configs/kylin-rk3036_defconfig\n+++ b/configs/kylin-rk3036_defconfig\n@@ -8,8 +8,11 @@ CONFIG_TARGET_KYLIN_RK3036=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3036-sdk\"\n CONFIG_SPL_SYS_MALLOC_F_LEN=0x0\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPT=y\n CONFIG_CMD_I2C=y\ndiff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig\nindex 3988e3fbdec2..b669c8cb3227 100644\n--- a/configs/miqi-rk3288_defconfig\n+++ b/configs/miqi-rk3288_defconfig\n@@ -7,10 +7,13 @@ CONFIG_TARGET_MIQI_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-miqi\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig\nindex a3699a2604e6..57aba7e6d09a 100644\n--- a/configs/mx6qsabrelite_defconfig\n+++ b/configs/mx6qsabrelite_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig\nindex 1062aa14d587..50e6b70bc9a0 100644\n--- a/configs/nitrogen6dl2g_defconfig\n+++ b/configs/nitrogen6dl2g_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig\nindex a2d85781c8aa..61e5ea4e21ef 100644\n--- a/configs/nitrogen6dl_defconfig\n+++ b/configs/nitrogen6dl_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig\nindex 41c118256c88..9dbb7181ee23 100644\n--- a/configs/nitrogen6q2g_defconfig\n+++ b/configs/nitrogen6q2g_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig\nindex 9e185cca5ee5..5478390fd8c3 100644\n--- a/configs/nitrogen6q_defconfig\n+++ b/configs/nitrogen6q_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig\nindex 998d05a95b51..01881686429b 100644\n--- a/configs/nitrogen6s1g_defconfig\n+++ b/configs/nitrogen6s1g_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig\nindex c67d3fa47be5..51f1f91be854 100644\n--- a/configs/nitrogen6s_defconfig\n+++ b/configs/nitrogen6s_defconfig\n@@ -9,6 +9,10 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y\n # CONFIG_SYS_STDIO_DEREGISTER is not set\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_HUSH_PARSER=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x12000000\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig\nindex 678fb911bd3c..091979e2d4b2 100644\n--- a/configs/omap3_beagle_defconfig\n+++ b/configs/omap3_beagle_defconfig\n@@ -8,6 +8,10 @@ CONFIG_VERSION_VARIABLE=y\n CONFIG_SPL=y\n CONFIG_SPL_MTD_SUPPORT=y\n CONFIG_SPL_OS_BOOT=y\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\n CONFIG_CMD_SPL_NAND_OFS=0x240000\ndiff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig\nindex 731415803e2b..dd4e23770fbb 100644\n--- a/configs/omap3_logic_defconfig\n+++ b/configs/omap3_logic_defconfig\n@@ -14,6 +14,9 @@ CONFIG_SPL_MTD_SUPPORT=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_HUSH_PARSER=y\n CONFIG_SYS_PROMPT=\"OMAP Logic # \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n # CONFIG_CMD_IMI is not set\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_SPL=y\ndiff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig\nindex 0dea72ebe482..53825eba33c3 100644\n--- a/configs/parrot_r16_defconfig\n+++ b/configs/parrot_r16_defconfig\n@@ -12,6 +12,8 @@ CONFIG_AXP_GPIO=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sun8i-r16-parrot\"\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_SPL=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\n # CONFIG_CMD_FPGA is not set\ndiff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig\nindex 25bf3bc788a2..17855a94b53c 100644\n--- a/configs/phycore-rk3288_defconfig\n+++ b/configs/phycore-rk3288_defconfig\n@@ -7,6 +7,7 @@ CONFIG_TARGET_PHYCORE_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-phycore-rdk\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n CONFIG_CONSOLE_MUX=y\n # CONFIG_DISPLAY_CPUINFO is not set\n@@ -14,6 +15,8 @@ CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n CONFIG_SPL_I2C_SUPPORT=y\n CONFIG_SPL_POWER_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig\nindex 40c75afe2a10..e9bd0c4f5e38 100644\n--- a/configs/popmetal-rk3288_defconfig\n+++ b/configs/popmetal-rk3288_defconfig\n@@ -7,11 +7,14 @@ CONFIG_TARGET_POPMETAL_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-popmetal\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n CONFIG_CONSOLE_MUX=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/rock2_defconfig b/configs/rock2_defconfig\nindex 2ef92b962546..b41644ef5fb3 100644\n--- a/configs/rock2_defconfig\n+++ b/configs/rock2_defconfig\n@@ -7,10 +7,13 @@ CONFIG_TARGET_ROCK2=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-rock2-square\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig\nindex 758ea32e335e..d0f9841e38d9 100644\n--- a/configs/sandbox_defconfig\n+++ b/configs/sandbox_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sandbox\"\n CONFIG_DISTRO_DEFAULTS=y\n+CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FIT=y\n CONFIG_FIT_SIGNATURE=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig\nindex ef25a4af6917..7a5a921322b7 100644\n--- a/configs/sandbox_flattree_defconfig\n+++ b/configs/sandbox_flattree_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sandbox\"\n CONFIG_DISTRO_DEFAULTS=y\n+CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FIT=y\n CONFIG_FIT_SIGNATURE=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig\nindex debe289b8dd1..e152917fe431 100644\n--- a/configs/sandbox_noblk_defconfig\n+++ b/configs/sandbox_noblk_defconfig\n@@ -1,5 +1,6 @@\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sandbox\"\n+CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FIT=y\n CONFIG_FIT_SIGNATURE=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig\nindex b76beb4df5a1..08c11591ed0c 100644\n--- a/configs/sandbox_spl_defconfig\n+++ b/configs/sandbox_spl_defconfig\n@@ -6,6 +6,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y\n CONFIG_SANDBOX_SPL=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sandbox\"\n CONFIG_DISTRO_DEFAULTS=y\n+CONFIG_ANDROID_BOOT_IMAGE=y\n CONFIG_FIT=y\n CONFIG_FIT_SIGNATURE=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/sniper_defconfig b/configs/sniper_defconfig\nindex 63c9f7f98f04..f24153b56fd3 100644\n--- a/configs/sniper_defconfig\n+++ b/configs/sniper_defconfig\n@@ -12,6 +12,13 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2\n # CONFIG_SPL_EXT_SUPPORT is not set\n CONFIG_HUSH_PARSER=y\n CONFIG_SYS_PROMPT=\"sniper # \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_BUF_ADDR=0x82000000\n+CONFIG_FASTBOOT_BUF_SIZE=0x2000000\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n CONFIG_CMD_BOOTZ=y\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_FLASH is not set\ndiff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig\nindex 78e4fc657061..1d3678fc0432 100644\n--- a/configs/tinker-rk3288_defconfig\n+++ b/configs/tinker-rk3288_defconfig\n@@ -7,12 +7,15 @@ CONFIG_TARGET_TINKER_RK3288=y\n CONFIG_SPL_STACK_R_ADDR=0x80000\n CONFIG_DEFAULT_DEVICE_TREE=\"rk3288-tinker\"\n CONFIG_DEBUG_UART=y\n+# CONFIG_ANDROID_BOOT_IMAGE is not set\n CONFIG_SILENT_CONSOLE=y\n CONFIG_CONSOLE_MUX=y\n # CONFIG_DISPLAY_CPUINFO is not set\n CONFIG_SPL_STACK_R=y\n CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000\n CONFIG_SPL_I2C_SUPPORT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_GPIO=y\n CONFIG_CMD_GPT=y\ndiff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig\nindex c43f03273c68..c3ba5bf63242 100644\n--- a/configs/xilinx_zynqmp_ep_defconfig\n+++ b/configs/xilinx_zynqmp_ep_defconfig\n@@ -17,6 +17,11 @@ CONFIG_SPL=y\n CONFIG_SPL_SYS_MALLOC_SIMPLE=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_SYS_PROMPT=\"ZynqMP> \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_CONSOLE is not set\n # CONFIG_CMD_IMLS is not set\n # CONFIG_CMD_XIMG is not set\ndiff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\nindex 90c090451ea9..588b15430bf6 100644\n--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\n+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\n@@ -18,6 +18,11 @@ CONFIG_SPL=y\n CONFIG_SPL_SYS_MALLOC_SIMPLE=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_SYS_PROMPT=\"ZynqMP> \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_THOR_DOWNLOAD=y\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\nindex ca61c6dcd340..0a3ac9dbeadc 100644\n--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\n+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\n@@ -19,6 +19,10 @@ CONFIG_SPL=y\n CONFIG_SPL_SYS_MALLOC_SIMPLE=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_SYS_PROMPT=\"ZynqMP> \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_THOR_DOWNLOAD=y\n CONFIG_CMD_MEMTEST=y\ndiff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig\nindex 22feaf03ca4f..ee0beda47a8e 100644\n--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig\n+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig\n@@ -18,6 +18,11 @@ CONFIG_SPL=y\n CONFIG_SPL_SYS_MALLOC_SIMPLE=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_SYS_PROMPT=\"ZynqMP> \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_THOR_DOWNLOAD=y\n CONFIG_CMD_EEPROM=y\ndiff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig\nindex 6a6e9780a789..e47e4bf6e5e1 100644\n--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig\n+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig\n@@ -18,6 +18,11 @@ CONFIG_SPL=y\n CONFIG_SPL_SYS_MALLOC_SIMPLE=y\n CONFIG_SPL_OS_BOOT=y\n CONFIG_SYS_PROMPT=\"ZynqMP> \"\n+CONFIG_FASTBOOT=y\n+CONFIG_USB_FUNCTION_FASTBOOT=y\n+CONFIG_CMD_FASTBOOT=y\n+CONFIG_FASTBOOT_FLASH=y\n+CONFIG_FASTBOOT_FLASH_MMC_DEV=0\n # CONFIG_CMD_IMLS is not set\n CONFIG_CMD_THOR_DOWNLOAD=y\n CONFIG_CMD_EEPROM=y\ndiff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h\nindex 973f63f891b7..415ce46e0d8d 100644\n--- a/include/configs/am335x_evm.h\n+++ b/include/configs/am335x_evm.h\n@@ -263,13 +263,6 @@\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_HOST\n \n-#ifndef CONFIG_SPL_USBETH_SUPPORT\n-/* Fastboot */\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1\n-#endif\n-\n #ifdef CONFIG_USB_MUSB_GADGET\n #define CONFIG_USB_ETHER\n #define CONFIG_USB_ETH_RNDIS\ndiff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h\nindex 3fdbfdcdc670..2eeb3d1420b0 100644\n--- a/include/configs/am335x_shc.h\n+++ b/include/configs/am335x_shc.h\n@@ -246,10 +246,6 @@\n \n /* SPL */\n \n-#ifndef CONFIG_SPL_USBETH_SUPPORT\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1\n-#endif\n-\n /*\n * Disable MMC DM for SPL build and can be re-enabled after adding\n * DM support in SPL\ndiff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h\nindex 62af3fa9ff49..b1c7ede7df0f 100644\n--- a/include/configs/am335x_sl50.h\n+++ b/include/configs/am335x_sl50.h\n@@ -78,10 +78,6 @@\n #define CONFIG_BOOTCOUNT_AM33XX\n #define CONFIG_SYS_BOOTCOUNT_BE\n \n-#ifndef CONFIG_SPL_USBETH_SUPPORT\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1\n-#endif\n-\n #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)\n /* Remove other SPL modes. */\n /* disable host part of MUSB in SPL */\ndiff --git a/include/configs/bav335x.h b/include/configs/bav335x.h\nindex c824ebde27e6..062c99c7ab43 100644\n--- a/include/configs/bav335x.h\n+++ b/include/configs/bav335x.h\n@@ -420,17 +420,6 @@ DEFAULT_LINUX_BOOT_ENV \\\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_HOST\n \n-#ifndef CONFIG_SPL_USBETH_SUPPORT\n-/* Fastboot */\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x07000000\n-\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1\n-#endif\n-\n #ifdef CONFIG_USB_MUSB_GADGET\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #endif /* CONFIG_USB_MUSB_GADGET */\ndiff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h\nindex a2ce9771adee..ad24f78a5754 100644\n--- a/include/configs/cgtqmx6eval.h\n+++ b/include/configs/cgtqmx6eval.h\n@@ -72,12 +72,6 @@\n \n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n \n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000\n-\n /* Framebuffer */\n #define CONFIG_VIDEO_IPUV3\n #define CONFIG_VIDEO_BMP_RLE8\ndiff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h\nindex efe63daf269f..6c0fc35d3a35 100644\n--- a/include/configs/dra7xx_evm.h\n+++ b/include/configs/dra7xx_evm.h\n@@ -76,15 +76,6 @@\n \tDFU_ALT_INFO_EMMC \\\n \tDFU_ALT_INFO_RAM \\\n \tDFU_ALT_INFO_QSPI\n-#else\n-/* Discard fastboot in SPL build, to spare some space */\n-#undef CONFIG_FASTBOOT\n-#undef CONFIG_USB_FUNCTION_FASTBOOT\n-#undef CONFIG_CMD_FASTBOOT\n-#undef CONFIG_ANDROID_BOOT_IMAGE\n-#undef CONFIG_FASTBOOT_BUF_ADDR\n-#undef CONFIG_FASTBOOT_BUF_SIZE\n-#undef CONFIG_FASTBOOT_FLASH\n #endif\n \n #ifdef CONFIG_SPL_BUILD\ndiff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h\nindex 6e1fd1c29303..8906c8f0b1a7 100644\n--- a/include/configs/evb_rk3229.h\n+++ b/include/configs/evb_rk3229.h\n@@ -40,7 +40,6 @@\n \n #define CONFIG_PREBOOT\n \n-#define CONFIG_ANDROID_BOOT_IMAGE\n #define CONFIG_SYS_BOOT_RAMDISK_HIGH\n \n #undef CONFIG_BOOTCOMMAND\ndiff --git a/include/configs/kc1.h b/include/configs/kc1.h\nindex 36c01c0e0577..49b24d1e8c3c 100644\n--- a/include/configs/kc1.h\n+++ b/include/configs/kc1.h\n@@ -122,20 +122,6 @@\n #define CONFIG_USB_MUSB_OMAP2PLUS\n \n /*\n- * Fastboot\n- */\n-\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x2000000\n-\n-#define CONFIG_FASTBOOT_FLASH\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t0\n-\n-#define CONFIG_CMD_FASTBOOT\n-\n-/*\n * Environment\n */\n \n@@ -175,8 +161,6 @@\n \n #define CONFIG_SYS_LOAD_ADDR\t0x82000000\n \n-#define CONFIG_ANDROID_BOOT_IMAGE\n-\n #define CONFIG_BOOTCOMMAND \\\n \t\"setenv boot_mmc_part ${kernel_mmc_part}; \" \\\n \t\"if test reboot-${reboot-mode} = reboot-r; then \" \\\ndiff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h\nindex b849eea48998..036c76d950a4 100644\n--- a/include/configs/mx6sabre_common.h\n+++ b/include/configs/mx6sabre_common.h\n@@ -217,12 +217,6 @@\n #define CONFIG_USBD_HS\n \n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n-\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000\n #endif\n \n #endif /* __MX6QSABRE_COMMON_CONFIG_H */\ndiff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h\nindex 2d533c16b98c..be772ed27cc1 100644\n--- a/include/configs/nitrogen6x.h\n+++ b/include/configs/nitrogen6x.h\n@@ -290,10 +290,4 @@\n \n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n \n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000\n-\n #endif\t /* __CONFIG_H */\ndiff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h\nindex 33d29b56926d..89880916e523 100644\n--- a/include/configs/omap3_beagle.h\n+++ b/include/configs/omap3_beagle.h\n@@ -48,11 +48,6 @@\n #define CONFIG_TWL4030_USB\t\t1\n #define CONFIG_USB_ETHER\n #define CONFIG_USB_ETHER_RNDIS\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x07000000\n \n /* USB EHCI */\n \ndiff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h\nindex b4311ab13b67..67b5562da18f 100644\n--- a/include/configs/omap3_logic.h\n+++ b/include/configs/omap3_logic.h\n@@ -59,11 +59,6 @@\n #define CONFIG_USB_MUSB_PIO_ONLY\n #define CONFIG_USB_ETHER\n #define CONFIG_USB_ETHER_RNDIS\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x07000000\n \n /* TWL4030 */\n #define CONFIG_TWL4030_USB\ndiff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h\nindex f9b6e8926e26..d78de6012aed 100644\n--- a/include/configs/rk3036_common.h\n+++ b/include/configs/rk3036_common.h\n@@ -48,14 +48,6 @@\n #ifndef CONFIG_SPL_BUILD\n /* usb otg */\n \n-/* fastboot */\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_FASTBOOT_FLASH\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t0\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x08000000\n-\n /* usb mass storage */\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #define CONFIG_CMD_USB_MASS_STORAGE\ndiff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h\nindex a49fba8f9cce..224687643009 100644\n--- a/include/configs/rk322x_common.h\n+++ b/include/configs/rk322x_common.h\n@@ -42,14 +42,6 @@\n #ifndef CONFIG_SPL_BUILD\n /* usb otg */\n \n-/* fastboot */\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_FASTBOOT_FLASH\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t0\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x08000000\n-\n /* usb mass storage */\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #define CONFIG_CMD_USB_MASS_STORAGE\ndiff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h\nindex 49aa4fc729cb..dfdb500763d5 100644\n--- a/include/configs/rk3288_common.h\n+++ b/include/configs/rk3288_common.h\n@@ -58,14 +58,6 @@\n /* usb otg */\n #define CONFIG_ROCKCHIP_USB2_PHY\n \n-/* fastboot */\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_FASTBOOT_FLASH\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t1\t/* eMMC */\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x08000000\n-\n /* usb mass storage */\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #define CONFIG_CMD_USB_MASS_STORAGE\ndiff --git a/include/configs/sandbox.h b/include/configs/sandbox.h\nindex f7908034d319..720a6ce5166a 100644\n--- a/include/configs/sandbox.h\n+++ b/include/configs/sandbox.h\n@@ -24,7 +24,6 @@\n #endif\n \n #define CONFIG_LMB\n-#define CONFIG_ANDROID_BOOT_IMAGE\n \n #define CONFIG_FS_EXT4\n #define CONFIG_EXT4_WRITE\ndiff --git a/include/configs/sniper.h b/include/configs/sniper.h\nindex 2306e7cdb967..54c312f7d29d 100644\n--- a/include/configs/sniper.h\n+++ b/include/configs/sniper.h\n@@ -122,20 +122,6 @@\n #define CONFIG_TWL4030_USB\n \n /*\n- * Fastboot\n- */\n-\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n-\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x2000000\n-\n-#define CONFIG_FASTBOOT_FLASH\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t0\n-\n-#define CONFIG_CMD_FASTBOOT\n-\n-/*\n * Environment\n */\n \n@@ -175,8 +161,6 @@\n \n #define CONFIG_SYS_LOAD_ADDR\t0x82000000\n \n-#define CONFIG_ANDROID_BOOT_IMAGE\n-\n #define CONFIG_BOOTCOMMAND \\\n \t\"setenv boot_mmc_part ${kernel_mmc_part}; \" \\\n \t\"if test reboot-${reboot-mode} = reboot-r; then \" \\\ndiff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h\nindex 24ea5e74555a..1c21d5d5c142 100644\n--- a/include/configs/sunxi-common.h\n+++ b/include/configs/sunxi-common.h\n@@ -311,23 +311,9 @@ extern int soft_i2c_gpio_scl;\n #endif\n \n #ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_FUNCTION_FASTBOOT\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #endif\n \n-#ifdef CONFIG_USB_FUNCTION_FASTBOOT\n-#define CONFIG_CMD_FASTBOOT\n-#define CONFIG_FASTBOOT_BUF_ADDR\tCONFIG_SYS_LOAD_ADDR\n-#define CONFIG_FASTBOOT_BUF_SIZE\t0x2000000\n-#define CONFIG_ANDROID_BOOT_IMAGE\n-\n-#define CONFIG_FASTBOOT_FLASH\n-\n-#ifdef CONFIG_MMC\n-#define CONFIG_FASTBOOT_FLASH_MMC_DEV\t0\n-#endif\n-#endif\n-\n #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE\n #endif\n \ndiff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h\nindex 6dcc8e59d80d..b382d84451ca 100644\n--- a/include/configs/xilinx_zynqmp.h\n+++ b/include/configs/xilinx_zynqmp.h\n@@ -103,16 +103,6 @@\n \t\tDFU_ALT_INFO_RAM\n \n #ifndef CONFIG_SPL_BUILD\n-# define CONFIG_USB_FUNCTION_FASTBOOT\n-# define CONFIG_CMD_FASTBOOT\n-# define CONFIG_ANDROID_BOOT_IMAGE\n-# define CONFIG_FASTBOOT_BUF_ADDR 0x100000\n-# define CONFIG_FASTBOOT_BUF_SIZE 0x6000000\n-# define CONFIG_FASTBOOT_FLASH\n-# ifdef CONFIG_MMC_SDHCI_ZYNQ\n-# define CONFIG_FASTBOOT_FLASH_MMC_DEV 0\n-# endif\n-\n # define CONFIG_RANDOM_UUID\n # define PARTS_DEFAULT \\\n \t\"partitions=uuid_disk=${uuid_gpt_disk};\" \\\n", "prefixes": [ "U-Boot", "2/2" ] }