From patchwork Tue Feb 9 11:52:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1438306 X-Patchwork-Delegate: hs@denx.de 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; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.a=rsa-sha256 header.s=google header.b=Oo2HB3M8; dkim-atps=neutral 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 4DZh9X5lphz9rx6 for ; Tue, 9 Feb 2021 22:53:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5AF16829F8; Tue, 9 Feb 2021 12:53:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.b="Oo2HB3M8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22CDC829C6; Tue, 9 Feb 2021 12:53:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (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 E386E829F8 for ; Tue, 9 Feb 2021 12:52:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@foundries.io Received: by mail-lf1-x134.google.com with SMTP id r65so4400998lff.6 for ; Tue, 09 Feb 2021 03:52:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R14h9fX69o18FGTLDkNmvmChzSwkbcZDWe6wUvnhgKQ=; b=Oo2HB3M8lEwV6YhRDfWpa6KW07D8PbQBh2aiGuCmF/erb2eqBrIkTDC3eNeN73s0sX ZJf8SfPMiHGKmEWhzrBw5fhCkp2AKISPik93/SGg7TNI7NNQ3vzuIDxMW4+eYut2zaxg sLzQ3d3nNIGE8BKgQ2MnpBVlMPqJPUwBe9qjgKjll6DAjV5hu1PvkMqPAz6Abqv8wSKX ljpg9Kgs/I7pK8OoPsRh/XdPS384p1K1G3+v6SZ5IEaPjBTN/WGpON/4GJZmn+iLHiCo k1ru4SFkQe4+snk9sTx6oHnJTHW/BGlVfWYl12o4AwcnrCilj2mBSYUN/pG2W1OsFn7W LM3g== 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=R14h9fX69o18FGTLDkNmvmChzSwkbcZDWe6wUvnhgKQ=; b=fZtWtkPeLtx72xBb2Yww8nF8freQ9in0szOXDL9YGVyD6FeGA2DxMZmLtR0esbgpIH gYz15urobaLRvmsePqgzfeV0L5EUZXLHSSJ4vT8PjzRSeLldNDaumRrVg7cTLnMrs+HB QrCWHjC29Aor2K87H5T25/kItQR0eYsgNKhjeyQcKagaLGNLiCjwKodshN3yMb8ndw4E ABMsyf3uRM6ZlBpCdwblHZNq4fSKbj8tzUV8l6D6//gB9eWF5FE90p37awm6vb+MiEjW qFnB6a5b1PPqwA+LAfNBgMfCzUKr2H4Bcgf6qV+SHzoNi67UK3yK3tFj9EKhYQZav1ez JIGw== X-Gm-Message-State: AOAM5324y5HRZO3wAtfdpFbFUk+tGqRndFVrW7v0SCo78BS7ER5VNSvf 5ZL5+qpUtWsh6GzMfD19vuLWBOM9O2wKEJzA X-Google-Smtp-Source: ABdhPJyNGc37s0EzU0sg3G5iY6mzafciWG7/UZ1zvVdo0OWJl9IvhBQD5ouvJVD+MRz1XDA/lN4fTg== X-Received: by 2002:ac2:4154:: with SMTP id c20mr13734541lfi.145.1612871572676; Tue, 09 Feb 2021 03:52:52 -0800 (PST) Received: from localhost ([109.108.76.111]) by smtp.gmail.com with ESMTPSA id p5sm2540380lfc.300.2021.02.09.03.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 03:52:51 -0800 (PST) From: Igor Opaniuk X-Google-Original-From: Igor Opaniuk To: u-boot@lists.denx.de Cc: ricardo@foundries.io, mike@foundries.io, jorge@foundries.io, sjg@chromium.org, trini@konsulko.com, Igor Opaniuk , Alison Wang , Biwen Li , Heiko Schocher , Michael Walle , Peng Fan , Priyanka Jain , Ruchika Gupta , Sumit Garg , Teresa Remmet , Yuantian Tang Subject: [PATCH v3 2/3] board: freescale: drop CONFIG_DM_I2C undefs Date: Tue, 9 Feb 2021 13:52:44 +0200 Message-Id: <20210209115245.47288-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210209115245.47288-1-igor.opaniuk@gmail.com> References: <20210209115245.47288-1-igor.opaniuk@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Drop CONFIG_DM_I2C undefs from board header files, and make them disabled on these boards in defconfigs instead. Disabling on Kconfig symbol was done automatically with this script: cd configs files=(*ls1046a*) files2=(*T104*RDB*) files3=(ls1021atwr_*) files4=("imx8mp_evk_defconfig phycore-imx8mp_defconfig") combine=("${files[@]}" "${files2[@]}" "${files3[@]}" "${files4[@]}") cd .. for item in ${combine[*]} do echo "Adjusting $item" echo "# CONFIG_SPL_DM_I2C is not set" >> configs/$item make $item && make savedefconfig && cp defconfig configs/$item done Signed-off-by: Igor Opaniuk Reviewed-by: Tom Rini --- Changes in v3: - Drop CONFIG_DM_I2C undefs from board header files (instead of replacing them with another undef for CONFIG_SPL_DM_I2C), and make them disabled on these boards in defconfigs. configs/imx8mp_evk_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/phycore-imx8mp_defconfig | 1 + include/configs/T104xRDB.h | 1 - include/configs/imx8mp_evk.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/phycore_imx8mp.h | 1 - 9 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index e70c430616..47a52eedb9 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -69,6 +69,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index e51dab0788..bce548d59c 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -52,6 +52,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index 0a2c71f919..21a144afe2 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 3d662e8b48..d09841a7f6 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -63,6 +63,7 @@ CONFIG_CLK_COMPOSITE_CCF=y CONFIG_CLK_IMX8MP=y CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_SYS_I2C_MXC=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index aee00a86cf..cf0f982375 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -30,7 +30,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#undef CONFIG_DM_I2C #endif #define RESET_VECTOR_OFFSET 0x27FFC #define BOOT_PAGE_OFFSET 0x27000 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 4850b1b934..61a5c6fb79 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -37,7 +37,6 @@ #define CONFIG_POWER_I2C #define CONFIG_POWER_PCA9450 -#undef CONFIG_DM_I2C #define CONFIG_SYS_I2C #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index dfb56437d9..068e744a61 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -442,7 +442,6 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#undef CONFIG_DM_I2C #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 32658cf641..0c32fceec2 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -16,7 +16,6 @@ #define SPL_NO_QSPI #define SPL_NO_USB #define SPL_NO_SATA -#undef CONFIG_DM_I2C #endif #if defined(CONFIG_SPL_BUILD) && \ (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 889dd36e6e..0490049850 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -33,7 +33,6 @@ #define CONFIG_POWER_I2C #define CONFIG_POWER_PCA9450 -#undef CONFIG_DM_I2C #define CONFIG_SYS_I2C #endif