From patchwork Mon Aug 28 11:15:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 806529 X-Patchwork-Delegate: sbabic@denx.de 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NHuJc46a"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xgq2r2SGGz9sNc for ; Mon, 28 Aug 2017 21:16:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B4319C220D1; Mon, 28 Aug 2017 11:16:06 +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_DNSWL_NONE, 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 77469C21EBC; Mon, 28 Aug 2017 11:16:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 835E8C21E07; Mon, 28 Aug 2017 11:16:03 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by lists.denx.de (Postfix) with ESMTPS id 30827C21DAB for ; Mon, 28 Aug 2017 11:16:02 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id c28so128097pfe.0 for ; Mon, 28 Aug 2017 04:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=oc9rlgoPmc/dUzE132VCi6SD8hahzqPG971X/n4cnTw=; b=NHuJc46aE0SGJ6kcxN/jO3RnzhIaY3M0wCiGqGt4VCYGxukL8MmnaiH3LqmsBrIti6 8gP46eArNg4OhiTiU6UHf2RGimN3pKBDWCMVQoRoRNuYKfcJPg1Xe+rdpQuJzMNsdg9Y pZhbXEKz+WlosIx1LgJpdWpMnrYdhVcOGCKfDrzFNToN1d+nvxRw7JlRjaXFHcn99P8O yy2HBN5G6ZzZZRRPmVVYdMrb++e/KYipfonk0ba7D1AtvbTuQTqmq3uFY4rgQCtc05Lu m+4/15PzvMh+G9c9+Pgnc8I8LfWoD1rDPDLmoRbhNbiWBBqeuUFSjkmkJlrJge46NJYO 8FAA== 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; bh=oc9rlgoPmc/dUzE132VCi6SD8hahzqPG971X/n4cnTw=; b=gWzno82X722tmy2XapT2WxzaDjedxj2Vt1xG28LDzyvIZHk73uXUOfBMqos5sFAxeb XWcTR7iP5DWdbrfgxApMoATulY3Cqw3N9BNXxVX3U3I4kneM6Q8jdc06uTfv46I5De5b CEpNeb/78/JMcLVrbbZ1RO9jRfkSBL5CWY4bB+p8gk3yfQgdaVlnY1D+s5Ad6apF8uol 9PlBInaaFwbj/Ib/UYl1WLWt6kDwIlNK7Ezjr6QtC9dsm2eq0G3Qr3HtqlYuvIyGcMvE x+aPBh+gSG8uzrecjsf8X9q85G8aqZcHgYOoZNg7V0Q5RJPHou7e/cJDahqTY8dJFeuJ fu/g== X-Gm-Message-State: AHYfb5j0UBe/rQGQc+0s/f1jXnh2/nmMRX174aA+XElOSB3mrLR5o3Da Fm6A1g4akj9A8VZb X-Received: by 10.84.218.6 with SMTP id q6mr240395pli.301.1503918960178; Mon, 28 Aug 2017 04:16:00 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id z7sm402861pgb.24.2017.08.28.04.15.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 04:15:59 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 28 Aug 2017 16:45:47 +0530 Message-Id: <1503918948-1436-1-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 Cc: Tom Rini , Fabio Estevam Subject: [U-Boot] [PATCH 1/2] i.MX6Q: spl: Fix falcon to use dram_init_banksize 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: Jagan Teki Memory dt node update introduced by spl_fixup_fdt() in below commit was making DDR configuration in-appropriate to boot falcon mode. Hence added dram_init_banksize for explicit assignment of proper base and size of DDR. "boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot" (sha1: 6e7585bb64b12f632681c80c4b193349e1985d92) Signed-off-by: Jagan Teki --- arch/arm/mach-imx/spl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 75698c4..0979458 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -15,6 +15,8 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + #if defined(CONFIG_MX6) /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) @@ -126,3 +128,13 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) } #endif + +#if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT) +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].size = imx_ddr_size(); + + return 0; +} +#endif From patchwork Mon Aug 28 11:15:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 806530 X-Patchwork-Delegate: sbabic@denx.de 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DoFCn9GO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xgq3V6CJVz9s8P for ; Mon, 28 Aug 2017 21:16:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4D09CC224CB; Mon, 28 Aug 2017 11:16:32 +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_DNSWL_NONE, 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 127A3C224CB; Mon, 28 Aug 2017 11:16:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 21177C224BE; Mon, 28 Aug 2017 11:16:13 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id 9EEFEC224B3 for ; Mon, 28 Aug 2017 11:16:09 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id c28so128293pfe.0 for ; Mon, 28 Aug 2017 04:16:09 -0700 (PDT) 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=IVLH1xNSg0JuBIjWIHqiTJAgXKs9F/hYvWBqkKAfDnY=; b=DoFCn9GOI8niP7/MI072JKDjc7M678GNGolNcUgJXIWbZd/QgPmeTcN3KU2DQhUesc lqeJ7nrSXrq+dguCs7Zd+cuwTGV+4Y0Kg+9T2TMn2O7Lxwd0GTeTyRJmuqqNqYqrW+JI 1E9aOTiKaH8AWWSOEBmCcnsm0JUyei7XS9Y43uId7qWe3QZDH46crHzJvW/2W3wY/MUI /L55aoszPNr0ewRe3wV/fM/meq3BAZ709S5DVA0CNEG83ac2J1fioZCYLgZ+BiaMOFxq cPUeUi8sHpHkyL9xHLp0XdZTeEmpOCswc7OMqT6+vzE06BheYMtxnH37vqYbIAAofv3J Vk4g== 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=IVLH1xNSg0JuBIjWIHqiTJAgXKs9F/hYvWBqkKAfDnY=; b=OA1HFPD/Gsa7/wPauSpqYat+6Oo5ucI22sRWjg9xfIFLt00FaKuwR/IOVM8mOsGk5j dE3aSU+59/EqFZasehh3Cv/oWEhJmeCQWl6RIOS/OmsVCk3oEAejUIcLSes4ukwpbUq6 RXDCRhMwWlbQKQVg/kZi0gR4rKwhi+dFMYfnzrr80TFaRuKYSg2lbwMgz0vHbU4CSRHB OEVkkr7umztOiRNQy08hJ2Bi4DJ6ZZb6palXFAR1M8qjTXJgnaGIj5dmWTJ0W1X7ONEF k+ZcrF/acdqy3To0ztiIJIfGnsRdR7hIMaCl+PYBYXWxIMCcXbSA5aE09p2Ojv+vPHqq VfBw== X-Gm-Message-State: AHYfb5hULcjyfdAxHYsDgNdh3IfaaQpVggrETkU0w7KLXIidWCTvFQp0 PCVMyXoPnCzs5fa0 X-Received: by 10.84.217.141 with SMTP id p13mr259902pli.159.1503918967778; Mon, 28 Aug 2017 04:16:07 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id z7sm402861pgb.24.2017.08.28.04.16.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 04:16:06 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 28 Aug 2017 16:45:48 +0530 Message-Id: <1503918948-1436-2-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503918948-1436-1-git-send-email-jteki@openedev.com> References: <1503918948-1436-1-git-send-email-jteki@openedev.com> Cc: Tom Rini , Fabio Estevam Subject: [U-Boot] [PATCH 2/2] i.MX6Q: icorem6: Add falcon mode 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: Jagan Teki Add Falcon mode support in Engicam i.CoreM6 board. Signed-off-by: Jagan Teki --- board/engicam/common/spl.c | 11 +++++++++++ configs/imx6qdl_icore_mmc_defconfig | 1 + include/configs/imx6-engicam.h | 14 ++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index a8a7cf3..6dc9851 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -39,6 +39,17 @@ static iomux_v3_cfg_t const uart_pads[] = { #endif }; +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot(void) +{ + /* break into full u-boot on 'c' */ + if (serial_tstc() && serial_getc() == 'c') + return 1; + + return 0; +} +#endif + #ifdef CONFIG_MX6QDL /* * Driving strength: diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 9d61c48..4baed1c 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -48,3 +48,4 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPL_OS_BOOT=y diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index e0bdb656..a1b7036 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -183,6 +183,20 @@ # define CONFIG_MII #endif +/* Falcon Mode */ +#ifdef CONFIG_SPL_OS_BOOT +# define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" +# define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" +# define CONFIG_CMD_SPL +# define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 +# define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) + +/* MMC support: args@1MB kernel@2MB */ +# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ +# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) +# define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ +#endif + /* Framebuffer */ #ifdef CONFIG_VIDEO_IPUV3 # define CONFIG_IPUV3_CLK 260000000