From patchwork Tue Jun 16 19:20:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310669 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ZiWBwL6d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdRp2pqQz9sRW for ; Wed, 17 Jun 2020 05:24:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F22281F76; Tue, 16 Jun 2020 21:21:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZiWBwL6d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A80481F4B; Tue, 16 Jun 2020 21:20:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A675281F3A for ; Tue, 16 Jun 2020 21:20:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id y11so24998722ljm.9 for ; Tue, 16 Jun 2020 12:20:35 -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=fT8BPVr+sRxlaCkPLDGcIS3q2sMh8Z9DYF5/Z5oxWe0=; b=ZiWBwL6doe5gkZLTJwjh6b7Xq28l/h1P+TMptgl/wGgsrsukONjmX29JBka41j6jgj u7wzt1x6jFvMkVR3/KSj5RvfRuSqHRlOQ/Zm5A+xR90QnwHzRz2LC+YW7o27TKa+e+mw trLWbNOey7EjhjnO+ZvEUCnV6UZ3gYsOobuPWkQ5qRcQUqCGH2kjnlw3+5YZO1bj0Bt0 8wnXyCThLd558fDskabGeG0EZ1D5iUtviKvSg4bR/0nZ1Znwi4YQwOtkPxnDsf433ltl 2sCgL8BOVXoy89RJ6gqsbIDGN1ZzhE7p3ccbFRPg/oBSlDjws9gPaVJg1nXE/Zvz4hh8 ITZw== 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=fT8BPVr+sRxlaCkPLDGcIS3q2sMh8Z9DYF5/Z5oxWe0=; b=NuNTOAlqUhaN6sMSBDTs7bwgG001nl+RDCWw1flNbV8HjJCGPxW6eBNECPbDE1XpXR ADjocCnhXY5hVsolqs75kur37U49DSeC9TwUJbHtjFyMn2dlCrjZjq11LxjynXuwKGxz zzYZ3JdeLW5dslOMBp5giuvyhwGZ0lOxwRZUBEtbgWnrSN+Tgfu6YGJ2SxphQdCeEFpP O45tmgLuYCYnAWRAVC5886fS8ugA/M5sS4IFFhoYvRya3rXLTXQxHX3uz+r3BHN7l/sO e1wsNSlQbDS2aIrS4Wn+tZA2WZUsf2TmsOLob9jJr1Kkc7Wf8wLYjHZHU+22GoGJKKnV B/WA== X-Gm-Message-State: AOAM530VU3gOP4MM2QqcZ92w4CrlMytJ0oNbhqF/zAUOFrJf5Qibywla LMgWp9bZjGqE/9hes3DAFc0O5b7a X-Google-Smtp-Source: ABdhPJwWbxTjyinzVF5jxc9G3SCmZC68DJh7h1Lh0Z/iAaPx4ycQZeGYnfnRPUjX2fOUh02U0nZK+g== X-Received: by 2002:a2e:974a:: with SMTP id f10mr2264708ljj.283.1592335233956; Tue, 16 Jun 2020 12:20:33 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id k22sm5459313lfg.69.2020.06.16.12.20.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:33 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 11/13] apalis_imx6: boot env configuration updates Date: Tue, 16 Jun 2020 22:20:09 +0300 Message-Id: <1592335211-5998-12-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Drop legacy emmcboot wrapper from env. 2. Change the "boot try" order. Default one is: SD -> eMMC -> USB -> DHCP 3. Drop DFU defines Signed-off-by: Igor Opaniuk --- include/configs/apalis_imx6.h | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d5a0625..dd99096 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -93,9 +93,9 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ + func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include @@ -105,14 +105,6 @@ #define BOOTENV #endif /* CONFIG_SPL_BUILD */ -#define DFU_ALT_EMMC_INFO \ - "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ - "boot part 0 1;" \ - "rootfs part 0 2;" \ - "zImage fat 0 1;" \ - "imx6q-apalis-eval.dtb fat 0 1;" \ - "imx6q-apalis-cam-eval.dtb fat 0 1" - #define UBOOT_UPDATE \ "uboot_hwpart=1\0" \ "uboot_blk=8a\0" \ @@ -124,23 +116,6 @@ "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \ "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0" -#define EMMC_BOOTCMD \ - "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \ - "ro,noatime rootfstype=ext4 rootwait\0" \ - "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ - "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ - "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "emmcbootpart=1\0" \ - "emmcdev=0\0" \ - "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ - "${fdt_addr_r} ${fdt_file} && " \ - "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \ - "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ - "emmcrootpart=2\0" - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ "fdt_addr_r=0x12100000\0" \ @@ -173,8 +148,6 @@ "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ - "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ - EMMC_BOOTCMD \ "fdt_file=" FDT_FILE "\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \