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 00374C4332F for ; Sat, 19 Nov 2022 23:51:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DA28852BB; Sun, 20 Nov 2022 00:46:51 +0100 (CET) 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="iSPGYTsF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 65AB38526C; Sun, 20 Nov 2022 00:46:25 +0100 (CET) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (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 C4742850EA for ; Sun, 20 Nov 2022 00:46:22 +0100 (CET) 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-qk1-x72c.google.com with SMTP id i9so5910462qki.10 for ; Sat, 19 Nov 2022 15:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Po6njxXhTw9fggO6u9YhjSfWDwdwuqboEdhb5y9ysoA=; b=iSPGYTsFgURGibJD/zq7Zpi2QVd7jcAp4HI/xuAH9loXTSII7GfjiIblxUJK4Ulht1 JUCs1VNPNZJIJ8A6r+ZsC8u0un8dh0DvqmouekYqHHJwt086GlljK375iX12K2qqQIr2 N+FXxW0UL0v7CjqtZ7W4AIz/TfNrq57olidWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Po6njxXhTw9fggO6u9YhjSfWDwdwuqboEdhb5y9ysoA=; b=2Vhdt/wzfxBsVrIBj3KaHijZ2dmw3iyH5Mf+AKTrZe2fSPBP9EkWelqWIp7uorGi9B tsxvzTx2q0+HL0z1Ovlxs95/vuScvELOWJ+blKnKwmZl0hkC4+3qjY0XC44+EvU2fuN5 54V4eLK1FtqzHwDMAI4qBFM5nCZjQHMuZWwdVmaxOno0NOF+l+yAiucd8pFFwc4bgUsf /cPebT6EXrVojcarAqQhsCDubaXaGo45nsSyFqallIcSqLK4Gx4s2U+nS0gxp3F+lUq3 wHxMa+52D/MojV9wWkn4mQBkgjkyuyC5i2PNgRSJiyp/lAIQmlvc4amcTW7OkLv8mwm/ cTLw== X-Gm-Message-State: ANoB5pk2RK9DxNWa484aySygbDoIuAjwylp0R5K6vIEIbv02D+uhXBqw vm9oh2RIoRqLFsdindF4gFBtwo9jz3+LnA== X-Google-Smtp-Source: AA0mqf4y864Q9NyzGn2PidFKROpQ/CK4mvZ4eUuYFkSSZB/PrW4H7rSqsiwKnLcQXr2p9TLu1gBQzw== X-Received: by 2002:a05:620a:8d3:b0:6fa:23d4:aecc with SMTP id z19-20020a05620a08d300b006fa23d4aeccmr11329237qkz.678.1668901561742; Sat, 19 Nov 2022 15:46:01 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-55ec-b699-c19f-3363.res6.spectrum.com. [2603:6081:7b00:6400:55ec:b699:c19f:3363]) by smtp.gmail.com with ESMTPSA id y11-20020a37f60b000000b006ce1bfbd603sm5169743qkj.124.2022.11.19.15.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Nov 2022 15:46:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefan Roese Subject: [PATCH 27/38] Convert CONFIG_SPD_EEPROM to Kconfig Date: Sat, 19 Nov 2022 18:45:34 -0500 Message-Id: <20221119234545.404563-27-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119234545.404563-1-trini@konsulko.com> References: <20221119234545.404563-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.6 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_SPD_EEPROM Cc: Stefan Roese Signed-off-by: Tom Rini --- Note that this increases the size of SPL on db-mv784mp-gp as now the SPD_EEPROM code is being included, where it wasn't before seemingly. --- README | 7 ------- configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/socrates_defconfig | 1 + drivers/ddr/Kconfig | 8 ++++++++ include/configs/MPC8548CDS.h | 1 - include/configs/db-mv784mp-gp.h | 3 --- include/configs/socrates.h | 1 - 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index dd43a0c08d4a..0acc0b410917 100644 --- a/README +++ b/README @@ -1683,13 +1683,6 @@ Low Level (hardware related) configuration options: Sets the EBC0_CFG register for the NDFC. If not defined a default value will be used. -- CONFIG_SPD_EEPROM - Get DDR timing information from an I2C EEPROM. Common - with pluggable memory modules such as SODIMMs - - SPD_EEPROM_ADDRESS - I2C address of the SPD EEPROM - - CONFIG_SYS_SPD_BUS_NUM If SPD EEPROM is on an I2C bus other than the first one, specify here. Note that the value must resolve diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig index 98a2c4f85fc5..8d2a0785a8af 100644 --- a/configs/MPC8548CDS_36BIT_defconfig +++ b/configs/MPC8548CDS_36BIT_defconfig @@ -45,6 +45,7 @@ CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="8548cds/uImage.uboot" CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eTSEC0" +CONFIG_SPD_EEPROM=y CONFIG_CHIP_SELECTS_PER_CTRL=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig index b47dbb533cee..5faba03e136d 100644 --- a/configs/MPC8548CDS_defconfig +++ b/configs/MPC8548CDS_defconfig @@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="8548cds/uImage.uboot" CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eTSEC0" +CONFIG_SPD_EEPROM=y CONFIG_CHIP_SELECTS_PER_CTRL=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig index af2c6a25eb9c..dbabf665cbf4 100644 --- a/configs/MPC8548CDS_legacy_defconfig +++ b/configs/MPC8548CDS_legacy_defconfig @@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="8548cds/uImage.uboot" CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eTSEC0" +CONFIG_SPD_EEPROM=y CONFIG_CHIP_SELECTS_PER_CTRL=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index ab52ea26a089..f45f570764cd 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -57,6 +57,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xFFF20000 CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="TSEC0" +CONFIG_SPD_EEPROM=y CONFIG_CHIP_SELECTS_PER_CTRL=2 CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xFE001001 diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig index 738b7884012f..fa873cc48750 100644 --- a/drivers/ddr/Kconfig +++ b/drivers/ddr/Kconfig @@ -37,3 +37,11 @@ config SYS_SPD_BUS_NUM source "drivers/ddr/altera/Kconfig" source "drivers/ddr/imx/Kconfig" + +config SPD_EEPROM + bool "DDR controller makes use of an SPD EEPROM for JEDEC information" + depends on SYS_FSL_DDR || SYS_FSL_MMDC || CONFIG_ARMADA_XP + help + Get DDR timing information from an I2C EEPROM. Common with pluggable + memory modules such as SODIMMs. You must define SPD_EEPROM_ADDRESS + to the I2C address of the SPD EEPROM. diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 83eb18c3b7ac..780ee5ae865a 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -30,7 +30,6 @@ #define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR /* DDR Setup */ -#define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 7b305955c962..bf8b35102ad7 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -45,7 +45,4 @@ /* SPL */ /* Defines for SPL */ -/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_SPD_EEPROM 0x4e - #endif /* _CONFIG_DB_MV7846MP_GP_H */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 0a2d5815170b..95393d3ab25e 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -50,7 +50,6 @@ #define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR /* DDR Setup */ -#define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup */ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef -- 2.25.1