From patchwork Wed Sep 25 10:42:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 20565 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D02723A4E for ; Wed, 25 Sep 2013 10:44:11 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht10sf5133103vcb.5 for ; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=/GbLGSWA5m9dA/WkH8RF+iYfvN8yP2Ka5NpNSVCJrRE=; b=c794NNGiaWSQIn2Ne7ilKNe+AyS63osz/K6Odccfz/htkS1Vw74IWckrBtCzYC2F45 ejvBtECJAUsmhL0pcI3RmudRVXIAGxVMOSQWMDXort/vYfWM1fiuW45d58sQSaeEtNZK iESSrFt3rutKE2kqTCUZCOAIIOBUFR5IwsJEhLGjZ68ht+ClwpaN23WsB9R4WYIVE+xU z4QOpH8AMOr+OXqv6P4SnFfTYRX4J/uFUOeZtzI2ubi4mKK5R7g1yvVbG6qU/Zok6VgA swvt09pPsQoPdxg039/M0nuARr3PqEVwWqT+fIvIOQ/eF6kepLC5qo0O1DrGnMWcYegj vCBA== X-Gm-Message-State: ALoCoQkdvwbb+okajuI5mSA2KHd4ppmCs1BqxRCZWIWXe1J75zWCPyf7J+ColmNSWCNpYlqZxsA1 X-Received: by 10.224.125.72 with SMTP id x8mr1048186qar.5.1380105850625; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.164 with SMTP id ll4ls345254qeb.17.gmail; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) X-Received: by 10.52.103.35 with SMTP id ft3mr27677687vdb.5.1380105850519; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id gw1si9610173vcb.137.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id if17so4313205vcb.32 for ; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) X-Received: by 10.220.237.208 with SMTP id kp16mr32323988vcb.4.1380105850435; Wed, 25 Sep 2013 03:44:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp297642vcz; Wed, 25 Sep 2013 03:44:09 -0700 (PDT) X-Received: by 10.204.229.76 with SMTP id jh12mr41928bkb.44.1380105849233; Wed, 25 Sep 2013 03:44:09 -0700 (PDT) Received: from mail-bk0-f45.google.com (mail-bk0-f45.google.com [209.85.214.45]) by mx.google.com with ESMTPS id ln2si11397658bkb.152.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.45 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.214.45; Received: by mail-bk0-f45.google.com with SMTP id mx11so2148274bkb.18 for ; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) X-Received: by 10.204.247.71 with SMTP id mb7mr27322722bkb.7.1380105848575; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) Received: from slackpad.drs.calxeda.com (g224194040.adsl.alicedsl.de. [92.224.194.40]) by mx.google.com with ESMTPSA id pk7sm13866293bkb.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:07 -0700 (PDT) From: Andre Przywara To: Rajeshwari Shinde , Simon Glass , Hatim RV , Chander Kashyap Cc: albert.u.boot@aribaud.net, trini@ti.com, u-boot@lists.denx.de, patches@linaro.org, Andre Przywara Subject: [PATCH 4/5] ARM: snow: move defines for Chromebook embedded controller Date: Wed, 25 Sep 2013 12:42:38 +0200 Message-Id: <1380105759-9687-5-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1380105759-9687-1-git-send-email-andre.przywara@linaro.org> References: <1380105759-9687-1-git-send-email-andre.przywara@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , AFAIK the CROS_EC is only available on the Chromebook. So move the corresponding define to the snow config file and include the keyboard only in this case. Also the LCD should be protected in the same way, though this seems to be also valid for the SMDK5250 board. Unfortunately compilation breaks for the SMDK5250 without the CROS_EC define, so pull it in for this board too for the time being. Signed-off-by: Andre Przywara --- include/configs/exynos5250-dt.h | 22 +++++++++++++++++----- include/configs/smdk5250.h | 1 + include/configs/snow.h | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index e855745..5f44684 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -74,23 +74,35 @@ #define CONFIG_SILENT_CONSOLE /* Enable keyboard */ -#define CONFIG_CROS_EC /* CROS_EC protocol */ +#ifdef CONFIG_CROS_EC /* ChromeOS embedded controller */ #define CONFIG_CROS_EC_SPI /* Support CROS_EC over SPI */ #define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ #define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ #define CONFIG_CMD_CROS_EC #define CONFIG_KEYBOARD +#endif /* Console configuration */ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define EXYNOS_DEVICE_SETTINGS \ - "stdin=serial,cros-ec-keyb\0" \ - "stdout=serial,lcd\0" \ + +#ifdef CONFIG_KEYBOARD +#define EXYNOS_DEVICE_INPUT "stdin=serial,cros-ec-keyb\0" +#else +#define EXYNOS_DEVICE_INPUT "stdin=serial\0" +#endif + +#ifdef CONFIG_LCD +#define EXYNOS_DEVICE_OUTPUT "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" +#else +#define EXYNOS_DEVICE_OUTPUT "stdout=serial\0" \ + "stderr=serial\0" +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - EXYNOS_DEVICE_SETTINGS + EXYNOS_DEVICE_INPUT \ + EXYNOS_DEVICE_OUTPUT /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index b1bb783..b8150e9 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -13,6 +13,7 @@ #define CONFIG_SPI_FLASH #define CONFIG_LCD #define CONFIG_CMD_SOUND +#define CONFIG_CROS_EC #include diff --git a/include/configs/snow.h b/include/configs/snow.h index 4d34c48..0cf7322 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -13,6 +13,7 @@ #define CONFIG_SPI_FLASH #define CONFIG_LCD #define CONFIG_CMD_SOUND +#define CONFIG_CROS_EC #include