From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5222C433F5 for ; Thu, 24 Mar 2022 21:19:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A973C84143; Thu, 24 Mar 2022 22:18:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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 1C8708411E; Thu, 24 Mar 2022 22:18:20 +0100 (CET) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 8FD3D8412A for ; Thu, 24 Mar 2022 22:18:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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-f169.google.com with SMTP id b18so5005854qtk.13 for ; Thu, 24 Mar 2022 14:18:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CZuCrVZ5Ot/tcjs31q1GCOGMTcc14uk7d8Exh8SsC8=; b=AO9aSJ8Q8OwBJbmWFNz2aMvdTOzs2B/47nu/gNrMKml63HNinZawXv2qSjhMDMRA65 h7GcvExhr1X+bdUEotzZJmELL9Wmkqogu69rx4rlm4qZ3jmG3GBS6nBuTX5aE6+4aLL6 0SWNMUR44wgYXLsveaDJ/b0d3I/GT51Hy//TIQ0YcZW7nlBmzDfU2w1MGWrgyKyvwnZs aUfP6Z/EYTPUOyPQmMBCwBk/P8gWEpihlVmCicC1FTItUr3BpTOuUScVnKyDUcn33fC9 xnE2xIbX4UFIyOwmbU/i2tWHNUz8CR0FGXK2n11CtUlOPpDP96PNsBAtBdfsz30orYmz BtSQ== X-Gm-Message-State: AOAM530dnUwlhAqzBTaoLQJUsn+HUKftVpa5wRceYBg9PgJX1ERVPKkW Z9fSCBuhKvRqtsDnQ1p+hPLub34BVg== X-Google-Smtp-Source: ABdhPJyGJrdAw0KWXuGT69+2t/F4EPdf325eYnGanJMIJHCC7zwgoPlzaEFBC3wF7RUDeKXNkqYG/Q== X-Received: by 2002:a05:622a:1708:b0:2e1:9106:66cd with SMTP id h8-20020a05622a170800b002e1910666cdmr6361080qtk.440.1648156695328; Thu, 24 Mar 2022 14:18:15 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id r7-20020ac85c87000000b002e234014a1fsm3262494qta.81.2022.03.24.14.18.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Mar 2022 14:18:15 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 06/11] Convert CONFIG_E300 et al to Kconfig Date: Thu, 24 Mar 2022 17:18:01 -0400 Message-Id: <20220324211806.1553189-6-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220324211806.1553189-1-trini@konsulko.com> References: <20220324211806.1553189-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_E300 CONFIG_E5500 Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc83xx/Kconfig | 3 +++ arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++ arch/powerpc/include/asm/config_mpc85xx.h | 2 -- include/configs/MPC837XERDB.h | 1 - include/configs/km/km-mpc8309.h | 1 - 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 52bc8cf750f8..2ebf8fc221d6 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -1,6 +1,9 @@ menu "mpc83xx CPU" depends on MPC83xx +config E300 + def_bool y + config SYS_CPU default "mpc83xx" diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 6c536b3c6b2d..c1b4e94d9191 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -653,6 +653,7 @@ config ARCH_T1024 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50 @@ -677,6 +678,7 @@ config ARCH_T1040 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50 @@ -701,6 +703,7 @@ config ARCH_T1042 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50 @@ -805,6 +808,9 @@ config E500MC help Enble PowerPC E500MC core +config E5500 + bool + config E6500 bool select BTB diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 7eb45664e69c..47bfcc72444c 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -270,7 +270,6 @@ #endif #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042) -#define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1 #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ @@ -299,7 +298,6 @@ #define CONFIG_SYS_FSL_SFP_VER_3_0 #elif defined(CONFIG_ARCH_T1024) -#define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1 #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 32dac86431e2..41313d8ad81a 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -13,7 +13,6 @@ /* * High Level Configuration Options */ -#define CONFIG_E300 1 /* E300 family */ #define CONFIG_HWCONFIG diff --git a/include/configs/km/km-mpc8309.h b/include/configs/km/km-mpc8309.h index ab629be380e6..af35e8e79267 100644 --- a/include/configs/km/km-mpc8309.h +++ b/include/configs/km/km-mpc8309.h @@ -1,7 +1,6 @@ /* * High Level Configuration Options */ -#define CONFIG_E300 1 /* E300 family */ #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" -- 2.25.1