From patchwork Fri Sep 11 02:21:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1362194 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; 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=feeCUbUO; 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 4BnfhT57Xyz9sTS for ; Fri, 11 Sep 2020 12:24:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 220C18234B; Fri, 11 Sep 2020 04:22:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="feeCUbUO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6BFCC82319; Fri, 11 Sep 2020 04:21:50 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) (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 6B408822E3 for ; Fri, 11 Sep 2020 04:21:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x141.google.com with SMTP id l4so7683621ilq.2 for ; Thu, 10 Sep 2020 19:21:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PBl07gwl2H29FxYHdCEdoA99Vxtg+afAGO3ucvv69mI=; b=feeCUbUO1E8oaokSsXSZolzYaERz9DI2CoYDU6Mb4gjIq+F7WolUJ68Ln86CKA722b M0+Sh1E4SVs76qEfUQHLqn6to69tT2s+lyYtsm8EPyyInE1nzFVLPBWkmoZunnWsKwqG eT3Vfv4nHRCRexvrNtT9kefgBv6dGfBnX9PcI= 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=PBl07gwl2H29FxYHdCEdoA99Vxtg+afAGO3ucvv69mI=; b=RwpU2mqeVjfUwRVh+arRIFKV5HWLGyP+mJHe2bocq6riVQ+MtPWzbOorQlvLbCED6w TcuK3t0Wm2CQ8FgVQVyW9hwW/4ExzpOd3g4aE1mR39nvrVZ3GulcW0auqdWnX5AQTzlt xAA4W1kjYvoq3m5Tjw7KCxvRofG8pqpqMWRdrkxhqwG/TUpCCYC/C4OOzq9u7B7f+dSR Sf/a0+KvzBfSo5hSll+9+mVgBtaC5WzrLapxKo8x9RjvVR9z+mL4N794IzdCX1ByxHXs aILh9KbQHiioDhVV5NWkSszCDKCngVgw5Mhm5YxWyrUsJgTXQrIcV95vUZO0XBdz4F9H QHGg== X-Gm-Message-State: AOAM532NsSdFELZd5NlsPq+C2eUx/oEacsxBGKlNHUmZk900nUWarHHc 5/MVN1XkVMp/Yi1qszi+XzvRvqReMuKl4SK4 X-Google-Smtp-Source: ABdhPJz2luPxA+gRzdwaRGqhoMkZx2n4EgdZLntohReJ9Nqhh1WJDnHD5GMHXyHJiaQnyoLINtbLWA== X-Received: by 2002:a92:c603:: with SMTP id p3mr4371ilm.56.1599790906028; Thu, 10 Sep 2020 19:21:46 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id m7sm440078ili.26.2020.09.10.19.21.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 19:21:45 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Masahiro Yamada , Marek Vasut , Tom Rini , Simon Glass , Heinrich Schuchardt , Jagan Teki , Kever Yang , Usama Arif Subject: [PATCH 11/16] Kconfig: Move startup hooks under init options Date: Thu, 10 Sep 2020 20:21:22 -0600 Message-Id: <20200910202100.11.I6c558411f1ca370ed1d16188d5753b61407ba007@changeid> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog In-Reply-To: <20200911022127.3451713-1-sjg@chromium.org> References: <20200911022127.3451713-1-sjg@chromium.org> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean These hooks relate to U-Boot init so move them under that menu. Signed-off-by: Simon Glass --- common/Kconfig | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 3aa8cf358a0..1955dd6ee91 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -442,16 +442,6 @@ config MISC_INIT_R help Enabling this option calls 'misc_init_r' function -config VERSION_VARIABLE - bool "add U-Boot environment variable vers" - default n - help - If this variable is defined, an environment variable - named "ver" is created by U-Boot showing the U-Boot - version as printed by the "version" command. - Any change to this variable will be reverted at the - next reset. - config BOARD_LATE_INIT bool "Execute Board late init" help @@ -485,27 +475,6 @@ config DISPLAY_BOARDINFO_LATE the relocation phase. The board function checkboard() is called to do this. -endmenu # Init options - -config BOUNCE_BUFFER - bool "Include bounce buffer API" - help - Some peripherals support DMA from a subset of physically - addressable memory only. To support such peripherals, the - bounce buffer API uses a temporary buffer: it copies data - to/from DMA regions while managing cache operations. - - A second possible use of bounce buffers is their ability to - provide aligned buffers for DMA operations. - -config BOARD_TYPES - bool "Call get_board_type() to get and display the board type" - help - If this option is enabled, checkboard() will call get_board_type() - to get a string containing the board type and this will be - displayed immediately after the model is shown on the console - early in boot. - menu "Start-up hooks" config ARCH_EARLY_INIT_R @@ -561,6 +530,37 @@ config PCI_INIT_R endmenu +endmenu # Init options + +config VERSION_VARIABLE + bool "add U-Boot environment variable vers" + default n + help + If this variable is defined, an environment variable + named "ver" is created by U-Boot showing the U-Boot + version as printed by the "version" command. + Any change to this variable will be reverted at the + next reset. + +config BOUNCE_BUFFER + bool "Include bounce buffer API" + help + Some peripherals support DMA from a subset of physically + addressable memory only. To support such peripherals, the + bounce buffer API uses a temporary buffer: it copies data + to/from DMA regions while managing cache operations. + + A second possible use of bounce buffers is their ability to + provide aligned buffers for DMA operations. + +config BOARD_TYPES + bool "Call get_board_type() to get and display the board type" + help + If this option is enabled, checkboard() will call get_board_type() + to get a string containing the board type and this will be + displayed immediately after the model is shown on the console + early in boot. + menu "Security support" config HASH