From patchwork Wed Mar 7 10:40:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 882566 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gMhStm/f"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zxBc51Z7mz9sY4 for ; Wed, 7 Mar 2018 22:43:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BFE68C21C50; Wed, 7 Mar 2018 11:43:05 +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=FREEMAIL_FROM, 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 1792AC21E4E; Wed, 7 Mar 2018 11:42:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B9C6BC21C2C; Wed, 7 Mar 2018 10:41:58 +0000 (UTC) Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by lists.denx.de (Postfix) with ESMTPS id 1181EC21C50 for ; Wed, 7 Mar 2018 10:41:58 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id w63so2737959ita.3 for ; Wed, 07 Mar 2018 02:41:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lDbDY61QLVKjHjCliSYMOkv8Vu/8eInC+bzKLGv3oxE=; b=gMhStm/fCu6PFH5oI7LsJEWChhG0x6I1ilN973WWdZQZ5A07cGc42RmoAAnH2w2+l/ J9QD8lkUTp1XZWV6Q2MLHdISh0wjQi/27zaLPHph6zL1+4aYVsTmj7ZyWsVMy44Kt/Nj a4DaggXEAxwCg0h4llJPl/C4SoEZ5QQtKDv3jiNShuXsGFHaG8bZ6XR2V9F10rU1QOjF wg9iD61fVomz5UayRrS5XzsiWOeMXubqgZl/UFJPlz1FGLjwQvdZ8t60AcNH8e3qLWxA DKnN5R71HH25aazxEzA9i8hyiwKGTZfOeyJR5f79xR3KtlgAik9Mdo1hu/ERwT+LZ5Kv LYPA== 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; bh=lDbDY61QLVKjHjCliSYMOkv8Vu/8eInC+bzKLGv3oxE=; b=TrYXSTbfPULy0uI2LKEe4xYs8el48JJrex0C09o119qhQDcjxzyDNj150qBCvP4Shi q2QWNHWWIzaM0Dn0AKT+AKdQ5dlE6Q7QS8659Ck+iQxvHgHa2veBtzYntffPcCGRWtik IYJjFDvGX+8/vErx373NdBqEGitvIug18uM5V+XxUO+ddCWi3Wku1XonedKw73GUNmV4 TRs0Vqo9MG57z4dol0CWU4k8jlPkR9PMLYG5scvdBBIk+I+sSUxv4sEZ9E44w7kgC+F6 sX/Zcy9WPFot0lv/NR0u4WjvuiFkJl9T8bpHOQbvBAZsZLKhJ9+nWNjL4oh2WgCf7Ou1 eeAw== X-Gm-Message-State: AElRT7GeNFBjmDRhE9UfGwbSEu2yoPf05bxUaPLhbkWHRf20FuXx2ciJ /3z6aBzBxKKvcYmdqspAGP57WK+u X-Google-Smtp-Source: AG47ELsjPy6ZjUXC60tceZgpceRkkqC/D+vRiatmLvz29CikXvcTjPlRqPh/q5Py0BhxNKibn4buHw== X-Received: by 10.36.117.209 with SMTP id y200mr8768925itc.152.1520419316546; Wed, 07 Mar 2018 02:41:56 -0800 (PST) Received: from tupperware.hsd1.mi.comcast.net ([2601:409:8501:1e23:b964:8c86:8cb:1b74]) by smtp.gmail.com with ESMTPSA id u77sm5867672ita.30.2018.03.07.02.41.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 02:41:55 -0800 (PST) From: Jason Kridner X-Google-Original-From: Jason Kridner To: u-boot@lists.denx.de Date: Wed, 7 Mar 2018 05:40:41 -0500 Message-Id: <20180307104044.4739-2-jdk@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180307104044.4739-1-jdk@ti.com> References: <20180307104044.4739-1-jdk@ti.com> X-Mailman-Approved-At: Wed, 07 Mar 2018 11:42:41 +0000 Cc: Tom Rini , Jason Kridner Subject: [U-Boot] [PATCH 1/4] Add support for BeagleBoard.org PocketBeagle 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Texas Instruments AM3358 based low-cost board using Octavo Systems OSD3358 SIP with built-in TPS65217 PMIC and 512MB DDR3. Board features small 35mm x 55mm size, high-speed USB OTG, microSD and 72 0.1" expansion header pins with 2xSPI, 2xI2C, 2xUART, USB, 8xADC, up-to-44 GPIO, PRU pins and much more. https://beagleboard.org/pocket This was tested using the am335x_evm_usbspl_defconfig. Note that MII pins are enabled despite not having Ethernet on this board. This avoids an issue where otherwise many timeout errors would be generated. See https://e2e.ti.com/support/arm/sitara_arm/f/791/t/298976 for some related discussion. Signed-off-by: Jason Kridner Cc: Tom Rini Reviewed-by: Tom Rini --- board/ti/am335x/board.c | 10 ++++++---- board/ti/am335x/board.h | 7 ++++++- board/ti/am335x/mux.c | 3 +++ include/configs/am335x_evm.h | 2 ++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index b144fd1821..87bdd2d63d 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -264,7 +264,7 @@ const struct dpll_params *get_dpll_ddr_params(void) if (board_is_evm_sk()) return &dpll_ddr3_303MHz[ind]; - else if (board_is_bone_lt() || board_is_icev2()) + else if (board_is_pb() || board_is_bone_lt() || board_is_icev2()) return &dpll_ddr3_400MHz[ind]; else if (board_is_evm_15_or_later()) return &dpll_ddr3_303MHz[ind]; @@ -295,7 +295,7 @@ const struct dpll_params *get_dpll_mpu_params(void) if (bone_not_connected_to_ac_power()) freq = MPUPLL_M_600; - if (board_is_bone_lt()) + if (board_is_pb() || board_is_bone_lt()) freq = MPUPLL_M_1000; switch (freq) { @@ -341,7 +341,7 @@ static void scale_vcores_bone(int freq) * Override what we have detected since we know if we have * a Beaglebone Black it supports 1GHz. */ - if (board_is_bone_lt()) + if (board_is_pb() || board_is_bone_lt()) freq = MPUPLL_M_1000; switch (freq) { @@ -542,7 +542,7 @@ void sdram_init(void) if (board_is_evm_sk()) config_ddr(303, &ioregs_evmsk, &ddr3_data, &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0); - else if (board_is_bone_lt()) + else if (board_is_pb() || board_is_bone_lt()) config_ddr(400, &ioregs_bonelt, &ddr3_beagleblack_data, &ddr3_beagleblack_cmd_ctrl_data, @@ -931,6 +931,8 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack")) return 0; + else if (board_is_pb() && !strcmp(name, "am335x-pocketbeagle")) + return 0; else if (board_is_evm_sk() && !strcmp(name, "am335x-evmsk")) return 0; else if (board_is_bbg1() && !strcmp(name, "am335x-bonegreen")) diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index e13fcff02a..bab5b77f34 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -34,6 +34,11 @@ static inline int board_is_bone_lt(void) return board_ti_is("A335BNLT"); } +static inline int board_is_pb(void) +{ + return board_ti_is("A335PBGL"); +} + static inline int board_is_bbg1(void) { return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4); @@ -41,7 +46,7 @@ static inline int board_is_bbg1(void) static inline int board_is_beaglebonex(void) { - return board_is_bone() || board_is_bone_lt() || board_is_bbg1(); + return board_is_pb() || board_is_bone() || board_is_bone_lt() || board_is_bbg1(); } static inline int board_is_evm_sk(void) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index ad85b3a19a..aa187605d0 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -390,6 +390,9 @@ void enable_board_pin_mux(void) #else configure_module_pin_mux(mmc1_pin_mux); #endif + } else if (board_is_pb()) { + configure_module_pin_mux(mii1_pin_mux); + configure_module_pin_mux(mmc0_pin_mux); } else if (board_is_icev2()) { configure_module_pin_mux(mmc0_pin_mux); configure_module_pin_mux(gpio0_18_pin_mux); diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 158b7d4e8e..8d45b6fade 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -133,6 +133,8 @@ "setenv fdtfile am335x-bone.dtb; fi; " \ "if test $board_name = A335BNLT; then " \ "setenv fdtfile am335x-boneblack.dtb; fi; " \ + "if test $board_name = A335PBGL; then " \ + "setenv fdtfile am335x-pocketbeagle.dtb; fi; " \ "if test $board_name = BBBW; then " \ "setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \ "if test $board_name = BBG1; then " \ From patchwork Wed Mar 7 10:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 882567 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mtx0QdNf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zxBd81bl7z9sY4 for ; Wed, 7 Mar 2018 22:44:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BFE90C21F27; Wed, 7 Mar 2018 11:43:26 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 E409FC21F17; Wed, 7 Mar 2018 11:42:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A2A35C21C50; Wed, 7 Mar 2018 10:42:03 +0000 (UTC) Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by lists.denx.de (Postfix) with ESMTPS id 16B12C21C2C for ; Wed, 7 Mar 2018 10:42:03 +0000 (UTC) Received: by mail-io0-f196.google.com with SMTP id q24so2508836ioh.8 for ; Wed, 07 Mar 2018 02:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DY7Dvt9GE87Pf3mGmvrlcP6VDMcyvdcO65GQtZgZ29M=; b=mtx0QdNfKYLsWNQgONsayMnAwCL3bsTAjZApS+cYLqA22SCLLvCrmqqyqVVzXpvLjC nqy4q7reMT50N7OblPco4kxP4MD2tVlEq9WLWvxf5jcwWqptaJvgzrcJeyrEdA9xwm9U T1dbZk2SOWn/vRuEXhTNBScTb3NTwrqjihdUzDGwDQZCRrguPlpMHPI1VaaXfLOj0ga+ iWON3mCzPOxxUX6qBSM9k3kgK0EubqG8WK8MdHXnBHv0X3n6VJJrymHakwkTm1a1za+J uSta3Ez8yXeQ31lwzBEsIM5lzAawbws/DRyWIUgM9b0el1yq3c3uPcyDC0E22yDh3teH 1Ndg== 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; bh=DY7Dvt9GE87Pf3mGmvrlcP6VDMcyvdcO65GQtZgZ29M=; b=KS8ptDBZVrQJJvR8VNhKVBNKqZ/sUl1/w4nSvuyr7IZVOQZmMqVeS/V0WJYjcAWee4 3x6DIpWi5PGwkDMXRfs7bTWkeR0abgRdk/udZVb0q5smuqvQfEryoxvTOlMp8TJ0nhKl gvI2d/oPuPCrbEXCpr63Aki4f0Zmibg7pYTb1cDQbx2ovXfUbyngKiBgjmSOPi1HVdCS 4mMDxcmxFIhnSEzs60tfIJz1pTm+55iy9iunQInWhwvETD62FuSjLPKOFdx3/zrVrOxT wmhacNZ6p70jexU9iUJxsdAUN+i6rjE8czzC8NS/NjLffOCCER8yL1TeU4x78LsPrRu1 iVmw== X-Gm-Message-State: AElRT7HN1mLMUS68IDuZ5+mI0u0Om3wTvbX27WDQFIjbuNQ3U6pxy/VS gqeSXSytmBgYUgs7luGt+i2ExPvU X-Google-Smtp-Source: AG47ELvI92dLyIkiTsfdurXhpFK5kRA7dh9dBLwBx222NRJSEfOfLDyyAI24zRTE3rYKU7cfPr4c7w== X-Received: by 10.107.151.74 with SMTP id z71mr24010904iod.277.1520419321543; Wed, 07 Mar 2018 02:42:01 -0800 (PST) Received: from tupperware.hsd1.mi.comcast.net ([2601:409:8501:1e23:b964:8c86:8cb:1b74]) by smtp.gmail.com with ESMTPSA id u77sm5867672ita.30.2018.03.07.02.42.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 02:42:00 -0800 (PST) From: Jason Kridner X-Google-Original-From: Jason Kridner To: u-boot@lists.denx.de Date: Wed, 7 Mar 2018 05:40:42 -0500 Message-Id: <20180307104044.4739-3-jdk@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180307104044.4739-1-jdk@ti.com> References: <20180307104044.4739-1-jdk@ti.com> X-Mailman-Approved-At: Wed, 07 Mar 2018 11:42:41 +0000 Cc: Tom Rini , Jason Kridner Subject: [U-Boot] [PATCH 2/4] am335x_evm: scan more partitions and use uname_r 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This enables mainline u-boot to boot the BeagleBoard.org Debian distribution builds without extensive environment modifications. Some boot layouts only have a single partition on the MMC/eMMC. This will scan those partitions after the second partition that was already being scanned. Some layouts use uname_r to define the kernel being used for the boot to support multiple kernels stored within the boot file system without using symlinks. See http://elinux.org/Beagleboard:U-boot_partitioning_layout_2.0 for more details on the BeagleBoard.org Debian image layout. Signed-off-by: Jason Kridner Cc: Robert Nelson Cc: Tom Rini --- include/configs/am335x_evm.h | 5 ++++- include/environment/ti/mmc.h | 13 +++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8d45b6fade..32fe0e0cd5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -61,7 +61,10 @@ #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ "setenv mmcdev " #instance"; "\ - "setenv bootpart " #instance":2 ; "\ + "setenv bootpart " #instance":2; "\ + "run mmcboot;"\ + "setenv mmcdev " #instance"; "\ + "setenv bootpart " #instance":1; "\ "run mmcboot\0" #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h index 4305ebdaaf..b803ecccb7 100644 --- a/include/environment/ti/mmc.h +++ b/include/environment/ti/mmc.h @@ -23,9 +23,10 @@ "bootenvfile=uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \ - "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadbootenv=if fatload mmc ${mmcdev} ${loadaddr} ${bootdir}/${bootenvfile}; then echo Found ${bootdir}/${bootenvfile} in FAT partition; else load mmc ${mmcdev} ${loadaddr} ${bootdir}/${bootenvfile}; fi\0" \ + "loadimage=if test -n ${uname_r}; then load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/vmlinuz-${uname_r}; run loadrd; else load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; fi\0" \ + "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/initrd.img-${uname_r}; setenv rdsize ${filesize}\0" \ + "loadfdt=if test -n ${uname_r}; then load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtbs/${uname_r}/${fdtfile}; else load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}; fi;\0" \ "envboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ @@ -45,7 +46,11 @@ "mmcloados=run args_mmc; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdtaddr}; " \ + "if test -n ${uname_r}; then " \ + "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ + "else " \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "fi; " \ "else " \ "if test ${boot_fdt} = try; then " \ "bootz; " \ From patchwork Wed Mar 7 10:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 882568 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sk8we7BN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zxBdX03pqz9sY4 for ; Wed, 7 Mar 2018 22:44:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6E1C7C21F5B; Wed, 7 Mar 2018 11:43:45 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 65D8DC21F1F; Wed, 7 Mar 2018 11:42:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F2952C21C50; Wed, 7 Mar 2018 10:42:05 +0000 (UTC) Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by lists.denx.de (Postfix) with ESMTPS id 6B329C21C2C for ; Wed, 7 Mar 2018 10:42:05 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id b34so2522672ioj.6 for ; Wed, 07 Mar 2018 02:42:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gBkQ/lmse0yIluCAYg/x+wAz1M/qXLwL9pff2pRv2S8=; b=Sk8we7BNCAsEA88wI4OwahNi1tGZi6MePJS7sBYFZc3dZeoW/t18DDqrmy8jydQL3w aJZcZAvm998xBF8huxjU23ZKkL1nWJlJsEp7r6CHMM5G/8h0L2mpVqamQX3MneUw8o5a 0I04+cRtJObX8xCori9c2TAFTnFS2C+3AxnfDkf+srTdbFo7CcXKJoFJPDzZjX95uer3 KIqvZWey3d/JzrTERE+ooq8tfrLORpK/X2DtQHsvlKgUd2jTPoVBL5sybYbgMfxobLcG dlVBlTo9rpgfBcKVGQVtZYs5hI02J+ZkCu6mhFGHIRnnaw4MZonR3PzFG+rrBHWHvppj iYTA== 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; bh=gBkQ/lmse0yIluCAYg/x+wAz1M/qXLwL9pff2pRv2S8=; b=KymrgJnmUe2LTwM8m7AJQqGwq/ctjDyUvJsBqcF7pas9y55191YmZv6YJhxV0E/JBE Lu+PTTM2UckHnlc8Cf3ckmuxMfZZqrlqcYkcoUwP5MJ0pQhvjAyLnhSuVi6IQjA11irj jl2XV+uKl5A9b9p82AWwMMsPCI0vJBsEbWLe3NCWAqtU6PtksIzL7XSWzIVylWEQiSEL EpP96bwVh6YDEQRYoXBZViX9iGGL2rxwATbj/pVAvCVN5TymAcc64w5t+q6bRdwnivkL gzRhLprPCWQZHmehalZ39Gq+ZTwgBYXK/bHFkPyMkIloCefr5qytEKsNnszGv1aK+f6N fitw== X-Gm-Message-State: APf1xPDQ0W/nkGnELanYudnsAOanGthxGx7HdCh5XNrYejCSfn5HdMh0 jzWS0VHxIwPVg3T5ECzWnx5zeay9 X-Google-Smtp-Source: AG47ELtdi2AWokHzYFns/nbuRQgfFpJde0/OoRW9Ix1cMw+rEZHazcP3KVDxJnt0E+tXpfHxwsSYJg== X-Received: by 10.107.41.16 with SMTP id p16mr25720923iop.173.1520419324091; Wed, 07 Mar 2018 02:42:04 -0800 (PST) Received: from tupperware.hsd1.mi.comcast.net ([2601:409:8501:1e23:b964:8c86:8cb:1b74]) by smtp.gmail.com with ESMTPSA id u77sm5867672ita.30.2018.03.07.02.42.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 02:42:03 -0800 (PST) From: Jason Kridner X-Google-Original-From: Jason Kridner To: u-boot@lists.denx.de Date: Wed, 7 Mar 2018 05:40:43 -0500 Message-Id: <20180307104044.4739-4-jdk@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180307104044.4739-1-jdk@ti.com> References: <20180307104044.4739-1-jdk@ti.com> X-Mailman-Approved-At: Wed, 07 Mar 2018 11:42:41 +0000 Cc: Joe Hershberger , Jason Kridner , Jason Kridner Subject: [U-Boot] [PATCH 3/4] Handle NETCONSOLE and SPL enabled 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jason Kridner NETCONSOLE isn't compiled in with SPL, so the include file needs to recognize that. Signed-off-by: Jason Kridner Cc: Joe Hershberger Reviewed-by: Tom Rini Acked-by: Joe Hershberger --- include/net.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net.h b/include/net.h index 455b48f6c7..3101096e9a 100644 --- a/include/net.h +++ b/include/net.h @@ -676,7 +676,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, /* Processes a received packet */ void net_process_received_packet(uchar *in_packet, int len); -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) void nc_start(void); int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len); @@ -684,7 +684,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, static __always_inline int eth_is_on_demand_init(void) { -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) extern enum proto_t net_loop_last_protocol; return net_loop_last_protocol != NETCONS; @@ -695,7 +695,7 @@ static __always_inline int eth_is_on_demand_init(void) static inline void eth_set_last_protocol(int protocol) { -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) extern enum proto_t net_loop_last_protocol; net_loop_last_protocol = protocol; From patchwork Wed Mar 7 10:40:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 882569 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kB4Ka6V/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zxBfK0lLXz9sfK for ; Wed, 7 Mar 2018 22:45:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A25F7C21F5B; Wed, 7 Mar 2018 11:44:03 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 25922C21F5B; Wed, 7 Mar 2018 11:42:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 43DC5C21C50; Wed, 7 Mar 2018 10:42:09 +0000 (UTC) Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by lists.denx.de (Postfix) with ESMTPS id C3087C21C2C for ; Wed, 7 Mar 2018 10:42:08 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id e7so2534529ioj.1 for ; Wed, 07 Mar 2018 02:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LTzbdtVOHG5fuO5H4TmQwoGX3FkuWGxeHNty+dkcBkw=; b=kB4Ka6V/1NHLZdwpts4cYNT0N94MRU7RbDvwWR98gE+fsiLPgcrWIAoq31lwE6Ahqm wzuuUR3Ys3y4OesztfP3akB1nK0LhcObdew8dJtUPRfA/wZnjEpopK5NDBbAsqpPhFRW n598GXjA1gBXnZvqUJsk1rwQ/Vh5NTC5LHAdp92RO4qp0UpT+fFNYJzyIluiKljKHaJg zo+C7LKJqEVH/onkKmOvp7EWl7WEGIauM41uUvvXrT9chvaavGexpfTz10hrJW4Bqou4 EgiQxBzgyHJ7TX3DDVRjK5ppHwVhzXTRvkjJBbKrRdo/iohSZWQvm5q4pBVqqvon70qD a5IA== 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; bh=LTzbdtVOHG5fuO5H4TmQwoGX3FkuWGxeHNty+dkcBkw=; b=pYb+sGT/l/Zj6h+4B/tqiSnbieCXJFtsky0EINqBfizyz/BgBZwDamb1Y6FLBPfuc0 PU6r9DOK/vnoiQuUsjyUYDyFIUQRdSv03UCpV/gBvVTECCMqGX1NmeFOrLugbCCWkCxN WLuO/Ju7idsSTMFruYfXLlPBNfHNm+sPlAgLw7AgtfYuBWxIeh1G4BvEYGYb+S/zlygm 3ThEUVtSu8Tny1aN4kvccU1DViIiWjJWmMDY/7vJONnGMCzyoJIfXs4KThsna8/C04qw BWOx0qpoF+nbcg337xUdc+N2jygNDoqlSc3ghznPbojrwcmFWUp16J1/7HtiYS7q9mNt E8Dg== X-Gm-Message-State: AElRT7EtNATC+2BDOYIyeAGVxtdoRBbmkRZsA7ZxUxjKNqdEmuCzYdud mdAuCf7OaBsCE7XBcjSABJ5xa1tR X-Google-Smtp-Source: AG47ELtdNKpcKM6ezw4ybul7XbK9yuV+KIAiBYvDTFWdgy/sHtxzqiLsANYrVq5pntY4CKA3zG/3GA== X-Received: by 10.107.23.131 with SMTP id 125mr24931829iox.130.1520419327464; Wed, 07 Mar 2018 02:42:07 -0800 (PST) Received: from tupperware.hsd1.mi.comcast.net ([2601:409:8501:1e23:b964:8c86:8cb:1b74]) by smtp.gmail.com with ESMTPSA id u77sm5867672ita.30.2018.03.07.02.42.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 02:42:06 -0800 (PST) From: Jason Kridner X-Google-Original-From: Jason Kridner To: u-boot@lists.denx.de Date: Wed, 7 Mar 2018 05:40:44 -0500 Message-Id: <20180307104044.4739-5-jdk@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180307104044.4739-1-jdk@ti.com> References: <20180307104044.4739-1-jdk@ti.com> X-Mailman-Approved-At: Wed, 07 Mar 2018 11:42:41 +0000 Cc: Tom Rini , Jason Kridner Subject: [U-Boot] [PATCH 4/4] am335x: am335x_evm_usbspl_defconfig: NETCONSOLE 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable NETCONSOLE by default. Still requires changes to the boot environment to enable on the platform. Signed-of-by: Jason Kridner Cc: Tom Rini Reviewed-by: Tom Rini --- configs/am335x_evm_usbspl_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e4bf757923..19f7c49951 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -6,7 +6,13 @@ CONFIG_AM33XX=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_ANDROID_BOOT_IMAGE is not set 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_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set +CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_SYS_STDIO_DEREGISTER is not set +# CONFIG_FIT_EMBED is not set CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y @@ -50,3 +56,4 @@ CONFIG_USB_ETHER=y CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_NETCONSOLE=y