From patchwork Sun Sep 11 14:21:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 75960 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp459041qgf; Sun, 11 Sep 2016 07:22:18 -0700 (PDT) X-Received: by 10.28.163.66 with SMTP id m63mr1587939wme.5.1473603738310; Sun, 11 Sep 2016 07:22:18 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id w190si6840125wmf.100.2016.09.11.07.22.18; Sun, 11 Sep 2016 07:22:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C91CF4B77D; Sun, 11 Sep 2016 16:22:13 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zvCbQmpFW_eu; Sun, 11 Sep 2016 16:22:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F53D4BA35; Sun, 11 Sep 2016 16:22:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 73C474B811 for ; Sun, 11 Sep 2016 16:21:58 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vFUCQRrlyJGl for ; Sun, 11 Sep 2016 16:21:58 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by theia.denx.de (Postfix) with ESMTPS id B735F4B77D for ; Sun, 11 Sep 2016 16:21:57 +0200 (CEST) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-09.nifty.com with ESMTP id u8BELJDS005832; Sun, 11 Sep 2016 23:21:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u8BELJDS005832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473603684; bh=zzbF/xWX9nk5PaloXQNZFj9b+KwSDbgZeuqUK8VFxSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fi8FJnNMMiMGmoXD2vmnDuD7brJDc1rQTPu2bck0JdR5HFTC9F479P97prdNQO+qw seZypWjdOtHapwwDjSVqXwjBczyS6l844moposVY+4fbH+TG6oc4fILtgB7yPacqwn cUX1sin+uEKE+7J73mHIBqQvfQ2/chey+p0tc2Aanrhc5iIGbiAsrbve5EcFlOVsiN jgPA2Jvy5bqi3mM37+4HPwXG9Dvd82iPIFbTtWRfOcmQUUCwfD5Y+Dj5x/re6ArQL/ navpFLVc4Q59XMPrYjkSHUID8oGG/6UsQRiZxPHf3bF0jKuVSv9YCd8gvh5gkqKEVc KCQb3MZEwF/Gg== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 11 Sep 2016 23:21:17 +0900 Message-Id: <1473603677-24887-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473603677-24887-1-git-send-email-yamada.masahiro@socionext.com> References: <1473603677-24887-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 3/3] treewide: rename CONFIG_SPL_I2C_SUPPORT to CONFIG_SPL_I2C X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" We conventionally named SPL options in CONFIG_SPL_*_SUPPORT format, but the suffix _SUPPORT did not add any value. Besides, it prevents us from exploiting the CONFIG_IS_ENABLED() macro. If we move the option to defconfig files (that are often re-synced), the renaming would be more conflict-happy, so I want to do this now. Signed-off-by: Masahiro Yamada --- README | 2 +- board/freescale/ls1021aqds/ls1021aqds.c | 2 +- doc/README.SPL | 2 +- drivers/Makefile | 2 +- include/configs/B4860QDS.h | 2 +- include/configs/C29XPCIE.h | 2 +- include/configs/P1010RDB.h | 6 +++--- include/configs/P1022DS.h | 6 +++--- include/configs/T102xQDS.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240QDS.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/chromebook_jerry.h | 2 +- include/configs/clearfog.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/imx6_spl.h | 2 +- include/configs/kc1.h | 2 +- include/configs/ls1021aqds.h | 4 ++-- include/configs/ls1021atwr.h | 2 +- include/configs/ls1043a_common.h | 4 ++-- include/configs/ls2080a_common.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/mcx.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/p1_p2_rdb_pc.h | 6 +++--- include/configs/siemens-am33x-common.h | 2 +- include/configs/sniper.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/tricorder.h | 2 +- 45 files changed, 53 insertions(+), 53 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/README b/README index d66f6cd..48741e1 100644 --- a/README +++ b/README @@ -3515,7 +3515,7 @@ FIT uImage format: CONFIG_SPL_LIBDISK_SUPPORT Support for disk/libdisk.o in SPL binary - CONFIG_SPL_I2C_SUPPORT + CONFIG_SPL_I2C Support for drivers/i2c/libi2c.o in SPL binary CONFIG_SPL_GPIO diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index dbea0bf..13774c9 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -241,7 +241,7 @@ void board_init_f(ulong dummy) preloader_console_init(); -#ifdef CONFIG_SPL_I2C_SUPPORT +#ifdef CONFIG_SPL_I2C i2c_init_all(); #endif diff --git a/doc/README.SPL b/doc/README.SPL index 3ba564a..5811e76 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -47,7 +47,7 @@ are supported: CONFIG_SPL_LIBCOMMON_SUPPORT (common/libcommon.o) CONFIG_SPL_LIBDISK_SUPPORT (disk/libdisk.o) -CONFIG_SPL_I2C_SUPPORT (drivers/i2c/libi2c.o) +CONFIG_SPL_I2C (drivers/i2c/libi2c.o) CONFIG_SPL_GPIO (drivers/gpio/libgpio.o) CONFIG_SPL_MMC_SUPPORT (drivers/mmc/libmmc.o) CONFIG_SPL_SERIAL (drivers/serial/libserial.o) diff --git a/drivers/Makefile b/drivers/Makefile index ea116db..6da0d47 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_)RAM) += ram/ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_CRYPTO_SUPPORT) += crypto/ -obj-$(CONFIG_SPL_I2C_SUPPORT) += i2c/ +obj-$(CONFIG_SPL_I2C) += i2c/ obj-$(CONFIG_SPL_GPIO) += gpio/ obj-$(CONFIG_SPL_MMC_SUPPORT) += mmc/ obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 3608d28..8793bd2 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -28,7 +28,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 4b6bd2f..8988fd2 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -32,7 +32,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 293c621..0c3a2a7 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -29,7 +29,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xD0001000 @@ -64,7 +64,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xD0001000 @@ -111,7 +111,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 7699a6a..1fcb083 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -23,7 +23,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -52,7 +52,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -83,7 +83,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 4d15018..34f94d6 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -50,7 +50,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index a7a737d..c96ad0c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -57,7 +57,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x30001000 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 9b7bb60..e33d032 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -50,7 +50,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x30001000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 24a5a5b..2601baf 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -60,7 +60,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 294447d..d2fbaee 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -49,7 +49,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 243aa6a..3f3c3ba 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -32,7 +32,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 5ead420..b9183a4 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -32,7 +32,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x00201000 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 23e1ccc..e0f4a70 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -289,7 +289,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index e5ee6f3..a3a075c 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -346,7 +346,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index e47165e..f872280 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -113,7 +113,7 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN /* General parts of the framework, required. */ -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index d998f12..a5108a9 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -27,7 +27,7 @@ #define CONFIG_KEYBOARD #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 6d14d39..78b6a95 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -126,7 +126,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3d1ec0c..2bd7cf3 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -308,7 +308,7 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index f57bbdb..cab24d9 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -160,7 +160,7 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_POWER_SUPPORT /* EEPROM */ diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 9960d3f..6856f33 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -94,7 +94,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 9ac7ad6..faf3a29 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -127,7 +127,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index f9c12ed..7e33d7e 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -119,7 +119,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 2c46768..d3d98b6 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -125,7 +125,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 2246501..3d18899 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -32,7 +32,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_GPIO #define CONFIG_SPL_WATCHDOG_SUPPORT diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 6ba7f9e..7081131 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -135,7 +135,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_GPIO -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 2 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d7045ea..a072690 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -71,7 +71,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL #define CONFIG_SPL_DRIVERS_MISC_SUPPORT @@ -109,7 +109,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 9af1ca1..ad11b11 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -116,7 +116,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 34c480f..5ca78e0 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -65,7 +65,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_SERIAL #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT @@ -95,7 +95,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_SERIAL #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index c76c868..1025aea 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -268,7 +268,7 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index d980db8..83abaab 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -87,7 +87,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/mcx.h b/include/configs/mcx.h index cddeb4b..f10dc54 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -322,7 +322,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 909d32d..b8426e8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -351,7 +351,7 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 08d5f60..963afc9 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -190,7 +190,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -219,7 +219,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000 #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -246,7 +246,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 1f6bff6..62770fc 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -136,7 +136,7 @@ #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_FS_FAT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 05e9603..22a9d92 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -143,7 +143,7 @@ #define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_GPIO -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 717c837..d451e7e 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -232,7 +232,7 @@ /* I2C */ #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ defined CONFIG_SY8106A_POWER -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #endif #if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 196c873..4eefe62 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -203,7 +203,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index a0a5c03..993a8d1 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -290,7 +290,7 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 776f13f..85920df 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -152,7 +152,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 47ff9f3..c842335 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -270,7 +270,7 @@ #define CONFIG_SYS_THUMB_BUILD /* General parts of the framework, required. */ -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 8c88ebf..35eeed3 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -164,7 +164,7 @@ /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ #undef CONFIG_SYS_I2C #undef CONFIG_SYS_I2C_OMAP24XX -#undef CONFIG_SPL_I2C_SUPPORT +#undef CONFIG_SPL_I2C #endif #endif /* __CONFIG_TI_OMAP4_COMMON_H */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 4baf554..ac6c87d 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -322,7 +322,7 @@ #define CONFIG_SPL_GPIO #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_I2C #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT