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 B987DC43334 for ; Thu, 16 Jun 2022 18:05:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 237358437A; Thu, 16 Jun 2022 20:04:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="fqqdENnh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 95DD684337; Thu, 16 Jun 2022 20:04:46 +0200 (CEST) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 DAE6C84362 for ; Thu, 16 Jun 2022 20:04:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf33.google.com with SMTP id r14so3208110qvh.1 for ; Thu, 16 Jun 2022 11:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uxxdr5L9jU2ZvuL7aQHr11BXiN7IqavTtOO7YWH6cZ4=; b=fqqdENnhBYPpLKbEB94f72pr4hWB2e3t4HxsWjCzZtRS+hY0FKdGOWUkpuvG6ZUYU+ a2sJNtca+/qnKm+u9n0w5rcdyEPTvhN3oc0WB5hYjE8v3yXZdhssdp3nVYCfScu8s+G/ 8KuQg8yRM3pM2gagAFatovWq8/isshBagjryM= 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=uxxdr5L9jU2ZvuL7aQHr11BXiN7IqavTtOO7YWH6cZ4=; b=qW+GPurowIAtACJ9ry0ghNey6FTQwkkBd6NEb0Qb9+M76Kj1gw7k+zwzi6OtSGwWel 2oT9WEhjKAaGwWjI1UT0Uk3J5mv5iGDhYZZI3bY8F46Kh34tktVd4nBkE+Hx/vHfiOT2 oFPO1pkkA1uxPX9TZJcodag4/Utk4payKv5vKTMmqAQ4aTFIK81e1jXY/b2/nzYgbL17 3ROf+5NOwl1MX/hlhYN1pE+dAOz/DKJNoKwMWlKpWNt4kl1H1t7awNxe6H9Ad7J/qABz mdtLto1oCUIDRZCWKyB6P9zaCmyxwoaMPfqvmAV02QW119swfcjC7c1E3VtkAbHIhD7p 9Ojg== X-Gm-Message-State: AJIora+c4+LaxuWuPFRjFobjffd+Z0uT+LgVND5dXg2voyEgle5PpxnP BBadQAtkuKc8Ca3Vqei5DAJf4FbaeqQsfA== X-Google-Smtp-Source: AGRyM1s8ai409J7uhJn7OXiTT5oIKWJ+Bt1DcqbaUAsW83WvjcwGxthJRYJFK17zgv5zh1335pdsCA== X-Received: by 2002:ac8:5996:0:b0:305:1041:372e with SMTP id e22-20020ac85996000000b003051041372emr4975705qte.520.1655402682349; Thu, 16 Jun 2022 11:04:42 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id h14-20020ac8568e000000b00304ef07ee7asm2175625qta.83.2022.06.16.11.04.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 11:04:41 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/8] Convert CONFIG_HETROGENOUS_CLUSTERS et al to Kconfig Date: Thu, 16 Jun 2022 14:04:34 -0400 Message-Id: <20220616180440.4181624-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220616180440.4181624-1-trini@konsulko.com> References: <20220616180440.4181624-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_HETROGENOUS_CLUSTERS CONFIG_SYS_MAPLE CONFIG_SYS_CPRI CONFIG_PPC_CLUSTER_START CONFIG_DSP_CLUSTER_START CONFIG_SYS_CPRI_CLK CONFIG_SYS_ULB_CLK CONFIG_SYS_ETVPE_CLK Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 34 +++++++++++++++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 8 ------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 5510bc728788..2cc0185c3778 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -187,6 +187,7 @@ config ARCH_B4420 select E500MC select E6500 select FSL_LAW + select HETROGENOUS_CLUSTERS select SYS_FSL_DDR_VER_47 select SYS_FSL_ERRATUM_A004477 select SYS_FSL_ERRATUM_A005871 @@ -214,6 +215,7 @@ config ARCH_B4860 select E500MC select E6500 select FSL_LAW + select HETROGENOUS_CLUSTERS select SYS_FSL_DDR_VER_47 select SYS_FSL_ERRATUM_A004477 select SYS_FSL_ERRATUM_A005871 @@ -822,6 +824,9 @@ config FSL_LAW help Use Freescale common code for Local Access Window +config HETROGENOUS_CLUSTERS + bool + config NXP_ESBC bool "NXP_ESBC" help @@ -1121,6 +1126,35 @@ config SYS_NUM_TLBCAMS Number of TLB CAM entries for Book-E chips. 64 for E500MC, 16 for other E500 SoCs. +if HETROGENOUS_CLUSTERS + +config SYS_MAPLE + def_bool y + +config SYS_CPRI + def_bool y + +config PPC_CLUSTER_START + int + default 0 + +config DSP_CLUSTER_START + int + default 1 + +config SYS_CPRI_CLK + int + default 3 + +config SYS_ULB_CLK + int + default 4 + +config SYS_ETVPE_CLK + int + default 1 +endif + config BACKSIDE_L2_CACHE bool diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 06f66d02de2b..225befb3a5e3 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -206,19 +206,11 @@ #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420) #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ -#define CONFIG_HETROGENOUS_CLUSTERS /* DSP/SC3900 core clusters */ -#define CONFIG_PPC_CLUSTER_START 0 /*Start index of ppc clusters*/ -#define CONFIG_DSP_CLUSTER_START 1 /*Start index of dsp clusters*/ #define CONFIG_SYS_FSL_SRDS_1 #define CONFIG_SYS_FSL_SRDS_2 -#define CONFIG_SYS_MAPLE -#define CONFIG_SYS_CPRI #define CONFIG_SYS_FSL_NUM_CC_PLLS 5 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_FM1_CLK 0 -#define CONFIG_SYS_CPRI_CLK 3 -#define CONFIG_SYS_ULB_CLK 4 -#define CONFIG_SYS_ETVPE_CLK 1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 #define CONFIG_SYS_FMAN_V3 #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 -- 2.25.1