From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 Jul 2024 13:01:51 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sRrYd-003jYI-0O for lore@lore.pengutronix.de; Thu, 11 Jul 2024 13:01:51 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sRrYc-0001t5-Kl; Thu, 11 Jul 2024 13:01:50 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sRrYX-0001px-0m; Thu, 11 Jul 2024 13:01:45 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sRrYW-008kHN-K5; Thu, 11 Jul 2024 13:01:44 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1sRrYW-001yQ6-1d; Thu, 11 Jul 2024 13:01:44 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Thu, 11 Jul 2024 13:01:41 +0200 Message-Id: <20240711110143.470379-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711110143.470379-1-a.fatoum@pengutronix.de> References: <20240711110143.470379-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Activating the first console unconditionally is a bad idea as it's probe order dependent which console is registered first. It seems like all systems we support with platform-v7a describe their default console with /chosen/stdout-path, so let's select CONFIG_CONSOLE_ACTIVATE_NONE instead, which instructs barebox to not activate a specific console unconditionally and instead activate depending on explicit configuration (like /chosen/stdout-path). Signed-off-by: Ahmad Fatoum --- configs/platform-v7a/barebox-am335x.config.diff | 4 +--- configs/platform-v7a/barebox-at91.config | 4 ++-- configs/platform-v7a/barebox-at91.config.diff | 2 +- configs/platform-v7a/barebox-mx6.config.diff | 4 +--- configs/platform-v7a/barebox-rpi2.config | 4 ++-- configs/platform-v7a/barebox-rpi2.config.diff | 2 +- configs/platform-v7a/barebox-stm32mp.config.diff | 4 +--- configs/platform-v7a/barebox-vexpress.config | 4 ++-- configs/platform-v7a/barebox-vexpress.config.diff | 4 +--- configs/platform-v7a/barebox.config | 4 ++-- 10 files changed, 14 insertions(+), 22 deletions(-) diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index f1d46b41cf9a..10c4775dfaba 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -27,8 +27,6 @@ CONFIG_CMD_NAND=y # CONFIG_COMMON_CLK is not set # CONFIG_COMMON_CLK_GPIO is undefined # CONFIG_COMMON_CLK_OF_PROVIDER is undefined -# CONFIG_CONSOLE_ACTIVATE_FIRST is not set -CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CRYPTO_KEYSTORE=y CONFIG_DEBUG_OMAP_UART_PORT=1 CONFIG_DIGEST_HMAC_GENERIC=y diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index c3aeee7125fe..d3c50caa44a0 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -195,9 +195,9 @@ CONFIG_IMD=y CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set -CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_CONSOLE_ACTIVATE_FIRST is not set # CONFIG_CONSOLE_ACTIVATE_ALL is not set -# CONFIG_CONSOLE_ACTIVATE_NONE is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_CONSOLE_DISABLE_INPUT is not set CONFIG_PBL_CONSOLE=y diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 2aca21897016..9ee1b4d98aef 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 291a35edc4b9..6b60d63a5828 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -35,8 +35,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SPLASH=y CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y -# CONFIG_CONSOLE_ACTIVATE_FIRST is not set -CONFIG_CONSOLE_ACTIVATE_NONE=y # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_KEYSTORE=y CONFIG_DEBUG_IMX_UART_PORT=1 diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 63035910c2a3..cb6ac777ca92 100644 --- a/configs/platform-v7a/barebox-rpi2.config +++ b/configs/platform-v7a/barebox-rpi2.config @@ -180,9 +180,9 @@ CONFIG_IMD=y CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set -CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_CONSOLE_ACTIVATE_FIRST is not set # CONFIG_CONSOLE_ACTIVATE_ALL is not set -# CONFIG_CONSOLE_ACTIVATE_NONE is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_CONSOLE_DISABLE_INPUT is not set # CONFIG_PBL_CONSOLE is not set diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index b2b34df1d863..bd7044318525 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 CONFIG_ARM_ASM_UNIFIED=y # CONFIG_CMD_NVMEM is not set CONFIG_DRIVER_NET_BCMGENET=y diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index be07a2a27b1f..6c285c6793bc 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -41,8 +41,6 @@ CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_STM32MP135=y CONFIG_COMMON_CLK_STM32MP157=y CONFIG_COMPILE_LOGLEVEL=6 -# CONFIG_CONSOLE_ACTIVATE_FIRST is not set -CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CRC8=y # CONFIG_DEBUG_PBL is not set CONFIG_DEFAULT_LOGLEVEL=7 diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index ac4bff2d9a9d..ee0229f5c862 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -164,8 +164,8 @@ CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set # CONFIG_CONSOLE_ACTIVATE_FIRST is not set -CONFIG_CONSOLE_ACTIVATE_ALL=y -# CONFIG_CONSOLE_ACTIVATE_NONE is not set +# CONFIG_CONSOLE_ACTIVATE_ALL is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_CONSOLE_DISABLE_INPUT is not set CONFIG_PBL_CONSOLE=y diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 103a9e77df62..788a820066f5 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -e68dcd40a22e40e08bfbabe8f90da935 +1cd68f01fa4cd1e3cbe5a47a02cbbb93 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y @@ -9,8 +9,6 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_CLOCKSOURCE_BCM283X is undefined # CONFIG_CMD_GPIO is undefined # CONFIG_CMD_SMC is undefined -CONFIG_CONSOLE_ACTIVATE_ALL=y -# CONFIG_CONSOLE_ACTIVATE_FIRST is not set # CONFIG_DEBUG_PBL is not set CONFIG_DRIVER_CFI=y CONFIG_DRIVER_CFI_AMD=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index a562d8e8bf73..54ca5d8da610 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -179,9 +179,9 @@ CONFIG_IMD=y CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set -CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_CONSOLE_ACTIVATE_FIRST is not set # CONFIG_CONSOLE_ACTIVATE_ALL is not set -# CONFIG_CONSOLE_ACTIVATE_NONE is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_CONSOLE_DISABLE_INPUT is not set # CONFIG_PBL_CONSOLE is not set -- 2.39.2