From patchwork Sat Feb 16 22:56:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1043549 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="XoxaS/KW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44259j1jDnz9s3l for ; Sun, 17 Feb 2019 09:57:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DC095C21E42; Sat, 16 Feb 2019 22:57:10 +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 D208BC21C29; Sat, 16 Feb 2019 22:57:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F1A69C21C29; Sat, 16 Feb 2019 22:57:05 +0000 (UTC) Received: from mail-it1-f194.google.com (mail-it1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id 30259C21C27 for ; Sat, 16 Feb 2019 22:57:04 +0000 (UTC) Received: by mail-it1-f194.google.com with SMTP id l66so22547770itg.3 for ; Sat, 16 Feb 2019 14:57:04 -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:mime-version :content-transfer-encoding; bh=g1YEj7VkPjHyc4jt2nB2q+ZJQ+Ifzoaxvuyo/jrWGm4=; b=XoxaS/KW2S7mupaJX+OWerdm6s41xTlGrzt9wlEnplR+tHWPpZtU4+wBdHeqipjMgv np0mbcHV1CNyDJmurBtbI1M2BpAN7RubEeVDi0Mbuqk9gVPtx4QTrTYsaU/liI8itJks DDy6OQTyJNZhnPiHcaBymTXNuMwibqpBNTFEO+SYi9F51OGszlKpIOpTGg2YXKIEruwL sVhzUw/7m4FK20WXTd7tbTjxwk7QqJ6d/GiuceCDbPJcomMgwM7I6vR/hw9PPc1mYXdQ v2e0AdhXKsXZTw6CS3La9awBH4sussEXfQKLJiqzDk1FWduitsEu6Fce0GQksobkh2qA auFQ== 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=g1YEj7VkPjHyc4jt2nB2q+ZJQ+Ifzoaxvuyo/jrWGm4=; b=Vj67LCmNXf4S2L8wKCA+K2ObUbAHmAK5KBbNns97P++r6aY0VCcMaBMY4JAqXpxkA8 Wo/SUeV/UoK1zenBnsf2ydVUExw5ozRBAtOQZmnPWymmXrOEUpt/Uonz3D3fvyrNJ0t/ F9ZX7F4gWcNL7PgjQA3qXAJRkOxeR1FTL3GFDpe75f0TqycqZtULTKOSb7l9Kx7efEcS PRCpbqm+JAypdCzWJSUjImafqerqAt1ejW7OgJq2CXkPLQsEnYxKytZRbk8D3LHJDOA7 /Ds8iSuczzg2e3iO5++ubLgtRGFp0T1q8ohKqmuvVOgIMYwvmFxQk+quIhGwyn6Gsedq bEEg== X-Gm-Message-State: AHQUAuYxnKgODrMZFJjPJRYzTsaKiElpmAFWZcD/1G30zn2FiOmnotQP pAFQJoRLl86xuZ+QdkVfhORAlSDJ X-Google-Smtp-Source: AHgI3IazSpjLvkKbNrCmpCyIljN2Lb4qRBOkg/2LbE7VTQyp8It50/W11sIGhHS+8trO0PuxNJE0Qw== X-Received: by 2002:a6b:e608:: with SMTP id g8mr10956977ioh.188.1550357822678; Sat, 16 Feb 2019 14:57:02 -0800 (PST) Received: from localhost.localdomain (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id k26sm3784484iol.14.2019.02.16.14.57.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 14:57:02 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 16 Feb 2019 16:56:50 -0600 Message-Id: <20190216225650.22414-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: trini@konsulko.com Subject: [U-Boot] [PATCH] ARM: omap3: evm: Update DM SPL support 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" - Switch to using the omap3-u-boot.dtsi file for needed properties - Enable SPL_OF_CONTROL This commit is based on the following series: https://patchwork.ozlabs.org/project/uboot/list/?series=92472 https://patchwork.ozlabs.org/project/uboot/list/?series=92462 Signed-off-by: Derald D. Woods Reviewed-by: Tom Rini --- arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 14 ++------------ arch/arm/dts/omap3-evm-u-boot.dtsi | 14 ++------------ board/ti/evm/evm.c | 12 ------------ configs/omap3_evm_defconfig | 14 +++++++++++--- 4 files changed, 15 insertions(+), 39 deletions(-) diff --git a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi index de411316d8..b9e433f873 100644 --- a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi @@ -5,20 +5,10 @@ * (C) Copyright 2017 Derald D. Woods */ +#include "omap3-u-boot.dtsi" + / { chosen { stdout-path = &uart1; }; }; - -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; diff --git a/arch/arm/dts/omap3-evm-u-boot.dtsi b/arch/arm/dts/omap3-evm-u-boot.dtsi index de411316d8..b9e433f873 100644 --- a/arch/arm/dts/omap3-evm-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-u-boot.dtsi @@ -5,20 +5,10 @@ * (C) Copyright 2017 Derald D. Woods */ +#include "omap3-u-boot.dtsi" + / { chosen { stdout-path = &uart1; }; }; - -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index c59aff595a..daecb4af3e 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -40,18 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; -static const struct ns16550_platdata omap3_evm_serial = { - .base = OMAP34XX_UART1, - .reg_shift = 2, - .clock = V_NS16550_CLK, - .fcr = UART_FCR_DEFVAL, -}; - -U_BOOT_DEVICE(omap3_evm_uart) = { - "ns16550_serial", - &omap3_evm_serial -}; - static u32 omap3_evm_version; u32 get_omap3_evm_rev(void) diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 22e623381f..aa9928e208 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -1,17 +1,21 @@ CONFIG_ARM=y +# CONFIG_SPL_USE_ARCH_MEMCPY is not set +# CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_TARGET_OMAP3_EVM=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_SEPARATE_BSS=y # CONFIG_SPL_FS_EXT4 is not set CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP3_EVM # " CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x280000 @@ -36,9 +40,13 @@ CONFIG_CMD_UBI=y # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" +CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_OF_TRANSLATE=y # CONFIG_SPL_BLK is not set CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000