From patchwork Wed Jun 10 20:16:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307188 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=none (p=none dis=none) header.from=konsulko.com 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 49hyvR1JFwz9sT5 for ; Thu, 11 Jun 2020 06:17:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DB3981734; Wed, 10 Jun 2020 22:16:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 007E7813BC; Wed, 10 Jun 2020 22:16:48 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) (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 2B7D18006D for ; Wed, 10 Jun 2020 22:16:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f66.google.com with SMTP id di13so1633019qvb.12 for ; Wed, 10 Jun 2020 13:16:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PxetNuic8GvpA0ZOJLGLBtLzpYM7XruJV7SKoJsJQ78=; b=pHCDDs3mn6SZkxeS+GhnoWAt5YLSCP899YFe2OrMz5EzPRgPFb/6TJ0ckllYq+3Qtz mozHXaCHE0UaXIJjyz/Rch4GcS7kEtNLSMNRCqJujJjTKPeL0Rxuspgyiy+180PlVxAm Ud7EUKE6ML2IW43EnRyXyn6R1rdn5CVTPb0TmW7ht0UwzvOsiMdJ5az24lW7QIu6chjO BuzVDmyBnnW+NJ0uRgQUtLMM/QKka91W0hOV6BvzkoNoXaY+kq5zVz4UC4AWSleD4pZm P/QXRvpX05+666caf5MUIN/jclYiznKP7OS3M6tZ2sOwLioWcjlglUy2N7nSVK3NEc0M SWFA== X-Gm-Message-State: AOAM532HSJy8pA3C/6/CeOjwlH+Ot5dWM1D2a0joQFjoL2gV/pgheQgZ Fz9ctkP5H6Y3kNiiwBeac+Z59Ez4hQ== X-Google-Smtp-Source: ABdhPJwpJO/akWBDxvJwo+g7JG5fKcydvAdoIq71ada6EOA5G2f2x0Fc9eUeUi5RLqL6kuYKoa3kaA== X-Received: by 2002:ad4:4309:: with SMTP id c9mr4874863qvs.50.1591820203389; Wed, 10 Jun 2020 13:16:43 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:42 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 01/30] Convert CONFIG_AM335X_LCD to Kconfig Date: Wed, 10 Jun 2020 16:16:05 -0400 Message-Id: <20200610201634.8457-2-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_AM335X_LCD Signed-off-by: Tom Rini --- configs/brxre1_defconfig | 1 + drivers/video/Kconfig | 1 - include/configs/brxre1.h | 3 --- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 5d3246ac8c72..456e4507c8c6 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -89,6 +89,7 @@ CONFIG_USB_MUSB_TI=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_AM335X_LCD=y CONFIG_LCD=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_OF_LIBFDT_OVERLAY is not set diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 38123543a539..05c173b9331c 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -475,7 +475,6 @@ config ATMEL_HLCD config AM335X_LCD bool "Enable AM335x video support" - depends on DM_VIDEO help Supports video output to an attached LCD panel. diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 9db011358eba..3a18aec5d332 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -15,9 +15,6 @@ #include #include /* ------------------------------------------------------------------------- */ -#if !defined(CONFIG_AM335X_LCD) -#define CONFIG_AM335X_LCD -#endif #define LCD_BPP LCD_COLOR32 /* memory */ From patchwork Wed Jun 10 20:16:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307189 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyvg2lPFz9sSg for ; Thu, 11 Jun 2020 06:17:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7C1881C4C; Wed, 10 Jun 2020 22:16:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id D0A7781775; Wed, 10 Jun 2020 22:16: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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) (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 65990800A9 for ; Wed, 10 Jun 2020 22:16:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f65.google.com with SMTP id di13so1633069qvb.12 for ; Wed, 10 Jun 2020 13:16:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Cr6z6buXtnI5WHUe9k/pSV34V8Pk53e3lpejxGaBKcg=; b=enH4UZmMDVDaHf3EsWxDubN3GHAxrsA+0wUU5gACVcFuJUfPs+auf8ModGgvNNZyCX AhsxmEvtMBQhmlSmgFTLV4UQL3U9M2bvnfh7R2Z2/IvY1bl1FtEZ21JlmH+C6cjqEjOa brtROKIOwpv+JIhihDK0MvAuoi1VXHB5S5Rw3rw7pv3jkBve0F+sPMAGctX2w/nGKbgj HYu4ATnLJ/rVnsPiCZ7lz6PmF080klpaC0EGpoxIOZh9FqQsqm7ObmLMcDVcTFEZcAcc IbXZGreIXDPZJ8qZaj9ObO62GRKlrE5PFPUognsRVH6YlialsQdD80Tx9wSzaOWOJd/o pBqA== X-Gm-Message-State: AOAM530AaSNyGHJVlOSazWryAoB8gp/nIa13fwixGyGj+docm/1glvqE dlOU49+SosxLX5moCY0Rxp9V5oZQ/g== X-Google-Smtp-Source: ABdhPJxFFJYaV6neCc4VHV3A+1/o8pMHgL27SItkxH11ySPtivSWkkvKNSUezrOV9L+12LHJzvik2w== X-Received: by 2002:a0c:eccd:: with SMTP id o13mr4956641qvq.49.1591820204899; Wed, 10 Jun 2020 13:16:44 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:43 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 02/30] Convert CONFIG_ARCH_MISC_INIT to Kconfig Date: Wed, 10 Jun 2020 16:16:06 -0400 Message-Id: <20200610201634.8457-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ARCH_MISC_INIT Signed-off-by: Tom Rini --- configs/apalis-tk1_defconfig | 1 + configs/chiliboard_defconfig | 1 + include/configs/apalis-tk1.h | 2 -- include/configs/chiliboard.h | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 868303a29cca..6538f9a5b8cd 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -17,6 +17,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_PROMPT="Apalis TK1 # " # CONFIG_CMD_IMI is not set CONFIG_CMD_GPIO=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 30100a3151d0..afc73dc89c52 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="am335x-chiliboard.dtb" +CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 965259c5e1e9..af008e4f4404 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -12,8 +12,6 @@ #include "tegra124-common.h" -#define CONFIG_ARCH_MISC_INIT - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index f4dcc54508ce..a2d198c5197b 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -147,7 +147,6 @@ /* NAND: SPL related configs */ /* USB configuration */ -#define CONFIG_ARCH_MISC_INIT #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST From patchwork Wed Jun 10 20:16:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307190 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=none (p=none dis=none) header.from=konsulko.com 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 49hyvw2K60z9sT6 for ; Thu, 11 Jun 2020 06:17:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B1CF81C78; Wed, 10 Jun 2020 22:16:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 5793A81947; Wed, 10 Jun 2020 22:16:52 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 E60FF8006B for ; Wed, 10 Jun 2020 22:16:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id w9so2873358qtv.3 for ; Wed, 10 Jun 2020 13:16:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Jpg8bnpoY+KztutZUbMH1U8FFtaE9zx872qowemmrE8=; b=P1r5XBoDY0+LCRivmvz90XZ/SRlRKseSFeoLb03KoBHfBVQrZcGuAldfRQ8B8USzyl blCXH5dg9t5Ii0XqR+2Mz2jCOPyWjq8iSieIv2KWsD/oUkLCy11zSRAUEgwh/dx2NNxV WM6cl5Fi0xG/ru4UyybNDg6VH9P4cnInyZaPeSzEtbkANnMU76mw3qCqAnCHQ2PZL+zH 8+UFcxPITzYRvZmfqXdyf0rJuK2fYnKKKRhywQkQV//GgN3loXrV+JgZdslLRrpxhACy oilKpCPduZiN+MKYwHTGwTFj5G7Wh5XD7t7x3wYxbw2znElcF65eEfwJzAbRsrSsAzQJ dV/A== X-Gm-Message-State: AOAM5305/aMLZUEEz0sHmY+mD20nU4rfTmmzqyg2aITsFxbj5dGJDVyZ qaBLjtxcz5sIenOHM78nmsaD+T4y7w== X-Google-Smtp-Source: ABdhPJzJWIHqhsFr2zCYoY6wkH/b3e0lpOgGw6CsLT/vNXu+rete3GWIaZlX2j01m5kTR6mcHNZQBQ== X-Received: by 2002:ac8:6897:: with SMTP id m23mr5031380qtq.379.1591820207267; Wed, 10 Jun 2020 13:16:47 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:45 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 03/30] Convert CONFIG_ARM_PL180_MMCI to Kconfig Date: Wed, 10 Jun 2020 16:16:07 -0400 Message-Id: <20200610201634.8457-4-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ARM_PL180_MMCI Signed-off-by: Tom Rini --- configs/vexpress_ca15_tc2_defconfig | 1 + configs/vexpress_ca5x2_defconfig | 1 + configs/vexpress_ca9x4_defconfig | 1 + drivers/mmc/Kconfig | 1 - include/configs/vexpress_common.h | 1 - 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index d2a59774420d..2c78e12df6a1 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFF80000 +CONFIG_ARM_PL180_MMCI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig index bedf99a7e163..8395bb74cdb2 100644 --- a/configs/vexpress_ca5x2_defconfig +++ b/configs/vexpress_ca5x2_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFF80000 +CONFIG_ARM_PL180_MMCI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 8234b5d1bbcf..1811782128ff 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x47F80000 +CONFIG_ARM_PL180_MMCI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 3c4f057373fc..12d03dc36e57 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -66,7 +66,6 @@ config MMC_SPI_CRC_ON config ARM_PL180_MMCI bool "ARM AMBA Multimedia Card Interface and compatible support" - depends on DM_MMC && OF_CONTROL help This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card Interface (PL180, PL181 and compatible) support. diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index ca765579e821..ffc3b43fc557 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -135,7 +135,6 @@ #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 -#define CONFIG_ARM_PL180_MMCI #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI #define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000 From patchwork Wed Jun 10 20:16:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307191 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hywB6gN2z9sSg for ; Thu, 11 Jun 2020 06:17:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC3FE81C7B; Wed, 10 Jun 2020 22:17:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 13D4181999; Wed, 10 Jun 2020 22:16:54 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 3A2A281743 for ; Wed, 10 Jun 2020 22:16:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f195.google.com with SMTP id j32so2835517qte.10 for ; Wed, 10 Jun 2020 13:16:50 -0700 (PDT) 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; bh=NXmanq/J5n/6eVGV+sOzm6hvz8DJ/8+lJrZ/HYBepCU=; b=BhoHj4KgP8rPDUVFiJDcedR3DRO8QtGLCxuav+MuHYhlMfs3lO8vjbWGZ3vJ4qbO9e TrCK4x8Gmj22IJGNFzy4GHBlTXw9eGIrySF7W9RUlLrgV4AskXkuWq13Ym1+k3HFCOby kzMBu4kxjKqQKvbJc6w2NXlvroJKpLP5RTtVNfBGKhmcTt1dR1VWHjU0a8QlmZw73xUe c5PcgNfSNYLw8n/SifGR1SIiQcJKI6Ne99p2/ZPeF/hhD75CHISBw8RwopSumTttVr8K YZGzhsA1Ee8OctxeMHF/AsnZlort2rG80HYqBwblJexpaAM8AKoegJZbQ/xX3zKtYDjW 713Q== X-Gm-Message-State: AOAM53151mM7i+Y84lqMncOFmMFiog8dXdbf+wsDq/D/9rzhnk1Z8OBE dIzwv5jCIdQkaj//Q0GnHZ8rENHz/w== X-Google-Smtp-Source: ABdhPJx0dUXuJium7NWfcCYAM7hR/Nf27aMoWJvwGep10twMCCqazvLVoQusySIUA3e4lVnLNr0Hgw== X-Received: by 2002:ac8:458d:: with SMTP id l13mr5086118qtn.279.1591820208401; Wed, 10 Jun 2020 13:16:48 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:47 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Tom Warren , Peter.Chubb@data61.csiro.au Subject: [PATCH 04/30] Convert CONFIG_ARMV7_PSCI et al to Kconfig Date: Wed, 10 Jun 2020 16:16:08 -0400 Message-Id: <20200610201634.8457-5-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ARMV7_PSCI CONFIG_ARMV7_PSCI_NR_CPUS Cc: Tom Warren Cc: Peter.Chubb@data61.csiro.au Signed-off-by: Tom Rini --- arch/arm/mach-tegra/tegra124/Kconfig | 1 + include/configs/cei-tk1-som.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig index 6fa31ea0a16c..fb016aa46c90 100644 --- a/arch/arm/mach-tegra/tegra124/Kconfig +++ b/arch/arm/mach-tegra/tegra124/Kconfig @@ -19,6 +19,7 @@ config TARGET_JETSON_TK1 config TARGET_CEI_TK1_SOM bool "Colorado Engineering Inc Tegra124 TK1-som board" + select ARCH_SUPPORT_PSCI select BOARD_LATE_INIT select CPU_V7_HAS_NONSEC if !SPL_BUILD select CPU_V7_HAS_VIRT if !SPL_BUILD diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index dbebef34e386..2541f2fc27c2 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -32,8 +32,6 @@ #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" -#define CONFIG_ARMV7_PSCI 1 -#define CONFIG_ARMV7_PSCI_NR_CPUS 4 /* Reserve top 1M for secure RAM */ #define CONFIG_ARMV7_SECURE_BASE 0xfff00000 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000 From patchwork Wed Jun 10 20:16:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307192 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=none (p=none dis=none) header.from=konsulko.com 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 49hywV34q0z9sT2 for ; Thu, 11 Jun 2020 06:18:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C7E308179A; Wed, 10 Jun 2020 22:17:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 24F01819F4; Wed, 10 Jun 2020 22:16:56 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (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 900578179A for ; Wed, 10 Jun 2020 22:16:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f194.google.com with SMTP id n11so3398241qkn.8 for ; Wed, 10 Jun 2020 13:16:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=sb9+Kvtw4Km+amRcSp8SLjXIJmFSAp1pFJvrsPRt1K8=; b=scU14AKfsfB9xkIqUjQY9gSIYW4nVySmiddbIXpkvWFfjsdX6Lobyw0+hHE5ASDl0+ /000X4P8LKxRLF+dj92MyVfAsnP7WFOKVrhIJk1hvqsFfLOtUiDPAXRlc1Xhk50YJ5gQ 82mR4TtI0RVrFFv/i5fLu3bMaU/stRa/yOVMVzVom6D825YVF+ntGZAKEr414LRzXEfb x13B8giW4l6Bom3J376Not82EDodz/bVh0gxT+TRVVx92qVRZItMdOumlSKZ+OgEA3vg wm+J5Ep1tmfA8eZNVLdm2jSGtaXGMmJFqnqcZ0O/WCMIFBc8WSKNOgEQ0m/YdvB/8R0A 663w== X-Gm-Message-State: AOAM530VQ6U6ygNtIwyRLKif7gT2Pi6FuSTYIT5W+UpZIkAkPcJC6fdo oOZuHE1JFctD/zw8VcwjPh2HPWOqMQ== X-Google-Smtp-Source: ABdhPJy1gKY93vgu0rVuMO4v2E10ubvmU+qExdSeOagMsiCGHv5IOu1JUFe2bIoAFwoyRAtIprAslA== X-Received: by 2002:a37:a593:: with SMTP id o141mr4854394qke.0.1591820209444; Wed, 10 Jun 2020 13:16:49 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:48 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 05/30] Convert CONFIG_AT91_GPIO to Kconfig Date: Wed, 10 Jun 2020 16:16:09 -0400 Message-Id: <20200610201634.8457-6-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_AT91_GPIO Signed-off-by: Tom Rini --- arch/arm/mach-at91/include/mach/at91rm9200.h | 2 -- configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/axm_defconfig | 1 + configs/corvus_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/taurus_defconfig | 1 + configs/vinco_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + drivers/gpio/Kconfig | 1 - include/configs/at91-sama5_common.h | 5 ----- include/configs/corvus.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/taurus.h | 1 - include/configs/wb45n.h | 1 - include/configs/wb50n.h | 3 --- 24 files changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index 3412df0f06c7..309039347c84 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -5,8 +5,6 @@ #ifndef __AT91RM9200_H__ #define __AT91RM9200_H__ -#define CONFIG_AT91_GPIO /* and require always gpio features */ - /* Periperial Identifiers */ #define ATMEL_ID_SYS 1 /* System Peripheral */ diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig index 0b025911d69c..2aaf87904562 100644 --- a/configs/at91rm9200ek_defconfig +++ b/configs/at91rm9200ek_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x10040000 +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig index 09c996b8b225..9d2fc473430b 100644 --- a/configs/at91rm9200ek_ram_defconfig +++ b/configs/at91rm9200ek_ram_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x10040000 +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 78e6c8d34569..1615d8af0eba 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -58,6 +58,7 @@ CONFIG_BLK=y CONFIG_HAVE_BLOCK_DEVICE=y CONFIG_CLK=y CONFIG_CLK_AT91=y +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 0eedaa93667a..c6e5955bf329 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -48,6 +48,7 @@ CONFIG_BLK=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index 0d1a46315bd3..a679c0f6700b 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -32,6 +32,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_AT91_GPIO=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 0157f5172e13..2921f2dfd4f7 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_AT91_GPIO=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 8f9a19f695ba..4545c7075b3f 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index c684e2b20a11..9e44395f03f0 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_AT91_GPIO=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_MTD=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 3ef091fab48f..e1c5c2ef4c1f 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_AT91_GPIO=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_MTD=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index d9a2d61ecb60..16a804b879f0 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -66,6 +66,7 @@ CONFIG_BLK=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 2684324cace6..8ca7556772b8 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="at91-vinco" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_AT91_GPIO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 5728cfb45481..d770e007a655 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_AT91_GPIO=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index 86a8549406bf..e764c303d069 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_AT91_GPIO=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d87f6cc10517..af608b7b0ef1 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -77,7 +77,6 @@ config DWAPB_GPIO config AT91_GPIO bool "AT91 PIO GPIO driver" - depends on DM_GPIO default n help Say yes here to select AT91 PIO GPIO driver. AT91 PIO diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 624b05ad08ce..53629743d9d4 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -19,11 +19,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -/* general purpose I/O */ -#if !CONFIG_IS_ENABLED(DM_GPIO) -#define CONFIG_AT91_GPIO -#endif - /* * BOOTP options */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index e9064a200d32..1dc946d78990 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -36,7 +36,6 @@ /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 2747c0cb9307..94d9111cbaae 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -28,7 +28,6 @@ /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index aacdd1263e7b..8c964087131d 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -85,7 +85,6 @@ /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO /* enable the GPIO features */ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 35cd7f69c1d8..32dd544a6c75 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -62,7 +62,6 @@ /* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY -#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x28 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index fcd35b715ce1..db4fd9be247f 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -60,7 +60,6 @@ /* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY -#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 /* UARTs/Serial console */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 9990c9340a3d..b9b9292502e1 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -41,7 +41,6 @@ /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index d256ce8e4b9b..f13ad112f793 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -20,7 +20,6 @@ /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO /* serial console */ #define CONFIG_ATMEL_USART diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index bb4deeac9b7d..ffcc9877eddb 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -20,9 +20,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -/* general purpose I/O */ -#define CONFIG_AT91_GPIO - /* serial console */ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU From patchwork Wed Jun 10 20:16:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307193 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hywp4WvDz9sRf for ; Thu, 11 Jun 2020 06:18:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF25C81CB9; Wed, 10 Jun 2020 22:17:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 53F7C819A0; Wed, 10 Jun 2020 22:16:55 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 D9080818F8 for ; Wed, 10 Jun 2020 22:16:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f195.google.com with SMTP id k22so2857296qtm.6 for ; Wed, 10 Jun 2020 13:16:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=UHb5g7UOTRFVIELg2v7YmcQjgoFubWR0ItVi0yVfFxM=; b=uoLsa7DZ7jAb/PNdKuM4UPrQMo3VZrnKsfH3mtA1ZVy+Nm0gjpL38W9jSyCXFw/CEv bFzRJKgXmIgl0oINTx8LteNdKEufudEb40ofXJyNY63/CbEv51vyE5u1GniOFEYNe1wE OgIFWXMwe9wjvxsogu+cy/p8lkezfBN3T5rUBeamXdFzY7AOWITQ9+0vgfuFezpalW+J 91D1qBjXTMf/kJL0q3jEde9kAFwUCDtBeI4d6Ioyu+uYFjpy2oCS43EZBqjeBuFxMu38 Lhee4FjeJ5qDwn0DgNf+VSE7ZLFn7aJc6GhwMj7DdYZkg8YmCyWdbKAgzj6dJ4mD+XsD 44aQ== X-Gm-Message-State: AOAM533anz7zSHucOB7XeIJJufd7l+qMHaDxjVflsw6dmCn7wg5txw86 8j0n1tPUHTJwuIiwmrEUq47CYte2uQ== X-Google-Smtp-Source: ABdhPJy0r0Uc/IvjkAMUhCKN/HK7ln7uGCw+uuGAi6qEYVN1XkaHVc82bkRHm5xsHKrl5NBFQVGlNw== X-Received: by 2002:aed:2a67:: with SMTP id k36mr5421369qtf.359.1591820210227; Wed, 10 Jun 2020 13:16:50 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:49 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 06/30] Convert CONFIG_ATMEL_HLCD to Kconfig Date: Wed, 10 Jun 2020 16:16:10 -0400 Message-Id: <20200610201634.8457-7-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ATMEL_HLCD Signed-off-by: Tom Rini --- configs/at91sam9n12ek_mmc_defconfig | 1 + configs/at91sam9n12ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 1 + drivers/video/Kconfig | 1 - include/configs/at91sam9n12ek.h | 1 - 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 6f159aaccfa0..5a147a0bf628 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -61,4 +61,5 @@ CONFIG_ATMEL_PIT_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_ATMEL_HLCD=y CONFIG_LCD=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 490addbedfd6..8263ffb1312e 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -62,4 +62,5 @@ CONFIG_ATMEL_PIT_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_ATMEL_HLCD=y CONFIG_LCD=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index 688f0c3a286e..0e95cff73363 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -63,4 +63,5 @@ CONFIG_ATMEL_PIT_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_ATMEL_HLCD=y CONFIG_LCD=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 05c173b9331c..026c6572489d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -469,7 +469,6 @@ config NXP_TDA19988 config ATMEL_HLCD bool "Enable ATMEL video support using HLCDC" - depends on DM_VIDEO help HLCDC supports video output to an attached LCD panel. diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 706217fef9a4..c2d4e485a9d3 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -25,7 +25,6 @@ #define CONFIG_LCD_LOGO #define CONFIG_LCD_INFO #define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 /* From patchwork Wed Jun 10 20:16:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307194 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyx55qMcz9sRR for ; Thu, 11 Jun 2020 06:18:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 76B4081CD0; Wed, 10 Jun 2020 22:17:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 6F15C81C75; Wed, 10 Jun 2020 22:16:57 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (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 0DA7C81969 for ; Wed, 10 Jun 2020 22:16:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f196.google.com with SMTP id c185so3407708qke.7 for ; Wed, 10 Jun 2020 13:16:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=idPddYehIqkgZ5J9LHke0KrIGp31mde6A8tlzlLpAA0=; b=ehwEnYEBdkKuCVKbmjDpmXvqlroAdPXuBd17YVZ9bnvmG2cyDh22jnAxyD30EPo6Go jH/PAv0ySIcwrBO45Sip7oKmfBsOn2PZtngnj+RU2kXDaEfPin1HBo3rghBCJdl8MPCa iyAKph27gzgqShGgf0HQ4lv7NeS8110gXsANrw1pt0SKs/WbPxUp1WqYs1nEH9XXZFv/ atyEUI+iZCXO35JiRgRR87NFXEwGUF37PSzStkxMwv3RGQ9EXmU/7+gHj2YuPQtcIV62 ci+HT6fWDSvcL9r8vabUhECgATzHllNw4Fgjrkxb1Hp3syfGXCfJaHHwXGJJoGQX5PYw 1D9A== X-Gm-Message-State: AOAM533AoM2LhTUP4TsOKHOgQbUHXY9CKUDq3uotRhil38HMjaWRFEgf 8eq9+cWzLMXJaZzPanoP1QR/T2DOzA== X-Google-Smtp-Source: ABdhPJy6hyBxzQtfQz5fd4EblZ1oYD/4XK2Vhl/x4yMFvP17Chj3qNP4slOh3QlE57evnZSYA09VtQ== X-Received: by 2002:a37:2710:: with SMTP id n16mr4991390qkn.149.1591820211422; Wed, 10 Jun 2020 13:16:51 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:50 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 07/30] Convert CONFIG_ATMEL_NAND_HW_PMECC et al to Kconfig Date: Wed, 10 Jun 2020 16:16:11 -0400 Message-Id: <20200610201634.8457-8-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ATMEL_NAND_HW_PMECC CONFIG_ATMEL_NAND_HWECC CONFIG_NAND_ATMEL CONFIG_PMECC_CAP CONFIG_PMECC_SECTOR_SIZE Signed-off-by: Tom Rini --- configs/sam9x60ek_nandflash_defconfig | 4 ++++ configs/sam9x60ek_qspiflash_defconfig | 4 ++++ include/configs/sam9x60ek.h | 7 ------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig index b59e4be4be80..d09f78828fa8 100644 --- a/configs/sam9x60ek_nandflash_defconfig +++ b/configs/sam9x60ek_nandflash_defconfig @@ -50,6 +50,10 @@ CONFIG_MICROCHIP_FLEXCOM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +# CONFIG_SYS_NAND_USE_FLASH_BBT is not set +CONFIG_NAND_ATMEL=y +CONFIG_ATMEL_NAND_HW_PMECC=y +CONFIG_PMECC_CAP=8 CONFIG_PHY_MICREL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig index 37de4044e9dc..6c4f534974e8 100644 --- a/configs/sam9x60ek_qspiflash_defconfig +++ b/configs/sam9x60ek_qspiflash_defconfig @@ -60,6 +60,10 @@ CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y +# CONFIG_SYS_NAND_USE_FLASH_BBT is not set +CONFIG_NAND_ATMEL=y +CONFIG_ATMEL_NAND_HW_PMECC=y +CONFIG_PMECC_CAP=8 CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 9b439a644161..19714402ca45 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -44,7 +44,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_MASK_ALE BIT(21) @@ -54,12 +53,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #endif -/* PMECC & PMERRLOC */ -#define CONFIG_ATMEL_NAND_HWECC -#define CONFIG_ATMEL_NAND_HW_PMECC -#define CONFIG_PMECC_CAP 8 -#define CONFIG_PMECC_SECTOR_SIZE 512 - #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ #ifdef CONFIG_SD_BOOT From patchwork Wed Jun 10 20:16:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307196 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyxd3xMgz9sRR for ; Thu, 11 Jun 2020 06:19:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8451881743; Wed, 10 Jun 2020 22:17:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 93E8A81C75; Wed, 10 Jun 2020 22:16:58 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 6B05381743 for ; Wed, 10 Jun 2020 22:16:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id d27so2876210qtg.4 for ; Wed, 10 Jun 2020 13:16:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oRd3guijshJYNbbJWo0ixbskyz2VM7K7dJIe8q3izD8=; b=aFF89Hd+4y4ZH9VBQmWfzCNM6woYH51A2U+hGnGOPvxLqVXN10epxEH2fkhAB3CFAu WBhGpfHibPUPui/+ZLXSzeJJ5BTFGT1ozyBQT99C6Gaii2wXEy335DsO1WYcQDu7MYBX eFHqecysHeuz1HdiXs2sbnG1nLwnbpS1uFqpMYodAbjb0JfVI91WafZzeZ9IuP1Tn/RG hVzczcXpcC6fKzjbM/vQF0PyeQeuIviyLKRxkwipj3QBviP+CfI3mwoi3J6ASiSoXY8p iYBj14cvbN47SQIK5sMWD6nEO5sZv7fh7zQk8j+rbDN3Tz4Iy0sBST50443Ea0I5bEm/ ufng== X-Gm-Message-State: AOAM530ODVY6EM6RwHvFiP12np/vEdbaM4uVnyEWVrWd4XVkHbJGmotr yfOCnlKRS8d5dHFVOJxj2E8OEYhCTQ== X-Google-Smtp-Source: ABdhPJxwePW7kn7rzcqIK9+nND+DxV6SSffO5VnHN0fsRuV2688TJhFOHLxsJ+pyYEC9pOh/P2d+Ww== X-Received: by 2002:aed:3ec4:: with SMTP id o4mr5338183qtf.357.1591820212490; Wed, 10 Jun 2020 13:16:52 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:51 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 08/30] Convert CONFIG_ATMEL_USART to Kconfig Date: Wed, 10 Jun 2020 16:16:12 -0400 Message-Id: <20200610201634.8457-9-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ATMEL_USART Signed-off-by: Tom Rini --- configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/vinco_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + include/configs/at91rm9200ek.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/vinco.h | 1 - include/configs/wb45n.h | 1 - include/configs/wb50n.h | 1 - 18 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig index 2aaf87904562..a990360794f4 100644 --- a/configs/at91rm9200ek_defconfig +++ b/configs/at91rm9200ek_defconfig @@ -29,6 +29,7 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_MII=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig index 9d2fc473430b..143346158b47 100644 --- a/configs/at91rm9200ek_ram_defconfig +++ b/configs/at91rm9200ek_ram_defconfig @@ -30,6 +30,7 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_MII=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index a679c0f6700b..5e0d6f7c2329 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -39,6 +39,7 @@ CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_ATMEL_NAND_HWECC=y CONFIG_PHYLIB=y +CONFIG_ATMEL_USART=y CONFIG_TIMER=y CONFIG_ATMEL_PIT_TIMER=y CONFIG_USB=y diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 2921f2dfd4f7..03783a2af067 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_AT91_GPIO=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 4545c7075b3f..e7edb01c41d9 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -56,6 +56,7 @@ CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 9e44395f03f0..fa4697989b85 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -37,5 +37,6 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index e1c5c2ef4c1f..abe033373459 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -36,5 +36,6 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 8ca7556772b8..d4852eafe0d4 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -38,6 +38,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_PHY_SMSC=y CONFIG_ETH_DESIGNWARE=y +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index d770e007a655..ef069a672cc2 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -40,6 +40,7 @@ CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_PMECC_CAP=4 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y +CONFIG_ATMEL_USART=y CONFIG_LZMA=y CONFIG_LZO=y CONFIG_OF_LIBFDT=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index e764c303d069..1b444f07529d 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -43,5 +43,6 @@ CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_ATMEL_USART=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 378f9dc48be4..5e1e59074758 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -96,7 +96,6 @@ * CONFIG_DBGU is DBGU unit on J10 * CONFIG_USART1 is USART1 on J14 */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0/* ignored in arm */ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 94d9111cbaae..3eb70d5e7821 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -31,7 +31,6 @@ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 8c964087131d..9498513f76f1 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -88,7 +88,6 @@ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 32dd544a6c75..cbef61877e28 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x28, 16} } /* UARTs/Serial console */ -#define CONFIG_ATMEL_USART #ifndef CONFIG_DM_SERIAL #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index db4fd9be247f..24bbea7d03b5 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -63,7 +63,6 @@ #define CONFIG_AT91_GPIO_PULLUP 1 /* UARTs/Serial console */ -#define CONFIG_ATMEL_USART /* Boot options */ #define CONFIG_SYS_LOAD_ADDR 0x23000000 diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 83ec78dc4315..496c228b58ea 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -17,7 +17,6 @@ /* The value in the common file is too far away for the VInCo platform */ /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE 0xfc00c000 #define CONFIG_USART_ID 30 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index f13ad112f793..8b333de8cffd 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -22,7 +22,6 @@ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index ffcc9877eddb..c2112763a2bb 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -21,7 +21,6 @@ #endif /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_DBGU From patchwork Wed Jun 10 20:16:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307195 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyxM5zpsz9sRR for ; Thu, 11 Jun 2020 06:18:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 023458168F; Wed, 10 Jun 2020 22:17:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1349481C64; Wed, 10 Jun 2020 22:16:59 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (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 DB7D081999 for ; Wed, 10 Jun 2020 22:16:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f195.google.com with SMTP id c14so3371450qka.11 for ; Wed, 10 Jun 2020 13:16:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Ap3EyDLbuvQznTkWdc7USNRvONJQbeGD6fDAeLW3Gas=; b=HkMHLw2v0ooStyRtajA3hQcCxRezz8+3OiqgMAm086NxpcjolML47sVhFpJ7lIOT0A 01iYWaaYLUn9STfkFqCtyxBrnHcH6nt4JfrcQnO9sL04kBJ8S96FZX7+YPTv80ckGlZf VPjae6jYwQ8N2YI0LKI5U0rpiPCF1mouX8L50aWMb0ub5hL46LV4fYG7T/CtvpHry79o z1YYyHOFgQQecNE6+bIF1MmcNFljYYdbbsb/qKmcN/5cCt8JDPwE1kfavdChvGlW4Ckg XXdU4tChk9hHnwBDyxSeXiuTTiagM2dSNXOBZiLdI0NTjRuICE5Ts7iZ26yk0dgVk2O2 gItQ== X-Gm-Message-State: AOAM531NFw9DQF2BX1nnxW8rzD97RQyI+m9YArTs5MTUf92sgJ1816Mn vgRTl6FCQ7Mguiwq+Q6keLLhXr09Hg== X-Google-Smtp-Source: ABdhPJyaktlnRizjbrbl9NUJXezRYA5KvVGw7gFf9dv7vH8IlKbQWxXt8qaAttF365LhC8t2KabKOA== X-Received: by 2002:a05:620a:13cc:: with SMTP id g12mr5095024qkl.473.1591820213391; Wed, 10 Jun 2020 13:16:53 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:52 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 09/30] bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to Kconfig Date: Wed, 10 Jun 2020 16:16:13 -0400 Message-Id: <20200610201634.8457-10-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR Signed-off-by: Tom Rini --- configs/bk4r1_defconfig | 3 +++ include/configs/bk4r1.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index 8c2bda6984ae..bcad243dd2bd 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -18,6 +18,9 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Enter passphrase to stop autoboot, booting in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR="123" # CONFIG_CMD_ELF is not set CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80010000 diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index f88172a05c55..300b9c7b7afb 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -57,12 +57,6 @@ "saveenv; " \ "fi; " -/* Autoboot options */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Enter passphrase to stop autoboot, booting in %d seconds\n" -#define CONFIG_AUTOBOOT_STOP_STR "123" - #include #include From patchwork Wed Jun 10 20:16:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307197 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyxs2kb6z9sRN for ; Thu, 11 Jun 2020 06:19:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B07F8819BD; Wed, 10 Jun 2020 22:17:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 12E8681CB4; Wed, 10 Jun 2020 22:17:05 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 44FF1819B8 for ; Wed, 10 Jun 2020 22:16:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id z1so2881263qtn.2 for ; Wed, 10 Jun 2020 13:16:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=X07qRBcb2kzoU9Qt++tW9HFBXSlnSQZMEcYX6ncddOA=; b=Cde7SsUoHXFYVh57OHVqLcG0t9G5x3dYtDAY/MXwZipowginftpHQnBebuhMxWTHYB /6ffOzWM+VJIre0ohtSu6yLhVDO/pCU3TK0VE/JfH26sbxp6QKrpAe4CfHJF9b3f0cHj /1FLl5wSRXNAo14Slh3qHYo0HFnBOACXNuI2e08wfbmKnWgwzRxLF1bUvDkvRDrnfG69 RHRCFbckUApCFr1RihyBt0HVIw5xhBLfDLYTyYDS4vrfe3mZ1q3G8gdYbAcDt1BtjeOW KWb+kngnFjW5yu2VjgWzkkTwgg9Tgf2vxJ5DALTrK0DZ5sFnkLklbTvFOIQfQbA8JtgL q60Q== X-Gm-Message-State: AOAM533ZeX94VMkWaQzX2anzFlUiWTqwM/8u2GTV7cdzQddd6wdeOn29 dzG4d4O7JQSkytdy8w1RtB21SGavlA== X-Google-Smtp-Source: ABdhPJytECoDARDxQaarKLqQYvnKfNdmW3M2PcFylc+r4gHyzkieVWgbLC0W1LAPeHrdlR+Z1S0VDg== X-Received: by 2002:ac8:3036:: with SMTP id f51mr5272169qte.226.1591820214430; Wed, 10 Jun 2020 13:16:54 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:53 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 10/30] Convert CONFIG_BAUDRATE to Kconfig Date: Wed, 10 Jun 2020 16:16:14 -0400 Message-Id: <20200610201634.8457-11-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BAUDRATE Signed-off-by: Tom Rini --- README | 5 ----- include/configs/apalis-imx8.h | 3 --- include/configs/bcm_northstar2.h | 1 - include/configs/bcmstb.h | 1 - include/configs/colibri-imx8x.h | 3 --- include/configs/controlcenterdc.h | 2 -- include/configs/dh_imx6.h | 1 - include/configs/display5.h | 1 - include/configs/grpeach.h | 3 --- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8qm_mek.h | 3 --- include/configs/imx8qm_rom7720.h | 3 --- include/configs/imx8qxp_mek.h | 3 --- include/configs/ls1021atsn.h | 2 -- include/configs/ls1028a_common.h | 1 - include/configs/ls1088a_common.h | 1 - include/configs/lx2160a_common.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/mx6memcal.h | 1 - include/configs/mx7ulp_evk.h | 1 - include/configs/owl-common.h | 3 --- include/configs/pdu001.h | 1 - include/configs/pico-imx8mq.h | 2 -- include/configs/presidio_asic.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk3368_common.h | 1 - include/configs/wb50n.h | 2 -- 27 files changed, 50 deletions(-) diff --git a/README b/README index bcf198363111..a0f54645fc26 100644 --- a/README +++ b/README @@ -670,11 +670,6 @@ The following options need to be configured: Define this variable to enable hw flow control in serial driver. Current user of this option is drivers/serial/nsl16550.c driver -- Console Baudrate: - CONFIG_BAUDRATE - in bps - Select one of the baudrates listed in - CONFIG_SYS_BAUDRATE_TABLE, see below. - - Autoboot Command: CONFIG_BOOTCOMMAND Only needed when CONFIG_BOOTDELAY is enabled; diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 08d34db1061e..6dad8216e969 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -103,9 +103,6 @@ #define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */ #define PHYS_SDRAM_2_SIZE SZ_2G /* 2 GB */ -/* Serial */ -#define CONFIG_BAUDRATE 115200 - /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE SZ_2K diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 45dc7b29c9e4..fbfab288b372 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_NS16550_COM2 0x66110000 #define CONFIG_SYS_NS16550_COM3 0x66120000 #define CONFIG_SYS_NS16550_COM4 0x66130000 -#define CONFIG_BAUDRATE 115200 /* console configuration */ #define CONFIG_SYS_CBSIZE SZ_1K diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 24569f7d94a8..01cfed0b869d 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -115,7 +115,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Serial console configuration. */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index da9226e2fbed..0ac4e7095de9 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -135,9 +135,6 @@ #define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */ #define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */ -/* Serial */ -#define CONFIG_BAUDRATE 115200 - /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE SZ_2K diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 00e5c8f7943e..0c36ea661057 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -112,8 +112,6 @@ */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 - #define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 5bfdf4044bee..0b6617fa82e9 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -62,7 +62,6 @@ /* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_BAUDRATE 115200 /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/display5.h b/include/configs/display5.h index 3348ecc7c7ba..94baa6561022 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -66,7 +66,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND "if run check_em_pad; then " \ diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 001e9d385ba1..bde168d47505 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -11,9 +11,6 @@ /* Board Clock , P1 clock frequency (XTAL=13.33MHz) */ #define CONFIG_SYS_CLK_FREQ 66666666 -/* Serial Console */ -#define CONFIG_BAUDRATE 115200 - /* Miscellaneous */ #define CONFIG_SYS_PBSIZE 256 #define CONFIG_CMDLINE_TAG diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f71efd45abdb..33a301409520 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -175,8 +175,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE_ADDR diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 8324767eb557..fd68c4f052e7 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -175,9 +175,6 @@ #define PHYS_SDRAM_1_SIZE 0x80000000 /* 2 GB */ #define PHYS_SDRAM_2_SIZE 0x100000000 /* 4 GB */ -/* Serial */ -#define CONFIG_BAUDRATE 115200 - /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 8000000 /* 8MHz */ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 89d7adabea84..9808e72474f0 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -163,9 +163,6 @@ /* LPDDR4 board total DDR is 6GB, DDR4 board total DDR is 4 GB */ #define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */ -/* Serial */ -#define CONFIG_BAUDRATE 115200 - /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 8000000 /* 8MHz */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index a58f68c17e6c..b442b48becf5 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -175,9 +175,6 @@ /* LPDDR4 board total DDR is 3GB */ #define PHYS_SDRAM_2_SIZE 0x40000000 /* 1 GB */ -/* Serial */ -#define CONFIG_BAUDRATE 115200 - /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 8000000 /* 8MHz */ diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 46c60aaf5cbc..ec2ed7c60969 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -104,8 +104,6 @@ #endif #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#define CONFIG_BAUDRATE 115200 - /* I2C */ #ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index f9040e661d01..44f2dc8f9b41 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* Miscellaneous configurable options */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 596f14bf3e9e..3ea16752de09 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #if !defined(SPL_NO_IFC) || defined(CONFIG_TARGET_LS1088AQDS) diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 5ab924457efb..a8636d398eeb 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -78,7 +78,6 @@ (void *)CONFIG_SYS_SERIAL1, \ (void *)CONFIG_SYS_SERIAL2, \ (void *)CONFIG_SYS_SERIAL3 } -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* MC firmware */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index bb6d82d32749..2ee66612c21b 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -33,7 +33,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index b774b167f648..0a28d61703a2 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -27,7 +27,6 @@ #else #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx) #endif -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16) diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 942b7dd41483..5e05b8c16693 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -39,7 +39,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CACHELINE_SIZE 64 diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h index f77a5fa4c114..98b5a96cf61c 100644 --- a/include/configs/owl-common.h +++ b/include/configs/owl-common.h @@ -29,9 +29,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x7ff00) -/* UART Definitions */ -#define CONFIG_BAUDRATE 115200 - /* Console configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index d524f3cbcf01..e4b14c5ecd6b 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -73,6 +73,5 @@ #define CONFIG_SYS_NS16550_COM4 UART3_BASE #define CONFIG_SYS_NS16550_COM5 UART4_BASE #define CONFIG_SYS_NS16550_COM6 UART5_BASE -#define CONFIG_BAUDRATE 115200 #endif /* ! __CONFIG_PDU001_H */ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 2ae13b30ee53..7b7d633f2828 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -150,8 +150,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ (PHYS_SDRAM_SIZE >> 1)) -#define CONFIG_BAUDRATE 115200 - #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE_ADDR diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 51177f44feed..34235b5a00c1 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -41,7 +41,6 @@ #define CORTINA_SERIAL_PORTS {(void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1} -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_SERIAL0 PER_UART0_CFG #define CONFIG_SYS_SERIAL1 PER_UART1_CFG diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index d0c9e5c809df..8f1d508b8ce2 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index e57d0efa7f92..f178a06945db 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index c2112763a2bb..a210449dae49 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -72,8 +72,6 @@ #define CONFIG_BOOTARGS \ "rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ From patchwork Wed Jun 10 20:16:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307198 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=none (p=none dis=none) header.from=konsulko.com 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 49hyy50Xj2z9sRN for ; Thu, 11 Jun 2020 06:19:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B787981CD6; Wed, 10 Jun 2020 22:17:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id A830481CC5; Wed, 10 Jun 2020 22:17:05 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 324D581C54 for ; Wed, 10 Jun 2020 22:16:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id g18so2828944qtu.13 for ; Wed, 10 Jun 2020 13:16:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cVUeWS3bwjKVRp5IkKj9ho2oBhzdzcwcHeaktI0L04o=; b=e5X2ULZwzvykOzap2xwtLy/LrYcXDD4V7FEsta74QvryTPJ0ZAgkHKiggFvPT8TIc+ /lwrO9B9JmRiZMBs5uUHksfaNkpRR/rOpbVvii69wf+VaIZ1oqvSNyVAYf3LqeQf8W53 BZjZ0PWSiyEh/SuZ5xx8/84NxcbrD7sfg0TqqFnKEETvbJx6KD+fXnOLIufNYNPDD2dx nBPipK7cPN6rEVGMizN7JmxszPFB+kIlVe97XlKSZfjk2cu0wMfsAj6VdIBZ0b1V3aJO omnMZJPQmPuOImisgBYQqVJuuuLi4Qnb2fM410ARuQx7seit1XYEoO04x/TN9nvmKQqX 9oqg== X-Gm-Message-State: AOAM533+FTO1Bq1V9Kl8qRyFyb/iIjhGVKln+e2aJ5cf1SrL4pcIpGe6 Phax0MjkI5YgxvFH/P26LaffzevZ6Q== X-Google-Smtp-Source: ABdhPJxVUSmgL8KORyNbZXubp7bRrVaUNWxCbmqsHG0fRgVEQdYE9y3fFyxJ3bkC/lZw1U4fpAYAWw== X-Received: by 2002:aed:2d23:: with SMTP id h32mr5148470qtd.69.1591820215287; Wed, 10 Jun 2020 13:16:55 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:54 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 11/30] Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig Date: Wed, 10 Jun 2020 16:16:15 -0400 Message-Id: <20200610201634.8457-12-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F CONFIG_BOARD_EARLY_INIT_R Signed-off-by: Tom Rini --- configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 + configs/deneb_defconfig | 1 + configs/giedi_defconfig | 1 + configs/imx8mq_evk_defconfig | 1 + configs/imx8mq_phanbell_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + configs/mx7ulp_evk_defconfig | 1 + configs/mx7ulp_evk_plugin_defconfig | 1 + configs/pico-imx8mq_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + include/configs/capricorn-common.h | 2 -- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8mq_phanbell.h | 2 -- include/configs/imx8qm_mek.h | 2 -- include/configs/imx8qxp_mek.h | 2 -- include/configs/lx2160a_common.h | 1 - include/configs/mx7ulp_evk.h | 2 -- include/configs/pico-imx8mq.h | 2 -- include/configs/vcoreiii.h | 1 - include/configs/xilinx_zynqmp.h | 2 -- 32 files changed, 22 insertions(+), 18 deletions(-) diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 030d28a5dfc7..227a5416c63f 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -15,6 +15,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTDELAY=0 # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_OS_BOOT=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x00000000 diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 9682cb7ca1a2..31a68f824025 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -23,6 +23,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 4e22a02aacd5..5dd34227af01 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -23,6 +23,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 871f784b49b0..caa56e38c525 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_BOARD_LATE_INIT=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 5364b58b7bff..65d952503f74 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_SD_BOOT=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index dc490bcf573a..5f68f9cac258 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -21,6 +21,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 9a31fb8e80ed..5f8513ae53c2 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -21,6 +21,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index 9bd90ddc3d70..ab4f9b6255ba 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="jr2 # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index a57d033d30a9..55edb199993b 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="luton # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index 32f4148e755f..3fe9e060bb56 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -18,6 +18,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="ocelot # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index e35219e3ce48..e423fc4efc52 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -16,6 +16,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="serval # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 669d9f6c23ff..49d8468226fc 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -15,6 +15,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="servalt # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 6908aeb2cc3f..32169c72403d 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index 4cc7cca349fe..6c8e40b5b77a 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -8,6 +8,7 @@ CONFIG_TARGET_MX7ULP_EVK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x60000000 diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 2eeec09f1bbd..c51cfcc3a2bb 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_BOARD_LATE_INIT=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index 4305db405839..0ca126f92961 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -10,6 +10,7 @@ CONFIG_ZYNQMP_PSU_INIT_ENABLED=y # CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index b041b40b84b9..7590f2f9ffbc 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -11,6 +11,7 @@ CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index bd5603a6a13d..7e1ca1220894 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -11,6 +11,7 @@ CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 4f4efa0cfabf..834b344328bc 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 3f780f746cfc..38d42d60212d 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 1f36f5c8e90a..866faddbeed6 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -14,6 +14,7 @@ CONFIG_ZYNQMP_NO_DDR=y # CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 7886d5a38f29..fe60d10c991d 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -14,6 +14,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index c671cb50afce..c2e9d0f11f9c 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -42,8 +42,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* Commands */ #undef CONFIG_BOOTM_NETBSD diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 33a301409520..b564f3831e8c 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -58,8 +58,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 6d038f21b74f..c655bb24a0ae 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -55,8 +55,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index fd68c4f052e7..1864374a4fc8 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -35,8 +35,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* Flat Device Tree Definitions */ #define CONFIG_OF_BOARD_SETUP diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index b442b48becf5..5fdb67f0ece6 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -35,8 +35,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* Flat Device Tree Definitions */ #define CONFIG_OF_BOARD_SETUP diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a8636d398eeb..9bc287f7aa43 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_FLASH_BASE 0x20000000 #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_BOARD_EARLY_INIT_F 1 /* DDR */ #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 5e05b8c16693..9e932690746a 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -32,8 +32,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) -#define CONFIG_BOARD_EARLY_INIT_F - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 7b7d633f2828..da2842934b5c 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -54,8 +54,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index d5b2a785bcf7..020f02caae9c 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -40,7 +40,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_BOARD_EARLY_INIT_R #if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT) #define VCOREIII_DEFAULT_MTD_ENV \ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e868c1341657..e7cfebee7c46 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -256,6 +256,4 @@ # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used" #endif -#define CONFIG_BOARD_EARLY_INIT_F - #endif /* __XILINX_ZYNQMP_H */ From patchwork Wed Jun 10 20:16:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307199 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=none (p=none dis=none) header.from=konsulko.com 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 49hyyK01ZTz9sRN for ; Thu, 11 Jun 2020 06:19:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1611481CEB; Wed, 10 Jun 2020 22:17:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id C58A1818F8; Wed, 10 Jun 2020 22:17:07 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (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 11B3081C5F for ; Wed, 10 Jun 2020 22:16:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f194.google.com with SMTP id g28so3441660qkl.0 for ; Wed, 10 Jun 2020 13:16:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=68Gbl3c70fyMX4Z8BBGy0GKhrkG1Ze/OMhwsvxVuXr8=; b=D4WHYAtAj1YVynTr4mfk/i1iQOSUmdev4MwklYE+nzK7qyGY200CGfqp37PugT6+/+ Ymczc2T0C61MjSKeOZHTwHOe1l3avxCFUDYAvPXmM/NhYjr2H+Ebc+kHundVRiVl3skH kthw2aUdi5fwPD+/5tcMdID9zRd+LDNzlNRHmHpYPmeUt/ywFZno1PIkHqntjBysflYV cekTWMG/kXvQ+2TUxcxn/peaPkuCy16UfZtK767Xsza1RLuB8Zxnfp0oMeIdSJExRviu GYzcAJ2XRDmoWKgRlio/VEVfjbs0suaN0duJFfwsBxCVbSWNEZtyEtX1gBZ1ZpFzwRQb SpoQ== X-Gm-Message-State: AOAM532t6Os3s2a8hvtRjWMb2M+qOnqsu2uQV1ntY7jhIQs/L/lb8srT TCCIK4kGTNHAtmHO6mNHEIebNJBnkQ== X-Google-Smtp-Source: ABdhPJxKcyzO6Bj4i5IAC5ZJWW5wHD75AHvOM/YsaOA7Y39elHhDWwGtZSpmIjLEe+0T9NlwU8ct4w== X-Received: by 2002:a05:620a:753:: with SMTP id i19mr5011488qki.357.1591820216169; Wed, 10 Jun 2020 13:16:56 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:55 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 12/30] Convert CONFIG_BOOTARGS to Kconfig Date: Wed, 10 Jun 2020 16:16:16 -0400 Message-Id: <20200610201634.8457-13-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOOTARGS Signed-off-by: Tom Rini --- configs/grpeach_defconfig | 2 ++ configs/imx28_xea_defconfig | 2 ++ configs/sama5d2_icp_mmc_defconfig | 1 + configs/socfpga_agilex_defconfig | 2 ++ configs/socfpga_secu1_defconfig | 2 ++ configs/socfpga_stratix10_defconfig | 2 ++ configs/stmark2_defconfig | 2 ++ configs/wb45n_defconfig | 2 ++ configs/wb50n_defconfig | 2 ++ include/configs/grpeach.h | 3 --- include/configs/sama5d27_som1_ek.h | 6 ------ include/configs/sama5d2_icp.h | 3 --- include/configs/socfpga_arria5_secu1.h | 4 ---- include/configs/socfpga_soc64_common.h | 1 - include/configs/stmark2.h | 6 ------ include/configs/wb45n.h | 4 ---- include/configs/wb50n.h | 3 --- include/configs/xea.h | 1 - 18 files changed, 17 insertions(+), 31 deletions(-) diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig index 417938a512ed..c4a2b449d676 100644 --- a/configs/grpeach_defconfig +++ b/configs/grpeach_defconfig @@ -9,6 +9,8 @@ CONFIG_DM_GPIO=y CONFIG_RZA1=y CONFIG_NR_DRAM_BANKS=1 CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_ELF is not set diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index d4feb661629f..592f3e387cc0 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -22,6 +22,8 @@ CONFIG_SPL_TEXT_BASE=0x1000 CONFIG_SPL_PAYLOAD="u-boot.img" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig index dc4e815ec127..8f3efd81a032 100644 --- a/configs/sama5d2_icp_mmc_defconfig +++ b/configs/sama5d2_icp_mmc_defconfig @@ -25,6 +25,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_DISPLAY_PRINT=y diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index 35316d7c252f..60397a8ccea6 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -12,6 +12,8 @@ CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y CONFIG_SPL_TEXT_BASE=0xFFE00000 CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="earlycon" CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index df30c7c5f0e2..8ebbf73148a4 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -14,6 +14,8 @@ CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_BUILD_TARGET="u-boot-with-nand-spl.sfp" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id=\"idq,regbank\"" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 21014f9f8cde..16ae0feb6807 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -12,6 +12,8 @@ CONFIG_IDENT_STRING="socfpga_stratix10" CONFIG_SPL_FS_FAT=y CONFIG_SPL_TEXT_BASE=0xFFE00000 CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="earlycon" CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 036ff707d19a..262f169d6cca 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -5,6 +5,8 @@ CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_TARGET_STMARK2=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=30000000" +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 rw rootfstype=ramfs rdinit=/bin/init devtmpfs.mount=1" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index ef069a672cc2..0a0120fe5edf 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -15,6 +15,8 @@ CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk rw noinitrd mem=64M rootfstype=ubifs root=ubi0:rootfs ubi.mtd=6" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index 1b444f07529d..b2f490a03c54 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -15,6 +15,8 @@ CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index bde168d47505..67301fabeb62 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -29,9 +29,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -/* Kernel Boot */ -#define CONFIG_BOOTARGS "ignore_loglevel" - /* Network interface */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0 diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 8e98254e2d39..4d66490cd68f 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -39,12 +39,6 @@ "bootz 0x22000000 - 0x21000000" #endif -#ifdef CONFIG_QSPI_BOOT -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index 2d1ba757fe74..7d6886ea73e1 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -44,9 +44,6 @@ #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91-sama5d2_icp.dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" #endif /* SPL */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index ad4c3c0786c1..77914438bfa0 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -30,10 +30,6 @@ /* Booting Linux */ #define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTFILE "zImage" -#define CONFIG_BOOTARGS \ - "console=ttyS0," __stringify(CONFIG_BAUDRATE) \ - " ubi.fm_autoconvert=1" \ - " uio_pdrv_genirq.of_id=\"idq,regbank\"" #define CONFIG_BOOTCOMMAND \ "setenv bootcmd '" \ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 7237ec95e345..775a122f1f12 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -79,7 +79,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * CONFIG_BOOTARGS goes into the environment value "bootargs". * Do note the value will override also the chosen node in FDT blob. */ -#define CONFIG_BOOTARGS "earlycon" #define CONFIG_BOOTCOMMAND "run fatscript; run mmcload;run linux_qspi_enable;" \ "run mmcboot" diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index b5bfac77f1b1..d9c79907acdb 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -19,12 +19,6 @@ #define CONFIG_TIMESTAMP -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 root=/dev/ram0 rw " \ - "rootfstype=ramfs " \ - "rdinit=/bin/init " \ - "devtmpfs.mount=1" - #define CONFIG_BOOTCOMMAND \ "sf probe 0:1 50000000; " \ "sf read ${loadaddr} 0x100000 ${kern_size}; " \ diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 8b333de8cffd..6ae777507f8f 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -83,10 +83,6 @@ #error No boot method selected, please select 'CONFIG_SYS_USE_NANDFLASH' #endif -#define CONFIG_BOOTARGS "console=ttyS0,115200 earlyprintk " \ - "rw noinitrd mem=64M " \ - "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=6" - #define CONFIG_EXTRA_ENV_SETTINGS \ "_mtd=mtdparts default; setenv bootargs ${bootargs} ${mtdparts}\0" \ "autoload=no\0" \ diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index a210449dae49..c65e59134257 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -69,9 +69,6 @@ "nand read 0x22000000 0x000e0000 0x500000; " \ "bootm" -#define CONFIG_BOOTARGS \ - "rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" - #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/xea.h b/include/configs/xea.h index 65109566d3b8..144f62e8f980 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -43,7 +43,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_BOOTCOMMAND "run ${bootpri} ; run ${bootsec}" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR From patchwork Wed Jun 10 20:16:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307200 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=none (p=none dis=none) header.from=konsulko.com 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 49hyyX3HYsz9sRN for ; Thu, 11 Jun 2020 06:19:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4316681D0B; Wed, 10 Jun 2020 22:17:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 92A9D81CAF; Wed, 10 Jun 2020 22:17:07 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (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 B5A0181743 for ; Wed, 10 Jun 2020 22:16:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f195.google.com with SMTP id v79so3387858qkb.10 for ; Wed, 10 Jun 2020 13:16:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=axjpJAKx7bN63Wb3+Pm0zTDZXJZTHbptZvbHb/qK+3Q=; b=eyv6ZZZk+Fpes8Hi8SoISKn8KP3NZhlth89vFJ/gsINwdV8vVuw/Ec1SX8lAvOrl4h GG2rGIG1ijqYmqRxJkxTNqomJpt2llJHQJnx8RYf4vtXvnoGlX4Gaksvdkv+/Kt3yN1S /2Nw6ZrjnLfkTCNsGg8sikgKf+B3S9SNozHzUD4bN5hLK4JSbfxf4MS723tsO30at2Zg cD4c86jo7As987TviDlh10SV1lJsA99aJwP/5/vbrvOC6B64V5cMkCzzYr7Vvv+fPI6o Z7G8qX+KhQkfduPGwjdyDMK/iCB/Lg9pZjHkBbgjJ6ihhwV3JSn3yY7lW9DX0d+5XWYK h+rg== X-Gm-Message-State: AOAM530GFKsQTRcLl1Gsccp4SSSegSElZbgi8OvM/SSdPpfOOpWLmLmD cOeznhs7m4akixW9iFHbvFb1oEAgxA== X-Google-Smtp-Source: ABdhPJzOzYarebGsbQsbtx2zCJhnvsK6qNR04pCVLSWLApCp4TxzfNPCs4xXYNFrAX0CMbYXBD2Vyg== X-Received: by 2002:a37:e304:: with SMTP id y4mr4729992qki.57.1591820216973; Wed, 10 Jun 2020 13:16:56 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:56 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 13/30] Convert CONFIG_BCH to Kconfig Date: Wed, 10 Jun 2020 16:16:17 -0400 Message-Id: <20200610201634.8457-14-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BCH Signed-off-by: Tom Rini --- configs/ge_bx50v3_defconfig | 1 + configs/mx53ppd_defconfig | 1 + include/configs/ge_bx50v3.h | 2 -- include/configs/mx53ppd.h | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 58778e670c99..d61c23804656 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -99,4 +99,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y CONFIG_WATCHDOG_TIMEOUT_MSECS=6000 CONFIG_IMX_WATCHDOG=y +CONFIG_BCH=y # CONFIG_EFI_LOADER is not set diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 1dca2455c819..4b561adc7d31 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -77,3 +77,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_IMX_WATCHDOG=y +CONFIG_BCH=y diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 47c5974b2ed8..a959488cb9bd 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -176,6 +176,4 @@ #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(1, 5) -#define CONFIG_BCH - #endif /* __GE_BX50V3_CONFIG_H */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 2ee66612c21b..8c7d1395d087 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -144,8 +144,6 @@ #define CONFIG_FSL_IIM -#define CONFIG_BCH - /* Backlight Control */ #define CONFIG_IMX6_PWM_PER_CLK 66666000 From patchwork Wed Jun 10 20:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307201 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyyl6v1Cz9sRN for ; Thu, 11 Jun 2020 06:19:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 090F281734; Wed, 10 Jun 2020 22:17:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2F574818C7; Wed, 10 Jun 2020 22:17:08 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (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 41565819A0 for ; Wed, 10 Jun 2020 22:16:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f196.google.com with SMTP id n11so3398671qkn.8 for ; Wed, 10 Jun 2020 13:16:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KbJ8rRqk6aZz8kCu+1U9CChmYZocfR9O2KMaggQT9p8=; b=fRKyZSSyNftzrntefRbSA+LNC57YcvcL865F9w7XwbLhBsRTV+df2Qnspu7GaBhmsi Qd2r+gnoKrDVEqEKZL0ISBrJS596tmdZxOn37bT89X7+G3GKAS+rF9ELKmAleF4J9FT+ +IU35cZFZ5TZdoMxAshjIJAf+9Hrc0JiubzVR7t0EE0Lrc12HmsWDnSOepk+CH9kp4rU K5KGdgpKjMuZiVNfm6ezZreY5e7HU73slQ1gPkr5zIKtqnuWGC9CUrcDJNw3yhxbGPpl uzt+I9Qsd5cAuIOG1j2+O3Cmcga6GFCodhnuVgjfO3qIffvgHuKIiiUmrumYVEXIGBW6 Sg0w== X-Gm-Message-State: AOAM533KrGLFxOW0f7oNyLFCBBXqel8/YFR/rK86enhXrawyeBPRe4ws /ZBDjDn1Z4tAVCztM40XFIWiLBDY/w== X-Google-Smtp-Source: ABdhPJyWkSopnLFNTqhLAa3ECxADKaATp5vgniA7E/lOK8iPeacDH0cF1MoNg8vKzLVtosbdRc3Fdw== X-Received: by 2002:a37:9586:: with SMTP id x128mr4874751qkd.312.1591820217765; Wed, 10 Jun 2020 13:16:57 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:57 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 14/30] Convert CONFIG_BOARD_TYPES to Kconfig Date: Wed, 10 Jun 2020 16:16:18 -0400 Message-Id: <20200610201634.8457-15-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOARD_TYPES Signed-off-by: Tom Rini --- configs/brsmarc1_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + include/configs/brsmarc1.h | 1 - include/configs/vcoreiii.h | 2 -- 8 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index a7cf98fc746c..8333038c61b7 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_BOARD_TYPES=y CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index ab4f9b6255ba..d9173f408666 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="jr2 # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index 55edb199993b..d5639016958d 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="luton # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index 3fe9e060bb56..a0e04bd4c749 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -18,6 +18,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="ocelot # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index e423fc4efc52..1c86c0dca39b 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -16,6 +16,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="serval # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 49d8468226fc..91347682eef3 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -15,6 +15,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="servalt # " # CONFIG_CMD_BDI is not set diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 5aa68d1d4695..acf13b830a2e 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -16,7 +16,6 @@ #include #include /* ------------------------------------------------------------------------- */ -#define CONFIG_BOARD_TYPES /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 020f02caae9c..460433cb00bf 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -23,8 +23,6 @@ #endif #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_MIPS_TIMER_FREQ -#define CONFIG_BOARD_TYPES - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) || defined(CONFIG_DDRTYPE_MT47H128M8HQ) #define CONFIG_SYS_SDRAM_SIZE (128 * SZ_1M) From patchwork Wed Jun 10 20:16:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307203 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=none (p=none dis=none) header.from=konsulko.com 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 49hyzG5Jt2z9sRR for ; Thu, 11 Jun 2020 06:20:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D72A981D1F; Wed, 10 Jun 2020 22:17:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B78C781CBF; Wed, 10 Jun 2020 22:17:10 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) (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 7523181C75 for ; Wed, 10 Jun 2020 22:17:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f67.google.com with SMTP id y9so1656926qvs.4 for ; Wed, 10 Jun 2020 13:17:00 -0700 (PDT) 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; bh=bz+xiquR4Y/EqFCwe9QGorGm5JKGP9bBPNjO3sT8z9s=; b=biobOoW9MNjRVnv9cBNfXGBnwH4l818bG2z+ros91fXRr9yDxJ9OMN448D/hBi9yad OMV3XUHCnUzOiufL91td1PkMXpU9oFyG9Vh1vTwx+BMtPgTnvC3+QjoyUyeWw5WUgZWC 6qy9/Dq6pgvT0UZ/guEQQ6vm1OEwOHsO2ueYfbNQAo+1lLP5to2mQADB3KT6eY79iIl4 Bu92v/8y7Lg+Sy6DnCCzAi7P+c632P6Fqfv8hXlt0Nu6NRFyu2IbtouHFyVY+4LY9Z/v J8zS7KpNthZH5uNFh36Z1OcJxSJWcsbJCah/j1muwKgGdbUMqiorcD6hnVxBQZ6/HeDx j8+A== X-Gm-Message-State: AOAM532Wc7Ni2j4XF5y4UQ0pas286t8xPVAWmjVSE2/w9Z6okbvGbW8Q hfNuUiv/mVcvS3cjOEZKUYJT/tAHMw== X-Google-Smtp-Source: ABdhPJzUbU2YwojU+H1/isl43ywEA+IQp2j9oGCRurC4NgoDht6xBRMeToZi70Ejc2rXATg6FTrmSg== X-Received: by 2002:a0c:ecc6:: with SMTP id o6mr4719322qvq.243.1591820218887; Wed, 10 Jun 2020 13:16:58 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:58 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Anatolij Gustschin Subject: [PATCH 15/30] arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to Kconfig Date: Wed, 10 Jun 2020 16:16:19 -0400 Message-Id: <20200610201634.8457-16-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_LIMIT Cc: Anatolij Gustschin Signed-off-by: Tom Rini --- configs/deneb_defconfig | 2 ++ configs/giedi_defconfig | 2 ++ include/configs/capricorn-common.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 31a68f824025..5377b4fed513 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 5dd34227af01..dfac924bbb08 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index c2e9d0f11f9c..b107e0ce3f96 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -138,9 +138,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 -#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_BOOTCOUNT_ENV - /* Environment organisation */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1, eMMC */ From patchwork Wed Jun 10 20:16:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307202 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=none (p=none dis=none) header.from=konsulko.com 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 49hyz26yy8z9sRR for ; Thu, 11 Jun 2020 06:20:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CF4881CF5; Wed, 10 Jun 2020 22:17:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B017E81C5F; Wed, 10 Jun 2020 22:17:09 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (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 8EE028179A for ; Wed, 10 Jun 2020 22:17:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f193.google.com with SMTP id b27so3415544qka.4 for ; Wed, 10 Jun 2020 13:17:01 -0700 (PDT) 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; bh=kRNeEwDzK6BSNGGpR+mFTaKGeSjRjeKfIaGn8p4sPiY=; b=Vb97auUjlfEU8xp09uJJEI9ViAHRDtioal8qQip1dtnqHhtOO5g5j1VJsIMZ31Qhd4 zy0GkROX0+cCbeL76YWu1MqJfnX7+yMulQJdAOgrtLeyV4WZhn3iOeHLY61spQlxL0/E keg9ILldkJrRcOgEY7ab6CjzUntt4giK0n/9n6Pf/WaocUbAQBp+3xjjNko4gfWrLOeQ B2lt2PRtNbWaSWPmMjHkzEIalcbK8xqUdWDbSWNVBhjs4ikG5KpcsMmls9N1rwvOaifR iWzmoi7n6gvi80Z0/vrmJy9fdcNl7HZxt9ue9aRehq/BW4XOQ+CXvIE2VqXy7IcZlPjZ oTmg== X-Gm-Message-State: AOAM531l8kDe98QadKubJJAAT0r6NjCkAOxzwU3R/fUZuWNyrNHuFpM1 QSXob45DDQ3nHnIdl1iC1ZgVqDoNjQ== X-Google-Smtp-Source: ABdhPJz6x846NDq+Qwv33Xvb0kheMpeaHxz+HeQRwIY8l/0y3XBEOKcoUxVYUmMlti1/b154OuqDsw== X-Received: by 2002:a37:2710:: with SMTP id n16mr4991914qkn.149.1591820219967; Wed, 10 Jun 2020 13:16:59 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:16:59 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Holger Brunck Subject: [PATCH 16/30] arm: abb secu1: Convert CONFIG_BOOTDELAY to Kconfig Date: Wed, 10 Jun 2020 16:16:20 -0400 Message-Id: <20200610201634.8457-17-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOOTDELAY Cc: Holger Brunck Signed-off-by: Tom Rini Acked-By: Holger Brunck --- include/configs/socfpga_arria5_secu1.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 77914438bfa0..eb17470ae6bc 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* Booting Linux */ -#define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTCOMMAND \ From patchwork Wed Jun 10 20:16:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307206 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyzs0zJgz9sRN for ; Thu, 11 Jun 2020 06:20:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 263E081D3A; Wed, 10 Jun 2020 22:17:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2EE2381CD1; Wed, 10 Jun 2020 22:17:15 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (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 3236281947 for ; Wed, 10 Jun 2020 22:17:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f193.google.com with SMTP id c14so3371887qka.11 for ; Wed, 10 Jun 2020 13:17:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3WeSdINU6m4L1ip+q/5kvycnR9oTNcPf7aoLoy8OnDI=; b=C/Qx6fRmlRhsPJoxtOcCIa4bPH/FY9/WP+AfqLfGoc7RHW7rofjdl6WT+xylBkYsjP lNKdR/etKdq3mnMlJOJAggev6qusW9A1l58N07M9QQrr8VvQo9Tna6lZE5usFQxW0B6t J4kH2gDsaxtkgxfOGWV69EYcm3MJVgiukiZ3LgRRVSp1anng/Zl8+PvDcN7eMP3Xg9Oo dn2EsZdidew0CGU0usbfPClqdX4j5sVNbu3J6FPZl6cAlXXfOJG/cJoNyASgZR5ThMOY QqN+4/pbbM6q7tfZlbe34Tm5vUl2VCudkDpmnEN+Iri5vQfwkpM9kPvY2uzk8KUgdSc8 4qEg== X-Gm-Message-State: AOAM530md3XKjAF6hLj4uSZq3eoVQIfzuyoHVFfxnhT8FlaojznsFW7z Yr4p7G/wfa5t2RcSjkCw06UykDswkg== X-Google-Smtp-Source: ABdhPJxQZIu2boBO/Xu4AwH//VoHbJEhS6Ne1HK3YBSbkuUB8vcvDnrZtMP3+uvawFLDDNY1s+EoMw== X-Received: by 2002:a05:620a:534:: with SMTP id h20mr5012700qkh.293.1591820220917; Wed, 10 Jun 2020 13:17:00 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:00 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 17/30] Convert CONFIG_BOOTP_DNS2 to Kconfig Date: Wed, 10 Jun 2020 16:16:21 -0400 Message-Id: <20200610201634.8457-18-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOOTP_DNS2 CONFIG_BOOTP_PXE_CLIENTARCH Signed-off-by: Tom Rini --- configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_guardian_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am335x_hs_evm_uart_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_rtconly_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_usb_defconfig | 1 + configs/apf27_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/chiliboard_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/k2l_hs_evm_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + configs/phycore-am335x-r2-wega_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/thuban_defconfig | 1 + configs/ti814x_evm_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + configs/tools-only_defconfig | 1 + include/configs/am335x_shc.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/apf27.h | 1 - include/configs/da850evm.h | 1 - include/configs/devkit8000.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/s32v234evb.h | 5 ----- include/configs/sandbox.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_am335x_common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - 73 files changed, 57 insertions(+), 20 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 2781d49daf5f..76f2a9421b34 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 64c1c537f933..b161b3bbc3cf 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 8d8276ba5612..b8333eb4b8bc 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index 01333e7d9346..b88e4d9970f7 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_MTD=y CONFIG_CMD_NAND=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_LED is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 393665fcf377..4faab7fa5bce 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_MTD_SUPPORT=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index a8afad9e0be8..fb4e11d1c7c8 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_MTD_SUPPORT=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 633c35f77bc3..5295b6ac81cb 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 94c513457c2a..6401375250b7 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 6650b3eb6d79..fea34a34242f 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index f03f1fa0ae71..84e43603f20f 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index 13b36864177b..14589a32e629 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 238164a55fe1..55170309c68b 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-sl50" diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 6dd04a4c1725..1e0baebc17ab 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y # CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_CACHE=y # CONFIG_CMD_TIME is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 075c09b62629..df02489b3b6e 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x40000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 39facf132e5f..459096db4f55 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am437x-sk-evm" diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index a0a6661e40d1..66fe74407f12 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x40000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index db48785f9117..d1a6fbe75387 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 523ce00585f8..deaa19007fae 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_SPL_USB_ETHER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 42942e9ed4bb..f0418bd0ffa5 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_AB_SELECT=y +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_PMIC is not set CONFIG_CMD_AVB=y CONFIG_OF_CONTROL=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index f80ec38004bc..c5a62fbbca6b 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_AB_SELECT=y +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_PMIC is not set CONFIG_CMD_AVB=y CONFIG_OF_CONTROL=y diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index 3b155cc2026d..c21a8755c128 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_AB_SELECT=y +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_PMIC is not set CONFIG_CMD_AVB=y CONFIG_OF_CONTROL=y diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 73a53047244d..88f1b5443503 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DNS=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 87dae5950b9b..2eb03ff67cc3 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -39,6 +39,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 5ee9878a5508..851d6fddafa5 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -39,6 +39,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index afc73dc89c52..01c114352131 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=8000000.nand" diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 51351669fee5..983aaf388d6e 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index ee49ed29e64a..1a6a97ed161a 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_DM=y CONFIG_CMD_MTD=y # CONFIG_CMD_SF is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_TIME is not set # CONFIG_CMD_EXT4 is not set CONFIG_CMD_FS_UUID=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index ab86108d664b..36ef122ba3ae 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MTD=y # CONFIG_CMD_SF is not set # CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_TIME is not set CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2" diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index bc2c0a2c2542..e805f2c10eda 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_DM=y # CONFIG_CMD_GPT is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_TIME is not set # CONFIG_CMD_EXT4 is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 1d642c095f48..53a43ed0ae5b 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_BOOTP_NTPSERVER=y CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 4c326211d768..7050482a9803 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 16202c848c59..ee31e26c8016 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -48,6 +48,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 644b6e54644e..c4758ef4e14f 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index d4b5a5fddd6f..34b5baa0edf9 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 5bc7f7f8656e..d16e8f48bd83 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_GPT is not set CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index a530ba035775..f089be4f563a 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_GPT is not set CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index eb5916c2c65d..6060a3e8bdf8 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 96cab5168725..ef1e4cc1da41 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 71a35e349616..39777d87f1b5 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 3fad15f121fd..26d071636ebf 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_MX_CYCLIC=y # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 50cf09c7f182..378465bf631b 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_DM=y CONFIG_CMD_NAND=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index ea7a0769f290..455ca32f53d6 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 43e64630ab62..b51a30e98192 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 3d0fcf3ea095..63fa72c13386 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_WOL=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 6585ac05fd09..5d79d4774c3c 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/phycore-am335x-r2-wega_defconfig b/configs/phycore-am335x-r2-wega_defconfig index 864e2ff59ba2..d19271652691 100644 --- a/configs/phycore-am335x-r2-wega_defconfig +++ b/configs/phycore-am335x-r2-wega_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_PING=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 67de086c0b26..3603f0b18cbf 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index c4a4e137379d..b237d5237664 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 40c9de25c698..20b5f981ba09 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -48,6 +48,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index a3f049e124e1..6cb3aa41fb60 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -49,6 +49,7 @@ CONFIG_CMD_READ=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 5b7569319b73..20a81a0350d2 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -56,6 +56,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_AXI=y CONFIG_CMD_AB_SELECT=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_PCAP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 21f9047046a3..22f4b159fac7 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_PCI=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index fc8b26e88cfe..d499ac1727eb 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_PCI=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index d81981a827e7..59b99cdace24 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig index 71c9119c7d06..60d9ccded8f1 100644 --- a/configs/ti814x_evm_defconfig +++ b/configs/ti814x_evm_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 21d152aea9d1..98322b80084d 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 70e62bf9d9da..1ae10236d2c9 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_SIGNATURE=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_ELF is not set +CONFIG_BOOTP_DNS2=y # CONFIG_CMD_DATE is not set CONFIG_OF_CONTROL=y CONFIG_OF_HOSTFILE=y diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index cf964373f0c6..c881ac621114 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -240,7 +240,6 @@ #endif #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index cc5e8314c71b..7cd9ec96593a 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -37,7 +37,6 @@ /* Ethernet */ #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4a2c39c44d46..b7cc1a137ba7 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -193,7 +193,6 @@ #ifndef CONFIG_SPL_BUILD /* CPSW Ethernet */ #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index e94b7c8d216a..adcd9a12e2e5 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -54,7 +54,6 @@ #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index cecd485e2055..aaf22acdb51e 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -40,7 +40,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_DNS2 #define CONFIG_HOSTNAME "apf27" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 4d651264dd2e..2bb4e47496b4 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -166,7 +166,6 @@ * Network & Ethernet Configuration */ #ifdef CONFIG_DRIVER_TI_EMAC -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 21af126c4bde..f90c1c5a18a6 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -65,7 +65,6 @@ /* BOOTP/DHCP options */ #define CONFIG_BOOTP_NISDOMAIN #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_TIMEOFFSET #undef CONFIG_BOOTP_VENDOREX diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 58fa5ccfa3ef..58fc10d31f46 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -157,7 +157,6 @@ #ifdef CONFIG_DRIVER_TI_EMAC #undef CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 5c6692c1999c..e207ca45fdb6 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -151,11 +151,6 @@ #define CONFIG_SYS_MALLOC_BASE (DDR_BASE_ADDR) #endif -#if 0 -/* Configure PXE */ -#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 -#endif - /* Physical memory map */ /* EVB board has 2x256 MB DDR chips, DDR0 and DDR1, u-boot is using just one */ #define PHYS_SDRAM (DDR_BASE_ADDR) diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2a81f3a9bc02..273a15a41a62 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -67,7 +67,6 @@ #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM #define CONFIG_TIMESTAMP -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ed931176504a..d146ba51dedb 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -171,7 +171,6 @@ */ #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index c13e9979219a..060030b83859 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -120,7 +120,6 @@ * */ #define CONFIG_DRIVER_TI_EMAC_USE_RMII -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 99ddc3e923c7..264b1f1a4cda 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -145,7 +145,6 @@ #endif /* Ethernet */ -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_ET1011C_TX_CLK_FIX diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index d16d61e5cdb2..01a174b29f24 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -88,7 +88,6 @@ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 19e1e2249ed4..4b3981b9b0d6 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -27,7 +27,6 @@ #ifndef CONFIG_SPL_BUILD /* Network defines. */ -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 1b014c1022be..750a69fa7750 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -84,7 +84,6 @@ /* Network Configuration */ #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 32 #define CONFIG_SYS_SGMII_REFCLK_MHZ 312 From patchwork Wed Jun 10 20:16:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307204 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hyzS5865z9sRN for ; Thu, 11 Jun 2020 06:20:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DBAB181D27; Wed, 10 Jun 2020 22:17:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 6334281CB9; Wed, 10 Jun 2020 22:17:11 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) (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 5D4BE819F3 for ; Wed, 10 Jun 2020 22:17:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f67.google.com with SMTP id p15so1643006qvr.9 for ; Wed, 10 Jun 2020 13:17:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5dfVKekVJLMQTVqrmSKMpg0pa93PINY7G78oB9P4G1g=; b=JscovTU+LCDLGWxyLBCVvttYCnt2bLdQW8cpyfH23H9YUv7CZerhEBwtmYtY8iNOAC R0MOOYJBSl0zXfqboGOrv4L9mwif3QHdQO1jbgHyQtDWcWaHp3sbH2hGlaAvkqKm18WH rpD2BYd/G0YH8uhtGPW3ULe7KpyZKWeFDJI5XuAfWek0z3v8jlv0CM7JPsldwfhpSJBw pqIlSR75OBrzu7M0Mbe2KyG43qTkscoWROW+bImAWXOnDjClOPyVZM0tKftqFOy3bNG2 +itGVB5ZA/LQWbMVaCShj67yL1ekvCzde6RpW7uB8QEin5zkDkfm/OUkeppleGxsHGFp l41w== X-Gm-Message-State: AOAM531krZH+2Uf6bFh+ALc7tPqVNCLdUbMqBmpG9pLiPh9GJJ8ILqEs rGiBNHajcvEcl5neilRMGBhNjyML0g== X-Google-Smtp-Source: ABdhPJxWD1QG2ln/dCvvI6UyfmHGubArGA7HxWWR8uW61mYvIGECLzcuAScYcaOVrxvHFV3SxlEQjw== X-Received: by 2002:ad4:4b33:: with SMTP id s19mr4432196qvw.211.1591820221758; Wed, 10 Jun 2020 13:17:01 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:01 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 18/30] Convert CONFIG_BOUNCE_BUFFER to Kconfig Date: Wed, 10 Jun 2020 16:16:22 -0400 Message-Id: <20200610201634.8457-19-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOUNCE_BUFFER Signed-off-by: Tom Rini --- include/configs/px30_common.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index d6c70601dd01..76d6ab1c8b4e 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -32,9 +32,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ -/* MMC/SD IP block */ -//#define CONFIG_BOUNCE_BUFFER - #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_BANK_SIZE (2UL << 30) From patchwork Wed Jun 10 20:16:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307205 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=none (p=none dis=none) header.from=konsulko.com 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 49hyzg1XSYz9sRN for ; Thu, 11 Jun 2020 06:20:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8413F81D32; Wed, 10 Jun 2020 22:17:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 28FD981CC5; Wed, 10 Jun 2020 22:17:12 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (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 D409C819BD for ; Wed, 10 Jun 2020 22:17:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f194.google.com with SMTP id q8so3378157qkm.12 for ; Wed, 10 Jun 2020 13:17:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZRKCFw6aLPi16mSmONrHSand12T/KZnmOv+E+C3MXrs=; b=M7mNxPaEiMud4YV4jiWCv+VcFmYV8by1FtMvz3lFpmeO2QCFu2O6gJlA6P4dbe96HP frJaJvvhMOG1Wsr9gCT0l7vrE9JYMuTaoZF2GMp393ggfeeNv4rGwwyG3jQNENeXxIy9 eXCvJl9xc9NOH7DaHU5gqpAtOEdQ0ZAdVy8/4IuAKTHPSW1jSBxcIEpBSYAgMuVgYm/k PZU0Nl3HgbI/ZOie4T6yNb/7BKvMdqMsbmrLXUjQluHGxPI4l6YZH07wrlEOK9URmeNn Ug8CaYza56tiKKEEt6ryAH0eGVvitbqXy7CdQmlyRxBBjA6aP4QWerkgc/5S55r0qPF/ LmoA== X-Gm-Message-State: AOAM531LZA3Lu7pnKnIKiEafHKDnWiBlTizJtkMV8FfMAJkt9nS3AazW oOXw2WadpjCrhy3TwM0OGQRI7FPaqw== X-Google-Smtp-Source: ABdhPJxtCbwR/qNrknbTFNsoPSKbAgrhkQyXhsy30d/V7Sg5dtM3rXMglG0P2GOMwDpznA+T+tpCVg== X-Received: by 2002:a37:79c6:: with SMTP id u189mr5001179qkc.490.1591820222966; Wed, 10 Jun 2020 13:17:02 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:02 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 19/30] Convert CONFIG_BUILD_TARGET to Kconfig Date: Wed, 10 Jun 2020 16:16:23 -0400 Message-Id: <20200610201634.8457-20-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BUILD_TARGET Signed-off-by: Tom Rini --- include/configs/db-88f6281-bp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/db-88f6281-bp.h b/include/configs/db-88f6281-bp.h index cc51e6646ee3..e234b0bf9826 100644 --- a/include/configs/db-88f6281-bp.h +++ b/include/configs/db-88f6281-bp.h @@ -11,7 +11,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SYS_TCLK 166666667 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg -#define CONFIG_BUILD_TARGET "u-boot.kwb" /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 From patchwork Wed Jun 10 20:16:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307207 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=none (p=none dis=none) header.from=konsulko.com 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 49hz051dMGz9sRN for ; Thu, 11 Jun 2020 06:21:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED35A81D4D; Wed, 10 Jun 2020 22:17:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0B0CA81CBF; Wed, 10 Jun 2020 22:17:16 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (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 74FF281CA6 for ; Wed, 10 Jun 2020 22:17:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f193.google.com with SMTP id w1so3415795qkw.5 for ; Wed, 10 Jun 2020 13:17:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2xeSyIlfoztTGP/l706ppFVp5hhzIW23BP8VyqxBoLI=; b=PQo+/TgiByAjncHmxA1O3LL8HwFmX2wOrzl9mRJ9GocRmr3nA+fkswnxPgO15YqPJ3 S3Vc3G7ESSAz9Klfjd4QZuUPLw2qWmnYdDHitXhUpRZEYydbmNi34g21jQFToxIVeh6J qPBxpAFIYoSkb37h6Jr36JWCBifFgYOwmc8HWVaO+RJn0/1eAY4c/puKFjqhCyTakSmc lQB9LqtZggTKzjH3BaJwXdxdAJnL9AT7tN2rhPyLgYFDEQTT3FA8sjTP8rhvLvHzA6PA V9sUutbq4z0OAjqyByDltv3pwUDt93gibvFDqi8MtDzSWGIR5Cl04Us+H+737w8ipxUs +KwA== X-Gm-Message-State: AOAM530jebR9JZ/797E+bB6nrhuN3iZh5BLEYnGTAm+mNrReFXtFVpuQ wWShxhLfV6yVcK5hNP8KiH38hRvl5A== X-Google-Smtp-Source: ABdhPJyfK8829un8kT/fkhy/2Zs3AdqWOMS2EabHfhjQv2iKPz8pNvvLmAqzcofE/HTDBwrut2Bo6A== X-Received: by 2002:a37:64d8:: with SMTP id y207mr5043626qkb.2.1591820223750; Wed, 10 Jun 2020 13:17:03 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 20/30] Convert CONFIG_CMDLINE_EDITING to Kconfig Date: Wed, 10 Jun 2020 16:16:24 -0400 Message-Id: <20200610201634.8457-21-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CMDLINE_EDITING Signed-off-by: Tom Rini --- include/configs/ls1028a_common.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 44f2dc8f9b41..c191f74a3a61 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -87,10 +87,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ -#ifndef CONFIG_CMDLINE_EDITING -#define CONFIG_CMDLINE_EDITING 1 -#endif - #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ From patchwork Wed Jun 10 20:16:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307208 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hz0J6Nr0z9sRN for ; Thu, 11 Jun 2020 06:21:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 509F081D69; Wed, 10 Jun 2020 22:17:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id D7BC481CD1; Wed, 10 Jun 2020 22:17:17 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (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 C96778168F for ; Wed, 10 Jun 2020 22:17:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f182.google.com with SMTP id g28so3442137qkl.0 for ; Wed, 10 Jun 2020 13:17:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yIQ8ADqy+0NUMFt1hUhQl2EOfhJ+A7GK36Jp0Nqg1AY=; b=dL/dhBFI9HJXXnQUni1C9x+fbPsKaQr6cw+clYN+zcmQ20R20sxt1ZKLx5WbOjDMPu ZwmWoNB80BYmb2RdN6/3ypgdeyGs80koa4f75vh+2sNCU6FRlprq0S+ESva+1Dh+h15M hGX+vy65gdyXK1l+9Tpn+ZG5R1XQZFB0W0P7Bz9hwS4VoYRkMZPt4vjVMZCFA/ufiAOA fprJzVdlPm9lJapZyg+MNV21FM7qJdLPvUWIh8e2FXaaL6JlhA6j6YkLi993RWe9LQ1w ycD39ic8LUzN3Y82RZM9mIdgGHGsB7H4fFxCcMdLLPu5zooc49c+2/2fpIPKxiKtxHSV 4BLQ== X-Gm-Message-State: AOAM532MGX0VaT5TuRWcud1pSgcSnVVp/U6kFLK655MtLqB+/pTKj/IQ rXfN5ll0o6e0Wk/xUKqeKkZsew/3zQ== X-Google-Smtp-Source: ABdhPJwpeuHyJ1RunpBZhiblvQ+61C87u4fBehrhLgkH1KoBK5TJOfV1XBmuls7P6+2ITH61jGAkQw== X-Received: by 2002:a05:620a:753:: with SMTP id i19mr5012033qki.357.1591820224854; Wed, 10 Jun 2020 13:17:04 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:04 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 21/30] Convert CONFIG_CONS_INDEX to Kconfig Date: Wed, 10 Jun 2020 16:16:25 -0400 Message-Id: <20200610201634.8457-22-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CONS_INDEX Signed-off-by: Tom Rini --- configs/am43xx_evm_defconfig | 1 - configs/am43xx_evm_qspiboot_defconfig | 2 +- configs/am43xx_evm_rtconly_defconfig | 1 - configs/am43xx_evm_usbhost_boot_defconfig | 1 - configs/am43xx_hs_evm_defconfig | 1 - configs/birdland_bav335a_defconfig | 1 - configs/birdland_bav335b_defconfig | 1 - configs/gardena-smart-gateway-mt7688_defconfig | 1 + configs/linkit-smart-7688_defconfig | 2 ++ configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + configs/mt7628_rfb_defconfig | 1 - configs/x530_defconfig | 1 + include/configs/SBx81LIFKW.h | 2 -- include/configs/SBx81LIFXCAT.h | 2 -- include/configs/brsmarc1.h | 2 -- include/configs/db-88f6281-bp.h | 7 ------- include/configs/gardena-smart-gateway-mt7688.h | 1 - include/configs/linkit-smart-7688.h | 1 - include/configs/ls1021atsn.h | 1 - include/configs/ls1028a_common.h | 1 - include/configs/mt7628.h | 1 - include/configs/vcoreiii.h | 2 -- include/configs/vocore2.h | 1 - include/configs/x530.h | 2 -- 29 files changed, 11 insertions(+), 31 deletions(-) diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index df02489b3b6e..be88f28e9e3d 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 459096db4f55..fea5aa01745a 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_AM43XX=y CONFIG_ENV_OFFSET_REDUND=0x120000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="QSPI,QSPI_BOOT" CONFIG_QSPI_BOOT=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index 66fe74407f12..8f1e60fd3e5d 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_RTC_DDR_SUPPORT=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index d1a6fbe75387..7afd328a4983 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -9,7 +9,6 @@ CONFIG_AM43XX=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index deaa19007fae..79a0466b5ac2 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -19,7 +19,6 @@ CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 2eb03ff67cc3..a20798be5443 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_BAV_VERSION=1 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 851d6fddafa5..f5d7e3f50a11 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_BAV_VERSION=2 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index 41496f739bda..610609091910 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -74,6 +74,7 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_MTD_UBI_BEB_LIMIT=22 CONFIG_MT7628_ETH=y CONFIG_PHY=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SPI=y CONFIG_MT7621_SPI=y CONFIG_WDT=y diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig index 8ec66938cdce..9115bb9d885f 100644 --- a/configs/linkit-smart-7688_defconfig +++ b/configs/linkit-smart-7688_defconfig @@ -60,6 +60,8 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_MT7628_ETH=y CONFIG_PHY=y CONFIG_MT76X8_USB_PHY=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_CONS_INDEX=3 CONFIG_SPI=y CONFIG_MT7621_SPI=y CONFIG_USB=y diff --git a/configs/ls1028aqds_tfa_lpuart_defconfig b/configs/ls1028aqds_tfa_lpuart_defconfig index e0348279d9f9..f3475b558a50 100644 --- a/configs/ls1028aqds_tfa_lpuart_defconfig +++ b/configs/ls1028aqds_tfa_lpuart_defconfig @@ -75,6 +75,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_SCSI=y CONFIG_DM_SCSI=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_SPI=y diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index d9173f408666..aaede4a70b93 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -68,6 +68,7 @@ CONFIG_DM_ETH=y CONFIG_MSCC_JR2_SWITCH=y CONFIG_PINCTRL=y CONFIG_PINCONF=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index d5639016958d..0846ee84741b 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -72,6 +72,7 @@ CONFIG_DM_ETH=y CONFIG_MSCC_LUTON_SWITCH=y CONFIG_PINCTRL=y CONFIG_PINCONF=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index a0e04bd4c749..36ca158715ba 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -72,6 +72,7 @@ CONFIG_DM_ETH=y CONFIG_MSCC_OCELOT_SWITCH=y CONFIG_PINCTRL=y CONFIG_PINCONF=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index 1c86c0dca39b..66d9e1d315aa 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -66,6 +66,7 @@ CONFIG_DM_ETH=y CONFIG_MSCC_SERVAL_SWITCH=y CONFIG_PINCTRL=y CONFIG_PINCONF=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 91347682eef3..1f56875b5feb 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -63,6 +63,7 @@ CONFIG_DM_ETH=y CONFIG_MSCC_SERVALT_SWITCH=y CONFIG_PINCTRL=y CONFIG_PINCONF=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y diff --git a/configs/mt7628_rfb_defconfig b/configs/mt7628_rfb_defconfig index f444cf98c6ce..ba3b06263f22 100644 --- a/configs/mt7628_rfb_defconfig +++ b/configs/mt7628_rfb_defconfig @@ -40,7 +40,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XMC=y CONFIG_MT7628_ETH=y -# CONFIG_SPECIFY_CONSOLE_INDEX is not set CONFIG_SPI=y CONFIG_MT7621_SPI=y CONFIG_LZMA=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index de077cb71fde..2f1fd755fb36 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -70,6 +70,7 @@ CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_MVEBU=y CONFIG_DM_RTC=y CONFIG_RTC_DS1307=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 8f31fc4c7456..ec0c531c4623 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -38,8 +38,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index f4440e576466..90480520ab3f 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -38,8 +38,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index acf13b830a2e..d0cc08baa635 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -69,6 +69,4 @@ BUR_COMMON_ENV \ /* SPI Flash */ /* Environment */ - -#define CONFIG_CONS_INDEX 1 #endif /* __CONFIG_BRSMARC1_H__ */ diff --git a/include/configs/db-88f6281-bp.h b/include/configs/db-88f6281-bp.h index e234b0bf9826..06a7091be208 100644 --- a/include/configs/db-88f6281-bp.h +++ b/include/configs/db-88f6281-bp.h @@ -29,13 +29,6 @@ #define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE #define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* - * Serial Port configuration - * The following definitions let you select what serial you want to use - * for your console driver. - */ - -#define CONFIG_CONS_INDEX 1 /* Console on UART0 */ /* * Environment variables configurations diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 261749db8d34..1b26466eda30 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_NS16550_CLK 40000000 #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM1 0xb0000c00 -#define CONFIG_CONS_INDEX 1 #endif /* UART */ diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index d7ebfeda4c56..e7a7ae319897 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_NS16550_CLK 40000000 #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM3 0xb0000e00 -#define CONFIG_CONS_INDEX 3 #endif diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index ec2ed7c60969..e76e54e97fc9 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -97,7 +97,6 @@ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index c191f74a3a61..d184673a71b5 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -43,7 +43,6 @@ #endif /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index 9b9218d29676..c6752f4acb72 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_NS16550_CLK 40000000 #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM1 0xb0000c00 -#define CONFIG_CONS_INDEX 1 #endif /* Serial common */ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 460433cb00bf..82a8fa7354ee 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -34,8 +34,6 @@ #error Unknown DDR size - please add! #endif -#define CONFIG_CONS_INDEX 1 - #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT) diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index 5aa3ad8ddf21..40467b737ceb 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_NS16550_CLK 40000000 #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM3 0xb0000e00 -#define CONFIG_CONS_INDEX 3 /* RAM */ diff --git a/include/configs/x530.h b/include/configs/x530.h index 7e0f2c24d943..4446510df4e0 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -30,8 +30,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ - /* NAND */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 From patchwork Wed Jun 10 20:16:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307209 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hz0W4CRcz9sRN for ; Thu, 11 Jun 2020 06:21:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57D3E81C9E; Wed, 10 Jun 2020 22:17:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 469BA81CD7; Wed, 10 Jun 2020 22:17:18 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (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 78E59819B8 for ; Wed, 10 Jun 2020 22:17:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f195.google.com with SMTP id n11so3399106qkn.8 for ; Wed, 10 Jun 2020 13:17:07 -0700 (PDT) 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; bh=Nd1v1ik6A5LTwelR7tC0BarkzQrclXZTgenDTlYf2+0=; b=BE4d8NvlNT0TAeV+ZyvyD895zzGm543D2GzmUaBzBAVJt71E0RmkvUGc9nGc21Mlvt eljWGeSFwUoWC3velS2PwOGp9SRJCTpfHINdGV2YtB4ttgtCnG92i5l7SyVd8NUGc2r0 SGmjwWk/kBZ3KcnoeVoLe3EoqcRQVAh7Rg2hdXn4joCeDZ7+NGJYeCQLjcx/XD+vy9FF bv0Q1MK8mOtQT9rva4FMCpoFoluuVGtg7eqpPfLCz1SdNUf4Oxk/grzuPRhyaO8qAH2S 9ZFyDIsEHhFIl+yh1C1ENH05zQ6benIKMfA1I+wBZe8cq7hkYdNKNLU6KCQg7O9HSKVg K+7A== X-Gm-Message-State: AOAM532pKZLFbsQsBuN2MnqJ/Oa36oVNADUSxwVpzZH6bx/SPhLSZW9W I5shizp8OqEsOcwaHNQvnHog4nAhYA== X-Google-Smtp-Source: ABdhPJxSLG1BKbPy209IqJSGUgeLRXBDlF4MyZosyP78CsS+CjO/Q9ACpQcOdI0rJSclAn9hUQjpRg== X-Received: by 2002:a37:e304:: with SMTP id y4mr4730522qki.57.1591820225785; Wed, 10 Jun 2020 13:17:05 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:05 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Igor Opaniuk Subject: [PATCH 22/30] arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig Date: Wed, 10 Jun 2020 16:16:26 -0400 Message-Id: <20200610201634.8457-23-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CONSOLE_MUX Cc: Igor Opaniuk Signed-off-by: Tom Rini Reviewed-by: Igor Opaniuk --- configs/apalis_imx6_defconfig | 2 -- configs/colibri_imx6_defconfig | 2 -- include/configs/apalis_imx6.h | 1 - include/configs/colibri_imx6.h | 1 - 4 files changed, 6 deletions(-) diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 6b0f0e463896..e9d9b3f30239 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -19,8 +19,6 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=1 -# CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 44a3ff859c2d..8bdae00129c3 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -18,8 +18,6 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 -# CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d5a0625e0282..b2d87019c8e7 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -74,7 +74,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 6beef250942b..a0ee4d48ad06 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -62,7 +62,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP From patchwork Wed Jun 10 20:16:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307210 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=none (p=none dis=none) header.from=konsulko.com 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 49hz0j3dL1z9sRN for ; Thu, 11 Jun 2020 06:21:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81D3781D73; Wed, 10 Jun 2020 22:17:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 33FC481CE3; Wed, 10 Jun 2020 22:17:19 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (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 6D2CA81743 for ; Wed, 10 Jun 2020 22:17:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f195.google.com with SMTP id c185so3408577qke.7 for ; Wed, 10 Jun 2020 13:17:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Rvj1Ua5uLNlKQ9BI9xmAuZMDD3k9XoBGyBMQGJbA83U=; b=QSA6W+m8Q2osZD/nrmhzgrVwQN8XU7F6PDRrnhW3yk8wLgYuVW7GJYpEe3kSPNI0Ju 2GUFaVXosV900FRILmU/MQnJXuqizUh3YTHsClOqgXGhzoQUA4e1iTSfgMAh2exEhGwR WhaQrxKdB+csro/fyvOaUu3qkvL7CpNhY7GJ/JlUSE4iSztLjnGsdc9S1OxmfQpWM935 B4tiZJTg6e/sQVpycd/nwB706h8nyIm6q5Vu/d5lAAESCgIDi+ybNXgMMk0e+tn6uqp1 Gf0PzqW7ghHg6Qr5W3e2XLfiPZcGWITtEsmq3/72A1iuCRXSdx+vq1IaSdgZGGl0Rg6U hXGQ== X-Gm-Message-State: AOAM531uT9RJifaiwMtJd7O8pv8HxkEwixBpiDToYomxO8l6tbaJ8VoT 6Ru1u32GMjH6KW4ZozaZG4h7YCv7yQ== X-Google-Smtp-Source: ABdhPJz/Ke7cJqECA+Ahp3AH6/Zo0/CW4j41ORGe5TjNz9e4QyifhxSlShJN6ehUwN4TuDVaNC3YfA== X-Received: by 2002:ae9:f804:: with SMTP id x4mr5155164qkh.164.1591820226952; Wed, 10 Jun 2020 13:17:06 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:06 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 23/30] Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig Date: Wed, 10 Jun 2020 16:16:27 -0400 Message-Id: <20200610201634.8457-24-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CONSOLE_SCROLL_LINES Signed-off-by: Tom Rini --- include/configs/evb_px5.h | 1 - include/configs/evb_rk3308.h | 2 -- include/configs/evb_rk3328.h | 2 -- include/configs/firefly_rk3308.h | 2 -- include/configs/geekbox.h | 2 -- include/configs/sheep_rk3368.h | 2 -- 6 files changed, 11 deletions(-) diff --git a/include/configs/evb_px5.h b/include/configs/evb_px5.h index e9304206bb12..ed801dd84556 100644 --- a/include/configs/evb_px5.h +++ b/include/configs/evb_px5.h @@ -8,7 +8,6 @@ #include -#define CONFIG_CONSOLE_SCROLL_LINES 10 #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/evb_rk3308.h b/include/configs/evb_rk3308.h index 4d40606e4bd3..0d2cb21ac679 100644 --- a/include/configs/evb_rk3308.h +++ b/include/configs/evb_rk3308.h @@ -14,7 +14,5 @@ #define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#undef CONFIG_CONSOLE_SCROLL_LINES -#define CONFIG_CONSOLE_SCROLL_LINES 10 #endif diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h index ed5888bfd3e9..26687e638616 100644 --- a/include/configs/evb_rk3328.h +++ b/include/configs/evb_rk3328.h @@ -12,6 +12,4 @@ #define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_CONSOLE_SCROLL_LINES 10 - #endif diff --git a/include/configs/firefly_rk3308.h b/include/configs/firefly_rk3308.h index 2cc7b4a153f8..7b8b62fbcb15 100644 --- a/include/configs/firefly_rk3308.h +++ b/include/configs/firefly_rk3308.h @@ -14,7 +14,5 @@ #define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#undef CONFIG_CONSOLE_SCROLL_LINES -#define CONFIG_CONSOLE_SCROLL_LINES 10 #endif diff --git a/include/configs/geekbox.h b/include/configs/geekbox.h index 91f4feb73708..4b12eb7af9a8 100644 --- a/include/configs/geekbox.h +++ b/include/configs/geekbox.h @@ -8,6 +8,4 @@ #include -#define CONFIG_CONSOLE_SCROLL_LINES 10 - #endif diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h index 238838fd7d05..550597c957d0 100644 --- a/include/configs/sheep_rk3368.h +++ b/include/configs/sheep_rk3368.h @@ -13,6 +13,4 @@ #define DTB_LOAD_ADDR 0x5600000 #define INITRD_LOAD_ADDR 0x5bf0000 -#define CONFIG_CONSOLE_SCROLL_LINES 10 - #endif From patchwork Wed Jun 10 20:16:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307211 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hz0v6cq8z9sRN for ; Thu, 11 Jun 2020 06:21:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E66E081D85; Wed, 10 Jun 2020 22:17:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 5D223819A0; Wed, 10 Jun 2020 22:17:20 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 EEF5D819A0 for ; Wed, 10 Jun 2020 22:17:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id k22so2858069qtm.6 for ; Wed, 10 Jun 2020 13:17:09 -0700 (PDT) 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; bh=sMjl6iTTHv5QXe/4NwFlhEcaaA3PCtetqWLvIpG90KE=; b=ksLbkQU8W2taQH/Gmuu8ZBcwiqogDlXODpnVuPWm8eqDvi5/lSRtUARYjgjswepbf3 rpI96TK0WuwisDZb10iSkr0B/INwDCCWkiyGJClNOctxXK98QZT8ZkYsPxO8/tqPLO+v lhAwNQXV8d+tlZA0nGbz547zHKYuDnzZw2DIZTy9+HqA+u0/5KNDBGSzx3oPRd4Xuvio cm1M4SomfVMVa+1fhv+S8wEg0oIEVzk9Hf5gPyfHRX606zB8xxu9/PR00T2jda5k7lwX UxSzstPLNTfRQkhpeV5RH4H46YHijor3tdY5QXdXc6+Kp+1zyOiCh4kMTsOq7x+Qu5IX ssqw== X-Gm-Message-State: AOAM531+rVzZ7giwSDLHrEdsCN//QgNbQ/HuVNRgech2reaFyEduSVUU LjQPka7GH2LdnUdwY+PXX6+T8Ryb1A== X-Google-Smtp-Source: ABdhPJzvhYiKz+HEbYgfvPePKenPIWemg3NymcFGrqgPMxpLeDabY34w/vAN7m6Pf2IWSY4aZv5YfQ== X-Received: by 2002:ac8:1a53:: with SMTP id q19mr5257976qtk.350.1591820228501; Wed, 10 Jun 2020 13:17:08 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:07 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" Subject: [PATCH 24/30] arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig Date: Wed, 10 Jun 2020 16:16:28 -0400 Message-Id: <20200610201634.8457-25-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean While the normal case of CSF_SIZE is handled via Kconfig we have entries in config headers related to CONFIG_SECURE_BOOT. However in commit d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") this was renamed to CONFIG_IMX_HAB. Update the CSF_SIZE entry to have the correct default value if we have IMX_HAB enabled. Cc: Stefano Babic Cc: Fabio Estevam Cc: NXP i.MX U-Boot Team Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") Signed-off-by: Tom Rini --- arch/arm/mach-imx/Kconfig | 1 + include/configs/imx8mm_beacon.h | 4 ---- include/configs/imx8mm_evk.h | 4 ---- include/configs/imx8mn_evk.h | 4 ---- include/configs/imx8mp_evk.h | 4 ---- include/configs/verdin-imx8mm.h | 4 ---- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6c3fedf665d6..0648c2725bf8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -52,6 +52,7 @@ config IMX_HAB config CSF_SIZE hex "Maximum size for Command Sequence File (CSF) binary" + default 0x2000 if IMX_HAB default 0x2060 help Define the maximum size for Command Sequence File (CSF) binary diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 21102d3c14d2..ce3ba7492435 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -9,10 +9,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE SZ_8K -#endif - #define CONFIG_SPL_MAX_SIZE (148 * 1024) #define CONFIG_SYS_MONITOR_LEN SZ_512K #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 901a1bed6dd1..382ba620ccf4 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -10,10 +10,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE SZ_8K -#endif - #define CONFIG_SPL_MAX_SIZE (148 * 1024) #define CONFIG_SYS_MONITOR_LEN SZ_512K #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index a07440c73ba8..4350b5a62aff 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -10,10 +10,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE SZ_8K -#endif - #define CONFIG_SPL_MAX_SIZE (148 * 1024) #define CONFIG_SYS_MONITOR_LEN SZ_512K #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 7f38f21c09c5..9c13235982c6 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -10,10 +10,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE 0x2000 /* 8K region */ -#endif - #define CONFIG_SPL_MAX_SIZE (152 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index ca528598f2f1..878c4996df42 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -9,10 +9,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE SZ_8K -#endif - #define CONFIG_SPL_MAX_SIZE (148 * 1024) #define CONFIG_SYS_MONITOR_LEN SZ_512K #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR From patchwork Wed Jun 10 20:16:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307212 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=none (p=none dis=none) header.from=konsulko.com 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 49hz171TVzz9sRN for ; Thu, 11 Jun 2020 06:22:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2932681D9A; Wed, 10 Jun 2020 22:18:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 9286981CD7; Wed, 10 Jun 2020 22:17:20 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (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 7BBA081C5F for ; Wed, 10 Jun 2020 22:17:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f196.google.com with SMTP id q14so2845574qtr.9 for ; Wed, 10 Jun 2020 13:17:11 -0700 (PDT) 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=5vzwNYDkZHx/mMHnzwmojyRyM56AK5vUYXA+DBbfmLE=; b=fvrcZ04Oab56nsv9Ro6zh7gB9NgX9DK6VHVBWBt5xkrCEAbsEmNrxGzjyvHzRezKsU OOL7PeZUfMzMv7y2ke2uBA+TuYR9I7DY3LNmObwKstsNtOOKHDfvJyWNOyBPzxW6YSS1 vegKGe4QGbKae822akHMOEnfZvmQKyxNzD/xF9ItEng76kdyIPeEtrQAQDxlw71e1eX2 SBg3CCM9lRmI3/+vqRLjY6jwSRjnQoQ7YMm4t4Nta2XOZR+my/VbdMY8oOhQY+J1xwcN ZpZbxhFMU9of24jtynNHwpTr78E5XbwuGDe2hT1sl47yi4ISXbQMqj4vVoTCK44uZVQx JTeg== X-Gm-Message-State: AOAM531qYGTenhCm3fvFQT0XDr8oLiAzjazBBAGhgdpJBQ6wiGmU5/EZ lXbjWFpl2JJ7/eR6IB0uwyhDOCpAOQ== X-Google-Smtp-Source: ABdhPJwQzgNOAw00xLEBn8GqnGSP0kmQj5PiroGDnAk/te4w0tK5o7GAUwGf6KOs8hV6XFJzl1jgcA== X-Received: by 2002:aed:2462:: with SMTP id s31mr5349349qtc.188.1591820229718; Wed, 10 Jun 2020 13:17:09 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:09 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , =?utf-8?q?Eddy_Petri=C8=99or?= , Shawn Guo , Vladimir Oltean , Priyanka Jain Subject: [PATCH 25/30] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB Date: Wed, 10 Jun 2020 16:16:29 -0400 Message-Id: <20200610201634.8457-26-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances. Cc: Stefano Babic Cc: Fabio Estevam Cc: NXP i.MX U-Boot Team Cc: Eddy Petrișor Cc: Shawn Guo Cc: Vladimir Oltean Cc: Priyanka Jain Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") Signed-off-by: Tom Rini --- Note that we have one place left for CONFIG_SECURE_BOOT being in use but I think that is shared with PowerPC so I don't think IMX_HAB is the right name. But perhaps I'm wrong about it being used for PowerPC? --- arch/arm/mach-imx/spl_qspi.cfg | 2 +- board/ea/mx7ulp_com/imximage.cfg | 2 +- board/freescale/s32v234evb/s32v234evb.cfg | 2 +- board/novtech/meerkat96/imximage.cfg | 2 +- include/configs/ls1021atsn.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg index 88956e626ffd..1e39ae2f01f7 100644 --- a/arch/arm/mach-imx/spl_qspi.cfg +++ b/arch/arm/mach-imx/spl_qspi.cfg @@ -12,6 +12,6 @@ BOOT_FROM qspi /* * Secure boot support */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif diff --git a/board/ea/mx7ulp_com/imximage.cfg b/board/ea/mx7ulp_com/imximage.cfg index d298d17c1e92..1b218996aea9 100644 --- a/board/ea/mx7ulp_com/imximage.cfg +++ b/board/ea/mx7ulp_com/imximage.cfg @@ -28,7 +28,7 @@ BOOT_FROM sd PLUGIN board/freescale/mx7ulp_evk/plugin.bin 0x2F020000 #else -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif /* diff --git a/board/freescale/s32v234evb/s32v234evb.cfg b/board/freescale/s32v234evb/s32v234evb.cfg index 7881512139d0..d7f722006312 100644 --- a/board/freescale/s32v234evb/s32v234evb.cfg +++ b/board/freescale/s32v234evb/s32v234evb.cfg @@ -23,6 +23,6 @@ BOOT_FROM sd */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB SECURE_BOOT #endif diff --git a/board/novtech/meerkat96/imximage.cfg b/board/novtech/meerkat96/imximage.cfg index 3bd8cc55e53c..86275b84d9c8 100644 --- a/board/novtech/meerkat96/imximage.cfg +++ b/board/novtech/meerkat96/imximage.cfg @@ -25,7 +25,7 @@ BOOT_FROM sd /* * Secure boot support */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index e76e54e97fc9..efa708a239ea 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -60,9 +60,9 @@ #define CONFIG_SYS_FSL_PBL_RCW \ "board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg" -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_SECURE_BOOT */ +#endif /* ifdef CONFIG_IMX_HAB */ #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000 From patchwork Wed Jun 10 20:16:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307213 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hz1K5PPwz9sRN for ; Thu, 11 Jun 2020 06:22:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D49381D92; Wed, 10 Jun 2020 22:18:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 4D73B81C5F; Wed, 10 Jun 2020 22:17:21 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 C0F93819BD for ; Wed, 10 Jun 2020 22:17:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id d27so2877032qtg.4 for ; Wed, 10 Jun 2020 13:17:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=20uXtkXgTLqcbTaFTonraXOJdnLzYDRfprSSQ7wo7XE=; b=sqSYq4/H/0gQxxJllfS8Srxpr4vFGwpp6HCYIt+VXgliAbTP/Dz1qXlmKLnPwAFFLH T+eEQ39/6lEmcybsm85zx/XDi+ymN2hpTvaU0l33sWSzapQUqthSxSvHE0cux6md+hYr ry9mgs5OmQuGqwg1zYcQLffCBPfWfEGQ9XwwnkKLkWQYCII7WI4+ejmivcKS0dYMp/J/ vcBEub1uaNwa1nFU71SV9tnfH7Go8Kv9op/p2/+dEb0XmY+vKtNvp2+l3PzO4FDiyZrR FZkey1PHpgDksKByyZXDqEjE/rN9S8/ag3xv/2IynKzMepjMp8butcIH/zrE/hUYSq6q rLkA== X-Gm-Message-State: AOAM531po71ILQnvWIgJlul2rEam0rcZ/l+02egkbCt5HuEOXGvAop+0 HiqfXIt7FcQ61/Ng/Vi8GlX0j5El1w== X-Google-Smtp-Source: ABdhPJzJdvuH4Zbyjnq/mzO6IrTp/ddusprqBz0IoZkwTTxFXX4U/RfXPlPbScQwAYs7+Q0vsAyvdw== X-Received: by 2002:ac8:3876:: with SMTP id r51mr4919030qtb.89.1591820230719; Wed, 10 Jun 2020 13:17:10 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:10 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 26/30] Convert CONFIG_BOOTM_NETBSD to Kconfig Date: Wed, 10 Jun 2020 16:16:30 -0400 Message-Id: <20200610201634.8457-27-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_BOOTM_NETBSD Signed-off-by: Tom Rini --- configs/deneb_defconfig | 1 + configs/giedi_defconfig | 1 + configs/imx8qm_rom7720_a1_4G_defconfig | 1 + include/configs/capricorn-common.h | 4 ---- include/configs/imx8qm_rom7720.h | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 5377b4fed513..c0e7725f64e5 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_CRC32 is not set diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index dfac924bbb08..d2b0f13f61f1 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_CRC32 is not set diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 305c4e827c66..8af2b239d6e8 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index b107e0ce3f96..38a56e897e82 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -42,10 +42,6 @@ #define CONFIG_REMAKE_ELF -/* Commands */ - -#undef CONFIG_BOOTM_NETBSD - /* ENET Config */ #define CONFIG_FEC_XCV_TYPE RMII #define FEC_QUIRK_ENET_MAC diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 9808e72474f0..5621ba8232da 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -15,8 +15,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_FSL_USDHC #define CONFIG_SYS_BOOTMAPSZ (256 << 20) #define CONFIG_SYS_FSL_ESDHC_ADDR 0 From patchwork Wed Jun 10 20:16:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307214 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com 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 49hz1X0SKRz9sRN for ; Thu, 11 Jun 2020 06:22:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B46A681DA8; Wed, 10 Jun 2020 22:18:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id C330D81C5F; Wed, 10 Jun 2020 22:17:22 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 C062081CCC for ; Wed, 10 Jun 2020 22:17:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f193.google.com with SMTP id j32so2836407qte.10 for ; Wed, 10 Jun 2020 13:17:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ifIA+D/IeCHRY2e5TbpCPCbcHs7t5MVmfRqvnmR/WBg=; b=mawALbkwS7jH2gVGkM8FhSgMfOQC4risg9pXQ91O/Om/6zXzUbfyAk8dBRb9eJ7kaA 4d9KTlSADaS6yqlBozOlrHp9UsnYMcjfWMtQpJAo6ZEWMGhQadRXmXbKLYGwp3MOb0KN WaOLhlWfJTh/00F1QduW32olKbaP3xOFI5JVmsDuqSe+af0S3187hn7jVL7Isusfq3/0 2eMtcFNToMKw/JGeZYuF5V9jTf90f0lvtG2lS9R4N7eBUt5/70HxESTpNgwrl8IiAL1y s0VyvVzWo4HWmjcF9t40Ir+lnUFvdgZ0cdgQH6FiDI0tldzZxSyZTQgPsF4kMM9GzTFK PXOg== X-Gm-Message-State: AOAM531eAsFc/5Hixs561SLNg/U4+jDRjr+ZKjttLs7FL/U5V6gSS19V laVTB2NppCafb/dwA3Kbxzffrsr1yg== X-Google-Smtp-Source: ABdhPJxKqW+QLlPkEz/QPgitUAJ0GnuTrw+YjuroC86/aO41gztgqkxIP05/nLE8yCAO6LyWbpE/8A== X-Received: by 2002:aed:3ec4:: with SMTP id o4mr5339433qtf.357.1591820231807; Wed, 10 Jun 2020 13:17:11 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:11 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 27/30] Kconfig: Remove CONFIG_CLOCKS_IN_MHZ Date: Wed, 10 Jun 2020 16:16:31 -0400 Message-Id: <20200610201634.8457-28-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This variable is unset anywhere and only unset on a number of platforms. Remove all relevant code. Signed-off-by: Tom Rini --- README | 13 ------------- include/configs/MPC8536DS.h | 2 -- include/configs/MPC8540ADS.h | 2 -- include/configs/MPC8541CDS.h | 2 -- include/configs/MPC8544DS.h | 2 -- include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 2 -- include/configs/MPC8560ADS.h | 2 -- include/configs/MPC8568MDS.h | 2 -- include/configs/MPC8569MDS.h | 2 -- include/configs/MPC8572DS.h | 2 -- include/configs/MPC8610HPCD.h | 2 -- include/configs/MPC8641HPCN.h | 2 -- include/configs/UCP1020.h | 2 -- include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/sbc8548.h | 2 -- include/configs/sbc8641d.h | 2 -- include/env_default.h | 3 --- 18 files changed, 47 deletions(-) diff --git a/README b/README index a0f54645fc26..11273726d323 100644 --- a/README +++ b/README @@ -559,19 +559,6 @@ The following options need to be configured: such as ARM architectural timer initialization. - Linux Kernel Interface: - CONFIG_CLOCKS_IN_MHZ - - U-Boot stores all clock information in Hz - internally. For binary compatibility with older Linux - kernels (which expect the clocks passed in the - bd_info data to be in MHz) the environment variable - "clocks_in_mhz" can be defined so that U-Boot - converts clock data to MHZ before passing it to the - Linux kernel. - When CONFIG_CLOCKS_IN_MHZ is defined, a definition of - "clocks_in_mhz=1" is automatically included in the - default environment. - CONFIG_MEMSIZE_IN_BYTES [relevant for MIPS only] When transferring memsize parameter to Linux, some versions diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 340574a98526..3956bdd2512c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -124,8 +124,6 @@ #error ("CONFIG_SPD_EEPROM is required") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Memory map -- xxx -this is wrong, needs updating * diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index f78782a1c140..f15af931483c 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -112,8 +112,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index b2a320107203..9c77dcecd99a 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -57,8 +57,6 @@ extern unsigned long get_clock_freq(void); #error ("CONFIG_SPD_EEPROM is required by MPC85555CDS") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index c9f193fc4672..49c2a4acca27 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -63,8 +63,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #error ("CONFIG_SPD_EEPROM is required") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Memory map * diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index de2bfd8f2f4a..933417483483 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -73,7 +73,6 @@ extern unsigned long get_clock_freq(void); #error ("CONFIG_SPD_EEPROM is required") #endif -#undef CONFIG_CLOCKS_IN_MHZ /* * Physical Address Map * diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index d964b4e12173..9a14323b52ef 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -55,8 +55,6 @@ extern unsigned long get_clock_freq(void); #error ("CONFIG_SPD_EEPROM is required by MPC85555CDS") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 97d8cc48edf7..250f2de86060 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -113,8 +113,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index a0bd5f4d40f6..46d6b16d34d2 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -59,8 +59,6 @@ extern unsigned long get_clock_freq(void); #error ("CONFIG_SPD_EEPROM is required") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index beba848214e7..bbc75e35a7f8 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -109,8 +109,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_DDR_ERR_DIS 0x00000000 #define CONFIG_SYS_DDR_SBE 0x00010000 -#undef CONFIG_CLOCKS_IN_MHZ - /* * Local Bus Definitions */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 3243f39df4b5..d924b2ba6117 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -118,8 +118,6 @@ #error ("CONFIG_SPD_EEPROM is required") #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Memory map * diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index b2acc7297361..c0407bbc16b2 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -176,8 +176,6 @@ #define CONFIG_SYS_SDRAM_SIZE 256 #endif -#undef CONFIG_CLOCKS_IN_MHZ - #define CONFIG_SYS_INIT_RAM_LOCK 1 #ifndef CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xe4010000 /* Initial RAM address */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index edbeeefdd4a9..ad8d261b3b4b 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -221,8 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_SDRAM_SIZE 256 #endif -#undef CONFIG_CLOCKS_IN_MHZ - #define CONFIG_SYS_INIT_RAM_LOCK 1 #ifndef CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0x0fd00000 /* Initial RAM address */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index cfc9567332e9..2590a28867d3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -227,8 +227,6 @@ #define CONFIG_SYS_DDR_MODE_2 0x8000c000 #define CONFIG_SYS_DDR_INTERVAL 0x0C300000 -#undef CONFIG_CLOCKS_IN_MHZ - /* * Memory map * diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 219e5d216bbc..6b57be912ac5 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -300,8 +300,6 @@ #define CONFIG_SYS_DDR_INTERVAL 0x0C300000 #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * Memory map * diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 55c4bff28ae4..4cdfd1b099e7 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -118,8 +118,6 @@ #define CONFIG_SYS_DDR_CONTROL 0xc300c000 #endif -#undef CONFIG_CLOCKS_IN_MHZ - /* * FLASH on the Local Bus * Two banks, one 8MB the other 64MB, using the CFI driver. diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 4ab364ae9a2f..662160701440 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -206,8 +206,6 @@ #define CONFIG_SYS_WRITE_SWAPPED_DATA #define CONFIG_SYS_FLASH_EMPTY_INFO -#undef CONFIG_CLOCKS_IN_MHZ - #define CONFIG_SYS_INIT_RAM_LOCK 1 #ifndef CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0x0fd00000 /* Initial RAM address */ diff --git a/include/env_default.h b/include/env_default.h index a657927e06f5..8a0c3057f0aa 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -83,9 +83,6 @@ const uchar default_environment[] = { #ifdef CONFIG_LOADADDR "loadaddr=" __stringify(CONFIG_LOADADDR) "\0" #endif -#ifdef CONFIG_CLOCKS_IN_MHZ - "clocks_in_mhz=1\0" -#endif #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY)"\0" #endif From patchwork Wed Jun 10 20:16:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307230 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=none (p=none dis=none) header.from=konsulko.com 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 49j0Vq1XLGz9sRK for ; Thu, 11 Jun 2020 07:29:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D171981947; Wed, 10 Jun 2020 23:29:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 9718E81C64; Wed, 10 Jun 2020 22:17:25 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) (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 6579181C54 for ; Wed, 10 Jun 2020 22:17:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f66.google.com with SMTP id x16so1659811qvr.3 for ; Wed, 10 Jun 2020 13:17:16 -0700 (PDT) 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; bh=qzYFBUPa2GqnVlr+/W8mf21kPUX1Bj18fngb5G8VRvY=; b=MYwDr6T4bpCGrPb1IRgoB8IIU+mcaHf+W9AjJyEA+ceCkrZBH0ilS4H2X6TnQWZ/sK n7gTEOqakvCi+3f30ly61BtUJyxpydutIHPk/7Y1ShJGcmjGcN1nAASHLwq/Wtey5ULr OEK+SyZiJKh5CuZ4BWqLSQe1mmFiDF0ElGsAIQBORaazVdmHmMLjabcbgPFNfvaoyCOt 8IxZFq4q2qiRJ0apcIBPJwhE74GWU8oy3uzmG29NgrRFmtvSVYFBtKYNu8cdjAvPwnAR 6nYuTk5H6HocqAGInJlr5tmGEaj2/0K6CYMkFD/OZuW8F7zIzk+HIfRWvP0vxjCKe9gv AYRA== X-Gm-Message-State: AOAM533JLCLiD//fXfd2nrJkoOcs6zT2EywZa/+eh9OJ8k2FJJx0coCs z+8zFrn+3ayJ+KnZmG3dvGNNCCaHK5py X-Google-Smtp-Source: ABdhPJyUJ5PomBxGOgtgd61/Pu5R+MUnc4ffByJbDtEPv3uJ0YW7NeiYVlm+7JiaRw+YKV8K02lK8w== X-Received: by 2002:a0c:efcf:: with SMTP id a15mr4891343qvt.108.1591820234491; Wed, 10 Jun 2020 13:17:14 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:13 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Adam Ford , Akash Gajjar , Anatolij Gustschin , Andy Yan , Anup Patel , Atish Patra , Bin Meng , Chee Hong Ang , Chin-Liang See , Dalon Westergreen , Dinh Nguyen , Eugen Hristev , Hannes Schmelzer , Heiko Schocher , Jagan Teki , Klaus Goger , Levin Du , Ley Foon Tan , Lokesh Vutla , Luca Ceresoli , Marek Vasut , Michal Simek , Mike Looijmans , Nicolas Ferre , Nikita Kiryanov , Palmer Dabbelt , Patrick Delaunay , Paul Walmsley , Pavel Machek , Peter Robinson , Philipp Tomsich , Simon Glass , Stefan Roese , Suniel Mahesh , Wolfgang Grandegger Subject: [PATCH 28/30] spi: Enable missing CONFIG_SPL_DM_SPI support Date: Wed, 10 Jun 2020 16:16:32 -0400 Message-Id: <20200610201634.8457-29-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-Mailman-Approved-At: Wed, 10 Jun 2020 23:29:09 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it. Cc: Adam Ford Cc: Akash Gajjar Cc: Anatolij Gustschin Cc: Andy Yan Cc: Anup Patel Cc: Atish Patra Cc: Bin Meng Cc: Chee Hong Ang Cc: Chin-Liang See Cc: Dalon Westergreen Cc: Dinh Nguyen Cc: Eugen Hristev Cc: Hannes Schmelzer Cc: Heiko Schocher Cc: Jagan Teki Cc: Klaus Goger Cc: Levin Du Cc: Ley Foon Tan Cc: Lokesh Vutla Cc: Luca Ceresoli Cc: Marek Vasut Cc: Michal Simek Cc: Mike Looijmans Cc: Nicolas Ferre Cc: Nikita Kiryanov Cc: Palmer Dabbelt Cc: Patrick Delaunay Cc: Paul Walmsley Cc: Pavel Machek Cc: Peter Robinson Cc: Philipp Tomsich Cc: Simon Glass Cc: Stefan Roese Cc: Suniel Mahesh Cc: Wolfgang Grandegger Signed-off-by: Tom Rini Reviewed-by: Patrick Delaunay Acked-by: Adam Ford #da850evm Tested-by: Adam Ford #da850evm Reviewed-by: Luca Ceresoli --- configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_usb_defconfig | 1 + configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/am65x_hs_evm_a53_defconfig | 1 + configs/am65x_hs_evm_r5_defconfig | 1 + configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 + configs/axm_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/brsmarc1_defconfig | 1 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_bob_defconfig | 1 + configs/chromebook_coral_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/chromebook_speedy_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_usb_defconfig | 1 + configs/evb-px5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 1 + configs/j721e_evm_r5_defconfig | 1 + configs/j721e_hs_evm_a72_defconfig | 1 + configs/j721e_hs_evm_r5_defconfig | 1 + configs/lion-rk3368_defconfig | 1 + configs/pinebook-pro-rk3399_defconfig | 1 + configs/puma-rk3399_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + configs/rockpro64-rk3399_defconfig | 1 + configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 1 + configs/sama5d3xek_spiflash_defconfig | 1 + configs/sama5d4_xplained_spiflash_defconfig | 1 + configs/sama5d4ek_spiflash_defconfig | 1 + configs/sifive_fu540_defconfig | 1 + configs/socfpga_agilex_defconfig | 1 + configs/socfpga_arria10_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_dbm_soc1_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_dhcor_basic_defconfig | 1 + configs/taurus_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + 68 files changed, 68 insertions(+) diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index f0418bd0ffa5..7c907fd3f496 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TARGET_AM57XX_EVM=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index c5a62fbbca6b..81bac5592eb6 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -5,6 +5,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index c21a8755c128..ea5215e8cf3a 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index d74a2d09309b..cc4da7dd15d4 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig index 4fc199e80911..1e7a7d1e6eec 100644 --- a/configs/am65x_evm_r5_defconfig +++ b/configs/am65x_evm_r5_defconfig @@ -10,6 +10,7 @@ CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig index 117953817d82..5b504ad6deb6 100644 --- a/configs/am65x_hs_evm_a53_defconfig +++ b/configs/am65x_hs_evm_a53_defconfig @@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig index b2d638672e33..9977e97f2b05 100644 --- a/configs/am65x_hs_evm_r5_defconfig +++ b/configs/am65x_hs_evm_r5_defconfig @@ -11,6 +11,7 @@ CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 227a5416c63f..7592033dbb18 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000 diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 1615d8af0eba..6a3336c256b6 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_OFFSET=0x100000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 964b22b10093..aea67c25dc20 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x20000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_AM33XX=y CONFIG_TARGET_BRPPT1=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index 8333038c61b7..aac8d17876bd 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x20000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=600 CONFIG_TARGET_BRSMARC1=y diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 23efafb0d2d5..22719fc5355c 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -3,6 +3,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3288=y # CONFIG_SPL_MMC_SUPPORT is not set CONFIG_TARGET_CHROMEBIT_MICKEY=y diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index 4f606e7ec9fc..b8093ca8fcce 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_ENV_OFFSET=0x3F8000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_BOOT_MODE_REG=0 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index d7cab2334baa..6cc3a8469feb 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -1,6 +1,7 @@ CONFIG_X86=y CONFIG_SYS_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x3d00 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SYS_MALLOC_F_LEN=0xf000 CONFIG_NR_DRAM_BANKS=8 CONFIG_BOOTSTAGE_STASH_ADDR=0xfef00000 diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 443e3cdace8d..6523921aee13 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -3,6 +3,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3288=y # CONFIG_SPL_MMC_SUPPORT is not set CONFIG_SPL_STACK_R_ADDR=0x80000 diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 75f3d2c4116d..a80225a11f3a 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ENV_SECT_SIZE=0x1000 +CONFIG_SPL_DM_SPI=y CONFIG_NR_DRAM_BANKS=8 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_BASE=0x3f8 diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 99ac0e067438..f33ab19998ff 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -3,6 +3,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3288=y # CONFIG_SPL_MMC_SUPPORT is not set CONFIG_TARGET_CHROMEBOOK_MINNIE=y diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index 82172ba810ca..95c9b6e6af53 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1a00 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ENV_SECT_SIZE=0x1000 +CONFIG_SPL_DM_SPI=y CONFIG_NR_DRAM_BANKS=8 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_BASE=0x3f8 diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig index 5a5152541bf3..f930ba6179f3 100644 --- a/configs/chromebook_speedy_defconfig +++ b/configs/chromebook_speedy_defconfig @@ -3,6 +3,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3288=y # CONFIG_SPL_MMC_SUPPORT is not set CONFIG_TARGET_CHROMEBOOK_SPEEDY=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 94b051ad4f95..4232aaca002e 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_AM43XX=y CONFIG_TARGET_CM_T43=y CONFIG_SPL_MMC_SUPPORT=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 1a6a97ed161a..12768065f3ab 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index e805f2c10eda..13026fd1ea2c 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x0 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index e4547d9dcc8c..afbc4383a6b0 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index c08bcce90381..d813040f93cf 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -5,6 +5,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig index 879c2b650be3..9d837e54460e 100644 --- a/configs/dra7xx_hs_evm_usb_defconfig +++ b/configs/dra7xx_hs_evm_usb_defconfig @@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_OMAP54XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig index d1323738e02b..039af2ddf076 100644 --- a/configs/evb-px5_defconfig +++ b/configs/evb-px5_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3368=y CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds" CONFIG_TPL_LIBCOMMON_SUPPORT=y diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig index 4deb4e219fe7..2d0b40719ddc 100644 --- a/configs/j721e_evm_a72_defconfig +++ b/configs/j721e_evm_a72_defconfig @@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig index ee9217aee238..c597f8309238 100644 --- a/configs/j721e_evm_r5_defconfig +++ b/configs/j721e_evm_r5_defconfig @@ -10,6 +10,7 @@ CONFIG_TARGET_J721E_R5_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig index ae540a26a401..bd933eb8d795 100644 --- a/configs/j721e_hs_evm_a72_defconfig +++ b/configs/j721e_hs_evm_a72_defconfig @@ -9,6 +9,7 @@ CONFIG_TARGET_J721E_A72_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/j721e_hs_evm_r5_defconfig b/configs/j721e_hs_evm_r5_defconfig index 51d5a3bb98fa..7bdf3401a1a5 100644 --- a/configs/j721e_hs_evm_r5_defconfig +++ b/configs/j721e_hs_evm_r5_defconfig @@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index b6504b71238c..45ff1714791b 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3368=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_TPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig index 0c129b9aebb4..754cf5e5b401 100644 --- a/configs/pinebook-pro-rk3399_defconfig +++ b/configs/pinebook-pro-rk3399_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_PINEBOOK_PRO_RK3399=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 6b7d2ee6b8af..8a0ae32c655a 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_ENV_OFFSET=0x3F8000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0 CONFIG_TARGET_PUMA_RK3399=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 90d287b7b063..a5be09b2ba1c 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_ENV_SIZE=0x40000 CONFIG_MAX_CPUS=2 +CONFIG_SPL_DM_SPI=y CONFIG_NR_DRAM_BANKS=8 CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index fd1b85c1e4ba..b3c8f19e43d0 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_SIZE=0x6000 CONFIG_ENV_OFFSET=0x460000 CONFIG_ENV_SECT_SIZE=0x1000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 80e700148181..edb327b46b8f 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_SIZE=0x6000 CONFIG_ENV_OFFSET=0x460000 CONFIG_ENV_SECT_SIZE=0x1000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 807747485a36..2bbded008361 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_SPL_DM_SPI=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCKPRO64_RK3399=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig index eea86f935708..58b906ad5923 100644 --- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig +++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 9f90aa1328c9..e5227b11f50b 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 4ff41161183b..b3bc4b4fe593 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index 6eaebea82ddf..2799b69a5d2f 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index f225e9ea390b..4b7e825ce022 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index 8d412f8d6ae2..904f6cd03911 100644 --- a/configs/sifive_fu540_defconfig +++ b/configs/sifive_fu540_defconfig @@ -2,6 +2,7 @@ CONFIG_RISCV=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SIZE=0x20000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index 60397a8ccea6..755541dc2266 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index 35ae18fac003..5d1b7657723d 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_SOCFPGA=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y CONFIG_IDENT_STRING="socfpga_arria10" diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index ce230110e453..2ff9e8bc81cc 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 1633ca1deb57..0ef320ce6ee0 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig index 3e1a06d94248..960d80dbca91 100644 --- a/configs/socfpga_dbm_soc1_defconfig +++ b/configs/socfpga_dbm_soc1_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_FIT=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index dafb5e83d09a..3fc0b04269be 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index 64ee602b742f..18d914e15b13 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 095fc84c4b1e..8301bc3987f3 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_SOCFPGA=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index a60df9b5d985..1128826dbc4d 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 CONFIG_TARGET_SOCFPGA_IS1=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 157efea52209..979d76fda87b 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_ARIES_MCVEVK=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 247f3abda1c8..d814fd7baa76 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index a9ec97f2f4bb..f8dfec613f25 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index c95a7fc5e073..328100f70eba 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0xE0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 CONFIG_TARGET_SOCFPGA_SR1500=y CONFIG_ENV_OFFSET_REDUND=0xF0000 diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 16ae0feb6807..96112062340a 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 CONFIG_SYS_SPI_U_BOOT_OFFS=0x3C00000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y CONFIG_IDENT_STRING="socfpga_stratix10" diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 61b569eb3cf6..37190ba04580 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_TARGET_SOCFPGA_SOFTING_VINING_FPGA=y CONFIG_ENV_OFFSET_REDUND=0x110000 CONFIG_SPL_TEXT_BASE=0xFFFF0000 diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index c7dd2926c944..668cd434f1e1 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_TARGET_ST_STM32MP15x=y diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 610657267351..1ac07c5865b8 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SIZE=0x4000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_TARGET_DH_STM32MP1_PDK2=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 249646c4494b..225d04497948 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SIZE=0x4000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_TARGET_DH_STM32MP1_PDK2=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 16a804b879f0..953f7784be42 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_OFFSET=0x100000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 721ed3f8a6a0..f816788fe946 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0xe0000000 diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index 56981bb73654..8c61ae694419 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0xe0000000 diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 129c8f657dfd..c714374771e9 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0xe0000000 diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 5da7440af287..4dbf10119dc9 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index fe60d10c991d..e0c6e7ab24f9 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index 462dff8942e5..8fbf5ec46619 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x190 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_MALLOC_LEN=0x1000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x0 From patchwork Wed Jun 10 20:16:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307216 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=none (p=none dis=none) header.from=konsulko.com 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 49hz1x0SlKz9sRN for ; Thu, 11 Jun 2020 06:22:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE94E81DBB; Wed, 10 Jun 2020 22:18:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 471CD81CCC; Wed, 10 Jun 2020 22:17:23 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) (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 C0E1281CC5 for ; Wed, 10 Jun 2020 22:17:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f66.google.com with SMTP id er17so1639909qvb.8 for ; Wed, 10 Jun 2020 13:17:16 -0700 (PDT) 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; bh=znzdAV2B8Frj26Q9NsbCPmZhtKQSjUrv90ay7AvSftE=; b=g7vCCmRLVlzytXn16dnVv+HD7EWNrF1rjiXD8AWr2VnGGN0jRHHoONlNRb+txIPXKh /fOuYWgUK6deE5JdCh+P1pyR7nADfRWhJI13nRwjWIKl8V3EaTsDsWHbPai7HCe3b951 j2HUFbT+nFP1aiTuJUqqo5wPmgCz0LWaLF+53xvOf2viqv0cATCi3MuuVswO32BPOJ9I e6HoXyYIuhY9M/Y93W+T4Jr32KCboqnD9yJh6YuEC6xpxqhZ5QU8cigHSKmHuID5zBKT ThHBWP94UbQ36o8MaDfvL4B8/hRwb8kGCOFikP0I6BfQlXMroNFdTn92JHjeRD9WG0B+ E7zQ== X-Gm-Message-State: AOAM5319fvCieYQGfokTR8fjEQOioYlTskUYsBisTIjnqnJOvh/OwOID Hhsi9a2vEWQz3wojvVcMHbyf34sSyIdP X-Google-Smtp-Source: ABdhPJzjxDs9YzP40coypvuw6Xvv4XK5PI7wRFrD5oSqiFq3+DIYsSGfTX5GVdAXkAvKmZ43LMX/eQ== X-Received: by 2002:a0c:fba2:: with SMTP id m2mr2169267qvp.5.1591820235313; Wed, 10 Jun 2020 13:17:15 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:14 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Jagan Teki Subject: [PATCH 29/30] spi: Update build guard for DM objects to cover SPL/TPL Date: Wed, 10 Jun 2020 16:16:33 -0400 Message-Id: <20200610201634.8457-30-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean We need to ensure that in the cases where SPL / TPL do not use DM we do not try and build the core nor drivers that require DM. Cc: Jagan Teki Signed-off-by: Tom Rini --- drivers/spi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 342776404a50..f05ab0f6c8c2 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -4,7 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # There are many options which enable SPI, so make this library available -ifdef CONFIG_DM_SPI +ifdef CONFIG_$(SPL_TPL_)DM_SPI obj-y += spi-uclass.o obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o obj-$(CONFIG_SOFT_SPI) += soft_spi.o From patchwork Wed Jun 10 20:16:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1307215 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=none (p=none dis=none) header.from=konsulko.com 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 49hz1k57Qgz9sRN for ; Thu, 11 Jun 2020 06:22:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9093381DB7; Wed, 10 Jun 2020 22:18:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 80A1981C5F; Wed, 10 Jun 2020 22:17:23 +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.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) (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 E566881CD6 for ; Wed, 10 Jun 2020 22:17:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f67.google.com with SMTP id r16so1659661qvm.6 for ; Wed, 10 Jun 2020 13:17:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=sjG/+4rfb9iY+UfcC9clyLdf4CjtKKSAO4VFzrYqbc8=; b=nSQEGQbUqvK/UjzUkSVq+Dm3IBGcV/DWwO679NjF7DSGxJyDlcAOm7mF8QqAiCxYa5 xAhDVkFQWfZqBTq5fxGz0tr4+Of1xrfQIei9YBaQ/SPZKuHLHxskiNOidWltdUwCst9r 7osC/D1cKC02ZMdF6EdI5K96PamdEVBM5PdbFz/WkSeKFahZx/pM8O8M0aTJbtHdQ5Fi PCd3fbPLBuwmYTcZQHXs31ncsNC63oXtv3gM3z0SFIdoiwhxLNV/DxOeN/A1UZe+ALnB 6e68gCRs3CNalSk7wKhqNDnxiFDA2jp40RgH5VGaX6QvOyarhSSp510pZPE7zvAtunQ7 e4yQ== X-Gm-Message-State: AOAM531NdBp46dwNN9TwJZJLQCgtIvClLoQP0yBZndilZEgJAsvdTVIg DipikCN/5MbLn2xizgfBqkuNR1jUtEB6 X-Google-Smtp-Source: ABdhPJxuAgbxII5EsEDtW77s2jf5gTkkvorEOzK7uLSGcqT/uj9sVa4pPeCxV+AM9R/3JTnAsecFug== X-Received: by 2002:a05:6214:5a4:: with SMTP id by4mr4764550qvb.40.1591820236405; Wed, 10 Jun 2020 13:17:16 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-8080-2c5b-4fc8-1785-177e.inf6.spectrum.com. [2606:a000:1401:8080:2c5b:4fc8:1785:177e]) by smtp.gmail.com with ESMTPSA id c4sm572846qko.118.2020.06.10.13.17.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 13:17:15 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 30/30] Convert CONFIG_CADENCE_QSPI to Kconfig Date: Wed, 10 Jun 2020 16:16:34 -0400 Message-Id: <20200610201634.8457-31-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CADENCE_QSPI Signed-off-by: Tom Rini --- configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + drivers/spi/Makefile | 2 +- include/configs/k2g_evm.h | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index d16e8f48bd83..b137238b9046 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -71,6 +71,7 @@ CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_CADENCE_QSPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index f089be4f563a..adedfddf4f50 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -62,6 +62,7 @@ CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_CADENCE_QSPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f05ab0f6c8c2..534e702b0c3b 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -6,6 +6,7 @@ # There are many options which enable SPI, so make this library available ifdef CONFIG_$(SPL_TPL_)DM_SPI obj-y += spi-uclass.o +obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o obj-$(CONFIG_SOFT_SPI) += soft_spi.o obj-$(CONFIG_SPI_MEM) += spi-mem.o @@ -23,7 +24,6 @@ obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o obj-$(CONFIG_BCM63XX_HSSPI) += bcm63xx_hsspi.o obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o -obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o obj-$(CONFIG_CF_SPI) += cf_spi.o obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 25f3959533c6..83466b9e0cfa 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -82,7 +82,6 @@ #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CADENCE_QSPI #define CONFIG_CQSPI_REF_CLK 384000000 #endif