From patchwork Wed Sep 25 10:42:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 20564 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1B5B23A4E for ; Wed, 25 Sep 2013 10:44:08 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id j7sf4337240qaq.11 for ; Wed, 25 Sep 2013 03:44:08 -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=eaF1wwt3+yCJYUoR8eadyQDbTZzggc3L33Tv070OBk8=; b=ibfXokGksRwa7Jeqhd/o8fTdfeGocbOWcbZAYaHpAMKoKSFpk9fYIOGuBLB42zy1wi yjFr0KWcMcUEDfZwnBNsYfUjoqXNXlUGgFMu5zgVQKwC7XDrKmHm2wW/u2Y2UVB58Ra+ 3azsYCmvZ0PDBkZgUvMy39qUkC0qWSdrDALWJyhDz02595dQsdDoKLJGk7oCjNK90grW OKR0qak7LGN4+VQS2EOYPre39lGXK/IiFn3LlZIsd24/9aUiAB1fLaXcHa0/ebM2OwOi 2dV+bHxFiCtew9H/56AeG8VYAjxDUo2wE0MDWuGIJnZOZKujFb81MC7aGDgZeOSxi0MH jKpw== X-Gm-Message-State: ALoCoQmrOmxWunNieHmxZ7khLYl3NEgKMDt4g+6L1MFzzDhqFbL38OQddiP4Q2yYe7DSQzaefzj0 X-Received: by 10.224.97.1 with SMTP id j1mr1049684qan.6.1380105848653; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.148 with SMTP id r20ls340459qeq.3.gmail; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) X-Received: by 10.52.161.231 with SMTP id xv7mr27470793vdb.1.1380105848532; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id s17si9620584vcu.89.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id e15so4233158vbg.18 for ; Wed, 25 Sep 2013 03:44:08 -0700 (PDT) X-Received: by 10.220.10.194 with SMTP id q2mr32065950vcq.2.1380105848441; Wed, 25 Sep 2013 03:44:08 -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 u4csp297637vcz; Wed, 25 Sep 2013 03:44:07 -0700 (PDT) X-Received: by 10.204.102.136 with SMTP id g8mr1061331bko.34.1380105847359; Wed, 25 Sep 2013 03:44:07 -0700 (PDT) Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) by mx.google.com with ESMTPS id yf5si11407324bkb.89.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.43 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.214.43; Received: by mail-bk0-f43.google.com with SMTP id mz13so1731799bkb.16 for ; Wed, 25 Sep 2013 03:44:06 -0700 (PDT) X-Received: by 10.204.232.207 with SMTP id jv15mr447913bkb.39.1380105846686; Wed, 25 Sep 2013 03:44:06 -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:05 -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 3/5] ARM: Exynos5250: move feature defines out of generic config file Date: Wed, 25 Sep 2013 12:42:37 +0200 Message-Id: <1380105759-9687-4-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.212.45 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: , The config file exynos5250-dt.h is used by two boards currently. To allow the Arndale board to use it too in the future, move some board specific defines out of that generic file. Update the copyright, header comment and include protection define on the way. Signed-off-by: Andre Przywara --- include/configs/exynos5250-dt.h | 15 ++++----------- include/configs/smdk5250.h | 10 +++++++++- include/configs/snow.h | 10 +++++++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index c8c4b35..e855745 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -1,13 +1,13 @@ /* - * Copyright (C) 2012 Samsung Electronics + * Copyright (C) 2012,2013 Samsung Electronics * - * Configuration settings for the SAMSUNG EXYNOS5250 board. + * Configuration settings for SAMSUNG EXYNOS5250 based boards. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_H -#define __CONFIG_H +#ifndef __CONFIG_EXYNOS_5250_DT_H +#define __CONFIG_EXYNOS_5250_DT_H /* High Level Configuration Options */ #define CONFIG_SAMSUNG /* in a SAMSUNG core */ @@ -165,7 +165,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT "SMDK5250 # " #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ @@ -205,7 +204,6 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS -#define CONFIG_IDENT_STRING " for SMDK5250" #define CONFIG_SYS_MMC_ENV_DEV 0 @@ -258,9 +256,6 @@ #define CONFIG_I2C_EDID /* SPI */ -#define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH - #ifdef CONFIG_SPI_FLASH #define CONFIG_EXYNOS_SPI #define CONFIG_CMD_SF @@ -299,7 +294,6 @@ #endif /* Sound */ -#define CONFIG_CMD_SOUND #ifdef CONFIG_CMD_SOUND #define CONFIG_SOUND #define CONFIG_I2S @@ -317,7 +311,6 @@ #define CONFIG_SHA256 /* Display */ -#define CONFIG_LCD #ifdef CONFIG_LCD #define CONFIG_EXYNOS_FB #define CONFIG_EXYNOS_DP diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 183aae7..b1bb783 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -9,9 +9,17 @@ #ifndef __CONFIG_SMDK_H #define __CONFIG_SMDK_H +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_SPI_FLASH +#define CONFIG_LCD +#define CONFIG_CMD_SOUND + #include -#undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 +#define CONFIG_SYS_PROMPT "SMDK5250 # " + +#define CONFIG_IDENT_STRING " for SMDK5250" + #endif /* __CONFIG_SMDK_H */ diff --git a/include/configs/snow.h b/include/configs/snow.h index ed5c0b6..4d34c48 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -9,9 +9,17 @@ #ifndef __CONFIG_SNOW_H #define __CONFIG_SNOW_H +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_SPI_FLASH +#define CONFIG_LCD +#define CONFIG_CMD_SOUND + #include -#undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow +#define CONFIG_SYS_PROMPT "SMDK5250 # " + +#define CONFIG_IDENT_STRING " for SMDK5250" + #endif /* __CONFIG_SNOW_H */