From patchwork Sun Sep 11 14:21:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 75959 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp458991qgf; Sun, 11 Sep 2016 07:22:06 -0700 (PDT) X-Received: by 10.28.170.197 with SMTP id t188mr6293468wme.42.1473603726560; Sun, 11 Sep 2016 07:22:06 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id c192si10380403wme.2.2016.09.11.07.22.06; Sun, 11 Sep 2016 07:22:06 -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 C1441A7527; Sun, 11 Sep 2016 16:22:04 +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 7P7yu7nYpwhq; Sun, 11 Sep 2016 16:22:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7C604B811; Sun, 11 Sep 2016 16:22:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D45A4B811 for ; Sun, 11 Sep 2016 16:21:55 +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 7YbZHgcVVD8l for ; Sun, 11 Sep 2016 16:21:55 +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 153E54B77D for ; Sun, 11 Sep 2016 16:21:50 +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 u8BELJDQ005832; Sun, 11 Sep 2016 23:21:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u8BELJDQ005832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473603682; bh=jqPS7mSgS9IBtNW7HXwaeCDIAxiAG/Z1V8Qh30oj3tM=; h=From:To:Cc:Subject:Date:From; b=oconNdSMN1ToTu4GalpAaECLcu+NJ23IHih5zoSTXNTGh2mHADboX5OhW+kdWXPMi G4qMRAsxiwYibwYk/tumQjb35HBjvX5+/SbhjNhd5hp93qhvZalcqQKOCWydf7hemq VAnRFD6j9u2S0Gt/bAoDbcuoD3gCo0qeEH+PSeybNiZQIgoSLjLiBhTy3HDqXnU+op VAIpQkiD2qyyWdy37r9hXtOAEQRL+Lk5JSq03i/7FCkbVDAYh5RpXE9mMj5XE+r3OK lPew2cp/GKf3e1DsnHDRIoyoJPa/cuu3w6b9hnwroszjVBWlO9byBsRpIWLbU+auHU dEVUorCX4TRfw== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 11 Sep 2016 23:21:15 +0900 Message-Id: <1473603677-24887-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Cc: Tom Rini Subject: [U-Boot] [PATCH 1/3] treewide: rename CONFIG_SPL_SERIAL_SUPPORT to CONFIG_SPL_SERIAL 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 +- common/Makefile | 2 +- common/spl/spl.c | 2 +- doc/README.SPL | 2 +- drivers/Makefile | 2 +- include/common.h | 2 +- include/configs/B4860QDS.h | 2 +- include/configs/BSC9131RDB.h | 2 +- include/configs/BSC9132QDS.h | 2 +- include/configs/C29XPCIE.h | 4 ++-- include/configs/MPC8313ERDB.h | 2 +- include/configs/P1010RDB.h | 10 +++++----- include/configs/P1022DS.h | 8 ++++---- 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/a3m071.h | 2 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/apf27.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/at91sam9x5ek.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/clearfog.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/corvus.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/ds414.h | 2 +- include/configs/edminiv2.h | 2 +- include/configs/imx6_spl.h | 2 +- include/configs/ipam390.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/m53evk.h | 2 +- include/configs/ma5d4evk.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/mcx.h | 2 +- include/configs/microblaze-generic.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mxs.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/p1_p2_rdb_pc.h | 8 ++++---- include/configs/picosam9g45.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/sama5d2_ptc.h | 2 +- include/configs/sama5d2_xplained.h | 2 +- include/configs/sama5d3_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- include/configs/sama5d4_xplained.h | 2 +- include/configs/sama5d4ek.h | 2 +- include/configs/sandbox_spl.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/sniper.h | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/taurus.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/tricorder.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/woodburn_sd.h | 2 +- include/configs/work_92105.h | 2 +- include/configs/x600.h | 2 +- include/configs/xilinx_zynqmp.h | 2 +- include/configs/zynq-common.h | 2 +- lib/Makefile | 4 ++-- lib/hang.c | 2 +- 86 files changed, 100 insertions(+), 100 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 f41a6af..bf6e674 100644 --- a/README +++ b/README @@ -3638,7 +3638,7 @@ FIT uImage format: Support for an OMAP3-specific set of functions to return the ID and MFR of the first attached NAND chip, if present. - CONFIG_SPL_SERIAL_SUPPORT + CONFIG_SPL_SERIAL Support for drivers/serial/libserial.o in SPL binary CONFIG_SPL_SPI_FLASH_SUPPORT diff --git a/common/Makefile b/common/Makefile index 21619b3..edfeb9f 100644 --- a/common/Makefile +++ b/common/Makefile @@ -123,7 +123,7 @@ obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o obj-$(CONFIG_HWCONFIG) += hwconfig.o obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_SERIAL_SUPPORT) += console.o +obj-$(CONFIG_SPL_SERIAL) += console.o else obj-y += console.o endif diff --git a/common/spl/spl.c b/common/spl/spl.c index e14ec80..346c0ef 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -407,7 +407,7 @@ static int spl_load_image(u32 boot_device) return spl_board_load_image(); #endif default: -#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) +#if defined(CONFIG_SPL_SERIAL) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) puts("SPL: Unsupported Boot Device!\n"); #endif return -ENODEV; diff --git a/doc/README.SPL b/doc/README.SPL index 3ba313c..c4b3f02 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -50,7 +50,7 @@ CONFIG_SPL_LIBDISK_SUPPORT (disk/libdisk.o) CONFIG_SPL_I2C_SUPPORT (drivers/i2c/libi2c.o) CONFIG_SPL_GPIO_SUPPORT (drivers/gpio/libgpio.o) CONFIG_SPL_MMC_SUPPORT (drivers/mmc/libmmc.o) -CONFIG_SPL_SERIAL_SUPPORT (drivers/serial/libserial.o) +CONFIG_SPL_SERIAL (drivers/serial/libserial.o) CONFIG_SPL_SPI_FLASH_SUPPORT (drivers/mtd/spi/libspi_flash.o) CONFIG_SPL_SPI_SUPPORT (drivers/spi/libspi.o) CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o) diff --git a/drivers/Makefile b/drivers/Makefile index 7861d34..b4748cb 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/ obj-$(CONFIG_ARMADA_XP) += ddr/marvell/axp/ obj-$(CONFIG_ALTERA_SDRAM) += ddr/altera/ -obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/ +obj-$(CONFIG_SPL_SERIAL) += serial/ obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/ diff --git a/include/common.h b/include/common.h index e9f0dea..e890f90 100644 --- a/include/common.h +++ b/include/common.h @@ -866,7 +866,7 @@ int getc(void); int tstc(void); /* stdout */ -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_SERIAL_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_SERIAL) #define putc(...) do { } while (0) #define puts(...) do { } while (0) #define printf(...) do { } while (0) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2a8aeee..3608d28 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -23,7 +23,7 @@ #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index a0ca0db..6c64c28 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -28,7 +28,7 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index eb6ddae..32d1baf 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -44,7 +44,7 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index f75919d..4b6bd2f 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -29,7 +29,7 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -46,7 +46,7 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS ((128 + 128) << 10) #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 1c4e082..d8b8a5e 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -22,7 +22,7 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 0c84622..293c621 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -22,7 +22,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE @@ -56,7 +56,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL @@ -86,7 +86,7 @@ #ifdef CONFIG_NAND #ifdef CONFIG_SECURE_BOOT #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE @@ -108,7 +108,7 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -125,7 +125,7 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS ((128 + 128) << 10) #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 9fbc128..7699a6a 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -16,7 +16,7 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE @@ -44,7 +44,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL @@ -80,7 +80,7 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -96,7 +96,7 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS ((128 + 128) << 10) #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TEXT_BASE 0xff800000 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 2218907..4d15018 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -45,7 +45,7 @@ #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index d5fd3e9..a7a737d 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -52,7 +52,7 @@ #endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 07c511f..9b7bb60 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -45,7 +45,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 065ffcd..24a5a5b 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -55,7 +55,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 1a8c62e..294447d 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -44,7 +44,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 06f03aa..243aa6a 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -27,7 +27,7 @@ #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 38ad503..5ead420 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -27,7 +27,7 @@ #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index ab2477c..60abff2 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -401,7 +401,7 @@ #define CONFIG_SPL_TEXT_BASE 0xfc000000 #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ #define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL /* Place BSS for SPL near end of SDRAM */ #define CONFIG_SPL_BSS_START_ADDR ((128 - 1) << 20) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 0055803..23e1ccc 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -293,7 +293,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 98c29b0..e5ee6f3 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -350,7 +350,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/apf27.h b/include/configs/apf27.h index e84cfb5..83383f2 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -38,7 +38,7 @@ #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 2048 #define CONFIG_SPL_TEXT_BASE 0xA0000000 -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL /* NAND boot config */ #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 37fa3ec..6531789 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -188,7 +188,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SYS_MONITOR_LEN 0x80000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 5fdda1a..a881cb4 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -233,7 +233,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 637c403..6bb240c 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -233,7 +233,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 1de5edc..e47165e 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -116,7 +116,7 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 6cbdee2..6d14d39 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -125,7 +125,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 562ba56..5926f84 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -312,7 +312,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/corvus.h b/include/configs/corvus.h index db90f92..16f71e8 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -162,7 +162,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ef0fd59..cfad56c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -343,7 +343,7 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-da850evm.lds" diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 4e00812..9960d3f 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -93,7 +93,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT /* SPL related SPI defines */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 88614b3..9ac7ad6 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -126,7 +126,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 5cdfd1c..f9c12ed 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -118,7 +118,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT /* SPL related SPI defines */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index abf1394..d287c82 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -197,7 +197,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT /* SPL will use serial */ -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL /* SPL loads an image from NAND */ #define CONFIG_SPL_NAND_SIMPLE diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 11c1ec4..2c46768 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -124,7 +124,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT /* SPL related SPI defines */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index c30b63b..8e4366b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -19,7 +19,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_TEXT_BASE 0xffff0000 #define CONFIG_SPL_MAX_SIZE 0x0000fff0 diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 9bd9f6e..89a9a49 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -31,7 +31,7 @@ #define CONFIG_SPL_STACK 0x0091FFB8 #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 37a5fa4..db0e65f 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -285,7 +285,7 @@ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-ipam390.lds" diff --git a/include/configs/kc1.h b/include/configs/kc1.h index c1a9e64..6b1e72f 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -132,7 +132,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 105702d..d7045ea 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -73,7 +73,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 @@ -111,7 +111,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 90ae770..9af1ca1 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -118,7 +118,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e55fcb2..34c480f 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -66,7 +66,7 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xf0 @@ -96,7 +96,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index ebe1415..c76c868 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -275,7 +275,7 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_MAX_SIZE 0x16000 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_STACK (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0) #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x1800a000 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index fd47a72..7059023 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -243,7 +243,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index a696c1a..b4ad62f 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -219,7 +219,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 47d2948..d980db8 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -86,7 +86,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT /* SPL related SPI defines */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 22a54c7..cddeb4b 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -326,7 +326,7 @@ #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e5bf700..6707f4d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -287,7 +287,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds" diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index a81dd78..33587f0 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -33,7 +33,7 @@ #define CONFIG_SPL_MAX_SIZE 2048 #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_TEXT_BASE 0x87dc0000 #define CONFIG_SYS_TEXT_BASE 0x87e00000 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index d80dc5e..70f4457 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -51,7 +51,7 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT /* Memory sizes */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index b134ac9..909d32d 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -353,7 +353,7 @@ #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 43afecd..4fcb011 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -268,7 +268,7 @@ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-da850evm.lds" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index ae0f6a5..08d5f60 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -183,7 +183,7 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE @@ -211,7 +211,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL @@ -243,7 +243,7 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -259,7 +259,7 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS ((128 + 128) << 10) #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index c2e2c43..f911bbc 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -165,7 +165,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 101a3ed..0fda5de 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -24,7 +24,7 @@ #define CONFIG_SYS_TIMER_BASE 0x200440a0 /* TIMER5 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_MEM32 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 601186c..4a9f3e5 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -27,7 +27,7 @@ #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index c1c01bd..517a4d6 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -124,7 +124,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 563c045..d45af43 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -128,7 +128,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index fef925f..ca14128 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -127,7 +127,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 248de8d..236560e 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -167,7 +167,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index d874ab5..468daa6 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -127,7 +127,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 61c3f85..4872315 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -125,7 +125,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MONITOR_LEN (512 << 10) diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h index ffc3098..a93323d 100644 --- a/include/configs/sandbox_spl.h +++ b/include/configs/sandbox_spl.h @@ -15,6 +15,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #endif diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 3eca93b..068a743 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -141,7 +141,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 5062cd0..b060366 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -140,7 +140,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index b3fb245..60ec374 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -325,7 +325,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #ifdef CONFIG_DM_MMC #define CONFIG_SPL_MMC_SUPPORT #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 708ab17..ff7d5ae 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -190,7 +190,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_BOARD_LOAD_IMAGE diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index a63db65..53d556c 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -207,7 +207,7 @@ #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 696ca32..8768d74 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -294,7 +294,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2c41dd8..215e388 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -260,7 +260,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 7b0940a..1338f48 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -124,7 +124,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 8bbf879..776f13f 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -151,7 +151,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_I2C_SUPPORT /* SPL related SPI defines */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 82ab479..d0641e4 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -172,7 +172,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index e3cd647..6d20760 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -138,7 +138,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 32cb202..11953bb 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -273,7 +273,7 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index e5d321a..f303855 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -324,7 +324,7 @@ #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b3ca46b..9e9f66c 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -277,7 +277,7 @@ #define CONFIG_PANIC_HANG #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_NOR_SUPPORT #ifdef CONFIG_ARM64 #define CONFIG_SPL_BOARD_LOAD_IMAGE diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index 25bfeef..78c284a 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -25,7 +25,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x100 /* address 0x60000 */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index b2103b4..bfb8d3c 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -191,7 +191,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT /* SPL will use serial */ -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL /* SPL will load U-Boot from NAND offset 0x40000 */ #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/x600.h b/include/configs/x600.h index 4af6b67..81b1a3f 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -268,7 +268,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NOR_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ #define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 02f0e4c..e0979df 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -262,7 +262,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 5f7fefd..aa1fe44 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -295,7 +295,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SERIAL #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE diff --git a/lib/Makefile b/lib/Makefile index f6a8ba1..7a0fe16 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -80,9 +80,9 @@ obj-$(CONFIG_LIB_RAND) += rand.o ifdef CONFIG_SPL_BUILD # SPL U-Boot may use full-printf, tiny-printf or none at all ifdef CONFIG_USE_TINY_PRINTF -obj-$(CONFIG_SPL_SERIAL_SUPPORT) += tiny-printf.o panic.o strto.o +obj-$(CONFIG_SPL_SERIAL) += tiny-printf.o panic.o strto.o else -obj-$(CONFIG_SPL_SERIAL_SUPPORT) += vsprintf.o panic.o strto.o strmhz.o +obj-$(CONFIG_SPL_SERIAL) += vsprintf.o panic.o strto.o strmhz.o endif else # Main U-Boot always uses the full printf support diff --git a/lib/hang.c b/lib/hang.c index 9246e12..ce90827 100644 --- a/lib/hang.c +++ b/lib/hang.c @@ -22,7 +22,7 @@ void hang(void) { #if !defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_LIBCOMMON_SUPPORT) && \ - defined(CONFIG_SPL_SERIAL_SUPPORT)) + defined(CONFIG_SPL_SERIAL)) puts("### ERROR ### Please RESET the board ###\n"); #endif bootstage_error(BOOTSTAGE_ID_NEED_RESET);