From patchwork Thu Sep 12 15:23:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 1161660 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VdV4IKqH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46TjGq14WKz9s00 for ; Fri, 13 Sep 2019 01:24:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6F38FC21E60; Thu, 12 Sep 2019 15:23:50 +0000 (UTC) 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_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 88538C21DB5; Thu, 12 Sep 2019 15:23:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A7AAC21DB5; Thu, 12 Sep 2019 15:23:47 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id B2331C21C2F for ; Thu, 12 Sep 2019 15:23:46 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id q5so16204873pfg.13 for ; Thu, 12 Sep 2019 08:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pCkNHpLUHg8OrKmXwWraxmN448A4/IBNYxns9/61OWs=; b=VdV4IKqHyhVIDHarQ5lo9IwjpZ1fAo0vj5gpZkVTqHlrqo2L4TvkcNsBz8dNwxqxp3 /OAV5mmN2HpTwizhfZylRsiW7L1/trQUxO1E3HtTQE5fo5F4/sOJo7FnjGgEfS24VM+/ 8Yr3UhJdmNLvcpLsNwm3lB877ig7oTg7nXlE2RDK4zhj+YjcT2dZppscEIFJy/jVu6c5 0vjvNUAmib2h6wxR9QCOk/YMuzTLe6FvZAHuzAwkHUghqmcgQ+JmyMy57BRWGW+VaHIN KUKf6OvUww4TaTZtkXfO9pXrp3J0tp+OjEJcnyMWSvOTPq/+NF4mIqkeoeHuUxwTBIS3 DfnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pCkNHpLUHg8OrKmXwWraxmN448A4/IBNYxns9/61OWs=; b=RPNiUbgS7+cw2tI6sKVrI0MVso4ftnnoCF5psBeBVP3u/S/1xkmTPt8DEfkikTyfhT 8i7HEinbxcjhLlwZzlVJSANcf74Tfmv5WRtlxSP3BLRNu1hq5cg+U75tJaqDdz8/+JyO q0vRHsIqCHf5Sr6RHV+39dMxVlKbiwd1u5lIKFGOz9fQnhVQV/6OQwtCmYvaJWua/qzV FaUdxx/sypkStJXOzGvdGS04RnR3TE+rNz3dj+BpFinYxKJoNV51aSoouAQ6GOXksAcc f4Ulc8vWtf2Dh2FZBfElK+WsAgbzLpDjBO4Nlyvo0OlTIPedKltHPoZmkIPJ5NyV15Xc X+hw== X-Gm-Message-State: APjAAAWPGegmuaP6Vala+2inbzcRPlWJOqJlqPqHepD09jeJxg3YcFcD eHP7v1C9I3Go02mQ+Pzg0jNNZHltzjcRNQ== X-Google-Smtp-Source: APXvYqyv00M33nTvGtqfmCPY4uy3OzYbYG09NCYU07YUbkFJpXwkgqSstJogOsU+nwktLDClpquySA== X-Received: by 2002:a65:4b89:: with SMTP id t9mr38090648pgq.55.1568301824481; Thu, 12 Sep 2019 08:23:44 -0700 (PDT) Received: from localhost ([2001:67c:2e5c:2011:2e0:4cff:fe68:2882]) by smtp.gmail.com with ESMTPSA id c62sm31915046pfa.92.2019.09.12.08.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2019 08:23:43 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Thu, 12 Sep 2019 18:23:37 +0300 Message-Id: <20190912152338.11686-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.23.0.rc1 MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 1/2] Revert "configs: Remove am335x_boneblack_defconfig" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Commit 8fa7f65dd02c ("configs: Remove am335x_boneblack_defconfig") removes defconfig for BeagleBone Black board, and it's advised to use am335x_evm_defconfig for all AM335x boards. But it's impossible to use am335x_evm_defconfig in eMMC use-case without modifications for BBB (NAND must be disabled, MMC enabled, etc). This is inconvenient for user to do such modifications via menuconfig (only developer knows what should be done). Furthermore, enabling MMC options in am335x_evm_defconfig leads to wrong pin-muxing scheme in board/ti/am335x/mux.c, because both NAND and MMC options are going to be enabled in the config, so that pins are muxed for BBB with NAND cape, which in turn leads to non-functioning eMMC. There is no way to make the single defconfig working for both eMMC and NAND use-cases, because we can't figure out in run-time which board configuration is used by user (EVM, BBB, or BBB with NAND cape). Hence we rely on CONFIG options to figure out which configuration is used. Because of this we can't use single defconfig for AM335x EVM and BBB. All that said, let's bring back am335x_boneblack_defconfig, because right now users are not able to use U-Boot for BBB. Further patch will update this defconfig by enabling Driver Model and pulling some other useful options from am335x_evm_defconfig. Fixes: 8fa7f65dd02c ("configs: Remove am335x_boneblack_defconfig") Signed-off-by: Sam Protsenko --- configs/am335x_boneblack_defconfig | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 configs/am335x_boneblack_defconfig diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig new file mode 100644 index 0000000000..439d0cba05 --- /dev/null +++ b/configs/am335x_boneblack_defconfig @@ -0,0 +1,50 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +CONFIG_AM33XX=y +CONFIG_SPL=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL_MUSB_NEW_SUPPORT=y +# CONFIG_SPL_NAND_SUPPORT is not set +CONFIG_SPL_OS_BOOT=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_DFU_TFTP=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_MMC_OMAP_HS=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MII=y +CONFIG_DRIVER_TI_CPSW=y +CONFIG_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_DSPS=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_LZO=y +CONFIG_OF_LIBFDT=y From patchwork Thu Sep 12 15:23:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 1161661 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="n0esxoUN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46TjHG6FhGz9s00 for ; Fri, 13 Sep 2019 01:24:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8654EC21EC3; Thu, 12 Sep 2019 15:24:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0D393C21E7F; Thu, 12 Sep 2019 15:24:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08370C21E39; Thu, 12 Sep 2019 15:23:56 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 3BA0DC21E45 for ; Thu, 12 Sep 2019 15:23:53 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id b10so11978279plr.4 for ; Thu, 12 Sep 2019 08:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dq5l+1LKZrOh/365019qY0Ipqc8whCFqzL1190uRh8U=; b=n0esxoUNhmwKurOthIrLpvdUwN0WTy3ZnsJfQlN6vd3C6VomUTsUxw8KRMamr5bbE6 lOlmV2RVuPCvkzrfw5tFsZWQnU3vS3pfcTQO1L5/iiniTX15J6kYkiX//Di0dC7XxeHs NCq4hHsJAl5CgTZrvYOI6YBcHBrk+web+3KZ4jfxoxveQJuNZ3Ri+Ql2UJPorGugS/JS R53tkh+pMCKGpaSJRDr2j/RfHkttWnkYZ+8yfE4cev1x+5Mo5VK95rshMfn5lm9xElc9 vpPxfVdd/AAw/myVR9tsXOw4JGYdKJ5nAcfR7Zn+dU5OuP07akiMP4/mIbqdyorjEiJl uUZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dq5l+1LKZrOh/365019qY0Ipqc8whCFqzL1190uRh8U=; b=UwczjsPWpVZUXvpKPGUCMEV1msi0PlDZLIeq927baY8UVPNxv+KLqQf1KvJ0ZN4IWD gFPzANV3hR6Kk8R5weB8HmPfCv0deaQPS+cyNdsUdMg/vddR7FT5mD2dZnI50meYaLd4 9ECZAb+0xYZc3NNeJXXTOjCJXfO+bd8U6uvYnmYXHLrJ7IGca9O3e2+GxsWTUbEE458d J30V/G5qvC4Bcv+ou0CbH0DFO/8kwUMd8BPlPUhyrSXVY7cagAvwZpR6P1ijwu6JGUCi Tma3vC743EjBMLwBFWxvs1UlOH1EbzB1/e6Xecqs8oJfwx0Vt/7DEaN6U95A/D4+N6Ep ev4w== X-Gm-Message-State: APjAAAXmJAZXu/WaJS9bvoik8MBWIarn3CMfE8Lwyc2eaJl3R04lVtu6 +btyyJ31wuyrNog2RjrQPY6jj5RCNW4tKg== X-Google-Smtp-Source: APXvYqx2V9K5PSQSdnR2fHsoHz+78XWyfxWUU7gYlaOJOUwYIlGW0Az2grht2nkbESfi8OCA776pjg== X-Received: by 2002:a17:902:6b4c:: with SMTP id g12mr26629566plt.291.1568301831213; Thu, 12 Sep 2019 08:23:51 -0700 (PDT) Received: from localhost ([2001:67c:2e5c:2011:2e0:4cff:fe68:2882]) by smtp.gmail.com with ESMTPSA id b18sm247549pju.16.2019.09.12.08.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2019 08:23:50 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Thu, 12 Sep 2019 18:23:38 +0300 Message-Id: <20190912152338.11686-2-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190912152338.11686-1-semen.protsenko@linaro.org> References: <20190912152338.11686-1-semen.protsenko@linaro.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 2/2] configs: am335x_boneblack: Sync with am335x_evm X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Old am335x_boneblack defconfig doesn't have Driver Model enabled. Pull DM options from am335x_evm, along with some others, like ones for shrinking SPL, making am335x_boneblack defconfig as close as possible to am335x_evm. Fixes: 8fa7f65dd02c ("configs: Remove am335x_boneblack_defconfig") Signed-off-by: Sam Protsenko --- configs/am335x_boneblack_defconfig | 37 ++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 439d0cba05..2b9dfdb5fc 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -4,23 +4,33 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_AM33XX=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" +CONFIG_LOGLEVEL=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL_FIT_IMAGE_TINY=y +CONFIG_SPL_ETH_SUPPORT=y +# CONFIG_SPL_FS_EXT4 is not set CONFIG_SPL_MUSB_NEW_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set +CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -CONFIG_AUTOBOOT_DELAY_STR="d" -CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_ETHER=y CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" +CONFIG_OF_LIST="am335x-boneblack am335x-bonegreen" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_TFTP=y CONFIG_DFU_MMC=y @@ -29,22 +39,35 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_DM_I2C=y +CONFIG_MISC=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y +CONFIG_TIMER=y +CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y +CONFIG_USB_MUSB_TI=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 CONFIG_USB_ETHER=y -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +# CONFIG_SPL_WDT is not set +CONFIG_DYNAMIC_CRC_TABLE=y +CONFIG_RSA=y CONFIG_LZO=y -CONFIG_OF_LIBFDT=y +# CONFIG_OF_LIBFDT_OVERLAY is not set