From patchwork Thu Oct 23 03:37:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 402343 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E1ED914007D for ; Thu, 23 Oct 2014 14:38:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CFC54C127; Thu, 23 Oct 2014 05:38:19 +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 wQC8yOzJta8O; Thu, 23 Oct 2014 05:38:18 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6D12A4C102; Thu, 23 Oct 2014 05:38:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA2D44C0EB for ; Thu, 23 Oct 2014 05:38:01 +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 Ve1R5Gsi2RQx for ; Thu, 23 Oct 2014 05:38:01 +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 mail-pd0-f202.google.com (mail-pd0-f202.google.com [209.85.192.202]) by theia.denx.de (Postfix) with ESMTPS id 4E8C24C0ED for ; Thu, 23 Oct 2014 05:37:59 +0200 (CEST) Received: by mail-pd0-f202.google.com with SMTP id fp1so32708pdb.1 for ; Wed, 22 Oct 2014 20:37:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RqcL3B9Cl7MZDg9ck48K6tqbKs0sC0cAP0Bl3pm03MA=; b=YMEZeloIUsjpvzsLRscEvZgVCovPEoFiMmrJ76bzEpfKjGRnjBOwjWH28CIBHFNlOu hkXBuRWd0d8jcUTToOtCEgmnh4cp+tuL9KtFQ7IvCdUs4UnHzubcebV3u1fwhkNuHwTh se0pBtCJtnKaHqxxA6jIl1OIlSeRZ+4GFbOxXt51fgI+Za45CoIXeiV+9gKd2TI+7O7G p5n6Bl3KpB7wGU/4D50TwIHadpXNjzq9p62WRm4LclBr2XWltRlnrrcEvO0MZmMF+a8v RX4S9VbWaw2d3cVpy0KGZTHeG2KJryOlBKnWKs0wwY5FZkCacShssp8JQ+8N94Raf1Gb HcKQ== X-Gm-Message-State: ALoCoQn5WBDhDYX6Ls5aC9M04aDrHycgVJU4CEts2/Ez3F14TMKLN5Non76Xsps8oP4v04dhbW+T X-Received: by 10.66.180.71 with SMTP id dm7mr1710668pac.33.1414035477926; Wed, 22 Oct 2014 20:37:57 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id l45si46532yha.2.2014.10.22.20.37.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Oct 2014 20:37:57 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id Lu5gl6VO.1; Wed, 22 Oct 2014 20:37:57 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 2BFAA22205C; Wed, 22 Oct 2014 21:37:57 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 22 Oct 2014 21:37:13 -0600 Message-Id: <1414035435-17897-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1414035435-17897-1-git-send-email-sjg@chromium.org> References: <1414035435-17897-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 13/15] dm: am335x: Remove serial options from CONFIG_SYS_EXTRA_OPTIONS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de With these options in place it is not possible to change the serial port using 'make menuconfig' or similar. It seems to result in duplicate defines. For example: In file included from include/linux/kconfig.h:4:0, from :0: include/generated/autoconf.h:20:0: note: this is the location of the previous definition #define CONFIG_CONS_INDEX 2 ^ The default option seems to be 1 anyway, in board/ti/am335x/Kconfig. Remove the options so that we can adjust the serial port if required. Signed-off-by: Simon Glass Acked-by: Tom Rini --- Changes in v2: None configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 38450c0..b631c41 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index e257143..5837a0a 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y