From patchwork Fri Nov 20 15:08:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Fontenot X-Patchwork-Id: 38922 X-Patchwork-Delegate: grant.likely@secretlab.ca Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7FAB9100B82 for ; Sat, 21 Nov 2009 02:08:24 +1100 (EST) Received: from e6.ny.us.ibm.com (e6.ny.us.ibm.com [32.97.182.146]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e6.ny.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 845021007D1; Sat, 21 Nov 2009 02:08:12 +1100 (EST) Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e6.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id nAKFDoXP008296; Fri, 20 Nov 2009 10:13:50 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nAKF89Ub111382; Fri, 20 Nov 2009 10:08:09 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nAKB13ME021490; Fri, 20 Nov 2009 06:01:03 -0500 Received: from [9.53.40.155] (mudbug-009053040155.austin.ibm.com [9.53.40.155]) by d01av02.pok.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nAKB10RO020865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Nov 2009 06:01:02 -0500 Message-ID: <4B06B0D5.8080909@austin.ibm.com> Date: Fri, 20 Nov 2009 09:08:05 -0600 From: Nathan Fontenot User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: devicetree-discuss@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org, microblaze-uclinux@itee.uq.edu.au Subject: [PATCH 3/4 v2] Makefile and Kconfig updates References: <4B06AF33.1000400@austin.ibm.com> In-Reply-To: <4B06AF33.1000400@austin.ibm.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Update the Kconfig and Makefile files for drivers/of, powerpc and microblaze to properly configure for CONFIG_OF_DYNAMIC to build the of_dynamic code. Signed-off-by: Nathan Fontenot --- arch/microblaze/Kconfig | 1 + arch/powerpc/Kconfig | 1 + drivers/of/Kconfig | 4 ++++ drivers/of/Makefile | 1 + 4 files changed, 7 insertions(+) Index: test-devicetree/arch/microblaze/Kconfig =================================================================== --- test-devicetree.orig/arch/microblaze/Kconfig 2009-11-20 11:59:01.000000000 -0600 +++ test-devicetree/arch/microblaze/Kconfig 2009-11-20 12:35:41.000000000 -0600 @@ -112,6 +112,7 @@ config OF def_bool y select OF_FLATTREE + select OF_DYNAMIC config PROC_DEVICETREE bool "Support for device tree in /proc" Index: test-devicetree/arch/powerpc/Kconfig =================================================================== --- test-devicetree.orig/arch/powerpc/Kconfig 2009-11-20 11:59:01.000000000 -0600 +++ test-devicetree/arch/powerpc/Kconfig 2009-11-20 12:35:41.000000000 -0600 @@ -164,6 +164,7 @@ config OF def_bool y select OF_FLATTREE + select OF_DYNAMIC config PPC_UDBG_16550 bool Index: test-devicetree/drivers/of/Kconfig =================================================================== --- test-devicetree.orig/drivers/of/Kconfig 2009-11-20 11:59:01.000000000 -0600 +++ test-devicetree/drivers/of/Kconfig 2009-11-20 12:35:41.000000000 -0600 @@ -2,6 +2,10 @@ bool depends on OF +config OF_DYNAMIC + bool + depends on OF + config OF_DEVICE def_bool y depends on OF && (SPARC || PPC_OF || MICROBLAZE) Index: test-devicetree/drivers/of/Makefile =================================================================== --- test-devicetree.orig/drivers/of/Makefile 2009-11-20 11:59:01.000000000 -0600 +++ test-devicetree/drivers/of/Makefile 2009-11-20 12:35:41.000000000 -0600 @@ -1,5 +1,6 @@ obj-y = base.o obj-$(CONFIG_OF_FLATTREE) += fdt.o +obj-$(CONFIG_OF_DYNAMIC) += of_dynamic.o obj-$(CONFIG_OF_DEVICE) += device.o platform.o obj-$(CONFIG_OF_GPIO) += gpio.o obj-$(CONFIG_OF_I2C) += of_i2c.o