From patchwork Fri Aug 23 17:00:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1152312 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; 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="dizQrA+C"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46FSMy5MVqz9s3Z for ; Sat, 24 Aug 2019 03:01:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 372D9C21C4A; Fri, 23 Aug 2019 17:00:57 +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, 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 09022C21C4A; Fri, 23 Aug 2019 17:00:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 99965C21C38; Fri, 23 Aug 2019 17:00:53 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by lists.denx.de (Postfix) with ESMTPS id 4884EC21C29 for ; Fri, 23 Aug 2019 17:00:53 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id k1so9532724wmi.1 for ; Fri, 23 Aug 2019 10:00:53 -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=sSkLAwGARjVlLaGZEgjkG47/lDaxu4qDCXhoXun0v1k=; b=dizQrA+CmGHcvoRzCZLHFTyKaN85bdMaugVcAncz2lXNbN7ttHiYj6vR5UhrFf9i+m FMDlvduvNqsskOBgGHTbsvVgL+0kbP1QVa0qkhMjKbZjuqFR7G3W4uNM/RGyUbKy3JY6 knkf1Ja2qvk5w2NP4A0nw2rGrVa7GL2zkHxSketVYd3jgb3wl5nifjB74tgCM+ejV7+B A/XD22GzC5M1Jbev50TwqSF29keyN8NUtJexSiZ7CogG3fFC0NM8fc+K9kasdnT6J0gx 9RzUIs1qdymeePVSOkMOphbu+ZS8dfVhCkwDXO9XPGKGskGwqPMQovih1f1egsmANM9V XhIA== 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=sSkLAwGARjVlLaGZEgjkG47/lDaxu4qDCXhoXun0v1k=; b=rFXMrP6hqkiVldGAYOCi9cMBxXE5sLAA75mekUwCRvxDKzeip+BLnnETzXyWu4W36Q gJTx9wtT6uQ+yhswJSZLfidCN21VitNzrCXb3eMv6QLR3X03CuusP194ftDxaMWePGfG I+OS9dko6Mt76GPFwj4yuGF4UFM6aI3xJiYrQMEDHRtuMy4PtjltZ2H2iX1GpgtWpwdT BarI2EUw9SwOeQ/lQdAIrDmGKFJRIJjsvQQw4qRtBEHtgGvNojy4p9JOBFjVyu5/y5VT X1CzYlUiIxWmTrDUV68/RMYDt2h9Ihr3Nm4elGkzBopLnhQMcABXMgDv0mk9eKtj1mue VUvg== X-Gm-Message-State: APjAAAUadZRaUCQYUEb8RyC+mLLP/0kca9dtHJb01qWxXdDXjx3jeWIN orHszG723Fj0ywWWVp4txsHQCNlZb7U= X-Google-Smtp-Source: APXvYqwn1wGO+IEWclRICG3XAcDBag0QyrWSX1PwfspMlTiKCVJO2ZZDQphgmRWGyj3OJuLqqBlnag== X-Received: by 2002:a1c:a003:: with SMTP id j3mr6452693wme.42.1566579652562; Fri, 23 Aug 2019 10:00:52 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id 20sm2717232wmk.34.2019.08.23.10.00.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Aug 2019 10:00:52 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Fri, 23 Aug 2019 20:00:48 +0300 Message-Id: <20190823170049.23870-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Igor Opaniuk , Stefan Agner , Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 1/2] colibri_imx6/imx7/imx8x: use distroboot by default 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: Igor Opaniuk Use distro_bootcmd as defauult bootcmd instead of legacy wrappers. Signed-off-by: Igor Opaniuk Reviewed-by: Oleksandr Suvorov --- include/configs/colibri-imx8x.h | 1 + include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 2469066849..2b093efb2c 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -82,6 +82,7 @@ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ + "boot_file=Image\0" \ "console=ttyLP3 earlycon\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 147f801353..a719a4eadc 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -92,6 +92,7 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) @@ -168,8 +169,7 @@ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ - "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ + "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \ "usb start ; " \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ "boot_file=zImage\0" \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 49cdd61038..760e36fac9 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -109,7 +109,8 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ - "ramdisk_addr_r=0x82100000\0" + "ramdisk_addr_r=0x82100000\0" \ + "scriptaddr=0x82500000\0" #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) #define SD_BOOTDEV 0 @@ -160,7 +161,7 @@ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ UBI_BOOTCMD #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) -#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \ +#define CONFIG_BOOTCOMMAND \ "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;" #define MODULE_EXTRA_ENV_SETTINGS \ "variant=-emmc\0" \ From patchwork Fri Aug 23 17:00:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1152313 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; 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="raDDkuln"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46FSNm52sMz9s3Z for ; Sat, 24 Aug 2019 03:01:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 40ED3C22132; Fri, 23 Aug 2019 17:01:09 +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 7FDF4C220ED; Fri, 23 Aug 2019 17:00:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BD3C9C21C38; Fri, 23 Aug 2019 17:00:54 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 6A1A9C21C29 for ; Fri, 23 Aug 2019 17:00:54 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id y8so9234333wrn.10 for ; Fri, 23 Aug 2019 10:00:54 -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=CiHmkOAgdsim6J5c+dn1ukyU3spYLr49ZBGCIhwY/as=; b=raDDkulnQ+u/PdQLqpK54/0ObIcyZOm3/zU9XB8d6syEpV/YHFhqEHdC+sQi+Kln8O 89JaJKDDZBQsrDCopSvQhdXQ3oYLndSZSWgQa53ju4GB2W7Ifo90fECHsSZJGOlqU91t Sqsnty+nZHsLA8MB7pcfxRtf43mtiu15OtrnH5D/ijQ8pHDlYkGJTLS/DtJn4RJHDuzq XjB+g4mj5E/QoyFRGN8I/ykRSRBpVEzuyqxLQLcFBcqBs95DQ7NyinUzFmN8npQ0vI43 73a5t7PiUQ4lyQn5HCPwm3Py90yPw5Cmi0wVIszmfX/eVm2o9ZTI+LXNaHT/n0RZ6GBM mw2g== 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=CiHmkOAgdsim6J5c+dn1ukyU3spYLr49ZBGCIhwY/as=; b=G2Tjs18r96ri36I2ABHhyptiH3pGan97yfcAYLRQLtvrjs2QHwnLBxz9rlSVcQv52Z wuQPmDtQejt+P56qrJS5nZs3wRDSdJaFYUu+JHv4kBkIW5mxjfomml1sER8OrRZALMUL yxK3nJsgsSIluLXeK45jgT97bU+FrAaKg9IqxxaALW72jJC1jUWvPMTblyMrzXmkQnwj M9cKmIbrQ7yecwW745lSBPEHkAYcJ3Oo895gWYQQz46inVwAHVqizTUlph9gFYzBF9Ws YXB+EsOSGSV3msc4cifk0tvVmCkxqjUv/1mstWpkAop5XOZT9MW3KxvG8dSYdtjhB0R8 z6/w== X-Gm-Message-State: APjAAAVfWNJL7D+sccgfsHTC9eSGILrKalJpgp4AEe/zit2HijsT4Ccy i4TXKayEWqAz3lAH1l79VoYAu9pEOyM= X-Google-Smtp-Source: APXvYqxut8urG2o0tAEPJIcrUs8xyEdcjThrsS3m6RfhEHkiHEHjsmcRq4rZZdw7RZMNCdP7AiVjxQ== X-Received: by 2002:a5d:494d:: with SMTP id r13mr6211745wrs.82.1566579653741; Fri, 23 Aug 2019 10:00:53 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id u186sm7857547wmu.26.2019.08.23.10.00.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Aug 2019 10:00:53 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Fri, 23 Aug 2019 20:00:49 +0300 Message-Id: <20190823170049.23870-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190823170049.23870-1-igor.opaniuk@gmail.com> References: <20190823170049.23870-1-igor.opaniuk@gmail.com> Cc: Marcel Ziswiler , Igor Opaniuk , Max Krummenacher Subject: [U-Boot] [PATCH v1 2/2] apalis_imx6: use distroboot by default 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: Igor Opaniuk Use distro_bootcmd as defauult bootcmd instead of legacy wrappers. Signed-off-by: Igor Opaniuk Reviewed-by: Oleksandr Suvorov --- include/configs/apalis_imx6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 974571df43..736ebb60ce 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -102,6 +102,7 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(USB, usb, 0) \ @@ -184,8 +185,7 @@ #endif #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ - "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ + "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ "usb start ; " \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ "boot_file=zImage\0" \