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: 277788 X-Patchwork-Delegate: promsoft@gmail.com 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 3AA842C00C5 for ; Wed, 25 Sep 2013 20:45:11 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2D8B24A07F; Wed, 25 Sep 2013 12:45:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 mZk6s0C1xdNb; Wed, 25 Sep 2013 12:45:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E65054A09B; Wed, 25 Sep 2013 12:44:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA3384A07F for ; Wed, 25 Sep 2013 12:44:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 bEhvKF-JASyH for ; Wed, 25 Sep 2013 12:44:16 +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-bk0-f42.google.com (mail-bk0-f42.google.com [209.85.214.42]) by theia.denx.de (Postfix) with ESMTPS id 438444A067 for ; Wed, 25 Sep 2013 12:44:07 +0200 (CEST) Received: by mail-bk0-f42.google.com with SMTP id my10so2254597bkb.1 for ; Wed, 25 Sep 2013 03:44:06 -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=eaF1wwt3+yCJYUoR8eadyQDbTZzggc3L33Tv070OBk8=; b=iB5jkuHy5Z0Qn96CFDBUxHRlkY2iXqWxXbi/ZHzdezjZgGHEPnjBSoSatKwdCGKxnQ Cxi5VTbdcTdrf9uFQWw6FvsdBnj4Tw1gOd1a/NP1SSLU8Dh4GoCHPzeAxvYqOfEUNE+r CAcQBOxcu0t778ixIitY/p6tAcr2PpaMOKvfolnQSScnLPU0PKWbvoBSdjTXCTrsSwnN 0/BSndeK+Z5ioCFZbfpIvr/uXCCRvm9nIySyfbE51eiQI+GAy/a2gxhf7v0bisbLnsQK mEGXXPUEbTVobf6hEta9ifJPqXBm5j6XVXOp1BMZAx6U93WBDoHht7RdxOjQVz0brVqs p6XQ== X-Gm-Message-State: ALoCoQljjlWSVcO2BsLekb/1HUXa1+lob9Dezbi2sAAgQaEv+omsbLcodgfY0eSFu6QoLln135iz 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 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> Cc: trini@ti.com, patches@linaro.org, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/5] ARM: Exynos5250: move feature defines out of generic config file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 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 */