From patchwork Wed May 17 09:25:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 763422 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wSVq80K41z9s7F for ; Wed, 17 May 2017 20:26:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="q/qT/bRz"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 87AF0C21DDD; Wed, 17 May 2017 09:38:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4600FC2239E; Wed, 17 May 2017 09:36:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2FCBDC22273; Wed, 17 May 2017 09:26:59 +0000 (UTC) Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com [209.85.218.49]) by lists.denx.de (Postfix) with ESMTPS id 85283C21E94 for ; Wed, 17 May 2017 09:26:58 +0000 (UTC) Received: by mail-oi0-f49.google.com with SMTP id h4so7847457oib.3 for ; Wed, 17 May 2017 02:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xVrQTjRWcYPROHTGkzQ9KrDJ5dOAL+l1lbOQQXz/IUo=; b=q/qT/bRzztGXJrRh1m1rClwrpCetFb+EE5FedPOV8liyxZZJadtXnylq3K6RR9r0Yj VZgPj8+3O678yvC8+dGL4n4LZUA0Q7l0DZuyENbccAHBkL7wpSgu0tRUXDXcFXStYgoa Kf6e5PqiJJN5RD4JeXg8fQuChXU+5BsB3Yj1OG93Ax7dh45jOJJkpYha1lk1+Y8rTcQj fOjLlKaimcRT22LVyWQUmtUMcnaEhi+wsZdeexVkFIgD6T9fnNaoJ8N0T5yCMifcp1dD EH0gX+Psm91uNKQhezBP4ejPh3rZFNFWmMIBjyee8pzYaHHRU4++5SVmYG/9GE7Z+Ytf Wh4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xVrQTjRWcYPROHTGkzQ9KrDJ5dOAL+l1lbOQQXz/IUo=; b=p4LcFuADrp8ZTzM/zYGCh27KoQ8oFJ2SYlPsfWfP1jVecLmyNNjWkfrdWbKpBxFEXr DSu1tihRIiBWOECOkRliSRO4nvARWG+eMueVBAi5ExS1b2GA96ZmtFmt8BeGTLBW0Dnm 3puGpTdq6muG6nomfruImKmUeftIOrTwO8YkpQR5z0fIihZjBr9Fr5+5hFNvKVL9YxqU fSHA5YWGwzFw45M4kFlfSscn2L4SLu/Ke48HjaNkW+I/QvQR8m0NsKfyyhkNYjAs7ol4 hjnwV/zJEwK/feLPo+I3J5kQD8kKNvZWDgMsAJRSH9B2Scfsk2N6JOtRZsP9e+8v3Sss J8CQ== X-Gm-Message-State: AODbwcABFYl+kuJld6YDTpZZSGIHOHnhCcmDW9P+MZOKwZsceo+rRyia uHk2N1aEFqXB6Hpf X-Received: by 10.157.58.102 with SMTP id j93mr1164331otc.241.1495013217070; Wed, 17 May 2017 02:26:57 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.184.96]) by smtp.gmail.com with ESMTPSA id j16sm822351oth.12.2017.05.17.02.26.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 02:26:56 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E137740563; Wed, 17 May 2017 03:26:55 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 17 May 2017 03:25:15 -0600 Message-Id: <20170517092544.19357-20-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.303.g4ebf302169-goog In-Reply-To: <20170517092544.19357-1-sjg@chromium.org> References: <20170517092544.19357-1-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v3 19/48] Convert CONFIG_CMD_ERRATA to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_CMD_ERRATA Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- Changes in v3: None Changes in v2: - Change 'default y if MPC85xx' to 'default y' - Fix defconfig ordering in controlcenterd_TRAILBLAZER boards arch/powerpc/cpu/mpc85xx/Kconfig | 8 ++++++++ configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 + configs/controlcenterd_TRAILBLAZER_defconfig | 1 + include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/t4qds.h | 1 - scripts/config_whitelist.txt | 1 - 25 files changed, 10 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index a87430cdbc..88d56a9a32 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -4,6 +4,14 @@ menu "mpc85xx CPU" config SYS_CPU default "mpc85xx" +config CMD_ERRATA + bool "Enable the 'errata' command" + depends on MPC85xx + default y + help + This enables the 'errata' command which displays a list of errata + work-arounds which are enabled for the current board. + choice prompt "Target select" optional diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index b197116f1c..95e4839b6d 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" controlcenterd trailblazer 0.01" CONFIG_MPC85xx=y +# CONFIG_CMD_ERRATA is not set CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP" CONFIG_BOOTDELAY=-2 diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig index aee0f3af71..ce29fc9104 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" controlcenterd trailblazer 0.01" CONFIG_MPC85xx=y +# CONFIG_CMD_ERRATA is not set CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH" CONFIG_BOOTDELAY=-2 diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 3dff45cd6e..3ed66fa455 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 36633bde6e..64875f3116 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -293,7 +293,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 28658e4894..506fb79b35 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -520,7 +520,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 84365f11df..c6afb9a208 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -436,7 +436,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2c1be228ee..59f1cc7c8d 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,7 +547,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 5b7d6adad3..9850fb80a0 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -724,7 +724,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0763cf312e..2d1564a835 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7629fe8eb4..bcc9cc8f9c 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -580,7 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #ifdef CONFIG_PCI diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index d8ad914515..427b6f23ae 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 5e35ceb89a..7af377a8d9 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index cba7404c31..d7af902858 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index d2ece40d4a..6e27e513a9 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -772,7 +772,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 02fd37d5cb..bd6c47cca5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,7 +744,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index faa1111e9f..fa1c9a74fc 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -690,7 +690,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 8ebfde19f9..f1144b2039 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -272,7 +272,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #ifdef CONFIG_PCI diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 8265f3c1ab..9cede19d4f 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -424,7 +424,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_ERRATA /* * USB diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 97faed8cca..40117b9a7f 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -343,7 +343,6 @@ #ifndef CONFIG_TRAILBLAZER -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 7e606cd794..af1573de92 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 435929723b..9210770d7b 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -411,7 +411,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 9bfcfdefe9..664a64c55a 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -370,7 +370,6 @@ int get_scl(void); * additionnal command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_ERRATA /* we don't need flash support */ #undef CONFIG_FLASH_CFI_MTD diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 55b8e3ebfc..f4f9a38b2c 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -241,7 +241,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #ifdef CONFIG_PCI diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d6de1d774b..0eecde12b2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ERRATA CONFIG_CMD_ESBC_VALIDATE CONFIG_CMD_ETHSW CONFIG_CMD_FDC