From patchwork Wed Sep 1 15:03:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Liu X-Patchwork-Id: 1523383 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=CNytZvwl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4H0F7W2Dg0z9sPf for ; Thu, 2 Sep 2021 05:51:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38E2F8324A; Wed, 1 Sep 2021 21:51:37 +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="CNytZvwl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6C8D834D2; Wed, 1 Sep 2021 17:03:33 +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=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (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 B1611834AD for ; Wed, 1 Sep 2021 17:03:29 +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=liu.ming50@gmail.com Received: by mail-wm1-x331.google.com with SMTP id j14-20020a1c230e000000b002e748b9a48bso3992714wmj.0 for ; Wed, 01 Sep 2021 08:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HWaA2fgNDAt/nGiebu6UmUmhe6IMx50b8KRNrnwb9PY=; b=CNytZvwl5KQW0Eb2kgKA/l6+qXdtp3XUIUL0QLOuDPenreNDiiJhKan/raww8GIxUP 1SRxdAJtC7/DiyHfIDmwZR2iG+fJsBCOfhc9FvKHwLkvCco6DziMm1+mgQoUmYZ6lv/Q UkTI9i3GhslZeURvIR6av0NCI10ui1ERvsJ22wWuV8KdqUyc9R98xMoeBeYxJ3stoDHj cfYyGgk25blqzC7AlVP4BshGCpuqVLkK8FAWwNdeWGPQc7cKnZSfnhBkNq/HB/TgskrL eCrYJNswjj7zOJsQieut8CyzYoJsVNdCTYevHlis4MkAyzOFOE+JwXbnHEf5F1mvNUgI xMKQ== 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=HWaA2fgNDAt/nGiebu6UmUmhe6IMx50b8KRNrnwb9PY=; b=eHWTRPlB645wGo3VDktp+NkPsacPxcN5PXEmcXdEHbdWOrYbIpd1Z9mLzSInNwwN4H U2cxGr3k4tJv3Tvqg23apM+k6dRR2DU4GNU/fWxqb5kaz5F5MhvhdDiC0ufq4m7y92iK HR3Gs7xQYbJGrIbn2VrKAkIm0vv62UQv0G0rPqS7/oM2QjsZlelIB40NBlUjr5Uvx8Nn rsLHFhqWYJi4XyOq2sy6xiu6d47a0pgBT+UVAOv18EeaPPoevsuGBmEKJqDtcuYv4szd eHng5jWlhXBGhz2+rSdI/wfdMCsI15Sg42JobGo6llm+23ri3+/IGKJefRmUHjOhOTdu irHg== X-Gm-Message-State: AOAM5336Cny/SycRHy5arQzJXF8Fkoi3Gv4mJtZHBeH0xe8LdBl/g+Le 4F6ZHgGeF6nVAfXFylAPmqr79WZlc0I= X-Google-Smtp-Source: ABdhPJzAu0vOfAPyN7h3k/CRcJusyOGX+dzaVRypR8jL260+JLwQqpnLloGxWQZBKPx/w2RaGdsY9A== X-Received: by 2002:a7b:cc16:: with SMTP id f22mr10157064wmh.99.1630508608973; Wed, 01 Sep 2021 08:03:28 -0700 (PDT) Received: from localhost.localdomain (customer-212-100-112-191.stosn.net. [212.100.112.191]) by smtp.gmail.com with ESMTPSA id x21sm5609035wmi.15.2021.09.01.08.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 08:03:28 -0700 (PDT) From: liu.ming50@gmail.com To: u-boot@lists.denx.de Cc: max.krummenacher@toradex.com, marcel.ziswiler@toradex.com, philippe.schenker@toradex.com, Ming Liu Subject: [PATCH V2] colibri-imx7: move CONFIG_BOOTCOMMAND from header to defconfig Date: Wed, 1 Sep 2021 17:03:24 +0200 Message-Id: <20210901150324.24779-1-liu.ming50@gmail.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 01 Sep 2021 21:51:32 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean From: Ming Liu Move CONFIG_BOOTCOMMAND definition from colibri_imx7.h to colibri_imx7_defconfig, to be more flexible, for instance, it could be overridden by merge_config.sh script. Signed-off-by: Ming Liu --- configs/colibri_imx7_defconfig | 3 ++- include/configs/colibri_imx7.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 39149167e0..74d452246b 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -14,7 +14,8 @@ CONFIG_IMX_HAB=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" CONFIG_BOOTDELAY=1 -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb " # CONFIG_CONSOLE_MUX is not set diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 2fffaa39c0..f663865156 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -117,8 +117,6 @@ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) -#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \ - "run distro_bootcmd;" #define MODULE_EXTRA_ENV_SETTINGS \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ UBI_BOOTCMD