From patchwork Wed Nov 5 21:29:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 407167 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 582D514003E for ; Thu, 6 Nov 2014 08:30:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 922654BE6D; Wed, 5 Nov 2014 22:30:08 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id re4nyhVTAnve; Wed, 5 Nov 2014 22:30:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 108C24BE7D; Wed, 5 Nov 2014 22:30:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60C274BE5B for ; Wed, 5 Nov 2014 22:30:01 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U7m8nATljvBP for ; Wed, 5 Nov 2014 22:30:01 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com [209.85.192.47]) by theia.denx.de (Postfix) with ESMTPS id 2BF1C4BE57 for ; Wed, 5 Nov 2014 22:29:56 +0100 (CET) Received: by mail-qg0-f47.google.com with SMTP id j107so19348qga.20 for ; Wed, 05 Nov 2014 13:29:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:organization :user-agent; bh=qjlk1fEV8yhW6VMsjfr0goukP7XEhjYW8RwNXHxPHfs=; b=rBta+0H9y3QHCO6M/mDIo/cws/g6Htb3wjOoudcD8afw3i9tkyi+EB1jpTckdzN/ru dbKGe6JbtY1il1BXsUuhjDpD0Ty1eaCL8cjGpoBnj2aus5tc0UvE4YmACFwaRcqx/Lpc +MP4XXOCzzvny99Kpd36KuUBSnJlSKMJdT3i2TcWjU4WgEMSOCfnSfrXAtkqAUk/wUyu 0uuU9hiMKGEOqPQ7+pKOAPAR3E7dV70srk4DN7a4zrnBLQHbbr9Subl4c1LjEN6DHZtO ODjm5+YB2jxd4vkjuRgH0J6jGrFMKrjCxRz7XS2MSYKEB01qeeXGtxScHgJBwbYIAouK CESA== X-Received: by 10.229.236.197 with SMTP id kl5mr69481qcb.31.1415222995515; Wed, 05 Nov 2014 13:29:55 -0800 (PST) Received: from bill-the-cat (cpe-174-106-048-186.ec.res.rr.com. [174.106.48.186]) by mx.google.com with ESMTPSA id l52sm4141783qgf.43.2014.11.05.13.29.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 13:29:54 -0800 (PST) Date: Wed, 5 Nov 2014 16:29:53 -0500 From: Tom Rini To: Dileep Katta Message-ID: <20141105212953.GO15133@bill-the-cat> References: <1414539431-10212-1-git-send-email-dileep.katta@linaro.org> MIME-Version: 1.0 In-Reply-To: <1414539431-10212-1-git-send-email-dileep.katta@linaro.org> Organization: Texas Instruments User-Agent: Mutt/1.5.21 (2010-09-15) Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [U-Boot, v5, 1/1] Enable Android Fastboot support on am335x_evm board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On Wed, Oct 29, 2014 at 05:07:11AM +0530, Dileep Katta wrote: > Signed-off-by: Dileep Katta After re-working things like this (so that am335x_evm_usbspl still builds): Applied to u-boot-ti/master, thanks! diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7c83e3b..560e3bf 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -314,12 +314,18 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST +#ifndef CONFIG_SPL_USBETH_SUPPORT /* Fastboot */ #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 +/* To support eMMC booting */ +#define CONFIG_STORAGE_EMMC +#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 +#endif + #ifdef CONFIG_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -330,10 +336,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -/*To support eMMC booting*/ -#define CONFIG_STORAGE_EMMC -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 - /* USB TI's IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022