From patchwork Fri Mar 24 20:58:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760949 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=g7FxBJav; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PjvhW1H5Lz1yYB for ; Sat, 25 Mar 2023 07:59:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 914E185D8B; Fri, 24 Mar 2023 21:58:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="g7FxBJav"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5313F85D9D; Fri, 24 Mar 2023 21:58:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) (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 4C24A85D4A for ; Fri, 24 Mar 2023 21:58:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2e.google.com with SMTP id p203so3778806ybb.13 for ; Fri, 24 Mar 2023 13:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nG37oRr6vgONHGl+noOjMTMwDZo8+aCTsjQ3k8eWYvw=; b=g7FxBJavaE5ArhJl0rbSYjU+uN2Ba/ztVmzU3iPaMi04HGwtDpYHqB28I41XKZxkus yMKNMivJS3NCYvEyvAQft8D4x2e0bOs0xaecTMR3tSaCR+ofKKdUuHqiSerWJuX9Hx5y /czuXaSSuJNiSX3TrhsEIimZg0f5mPSYNNNPQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nG37oRr6vgONHGl+noOjMTMwDZo8+aCTsjQ3k8eWYvw=; b=WCDE9geSXpjNQHdOJP2eZU+WX5Ybo2NYCcDakmKsTfEre9amZef872/c8QSjX51mtB 40vW40QW3f4k+bRVkazqIJwA32LH1Xq58Fm/SkPOSpMl5vGVyGLuXARheup+r3SEf5UX ib5cCeNBed0Kbv2aiLq3L9l+7UhDOxxOksvMQT6FO1IPNxZ8G6Nu7YAbSv34tK+mwBKO +5FH5DfTj7Wy0fEFggaWnha7EagHzVfyIfyQqbT4mMQrAxIoMzZRwt5KHLNTxE5GB76q Eh5kZs/0182gJFRgtNsVfmQOZoZBSjYjuKTlLaPNy30s5/xHMhAy4qv6cxhb/NsUi0j0 t/bQ== X-Gm-Message-State: AAQBX9e54INZj2gXdcD/rFnNCDPA8FffO7/pYxyBGL6Siy9VHWfp6VFp CIiDGt1gsgNthVExFtNmI3Rr6cw5S7EDQJtRUF/0kw== X-Google-Smtp-Source: AKy350a3HuyOgUxI7+ktTNxzXq49XTBO3ntMbaae9DWw4AMcZEAN8GYfcYHRw2367pgiCemm2wui/g== X-Received: by 2002:a25:e6d0:0:b0:b67:3bcd:5c31 with SMTP id d199-20020a25e6d0000000b00b673bcd5c31mr3389305ybh.51.1679691506614; Fri, 24 Mar 2023 13:58:26 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:26 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass , Vagrant Cascadian Subject: [v4 1/7] rockchip: Drop bootstage stash in TPL and SPL for rockpro64 Date: Fri, 24 Mar 2023 16:58:10 -0400 Message-Id: <20230324205816.2035181-2-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass Unfortunately the IRAM used to stash the bootstage records in TPL becomes inaccessible after SPL runs. Presumably this is because of ATF taking it over. We could move the stash to another address in SPL, before passing it to U-Boot proper. But it seems easier to wait until we have support for standard passage[1] which should not be too far away. For now, disable it in TPL and SPL. [1] https://patchwork.ozlabs.org/project/uboot/cover/ 20220117150428.1580273-1-sjg@chromium.org/ Signed-off-by: Simon Glass Tested-by: Vagrant Cascadian --- Changes in v4: None. --- configs/rockpro64-rk3399_defconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index dd67f9dff64b..496142368195 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -13,7 +13,6 @@ CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCKPRO64_RK3399=y CONFIG_SPL_STACK=0x400000 -CONFIG_BOOTSTAGE_STASH_ADDR=0xff8e0000 CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y @@ -21,11 +20,7 @@ CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y CONFIG_BOOTSTAGE=y -CONFIG_SPL_BOOTSTAGE=y -CONFIG_TPL_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=10 -CONFIG_BOOTSTAGE_STASH=y CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y From patchwork Fri Mar 24 20:58:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760951 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=DM6Ii/Nt; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pjvj00NHSz1yYB for ; Sat, 25 Mar 2023 07:59:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB21A85DB0; Fri, 24 Mar 2023 21:58:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="DM6Ii/Nt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C0D9859F1; Fri, 24 Mar 2023 21:58:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) (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 9D70F85D6B for ; Fri, 24 Mar 2023 21:58:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb34.google.com with SMTP id p204so3782139ybc.12 for ; Fri, 24 Mar 2023 13:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=91jybTZrqv1B3VdW5qUXy6XnqO2gNx4BGSU+iJGZ4Fc=; b=DM6Ii/Nte3tSAoHRtEdLuPCye2xe4MD4DrBVky7bDFe8fdSR5C182UN5qQMSogcOdO jH/3wRfFa7Cp/PacPqpuQ3tK2j8YyqbeZAJaPT6NYQsNBaMb8xFpxPWzz4HEXVbb6Qgw Ulz3TYupwI04XI0PSBvbMcE+COYggqSkY0zO4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=91jybTZrqv1B3VdW5qUXy6XnqO2gNx4BGSU+iJGZ4Fc=; b=1YRc/VXfj3wiR3/qD8FOq9uYupfgHSwux587ytk+yWBCtnA0kgwgQQA0ee/RDLYEVW e+WcvWMrC2bzI2nopwA0XnoZFObKSpTdmHqBn4NaAiLxYbQ2x6gSqKwT87aQL/zKiywg IOfLgeaWejz9zfd38qo5gWpUMt3Y2+RrGEIOexeRjMIW4kOjSWtu/NBXuWLyog093yNS KdZK3gKzmikBWyQlv2pxj+dQ5nlwRivnsrPWRiyi4wlo5cL2+gFCzZxscB9Fta+gKavG A6IgHpRGy0RhqN081kLjisQ8rC8VhK6MdnDS7TU0Q/Har+esBeyw3zu2A8XNKEFSUyWN STxg== X-Gm-Message-State: AAQBX9cPy3/qmL0QXz5LP2sR4zRsYNNjs8prgv6LBkaz8fR+PbHPoprH Oa6Hhxx1VN0O4wG7OnPBw2zQLe7Wge00ueZZI0aAbQ== X-Google-Smtp-Source: AKy350bd4GGKBw8GJExYyxNmGzp7A0QELDk4fL1JTFrCNfTjvdcitv2UIskvNW88gE06AhICJZSw1w== X-Received: by 2002:a25:3618:0:b0:b74:81b3:412c with SMTP id d24-20020a253618000000b00b7481b3412cmr3335045yba.33.1679691507198; Fri, 24 Mar 2023 13:58:27 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:27 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [v4 2/7] Move DISTRO_DEFAULTS into boot/ Date: Fri, 24 Mar 2023 16:58:11 -0400 Message-Id: <20230324205816.2035181-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass This relates to booting so move it in to that Kconfig file, before changing it. Signed-off-by: Simon Glass --- Changes in v4: None. --- Kconfig | 27 --------------------------- boot/Kconfig | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Kconfig b/Kconfig index a75cce7e28fb..b8f65589f457 100644 --- a/Kconfig +++ b/Kconfig @@ -191,33 +191,6 @@ config XEN [1] - https://xenproject.org/ -config DISTRO_DEFAULTS - bool "Select defaults suitable for booting general purpose Linux distributions" - select AUTO_COMPLETE - select CMDLINE_EDITING - select CMD_BOOTI if ARM64 - select CMD_BOOTZ if ARM && !ARM64 - select CMD_DHCP if CMD_NET - select CMD_ENV_EXISTS - select CMD_EXT2 - select CMD_EXT4 - select CMD_FAT - select CMD_FS_GENERIC - select CMD_PART if PARTITIONS - select CMD_PING if CMD_NET - select CMD_PXE if NET - select CMD_SYSBOOT - select ENV_VARS_UBOOT_CONFIG - select HUSH_PARSER - select SUPPORT_RAW_INITRD - select SYS_LONGHELP - imply CMD_MII if NET - imply USB_STORAGE - imply USE_BOOTCOMMAND - help - Select this to enable various options and commands which are suitable - for building u-boot for booting general purpose Linux distributions. - config ENV_VARS_UBOOT_CONFIG bool "Add arch, board, vendor and soc variables to default environment" help diff --git a/boot/Kconfig b/boot/Kconfig index 5f491625c820..170ab63f27dc 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -820,6 +820,33 @@ config SYS_BOOT_RAMDISK_HIGH endmenu # Boot images +config DISTRO_DEFAULTS + bool "Select defaults suitable for booting general purpose Linux distributions" + select AUTO_COMPLETE + select CMDLINE_EDITING + select CMD_BOOTI if ARM64 + select CMD_BOOTZ if ARM && !ARM64 + select CMD_DHCP if CMD_NET + select CMD_ENV_EXISTS + select CMD_EXT2 + select CMD_EXT4 + select CMD_FAT + select CMD_FS_GENERIC + select CMD_PART if PARTITIONS + select CMD_PING if CMD_NET + select CMD_PXE if NET + select CMD_SYSBOOT + select ENV_VARS_UBOOT_CONFIG + select HUSH_PARSER + select SUPPORT_RAW_INITRD + select SYS_LONGHELP + imply CMD_MII if NET + imply USB_STORAGE + imply USE_BOOTCOMMAND + help + Select this to enable various options and commands which are suitable + for building u-boot for booting general purpose Linux distributions. + menu "Boot timing" config BOOTSTAGE From patchwork Fri Mar 24 20:58:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760950 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=IDFpxyWE; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pjvhl6Nd8z1yYB for ; Sat, 25 Mar 2023 07:59:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 89E2085D99; Fri, 24 Mar 2023 21:58:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="IDFpxyWE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 395D0859F1; Fri, 24 Mar 2023 21:58:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) (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 203A085D80 for ; Fri, 24 Mar 2023 21:58:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2e.google.com with SMTP id e65so3788723ybh.10 for ; Fri, 24 Mar 2023 13:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SaSsicYkP3tOE2ARbGuFAMsCdYnwXv+rBzOQ6CASI9U=; b=IDFpxyWE07lxKOyPhC3D1xcifmGaxs8hEvB679aNGKRhDXQy/8rQc2TzsQoiGiNih/ klFCQd3/R2ti6w3gpkXPLhS0GaRcGKwyEPQSRbXGLRiWxrjQnqJ3QaEVTGoGF7zR9+VU +kbJrcmrAVisFgWm6jQb3I/GcykdxIMrwQwhI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SaSsicYkP3tOE2ARbGuFAMsCdYnwXv+rBzOQ6CASI9U=; b=F//2hzo/vDih01r9Tknas1EUlf4r14cNDz9GI5VHfN/chpk3bHeW5TWf1sVzpsLTVU nRMVbs4BKTDSAS4ULkMMnS4z9ArZLF+JXy1XVhz4GYRA8jvgY1fvL8Bm5xj/no8g2A4r IAQV0A5EsL4uI9uosnQ7p3j2PU8ZFfEMVs7l2NobXA3R/+1aBxSfp+40jxeQibArYKb2 grQRC7D3RjD5KpXf2ivAnQl3AtSQ0NFfR/rw1PwqF09LwpgKxRR18ahuNkbr2q/ljy2m 2YjTcUnrUtno8WpDsoZmV25B6wRYSwRCS1zuzYZdvHZl5VJrwY9jcWOnu7cgPXF/Iva4 bOVg== X-Gm-Message-State: AAQBX9cYDvSfRtgmzAXUADq5oUOEeACe0Z9XQKXAU4iDEXBMsJDhF5HV TGgFqrU1gcmRYGvTSbdnU1ibWHl4vGqRj7oCsjXMMw== X-Google-Smtp-Source: AKy350be2D0JERELblXyY1lDHyU1IiORRkaJcS5jM3Q0ue5TbOLDLXLGUPhKlNUfZdpG/ECOzNFIfA== X-Received: by 2002:a25:343:0:b0:b34:52f6:710d with SMTP id 64-20020a250343000000b00b3452f6710dmr8847120ybd.3.1679691507821; Fri, 24 Mar 2023 13:58:27 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:27 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [v4 3/7] lmb: Enable LMB if SYS_BOOT_RAMDISK_HIGH Date: Fri, 24 Mar 2023 16:58:12 -0400 Message-Id: <20230324205816.2035181-4-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass Ramdisk relocation requires LMB, so enable it automatically to avoid build errors. Signed-off-by: Simon Glass --- Changes in v4: None. --- boot/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/Kconfig b/boot/Kconfig index 170ab63f27dc..8fa3181d7e23 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -814,6 +814,7 @@ config SYS_BOOT_RAMDISK_HIGH depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ depends on !(NIOS2 || SANDBOX || SH || XTENSA) def_bool y + select LMB help Enable initrd_high functionality. If defined then the initrd_high feature is enabled and the boot* ramdisk subcommand is enabled. From patchwork Fri Mar 24 20:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760948 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=O4CFEx1z; dkim-atps=neutral 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PjvhC6QPZz1yYB for ; Sat, 25 Mar 2023 07:58:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 06F1185D4A; Fri, 24 Mar 2023 21:58:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="O4CFEx1z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CCDC785DA9; Fri, 24 Mar 2023 21:58:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb36.google.com (mail-yb1-xb36.google.com [IPv6:2607:f8b0:4864:20::b36]) (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 04A9C859F1 for ; Fri, 24 Mar 2023 21:58:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb36.google.com with SMTP id p15so3792272ybl.9 for ; Fri, 24 Mar 2023 13:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YV40+ZsdcCsFvrVdnmYv5QlHndDoxNmawttn5UuVXTY=; b=O4CFEx1zhlzkcawrwiydH3m7bhRaovVyShdyBJjjsRLy2x8NESTeF8shECo8Mz7G/H c3TXbxOhwKaUhuRupV2Poaq04+miQNqM/+0LVJGdNPM4UpWvQ0GkLNkA4rEQQXcRk/KF 9Ew1gI7MkNQNfpBmgdpSFmPNuCluvLdPC/i64= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YV40+ZsdcCsFvrVdnmYv5QlHndDoxNmawttn5UuVXTY=; b=eTHDZK3ESb3BU6pBheVvqvzrOqkbSGcrRUrCOWUbK++LbU8fTD0CKVzvoLPZBX51pU MZ4GMB/SmnGA4xgg3lrmEAHGhvMseYYGXEC1SZz3N6ucRfI2WUKyHGhC6ox9gzryVEWw EcdCzf7dpI37WU+z2Ux1Oojse/jRCjJiKLZwAzGuJgyVGFoVsON0o5gCSvwWTF4cA3CJ p7YPTB7c0L+u5lp5rWUVW69AT8JqGWBEwduRqlnj1lO0lpmPWArIG17cbaVR9lql3P06 DOFiCXYk5FchwrmUCj6CGwjvMNB3TCgyqllHeDz6f55JK6Vw049E9aucTUmNFPpJTAo8 22ZQ== X-Gm-Message-State: AAQBX9ecdGIvLmCZhJS/VeKnhXEISnMpWliwDqF4e2x7lF2EyaPzI3WL KjlxKwX63nlQWJ74zNydRIPxHDFmHCYHKSA2mOU7VA== X-Google-Smtp-Source: AKy350Y/ZYC2qwWMXlls0fxVs7HiNz+hE4ywRD9MkQBSxjlk+pxDuAsVcSfH2pLbOT8qaBIxY8GQyw== X-Received: by 2002:a05:6902:1543:b0:b44:1a6:6ccb with SMTP id r3-20020a056902154300b00b4401a66ccbmr4807591ybu.3.1679691508456; Fri, 24 Mar 2023 13:58:28 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:28 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [v4 4/7] boot: Create a common BOOT_DEFAULTS for distro and bootstd Date: Fri, 24 Mar 2023 16:58:13 -0400 Message-Id: <20230324205816.2035181-5-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass These two features use a lot of common options. Move them into a common CONFIG to reduce duplication. Use 'select' for most options since these are things that boards aren't supposed to override. For now it is not possible to disable BOOT_DEFAULTS but we may take another look later. Note that five options use 'imply' to match existing behaviour. Signed-off-by: Simon Glass [trini: Rework a bit so we don't grow so many platforms unintentionally] Signed-off-by: Tom Rini --- Changes in v4: - Reword the commit message - Rework the logic so that build-wise, nothing changes. --- boot/Kconfig | 62 ++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 8fa3181d7e23..ad035695a4a3 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -350,6 +350,32 @@ config PXE_UTILS help Utilities for parsing PXE file formats. +config BOOT_DEFAULTS + bool # Common defaults for standard boot and distroboot + imply USE_BOOTCOMMAND + select CMD_ENV_EXISTS + select CMD_EXT2 + select CMD_EXT4 + select CMD_FAT + select CMD_FS_GENERIC + select CMD_PART if PARTITIONS + select CMD_DHCP if CMD_NET + select CMD_PING if CMD_NET + select CMD_PXE if CMD_NET + select SUPPORT_RAW_INITRD + select ENV_VARS_UBOOT_CONFIG + select CMD_BOOTI if ARM64 + select CMD_BOOTZ if ARM && !ARM64 + imply CMD_MII if NET + imply USB_STORAGE + imply EFI_PARTITION + imply ISO_PARTITION + help + These are not required but are commonly needed to support a good + selection of booting methods. Enable this to improve the capability + of U-Boot to boot various images. Currently much functionality is + tied to enabling the command that exercises it. + config BOOTSTD bool "Standard boot support" default y @@ -410,24 +436,7 @@ config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" depends on BOOTSTD imply USE_BOOTCOMMAND - # Bring in some defaults which are generally needed. Boards can drop - # these as needed to save code space. Bootstd does not generally require - # the commands themselves to be enabled, but this is how some of the - # functionality is controlled at present - imply CMD_EXT2 - imply CMD_EXT4 - imply CMD_FAT - imply CMD_FS_GENERIC - imply CMD_PART - imply CMD_DHCP if NET - imply CMD_MII if NET - imply CMD_PING if NET - imply CMD_PXE if NET - imply USB_STORAGE - imply SUPPORT_RAW_INITRD - imply ENV_VARS_UBOOT_CONFIG - imply EFI_PARTITION - imply ISO_PARTITION + select BOOT_DEFAULTS help These are not required but are commonly needed to support a good selection of booting methods. Enable this to improve the capability @@ -823,27 +832,12 @@ endmenu # Boot images config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" + select BOOT_DEFAULTS select AUTO_COMPLETE select CMDLINE_EDITING - select CMD_BOOTI if ARM64 - select CMD_BOOTZ if ARM && !ARM64 - select CMD_DHCP if CMD_NET - select CMD_ENV_EXISTS - select CMD_EXT2 - select CMD_EXT4 - select CMD_FAT - select CMD_FS_GENERIC - select CMD_PART if PARTITIONS - select CMD_PING if CMD_NET - select CMD_PXE if NET select CMD_SYSBOOT - select ENV_VARS_UBOOT_CONFIG select HUSH_PARSER - select SUPPORT_RAW_INITRD select SYS_LONGHELP - imply CMD_MII if NET - imply USB_STORAGE - imply USE_BOOTCOMMAND help Select this to enable various options and commands which are suitable for building u-boot for booting general purpose Linux distributions. From patchwork Fri Mar 24 20:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760954 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=J+Yx33Vz; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pjvjl3XhCz1yYN for ; Sat, 25 Mar 2023 08:00:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C5D785E02; Fri, 24 Mar 2023 21:58:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="J+Yx33Vz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 68BDC85D7C; Fri, 24 Mar 2023 21:58:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) (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 676EA85D38 for ; Fri, 24 Mar 2023 21:58:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb33.google.com with SMTP id e65so3788772ybh.10 for ; Fri, 24 Mar 2023 13:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ob/HO3Lm3fzDpfVj3fy01c2WWe91hPJ/4Vf2L97CTWg=; b=J+Yx33VzWaMPG4hp2Vnh6aO0zyJ19X2VHCOHysdIWnPJjKIX75qhKfsiy3dUPQ9Ash ycD7zOfV0KvVJCOiboKbx40UOYlc+8FJFXMkTqhm02mYspJjI1oXMs50uIMdej7uRzuN MOjYuXI31dgj2PF/SwaZxJwL3OZ4MnAKdoKg8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ob/HO3Lm3fzDpfVj3fy01c2WWe91hPJ/4Vf2L97CTWg=; b=SsYXVE9zsT9dGnT99MFIi8I6BdFBUZsd21Oz/IgUgIt9dI/OFso5SKj9/MK9506QE/ KNCHTb580fkmkyB/o6+iPpILRVROpxWbdr6Afyqd9GmAdsQNBqR1VK9LQjSzm63FJoYC aZy1TOwplTKvprI/2e6Myg8egwsN2AelpYwSPutgN/2+6ylpVwZMSHQVhdD5f83Dw6JN syr5zVA/cQFyyyWHe1J2IOI6IzPZFKS8+LK1zSZAAFgNS1NUy2R8mn81SoBWBSfQvI7j 0MtxgRjEKMU7s9wxEi1IdJlfAkhTCX/S+kRok2PAEKmr4+g8S07hr8nEXezhDDQuOUDp Xlyg== X-Gm-Message-State: AAQBX9foVlwIZ31WsBlj7VX+Dek98VZxsihv4G+nX9AJhhMnPpX3u6Qf 6AlgWSgkguoyQWv9CI1wBPWx2hyFOPxh7ez8nu66KA== X-Google-Smtp-Source: AKy350Y/RyKk1Z+uzirBwIjCYdyBu42OgSRy8bpcaVFhx2iEPgNhp51nMdPkGV8NxAftZ/MD5dX04g== X-Received: by 2002:a25:4087:0:b0:b73:8066:d872 with SMTP id n129-20020a254087000000b00b738066d872mr3517189yba.38.1679691509018; Fri, 24 Mar 2023 13:58:29 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:28 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass , Vagrant Cascadian Subject: [v4 5/7] rockchip: Disable DISTRO_DEFAULTS for rk3399 boards Date: Fri, 24 Mar 2023 16:58:14 -0400 Message-Id: <20230324205816.2035181-6-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass These board have moved to standard boot but the old 'distro_bootcmd' command is still active. Disable DISTRO_DEFAULTS to fix this. Signed-off-by: Simon Glass Tested-by: Vagrant Cascadian --- Changes in v4: None. --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bd7fffcce0ba..4e7ebeaee87d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1955,7 +1955,7 @@ config ARCH_ROCKCHIP imply ADC imply CMD_DM imply DEBUG_UART_BOARD_INIT - imply DISTRO_DEFAULTS + imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399 imply FAT_WRITE imply SARADC_ROCKCHIP imply SPL_SYSRESET From patchwork Fri Mar 24 20:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760952 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=EGtfCPCy; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PjvjC5r1Jz1yYB for ; Sat, 25 Mar 2023 07:59:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B68AF85DB7; Fri, 24 Mar 2023 21:58:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="EGtfCPCy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA203859F1; Fri, 24 Mar 2023 21:58:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb35.google.com (mail-yb1-xb35.google.com [IPv6:2607:f8b0:4864:20::b35]) (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 0A32485D8F for ; Fri, 24 Mar 2023 21:58:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb35.google.com with SMTP id k17so3793632ybm.11 for ; Fri, 24 Mar 2023 13:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YFea11U1OMi/diE4WN7f3eF0oTFT+EznkYqHQVFNfNw=; b=EGtfCPCyKDgeqyrQJdkzVN6D/T6Ss6Y7xZYg6c9ssKENEvdRhhzlIdYCPNpgbld13Q s8v/xvMbazE960DPnlVZpJaLYqyTRcd9K7IQB1ePaz4vWytntr038yQe7+qCihZgM+oc lz8e/CDczNsR8OWJaEvR6WFNLbFjZLJu7E4VQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YFea11U1OMi/diE4WN7f3eF0oTFT+EznkYqHQVFNfNw=; b=Ez5w+4RviVnHAOqRJ9ybVBPAav4Lw0jo9l9m76H55jH422L+Y1QVgzs4NOM9kM2Tj6 Hfo9jMiNrDEG9uEj2m+ZrVioQJ0UEDdb+gljx9db0LWwRWyJ9By6FjDEfE2UPyye1he+ LfQ9rcIJsVCDIEXc2IykXBo6jgWTDQGlO7lWtzpZc90AV/btON4+mlyaqnqdkZ+pQSEd UT8YX5bLpj6nTkOKcFgWSCOIZwLi7+34X+0zEZTP4t0oJ9pT+AwWHhdqUqXdWlHObACs k5lVzfBZsgL9fjM3pX/oL9OBqzkgG2Cqu+ihpktyHjmGxvRFZdSqTiskvjF37W19V3de bg/g== X-Gm-Message-State: AAQBX9do10CTYrZ0gKLRcrbn5l8Z3NS3sq+il/q9KNM/4V2BO7TN0nfL H9Eg/4L4zR/HQwPdWQ2LJdVRLVzILORFfQRYPMLZJQ== X-Google-Smtp-Source: AKy350ZvVepzYGTn7yyDDmXKWKlW0EDegm+5FeB4vhP0kL3gEO1PV/Dr31kJE+p7Uin5S776BSg6Cw== X-Received: by 2002:a25:dc42:0:b0:a97:9962:e13c with SMTP id y63-20020a25dc42000000b00a979962e13cmr4389259ybe.0.1679691509613; Fri, 24 Mar 2023 13:58:29 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:29 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [v4 6/7] rockchip: Use BOOTSTD_DEFAULTS if not DISTRO_DEFAULTS Date: Fri, 24 Mar 2023 16:58:15 -0400 Message-Id: <20230324205816.2035181-7-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean When we do not enable DISTRO_DEFAULTS (generally, to get distro_bootcmd) we instea do want to imply BOOTSTD_DEFAULTS so that when using bootstd the general distro boot functionality will still work. Signed-off-by: Tom Rini --- Changes in v4: - New patch --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4e7ebeaee87d..8a1e22342248 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1956,6 +1956,7 @@ config ARCH_ROCKCHIP imply CMD_DM imply DEBUG_UART_BOARD_INIT imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399 + imply BOOTSTD_DEFAULTS if !DISTRO_DEFAULTS imply FAT_WRITE imply SARADC_ROCKCHIP imply SPL_SYSRESET From patchwork Fri Mar 24 20:58:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1760953 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=V5RFRFoY; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PjvjS3jWNz1yYB for ; Sat, 25 Mar 2023 07:59:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A031785DCD; Fri, 24 Mar 2023 21:58:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="V5RFRFoY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86C13859F1; Fri, 24 Mar 2023 21:58:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (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 9A0E285D92 for ; Fri, 24 Mar 2023 21:58:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2b.google.com with SMTP id y5so3832054ybu.3 for ; Fri, 24 Mar 2023 13:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4JUxfHhaybLhHMF+veQGZdFi8h5zuarVXdyQfdwrLhE=; b=V5RFRFoYvL9SY1Rzljq4LE+MzL4HzzLhZslANqGz5jHSPOdKlNZKpzXy7sRAlTZ3fj YpvUsmB+iiLsOWe2YKmQN1S63SPlw0aexGM4aQ/qDOt0DvBo1H25sOSApipIKu9Fsxj1 LQAEKhUufZ0LCNwlGu4ipb1STZJ3qMvymdPH0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4JUxfHhaybLhHMF+veQGZdFi8h5zuarVXdyQfdwrLhE=; b=VCu0AxjgKxSLQ7qbBaf87eoP3PxGW+S2wm2AWLL98p45yWUvN4WyGVnxmBqtSR+Xsk balAYBEZuE0Qx8GpKUQiZJTnLspGZl01qqv6VGcjreQfIsYKfZEObdTIW6Dac9dYtkR0 w3KmpNf+89wuclckJX2sMJkVmBmPDvauxto0bcOzJsTPR8bTdEFAhAG77v2sfIyNRfF7 QbiGFhUDENMLw62N5KwvWJvMqJwvEi0B1SUMo6vT4B04f9pBkcES0YfM5G46pAxkrLMb zfvjqPM1FMUCdpO9YvbOMJUDUoaogTxsYppzcliy4xby3SdGCLVvwnNv7KPh2jPagikv wMzA== X-Gm-Message-State: AAQBX9dGuTWxYbvBolQhdiFch/4jJU3RB+5gO1K3G8sZ0UJS/J0jgsEM MUhR+Ttk5aOjK78wf/MnBuLVqFSJX9w0CDN6G3xPgQ== X-Google-Smtp-Source: AKy350bXzi5qTwe4veAdn+lNWDQQQVHLspAXeEK48uDv7DU4rs+6RAsDwOHJhfBujVL1B7h1nf//Ng== X-Received: by 2002:a25:a181:0:b0:a13:52dd:cf02 with SMTP id a1-20020a25a181000000b00a1352ddcf02mr3675797ybi.61.1679691510294; Fri, 24 Mar 2023 13:58:30 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:30 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Kever Yang , Simon Glass , Jonas Karlman Subject: [v4 7/7] rockchip: rk3399: Drop altbootcmd Date: Fri, 24 Mar 2023 16:58:16 -0400 Message-Id: <20230324205816.2035181-8-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean The defined altbootcmd was specific to distro_bootcmd which is not longer in use on these platforms, so drop it. Signed-off-by: Tom Rini Tested-by: Jonas Karlman Reviewed-by: Jonas Karlman --- Changes in v4: - New patch Cc: Kever Yang Cc: Simon Glass Cc: Jonas Karlman --- include/configs/rk3399_common.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 04dcbf20bcb5..96ba19c659bd 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -52,10 +52,7 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ - "boot_targets=" BOOT_TARGETS "\0" \ - "altbootcmd=" \ - "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ - "run distro_bootcmd\0" + "boot_targets=" BOOT_TARGETS "\0" #endif