From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 542ABC4338F for ; Thu, 29 Jul 2021 12:00:37 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A25AD60720 for ; Thu, 29 Jul 2021 12:00:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A25AD60720 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DD7182F2F; Thu, 29 Jul 2021 13:59:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="IQJKVhTg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9164282E02; Thu, 29 Jul 2021 09:21:27 +0200 (CEST) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (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 9B7CF82DF3 for ; Thu, 29 Jul 2021 09:21:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wm1-x32f.google.com with SMTP id a192-20020a1c7fc90000b0290253b32e8796so4639830wmd.0 for ; Thu, 29 Jul 2021 00:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=10Dmd8yHQ9SOnTjpQsAY1qUXx0h8BepXL9g0+xCzzSY=; b=IQJKVhTgiYc5BKtAhoTI+rb+wwcpIgPTTuZHo3MeRfB44QP7LxtDM9tQ/g4jgT4JtK 9rD+UO4zMkY//kl6JA08MY71ceHw3eLa8UXHuFrdCAzKDXYys2di+s3LmuEm3ocNZvqJ j7CQKlVbSbXhC9lczH7O+uilxIli8Q+k3xb1yzVbgY1ku2+MwzXX/AqkqNWQmAYArpqZ +/p9SoWfksDVeQ3GF+j7JiXd2Y0kj0Td7eyDdX6DBgBhbwcRniNyooMrv2cL4SgZjM2c OTACZRejQ3kPeiVscW7LfLzN7LAYhPYRhKdyvayZWk0fDXVmq7oThnN337/LwM3CoWJs gHaA== 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:mime-version:content-transfer-encoding; bh=10Dmd8yHQ9SOnTjpQsAY1qUXx0h8BepXL9g0+xCzzSY=; b=QfRzoqPVR6dFcGeSQsaqCDnBxuHlMUdvkHjdQkCREFlrYf7IaFrxYTGqNZBlC6BTZi kT5CHG4GkVy2XvxmZkxbaYf+nO6oytQqu8htB1o0L5QiwsA6hlYU8yqBkAOQf6BJ7qYq /9trXgSjkIoqapWdJ/keCvOp059pSrA3fMGDBT5lMYD1Boxb0fCffQ09mMhu3vFdGyBH b85P8ftpfE6/RaoBgswwCiIjUnRYgceqEYsb7AScdGpPhQzOTJgHD3YbojWNFRuU93YM 8o67N9ID+U++ig6XXdolyk7yCEfwUeQVEOjq/E3bwe4Ib8ePtZcpi1NfVBENOg/6jKEd tM/Q== X-Gm-Message-State: AOAM533GEUgbYIJ0kImYbfhOLFLLmqAuPmTidNVJGTGS/nNXlZW8tZZF FN60Os0Nz7WQ2Jvf+r/yu0rWZti0LPp0qfzS X-Google-Smtp-Source: ABdhPJxqBGSkhKhwRwZfsDVz7XgXreNS0VU/2flCgOOd+ZJ+Cg45lcaDnmGCj2GR/Ldz8xzxgIErgg== X-Received: by 2002:a7b:c351:: with SMTP id l17mr3258816wmj.120.1627543281185; Thu, 29 Jul 2021 00:21:21 -0700 (PDT) Received: from groot.home ([2a01:cb19:826e:8e00:b844:cc86:4a22:410b]) by smtp.gmail.com with ESMTPSA id q5sm2298185wrx.33.2021.07.29.00.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 00:21:20 -0700 (PDT) From: Mattijs Korpershoek To: Neil Armstrong Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Mattijs Korpershoek Subject: [PATCH 6/6] configs: meson64_android: don't set console bootargs Date: Thu, 29 Jul 2021 09:21:13 +0200 Message-Id: <20210729072113.208099-7-mkorpershoek@baylibre.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729072113.208099-1-mkorpershoek@baylibre.com> References: <20210729072113.208099-1-mkorpershoek@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Thu, 29 Jul 2021 13:59:28 +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 The console bootargs are already set from the kernel commandline. On Android, this is done in yukawa at [1] Don't set it in the bootloader since it's overridden by the kernel anyways. [1] https://android-review.googlesource.com/c/device/amlogic/yukawa/+/1112994 Signed-off-by: Guillaume La Roque Signed-off-by: Mattijs Korpershoek --- include/configs/meson64_android.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index 56545a72f8..3b61d5f703 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -86,7 +86,7 @@ "bootcmd_system=" \ "echo Loading Android " BOOT_PARTITION " partition...;" \ "mmc dev ${mmcdev};" \ - "setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \ + "setenv bootargs ${bootargs} androidboot.serialno=${serial#};" \ "part start mmc ${mmcdev} " BOOT_PARTITION " boot_start;" \ "part size mmc ${mmcdev} " BOOT_PARTITION " boot_size;" \ "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \ @@ -121,8 +121,6 @@ "gpio_recovery=88\0" \ "check_button=gpio input ${gpio_recovery};test $? -eq 0;\0" \ "load_logo=" PREBOOT_LOAD_LOGO "\0" \ - "console=/dev/ttyAML0\0" \ - "bootargs=no_console_suspend\0" \ "stdin=" STDIN_CFG "\0" \ "stdout=" STDOUT_CFG "\0" \ "stderr=" STDOUT_CFG "\0" \ -- 2.30.2