From patchwork Sat Feb 7 18:51:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 437592 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 C02D514017B for ; Sun, 8 Feb 2015 05:53:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B73154B6CE; Sat, 7 Feb 2015 19:52:54 +0100 (CET) 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 4DIJRiZPFRjp; Sat, 7 Feb 2015 19:52:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 572654B664; Sat, 7 Feb 2015 19:52:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 960474B585 for ; Sat, 7 Feb 2015 19:52:21 +0100 (CET) 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 dCcZ5-t_394z for ; Sat, 7 Feb 2015 19:52:21 +0100 (CET) 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-yh0-f73.google.com (mail-yh0-f73.google.com [209.85.213.73]) by theia.denx.de (Postfix) with ESMTPS id 984A74A056 for ; Sat, 7 Feb 2015 19:52:17 +0100 (CET) Received: by mail-yh0-f73.google.com with SMTP id f10so1476362yha.0 for ; Sat, 07 Feb 2015 10:52:16 -0800 (PST) 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=KSeZ2PWkXb93ei/1G+7fwDCfTEm5jUt1sj13bJEJmWk=; b=fIugM2tWbgYYqFNMAeWS2zTPCY4WyeUZ4WQn13rop3+odmCaBdBw62sagiu06MdJ+5 m6fG3ngsARWvQKDMobsg0nOExHxJoQaaAfkxSsUDJmpsWt4NSBN65L5pt6xwnQuZ8aAR mjSSKKwT5EfzUv6OonmEHZbu721oTVVdVuXKGAuJnilCl9L0IwHR/lNwOxtUbWhM/GZg Z1QUtPBWFqL5MkS8LLDGnUcFyxgQmFmY36ZfNPJQZnVftzAmxuzmzwxXqQWm1AQDUGPw wgl5PNypQz1AZd4rYjjgITSRWjrFIKJ2ILSY1nv5BKg6ATcdt+qx9VDJKk7B6si7w6VL +FZw== X-Gm-Message-State: ALoCoQkEn3WgSxUZDj/Z0S1ANZ2sfZ6W73onxfCdxu1eHytrKKmA9AAcU2w0x/u1ILBDbc7Hc3Wp X-Received: by 10.224.26.139 with SMTP id e11mr8421332qac.6.1423335136492; Sat, 07 Feb 2015 10:52:16 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id z3si1086918qcn.0.2015.02.07.10.52.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Feb 2015 10:52:16 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id ebgC8QIw.1; Sat, 07 Feb 2015 10:52:16 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A57B4220E7F; Sat, 7 Feb 2015 11:52:15 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 7 Feb 2015 11:51:37 -0700 Message-Id: <1423335112-24585-5-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1423335112-24585-1-git-send-email-sjg@chromium.org> References: <1423335112-24585-1-git-send-email-sjg@chromium.org> Cc: Kim Phillips , Kumar Gala , Andy Fleming , Stefan Roese Subject: [U-Boot] [PATCH v2 04/19] powerpc: ppc4xx: Move CANYONLANDS/GLACIER/ARCHES to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Move these options to Kconfig and remove them from the CONFIG files. Signed-off-by: Simon Glass --- Changes in v2: None board/amcc/canyonlands/Kconfig | 20 ++++++++++++++++++++ configs/arches_defconfig | 2 +- configs/canyonlands_defconfig | 2 +- configs/glacier_defconfig | 2 +- include/configs/canyonlands.h | 2 ++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig index 530a6ef..0fc6877 100644 --- a/board/amcc/canyonlands/Kconfig +++ b/board/amcc/canyonlands/Kconfig @@ -9,4 +9,24 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "canyonlands" +choice BOARD_TYPE + prompt "Select which board to build for" + +config CANYONLANDS + bool "Glacier" + help + Select this to build for the Canyonlands 460EX board. + +config GLACIER + bool "Glacier" + help + Select this to build for the Glacier 460GT board. + +config ARCHES + bool "Arches" + help + Select this to build for the Arches dual 460GT board. + +endchoice + endif diff --git a/configs/arches_defconfig b/configs/arches_defconfig index 18d0a14..60e6ef9 100644 --- a/configs/arches_defconfig +++ b/configs/arches_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARCHES" CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y +CONFIG_ARCHES=y diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index 09b9ab9..37a2b4d 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CANYONLANDS" CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y +CONFIG_CANYONLANDS=y diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index 2a66bfb..436b9f8 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="GLACIER" CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y +CONFIG_GLACIER=y diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 7b1f368..ed790cc 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include + /*----------------------------------------------------------------------- * High Level Configuration Options *----------------------------------------------------------------------*/