From patchwork Wed Apr 18 09:02:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899986 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SZq6xYOh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx6T4r6Sz9s3G for ; Wed, 18 Apr 2018 19:05:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6E86CC21EDC; Wed, 18 Apr 2018 09:03:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0D52FC21EBD; Wed, 18 Apr 2018 09:02:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3BB54C21EBD; Wed, 18 Apr 2018 09:02:50 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id DDB10C21ED5 for ; Wed, 18 Apr 2018 09:02:49 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id d19-v6so2674851wre.1 for ; Wed, 18 Apr 2018 02:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WFKVQ4c+FqRWutM3sj7HJbRv7U5IzxC5bvsA9QPPJw8=; b=SZq6xYOhtx05m3JiPUBTGBsWvpN0irxEjimsbkssrqosKKuwmsWVLSbtQ/je+jshbX u5LM9tx1X+rj5xHaB0pJCn6WaimEDSng0jkV0XXJyzNgsB0NB0fTebEqC1C3Ryv3p3Ck fHgf8TDhLqdNyuSMDPdXfmAOtedPIMawSCUaU7yukahslF7oHVC83J3SLbrl0lHdwqkg u8LXYsGgORBovo4qaI3eL6egOWBiZGJG+bTD7KnirghFDDd3es/jPbpoi4/99ARYIMPo GAINY4HWHNJSDpuFBvCC4xVqMj0gH9cCcz80HKpfRP8niubz5RYR9UFXeAiJeKAbOAPw pRMQ== 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; bh=WFKVQ4c+FqRWutM3sj7HJbRv7U5IzxC5bvsA9QPPJw8=; b=QeuroJHSEMIR/jbl80YyfKpgmRobAZWp7rHZroIniHJLvgR96ZHueY1jqk15I0n/ga 0ufY7kbUADZpEMm5Ne9WZ+++ZJdjKU1E1BHw0+5SySyMnLfSXkMbx+e4mOmWNi02+3BY phCijkhr65kfRouto5Y9CDMa/+K46LT4OKeNLhl3aoXxKYSIHJd1b5simjDJNoqwEK5m SaMDhJIWQhPEHlMthq5+jhdDkiTmiHUme4vSHQzvjXbqpAGEee1Bw2MNSiyihZEmvTPd gkkRi9RKNqF7NitFdBp7pk5enwg80OjNBPmDYiV9rmYHstITRtxuNh5AwcrPYn+pIwUY i4lw== X-Gm-Message-State: ALQs6tABgze6gDXDOnTe56IesmQTQsIEBDbRt7QtdzlQv5ywe8nGTGwR TRhlSfWsz0Pfx8kCypXiSo1o6/SeBXk= X-Google-Smtp-Source: AIpwx4+ztCyGJDbGpN+QrQWcjDD/zsHh91r3nhgZ/pRqY1j05d1BMLSiRohTRq61QKP/Y+fyfkdewg== X-Received: by 2002:adf:bacd:: with SMTP id w13-v6mr928111wrg.125.1524042169312; Wed, 18 Apr 2018 02:02:49 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:48 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:16 +0000 Message-Id: <1524042143-30213-2-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Feng Li , Thomas Petazzoni , Yuantian Tang , Vinitha Pillai-B57223 , Mingkai Hu , Hou Zhiqiang , Ruchika Gupta Subject: [U-Boot] [PATCH v1 1/8] Cleanup CONFIG_SPL_SERIAL_SUPPORT migration X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" CONFIG_SPL_SERIAL_SUPPORT had already been migrated to Kconfig, but existed in some include files; fix those up here. Signed-off-by: Alex Kiernan --- configs/controlcenterdc_defconfig | 1 + configs/ls1021aiot_sdcard_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046ardb_emmc_defconfig | 1 + configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_sdcard_defconfig | 1 + include/configs/controlcenterdc.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1046a_common.h | 2 -- 11 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 5fe18c6..92d289e 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CONTROLCENTERDC=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL=y diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index 59592db..a34cb52 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AIOT=y CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index 1d40a14..3a5c001 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig index 4d0907c..2c5a9e9 100644 --- a/configs/ls1046aqds_sdcard_ifc_defconfig +++ b/configs/ls1046aqds_sdcard_ifc_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig index 8467148..66ddc35 100644 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig index 3ca8f16..97de7b1 100644 --- a/configs/ls1046ardb_emmc_defconfig +++ b/configs/ls1046ardb_emmc_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046ARDB=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index ee6320f..dfa0f01 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_LS1046ARDB=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig index 0fa6fa4..5a33dc6 100644 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046ARDB=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_FSL_LS_PPA=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index b6d15f6..89e57301 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -112,7 +112,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index f2a6837..dc1206f 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -67,7 +67,6 @@ #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_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index b9424e6..2851c84 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -67,7 +67,6 @@ #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_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT @@ -104,7 +103,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT From patchwork Wed Apr 18 09:02:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899979 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H+vzAlCj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx3Y5X3pz9s3G for ; Wed, 18 Apr 2018 19:03:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 518B0C21EC9; Wed, 18 Apr 2018 09:02:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1D627C21DD4; Wed, 18 Apr 2018 09:02:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 22D0FC21DD4; Wed, 18 Apr 2018 09:02:51 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id E499FC21EC8 for ; Wed, 18 Apr 2018 09:02:50 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id f14-v6so2649175wre.4 for ; Wed, 18 Apr 2018 02:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oa9sFjfw5xppgjH1vRj0CufdyYtlcnE1QWrk/uJlA6E=; b=H+vzAlCj3r+4g3T9smr3amwbsmAXtVM0M6Se2u1FcIYGzdKk5xJzZYe1mqteVOr9Jf vQLfeIks2tFhcAPgod9DJM2dNzdwAGJyDUmCOYbS022whLxCdYAR1xDU/7BbgmwdASVA Fa30izTetr4+nTMl1zEcrGAB8oDEKo7I/gxHk01XRQ/0ApIIJ1XeL2WnDYwOqKk33JXL 1JK+qfIyz9ITT89Fjm+49VM/c4fzfTYDnwWN3sg/2Ptn3chP6ozCZCYOAqY75ubolylE AfYq+aUhoglrDQHbUuT1AoW3ItKp4dRb4uFB6mco3xWTFfEpr6Jxj51r0SL467YrnUyG obeA== 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; bh=oa9sFjfw5xppgjH1vRj0CufdyYtlcnE1QWrk/uJlA6E=; b=Yb/YB6Bj78Ap+NetmHzGm5wfGxt26mwULVtuY1+xNnGuAg7zBPc3bKwh9e/UdG8sH/ 41EjMan2FJHiyU152SzWT/RpHLZa34rHqwPgqYGsRJuZcg7gzvAp3vYM5kfO5OyKdT+l gUf1UrbcRUOP2VDshjs5TyOsIrvubUfGh9f1mVUbufZmz26IBahSXRND8oSVd1ga24Br eDN12q8rlnsHHXOsq+6EvnP7ZGnj6O2K3A/PX2AWpabZnNp7+c09vtCDZA5xEFuhK8xc Raab1ZlnXJOmRd7iEqtqr5hrDO6kCxx4K3xXH7h3G7tR4dvkckDuYI6aOojiuiEe8/Ih TI5A== X-Gm-Message-State: ALQs6tA9njFlCkdln/N8Y38i6x0vn7ikXRupQ2s8MspFNHK4eXFEu+lO hazI77Et7MxDZQVw5AEW4QdZtoqM2iM= X-Google-Smtp-Source: AIpwx4+FMass+RRUw2qyBPToDwJusU7wEPumB/B+WiqzPGt3MANmE95mjBjCKXWjANhC4zk9XQGCmg== X-Received: by 10.28.127.203 with SMTP id a194mr1139826wmd.57.1524042170311; Wed, 18 Apr 2018 02:02:50 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:49 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:17 +0000 Message-Id: <1524042143-30213-3-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Tom Rini , Andy Yan Subject: [U-Boot] [PATCH v1 2/8] spl: ti: Avoid preloader_console_init if !CONFIG_SPL_SERIAL_SUPPORT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" If CONFIG_SPL_SERIAL_SUPPORT is disabled then the build fails because serial_init is undefined. Guard preloader_console_init() appropriately to fix this. Signed-off-by: Alex Kiernan --- arch/arm/mach-omap2/boot-common.c | 3 ++- common/spl/spl.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index db68a9d..f9ab5da 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -196,9 +196,10 @@ u32 spl_boot_mode(const u32 boot_device) void spl_board_init(void) { +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* Prepare console output */ preloader_console_init(); - +#endif #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) gpmc_init(); #endif diff --git a/common/spl/spl.c b/common/spl/spl.c index 61d3071..794dbd0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -471,6 +471,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) jump_to_image_no_args(&spl_image); } +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* * This requires UART clocks to be enabled. In order for this to work the * caller must ensure that the gd pointer is valid. @@ -491,6 +492,7 @@ void preloader_console_init(void) spl_display_print(); #endif } +#endif /** * spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution From patchwork Wed Apr 18 09:02:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899983 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YGIOtWOq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx4w5GlFz9s3G for ; Wed, 18 Apr 2018 19:04:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 304C9C21EAE; Wed, 18 Apr 2018 09:03:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2A78FC21EE4; Wed, 18 Apr 2018 09:02:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9594AC21E89; Wed, 18 Apr 2018 09:02:52 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 470EBC21EC8 for ; Wed, 18 Apr 2018 09:02:52 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id u4-v6so2629464wrg.10 for ; Wed, 18 Apr 2018 02:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6WPHf9HZIMEBf1MtRdN3Ss89xj0d9RlJo9sVvh3eils=; b=YGIOtWOqhymWNp09sJIsYvxLkkGlLQWQwmxHJm6PypyZv48pbzg3/f7E0TECA9jdxf 7VRPvtR6YP/NgmV0745uln2A5W24UJpIQVZcHtpQWYWIkPUIfHtv5VlBZBzoHtHcygRc 4Vsxmo2yQYHP1vXatXPf2yiTAb0O5AAI/ahra2eW46WVzEAAaZVt+UYRtxpicnZZtoQY rEEO+hPpDR0QLfqaixKxeyCkZB9wI8I2gpN7kQbMfT85MrLMIvYeMGcXVfbY7gLqtbts KQ0dNyGIOYkXzYBCXgG8wxMejDTSgqB/T9r1EWsm6jIL5j/vhiXM6Mvdz1lo6wSwHhcT qIng== 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; bh=6WPHf9HZIMEBf1MtRdN3Ss89xj0d9RlJo9sVvh3eils=; b=oI1bk9ZF2/4+I6NNLC2PJ1IeUo2U2BMwylvEgR5OgLxHXFntb3V3AOxYIvu6jsOZow sg6qbBJjYu6egXVDVW0eYeP1m68fk3XtRc/v7c120AldHwjAc69nOccvCTnGlvqeCx/H mi+gHituqEqlTMMlBby3GONmSOPjKbYYaTJdHXkPYwsMMcaedgjw2y0ZbIQN+1zeqdYb Yv3DgIx92xSsbjq7Uhhj6yetUkdvd6Pb7id5TMEdjgZds9qFl40Z1Rly03VOIyAtfCnO RWvIFpm7lKFkZKn8ab5E00Dx/TBzzYk7QidV7kTH/oUXmFfG8ReewM4cHnsKAcrOAwok /Enw== X-Gm-Message-State: ALQs6tAh3f+dRjQyI7cNZXX1XazfRtopWkhnNPiWAPgrT6UYc4sHQu07 UGxhdVz19VcXZTVRFJAMPIK7AYN/XTg= X-Google-Smtp-Source: AIpwx4+wmiUjtpRICIakHMi5xQzIp9rdBZLBGDggp1oZa5euU+z6TrGSen2okvaY7BA2etEnJOECtQ== X-Received: by 10.28.19.13 with SMTP id 13mr1166120wmt.89.1524042171493; Wed, 18 Apr 2018 02:02:51 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:50 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:18 +0000 Message-Id: <1524042143-30213-4-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Subject: [U-Boot] [PATCH v1 3/8] spl: Add dependency on serial to Ymodem X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Building with Ymodem support requires serial in SPL/TPL, add that dependency here. Signed-off-by: Alex Kiernan --- common/spl/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 4d27565..c5d4b5e 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -751,6 +751,7 @@ config SPL_WATCHDOG_SUPPORT config SPL_YMODEM_SUPPORT bool "Support loading using Ymodem" + depends on SPL_SERIAL_SUPPORT help While loading from serial is slow it can be a useful backup when there is no other option. The Ymodem protocol provides a reliable @@ -951,6 +952,7 @@ config TPL_SPI_SUPPORT config TPL_YMODEM_SUPPORT bool "Support loading using Ymodem" + depends on TPL_SERIAL_SUPPORT help While loading from serial is slow it can be a useful backup when there is no other option. The Ymodem protocol provides a reliable From patchwork Wed Apr 18 09:02:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899985 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UaOdyUxQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx692LrHz9s3G for ; Wed, 18 Apr 2018 19:05:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 015C4C21E3B; Wed, 18 Apr 2018 09:03:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DE1E2C21EE8; Wed, 18 Apr 2018 09:02:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8FC3AC21DD4; Wed, 18 Apr 2018 09:02:53 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 3BB63C21C2C for ; Wed, 18 Apr 2018 09:02:53 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id q13-v6so2666732wre.3 for ; Wed, 18 Apr 2018 02:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q2Dlnz4tOr6tVOf8E+ZxmtuI/Muk1HqTdHZwbKk86dY=; b=UaOdyUxQImV56UUbL1HwPsvRewKNTh57d+14xCUuAbYTL6ABQF86mz6MGA9pMbZTBv CyoAvlbvtAwOqon4Pkj8SsQM62GlKVyYPM87vRMFP1PMZ8SuFD5BKodCpD165GPisU36 P+t47C4+Q2Qjwp1Jbm7Wpmq8HzlIutfWnZlHu0Qir6WYHJ3Mm/0j/amT8YZN64FpIy74 YhtcwN7C2N/YzO/uuEeeZvOeRvmRu3J9fWOSvskSpxTN+R72U6pKGZ2EJSTR+H01ekJa bC+nMLnEQtZzWZtZTGWhNFa5ck9j3A2fmo9IYWj+D/6Z88Z+vCHes6/O6YUaJRPXbGAi 1LYg== 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; bh=Q2Dlnz4tOr6tVOf8E+ZxmtuI/Muk1HqTdHZwbKk86dY=; b=ptwLFGIOrj5nxjtmL7fCG10Jjvaeqx1K6etlGK5IVXjh0jMqLRkcmrHBYVD5KSwQ/1 igXKfW2Hwanv2NQmfhUbZkv0c+47SfoRrzOiBggFD2e+OSSnIdwYPvJTb740fmXgb5Po LeFRE/YuKig85T23ZBDUZnmWlszr0GGzQ3lIYS6aOpgxbmw8FORnp7XV3AXq3Ujy2SUc R3N5QQlVHG5glRr3PyyEK01YbJxDKLiNlXMwmmAcw81HVONOar58GfUjcw/S9ULyVXB1 NVD0CIaji4wt7m0Kwq2jzQI4hq+cicy4mVA7jJhgOv9v1uH3sgRUjbFTuorJpMTVkN2c LNJA== X-Gm-Message-State: ALQs6tCjs/X7TXYzWsXWYbcrYTTT8mzKABD7iYvSIRq5H/RZEh9kJlOo QkrSARBASpU5r8LIxiinPeVI5xC6Ii4= X-Google-Smtp-Source: AIpwx4+uJiwg8DZ4RCrsAkFAqzftC+T/4pvSQyDyS5lWZCgc8x5PMGPAC1+jK7BQK//RTcMbx84m4A== X-Received: by 10.28.153.213 with SMTP id b204mr1149455wme.79.1524042172745; Wed, 18 Apr 2018 02:02:52 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:52 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:19 +0000 Message-Id: <1524042143-30213-5-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Tom Rini Subject: [U-Boot] [PATCH v1 4/8] spl: ti: Avoid serial calls when serial support is disabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" If CONFIG_SPL_SERIAL_SUPPORT is not set, then the build will fail: board/ti/am335x/built-in.o: In function `spl_start_uboot': board/ti/am335x/board.c:247: undefined reference to `serial_tstc' board/ti/am335x/board.c:247: undefined reference to `serial_getc' Avoid the calls to the serial functions in that case. Signed-off-by: Alex Kiernan --- board/ti/am335x/board.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index c33bf58..896b9b6 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -243,9 +243,11 @@ static struct emif_regs ddr3_icev2_emif_reg_data = { #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* break into full u-boot on 'c' */ if (serial_tstc() && serial_getc() == 'c') return 1; +#endif #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); From patchwork Wed Apr 18 09:02:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899992 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FqSkSo7b"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx9P3FMrz9s3Z for ; Wed, 18 Apr 2018 19:08:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 28777C21EEB; Wed, 18 Apr 2018 09:04:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CB987C21EE5; Wed, 18 Apr 2018 09:03:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DECB0C21E85; Wed, 18 Apr 2018 09:02:57 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 35F8FC21E2B for ; Wed, 18 Apr 2018 09:02:54 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id s18-v6so2638082wrg.9 for ; Wed, 18 Apr 2018 02:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cXnFnXQbVjiK1cAQj708hUTrgqNOVrZqh7uo+9QlhT4=; b=FqSkSo7bVdcLceAre3Iwx8vh9WJIjvwxNLCsZ8klLxU+/Lg6Gazl1vOSnksYmwvbhk +3583FXtGYrxPD/gr7Q4OVdfaJxGsnTcVWUwsNtHptscNSYHjXDbVHCG1fgBm8WN3JTT F5Rzb/uXjIbjzOlQg/SO0etQyiJHoF0g05yDpO03xgx/b+GosnrSJoal4dTsUHH0/rgL cjh4elmJnIiqqYUuun+v29llka3YlyDZyNXkycqOnzmTFpsq9SPtMhEWSC6FcOea3Y6u EBK/z2U1k0mcM0RWLJR+v+R8JDENDlTkPrs59aGKYP+J1SwbOQqdqg/SznrSvQuCrU50 sBkw== 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; bh=cXnFnXQbVjiK1cAQj708hUTrgqNOVrZqh7uo+9QlhT4=; b=ZbNK2dikR8xcTlQeq23fse1vU1o5xuKshyFkgAhsXfiKgr5kvMerHfdtu8UZzdYGCq RKFLg1uxEZL3OV/4I+gOq2E2B11KJ9JvSxfZ8ZMoznPbH8KcA41tnJa9X8RshMI4tW4X lN4ZNTmmBejUxGdiI1VKpcALRfLW89q8PoJuaEaxNJDvazUFDbiYFrEDwF70O2lL+gI0 74VlsXOymK+pzD3MxpOIpGIWLuHZ2v14QrGu4Zh8R2S0sH2HP3d4ouSqPOGY0CM03fNZ gogvWUAyvAF6Q7MPHJRRnVwEOComXFUcUuHlGWU8e/KQg06KXLF6xyYoknS07J7C6o7a 9b2g== X-Gm-Message-State: ALQs6tDUk4l3YLu/uBElJfGKlJ5AA0kCppIy2RbRvqv2DaUpb7MMAPL5 xB0VrFGp1/nLMKxvWDPThrHsezLS+wY= X-Google-Smtp-Source: AIpwx49d1F4WvxKEaridqdtxNEvGfcBBoOmoatQybkkbOREst0Z0SfUGJS7Ko3DtBWer/VhJZnljlQ== X-Received: by 10.28.170.78 with SMTP id t75mr1156264wme.55.1524042173661; Wed, 18 Apr 2018 02:02:53 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:53 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:20 +0000 Message-Id: <1524042143-30213-6-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Alexander Graf , Heinrich Schuchardt , Andre Przywara , Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH v1 5/8] spl: Split sprintf, strto* from SPL serial in Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" When SPL serial is disabled, callers who need sprintf or strtoul fail because their inclusion is guarded by CONFIG_SPL_SERIAL_SUPPORT/ CONFIG_TPL_SERIAL_SUPPORT. Split printf, sprintf and strto into their own entries and then select all of them if SERIAL_SUPPORT is enabled to match the current behaviour. Include panic.o unconditionally as it can be called from anywhere which uses BUG_ON(). Signed-off-by: Alex Kiernan --- common/spl/Kconfig | 4 ++++ lib/Kconfig | 22 ++++++++++++++++++++++ lib/Makefile | 15 ++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index c5d4b5e..259f966 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -626,6 +626,8 @@ config SPL_SATA_SUPPORT config SPL_SERIAL_SUPPORT bool "Support serial" + select SPL_PRINTF + select SPL_STRTO help Enable support for serial in SPL. This allows use of a serial UART for displaying messages while SPL is running. It also brings in @@ -927,6 +929,8 @@ config TPL_RAM_DEVICE config TPL_SERIAL_SUPPORT bool "Support serial" + select TPL_PRINTF + select TPL_STRTO help Enable support for serial in TPL. See SPL_SERIAL_SUPPORT for details. diff --git a/lib/Kconfig b/lib/Kconfig index 436b90f..82c8fbc 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -27,6 +27,28 @@ config HAVE_PRIVATE_LIBGCC config LIB_UUID bool +config SPL_PRINTF + bool + select SPL_SPRINTF + select SPL_STRTO if !USE_TINY_PRINTF + +config TPL_PRINTF + bool + select TPL_SPRINTF + select TPL_STRTO if !USE_TINY_PRINTF + +config SPL_SPRINTF + bool + +config TPL_SPRINTF + bool + +config SPL_STRTO + bool + +config TPL_STRTO + bool + config USE_PRIVATE_LIBGCC bool "Use private libgcc" depends on HAVE_PRIVATE_LIBGCC diff --git a/lib/Makefile b/lib/Makefile index 35da570..13be8f4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -88,22 +88,19 @@ obj-y += time.o obj-$(CONFIG_TRACE) += trace.o obj-$(CONFIG_LIB_UUID) += uuid.o obj-$(CONFIG_LIB_RAND) += rand.o +obj-y += panic.o -ifdef CONFIG_SPL_BUILD -ifdef CONFIG_TPL_BUILD -SERIAL_SUPPORT := $(CONFIG_TPL_SERIAL_SUPPORT) -else -SERIAL_SUPPORT := $(CONFIG_SPL_SERIAL_SUPPORT) -endif +ifeq ($(CONFIG_$(SPL_TPL_)BUILD),y) # SPL U-Boot may use full-printf, tiny-printf or none at all ifdef CONFIG_USE_TINY_PRINTF -obj-$(SERIAL_SUPPORT) += tiny-printf.o panic.o strto.o +obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += tiny-printf.o else -obj-$(SERIAL_SUPPORT) += vsprintf.o panic.o strto.o strmhz.o +obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o strmhz.o endif +obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o else # Main U-Boot always uses the full printf support -obj-y += vsprintf.o panic.o strto.o strmhz.o +obj-y += vsprintf.o strto.o strmhz.o endif subdir-ccflags-$(CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED) += -O2 From patchwork Wed Apr 18 09:02:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899989 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="F5UP/yeA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx7C2rcsz9s3G for ; Wed, 18 Apr 2018 19:06:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 05D19C21EBA; Wed, 18 Apr 2018 09:04:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 05844C21EBB; Wed, 18 Apr 2018 09:03:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3D348C21E89; Wed, 18 Apr 2018 09:02:59 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id F3CD5C21E89 for ; Wed, 18 Apr 2018 09:02:54 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id q6-v6so2647512wrd.6 for ; Wed, 18 Apr 2018 02:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0oEbPTpP66tCGL26aUdxgc8wZL2vPii6uX5m4Z/Q8Po=; b=F5UP/yeAKboHP/9BAUZw6Y/Bl5+Q2qYl5TFn52tb1HcRFRu9LNAw5umxlZ4oJ5uc4t sWzedEd1ydWllCoSDrbFuHb1qujjLz+eCH8Fmm/jJKfCKRJmwycEutWEIxTMWHFK8mUT +/Pq8jAVT4Kkr7Mu6Ycxdf5hu0nV8WotwrqCcRfFgpkPRwkvie+aEIPww2Au3qGGVHa1 eMmpU78HtyRkgZLu3loZ74FieFQQSxLy31kGtsuSQ+74F2y2Ns/ZvsN8F86GDNzXjdYd Dcc8Ga0j/iZ3FYxM4zQdm2kJL8ADjAg7DLFht8aSgsq5EAAaCeqEZc0H7mstMMBw7KJL 5K1Q== 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; bh=0oEbPTpP66tCGL26aUdxgc8wZL2vPii6uX5m4Z/Q8Po=; b=bQypMIRSDd4rW3BR+Fxi/EPeigRinZu/IRyGXAPvf6FoI3OoRB0MeTf8k4Q25h/my6 pMvmcksO7eDpDsX/kT/+ixyadWCFiqXCpcW290hxmBz8NHNHfekof2A3KeBOc9mDQFNp T3ZsjSfrhMrWOnuACraVpNbXa/mrnMQeoAjcnnQEYcNT4I3wJbuC16XHBm9UbTxFiqBq Ap5PQ3OR1R6WD/ec8duMUJiXyZs2YhlUhsi2JXwd+F6oB52FxlA52Hk87HrS3OqZ3mDx n3LoOISlFmLK/gUDVk5V9eMUESEb8ljp2fnRjQ8+UnG5wQG61cQmc1CCHCHvKFWQ5TcL TbNQ== X-Gm-Message-State: ALQs6tCXQq+4m0aHN4++kbY3BmiQEYk0GDlI7zxLd5yatOTzliNtwrZd g6E+dmFQkc+L9yUBMRTkGbBBl/V/SUY= X-Google-Smtp-Source: AIpwx4/fWYA54DNsuIITV1MvWDbnIqJHTz8TO/7GQTULYLVhUS+pruet4O0B7GF/KxVNs9bHJWycgw== X-Received: by 10.28.45.9 with SMTP id t9mr1070537wmt.161.1524042174471; Wed, 18 Apr 2018 02:02:54 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:53 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:21 +0000 Message-Id: <1524042143-30213-7-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Heinrich Schuchardt , Alexander Graf Subject: [U-Boot] [PATCH v1 6/8] spl: Disable printf if not required X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Now we have a guard for printf, disable it in the build if it's not selected. Signed-off-by: Alex Kiernan --- lib/panic.c | 3 +++ lib/tiny-printf.c | 13 ++++++++----- lib/vsprintf.c | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/panic.c b/lib/panic.c index e2b8b74..3ca6421 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -37,9 +37,12 @@ void panic_str(const char *str) void panic(const char *fmt, ...) { +#if !(IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_TPL_BUILD)) || \ + CONFIG_IS_ENABLED(PRINTF) va_list args; va_start(args, fmt); vprintf(fmt, args); va_end(args); +#endif panic_finish(); } diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 0b04813..9b97aed 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -23,11 +23,6 @@ struct printf_info { void (*putc)(struct printf_info *info, char ch); }; -static void putc_normal(struct printf_info *info, char ch) -{ - putc(ch); -} - static void out(struct printf_info *info, char c) { *info->bf++ = c; @@ -321,6 +316,13 @@ abort: return 0; } +#if !(IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_TPL_BUILD)) || \ + CONFIG_IS_ENABLED(PRINTF) +static void putc_normal(struct printf_info *info, char ch) +{ + putc(ch); +} + int vprintf(const char *fmt, va_list va) { struct printf_info info; @@ -343,6 +345,7 @@ int printf(const char *fmt, ...) return ret; } +#endif static void putc_outstr(struct printf_info *info, char ch) { diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 5f7a5f1..bb0c573 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -783,6 +783,8 @@ int sprintf(char *buf, const char *fmt, ...) return i; } +#if !(IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_TPL_BUILD)) || \ + CONFIG_IS_ENABLED(PRINTF) int printf(const char *fmt, ...) { va_list args; @@ -824,7 +826,7 @@ int vprintf(const char *fmt, va_list args) puts(printbuffer); return i; } - +#endif void __assert_fail(const char *assertion, const char *file, unsigned line, const char *function) From patchwork Wed Apr 18 09:02:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899991 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r394kslm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx8L2VcMz9s3G for ; Wed, 18 Apr 2018 19:07:14 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D67C9C21E3B; Wed, 18 Apr 2018 09:04:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5A513C21E2B; Wed, 18 Apr 2018 09:03:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 225F4C21ED6; Wed, 18 Apr 2018 09:03:00 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 6E18CC21EAE for ; Wed, 18 Apr 2018 09:02:56 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id w3-v6so2657466wrg.2 for ; Wed, 18 Apr 2018 02:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yrj46EVPlLIx0VRwE7j67tbvcpaStWTjJhj1DSy8UD8=; b=r394kslm/QavwFc67C7/X3BcIgPGbF9sXc0tzNcZ4Q8C35JMmuF5VsV4UcdULQWjxm yxxkqRN539zAVn8zSCO5ib8Hn4DKoLJf6MogXZ2Z8+EXKW8TLYzmu344i8ISK3TGTYn9 6W4XFtT1aFhZHV8vnNF2eB2Y/WX7G60COb+4HyNYRV/hbu+FBZIA3prI/ZSStbCzw9IQ DoNEUhWlIMtsb2SKCHblEIX9cfOB7HYaxq7vQQUMWOTHIdnVQhMLvilkHOAaRgwVeCAO Z3Fdwy4gmO8Zhqp7aOtsA6SKLMd3S9Hk+XEEC5uUd1Ur0j8OBoK3Y0mr/IDaw0Euxvje rsCA== 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; bh=Yrj46EVPlLIx0VRwE7j67tbvcpaStWTjJhj1DSy8UD8=; b=kOdsn4ZUxSE7oMoBCcyQDRjQWqtsTUKOKAiw35ngr1nKRb6ofJAPYMbLBJHwALIYkp spLavS1ZbwogXLgJVQS2qtNOeUAAYX2Bj8dix4wIDnfaJvo+iJ5HBwrnlic5kDJ7uyIU dIgVmDkIcZne4DEyvaz9kEEijlWvejCLXU0sdMrCO0+OrYTwal+LHPjpStTQZ0eTaiiA tGu+EK8gJgYxToqqWianBHcHZmIPW5dApG4L2Dk5GWmR+Im/ZOdz/YUE75/jXyJFKggP nkOn6Kaotsgt1QpPdlpVynw86RDECc+iWzGgWD3qhfLLCPnPIP7MLRlwNmtyfdRGHdos pPoA== X-Gm-Message-State: ALQs6tDRZvaAIefuq42gOB5UmuuF9XdBbx89asxzuy01/p9BeFnH6sNO oMWkGY1jvpkMwNOiKffXnsW2FxSoCGY= X-Google-Smtp-Source: AIpwx4/fAdqMEOojFYGSsLV2NeM573CProo22Tz+hxfZX3PwnmHxZWsIdrKI78QV/UYspCVhiPvJTQ== X-Received: by 2002:adf:b972:: with SMTP id b47-v6mr1004478wrg.238.1524042175948; Wed, 18 Apr 2018 02:02:55 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:55 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:22 +0000 Message-Id: <1524042143-30213-8-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Heinrich Schuchardt , Alexander Graf Subject: [U-Boot] [PATCH v1 7/8] Consolidate __assert_failed into one implementation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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 had two implementations of __assert_failed which were almost identical, combine them into one. Signed-off-by: Alex Kiernan --- lib/panic.c | 8 ++++++++ lib/tiny-printf.c | 9 --------- lib/vsprintf.c | 8 -------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/panic.c b/lib/panic.c index 3ca6421..328cfae 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -46,3 +46,11 @@ void panic(const char *fmt, ...) #endif panic_finish(); } + +void __assert_fail(const char *assertion, const char *file, unsigned int line, + const char *function) +{ + /* This will not return */ + panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, + assertion); +} diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 9b97aed..030aef5 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -384,12 +384,3 @@ int snprintf(char *buf, size_t size, const char *fmt, ...) return ret; } - -void __assert_fail(const char *assertion, const char *file, unsigned line, - const char *function) -{ - /* This will not return */ - printf("%s:%u: %s: Assertion `%s' failed.", file, line, function, - assertion); - hang(); -} diff --git a/lib/vsprintf.c b/lib/vsprintf.c index bb0c573..9295d5f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -828,14 +828,6 @@ int vprintf(const char *fmt, va_list args) } #endif -void __assert_fail(const char *assertion, const char *file, unsigned line, - const char *function) -{ - /* This will not return */ - panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, - assertion); -} - char *simple_itoa(ulong i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ From patchwork Wed Apr 18 09:02:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 899987 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qwev+x9S"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Qx6l4T2Yz9s3G for ; Wed, 18 Apr 2018 19:05:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5BD78C21EEF; Wed, 18 Apr 2018 09:05:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 80A12C21EC5; Wed, 18 Apr 2018 09:03:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3DF57C21EC8; Wed, 18 Apr 2018 09:03:00 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 73648C21DD4 for ; Wed, 18 Apr 2018 09:02:57 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id v24-v6so2635715wra.8 for ; Wed, 18 Apr 2018 02:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/Aw6msHMXWZX9o7zN3QhO/gh4a++l+AFLJ1yYbPx8oQ=; b=qwev+x9SikUsiGFH1AL6uWxvWDCEzjv7roWjrA+e9UQ9rtGDp4ZXlWYJ7V4qdtOhTB 67lyZD5UUWsbZfOGJd23hZ9dtPhOXEViyx6spdBW+ppWn3TNMr4RMnd1Kpkz8Kaa4iit SckvZ5jqqYVFc7kCIZmIiW9xT0go2TvbncIcuBtq+2Y39ogCpKrhjFfyqYP13KCsvP9i E6VDSq1eqh6JfD0+ZvnpmTTCNv023DLMREuNW/oadFAEV6LBgve6h5CUXRB2AC4i8AF6 pw8NkoZpqbnNCXjQzQs25M9OhxRBql9McqZc1qPvMkCWNwPh48XJj53NrrFkt+vQIx0X 81cw== 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; bh=/Aw6msHMXWZX9o7zN3QhO/gh4a++l+AFLJ1yYbPx8oQ=; b=dPdXhtAB9VGboG8UiQbuguQ3LxaU/SgjvFPl/5wtHMcTlO+ZjHIvk66LnDDVXJIOjS aMFu+iTqarDQrBd2uiNCkwTrgtSMApdnHm/xowQOVBHOQR3R/up9Y7gtJzVZhrMv3WcF YSvrYBhKn32A8mmQaTYJse8OkNp5KBVWm2bYkFt01Aj9r/O++p5EJ73yzKMsDv9ugK3R nn5iDBSgx/hylxoKbzbkNruOPyI9OMeVuKf39x6Y0cbhNmfkdiH90/0ZSkwr0tiz137d CoaRSknoyrxrCiE2mzWLmZOTSAYq+FeFd7nk+0eYUN9W24e7K/KkcRL/MAd76q9MSMFK R3Kg== X-Gm-Message-State: ALQs6tBKJPgaNNsSnjzE5Tu01awaCemmn2FsRRN5mI2ruWS59zzeBsHb iAf/hrUyeczI74vhxDO9e/8j6zAcTS8= X-Google-Smtp-Source: AIpwx4+X46RG0t8vTkrjAXh0f2/dV2Z32LHFBOSCwlaNPbunMZRRzQHOszbM114aamFTDgUgSkCQIg== X-Received: by 2002:adf:99b5:: with SMTP id y50-v6mr913768wrb.168.1524042176920; Wed, 18 Apr 2018 02:02:56 -0700 (PDT) Received: from localhost.localdomain ([89.197.133.108]) by smtp.gmail.com with ESMTPSA id z12-v6sm595871wrg.20.2018.04.18.02.02.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 02:02:56 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Wed, 18 Apr 2018 09:02:23 +0000 Message-Id: <1524042143-30213-9-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> References: <1524042143-30213-1-git-send-email-alex.kiernan@gmail.com> Cc: Marek Vasut , Andre Przywara , Alexander Graf , Maxime Ripard Subject: [U-Boot] [PATCH v1 8/8] spl: disk: usb: Add dependencies to sprintf/strto* X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" If SPL serial support is disabled nothing brings in sprintf, snprintf or simple_strtoul: env/built-in.o: In function `regex_callback': env/attr.c:128: undefined reference to `sprintf' disk/built-in.o: In function `blk_get_device_by_str': disk/part.c:386: undefined reference to `simple_strtoul' disk/part.c:395: undefined reference to `simple_strtoul' disk/built-in.o: In function `blk_get_device_part_str': disk/part.c:522: undefined reference to `simple_strtoul' disk/built-in.o: In function `part_set_generic_name': disk/part.c:704: undefined reference to `sprintf' drivers/built-in.o: In function `init_peripheral_ep': drivers/usb/musb-new/musb_gadget.c:1826: undefined reference to `sprintf' drivers/built-in.o: In function `musb_core_init': drivers/usb/musb-new/musb_core.c:1451: undefined reference to `snprintf' Add those dependencies here. Signed-off-by: Alex Kiernan --- disk/Kconfig | 4 ++++ drivers/usb/musb-new/Kconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/disk/Kconfig b/disk/Kconfig index 8af2a95..f9f8416 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -4,6 +4,10 @@ menu "Partition Types" config PARTITIONS bool "Enable Partition Labels (disklabels) support" default y + select SPL_SPRINTF + select TPL_SPRINTF + select SPL_STRTO + select TPL_STRTO help Partition Labels (disklabels) Supported: Zero or more of the following: diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index ea5bae2..46ae794 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -5,12 +5,16 @@ comment "MUSB Controller Driver" config USB_MUSB_HOST bool "MUSB host mode support" + select SPL_SPRINTF + select TPL_SPRINTF help Enables the MUSB USB dual-role controller in host mode. config USB_MUSB_GADGET bool "MUSB gadget mode support" select USB_GADGET_DUALSPEED + select SPL_SPRINTF + select TPL_SPRINTF help Enables the MUSB USB dual-role controller in gadget mode.