From patchwork Mon Jun 22 09:27:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 28982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id A06CAB7124 for ; Mon, 22 Jun 2009 19:35:43 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MIftt-00022C-9j; Mon, 22 Jun 2009 09:33:17 +0000 Received: from mail-ew0-f211.google.com ([209.85.219.211]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MIftk-00020f-FW for linux-mtd@lists.infradead.org; Mon, 22 Jun 2009 09:33:15 +0000 Received: by ewy7 with SMTP id 7so7974519ewy.18 for ; Mon, 22 Jun 2009 02:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:cc:content-type :content-transfer-encoding:content-disposition:message-id; bh=roRL1VtVe0sdwozovAL66A+3yTamWxCKGTSet1DhdKQ=; b=CE6ACrWA9pYoXMopDD8Xg3QSrKnAPSzsh31jkQCet6Htbdf0rG46ToqNtZUMdreI9a Hb5uu/B7gFtGQlZE5vj0DwHZTrwSfjYEhoQUkrb00xn5u70ZMPA0l/ctx672x2VzUE9g aLeR7R3OJHSD/JPsZwEhE86Sqo8OQjN7mNaDY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to:cc :content-type:content-transfer-encoding:content-disposition :message-id; b=Vqukv/9QzN+z06yw4ZMKDvqgznUKQhKUU8AF1RtQyYWOYh2O+oEXGlh5IVLOGuoImA 82IWRVYKICkQ+B6sKekOrsLspb0IbH0Uwit13Qs0K+K6dhaBBXulrziNk0ibbPZ4px6A O4KE9kW09PmEqUCesqtXIMjC2D6X1475BSqE8= Received: by 10.211.194.9 with SMTP id w9mr4579753ebp.19.1245662831704; Mon, 22 Jun 2009 02:27:11 -0700 (PDT) Received: from florian.lab.openpattern.org (lab.openpattern.org [82.240.16.241]) by mx.google.com with ESMTPS id 23sm20375eya.39.2009.06.22.02.27.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 22 Jun 2009 02:27:09 -0700 (PDT) From: Florian Fainelli Date: Mon, 22 Jun 2009 11:27:06 +0200 Subject: [PATCH] MTD: enable partition parser in the default list when selected MIME-Version: 1.0 X-UID: 339 X-Length: 1716 To: linux-mtd@lists.infradead.org Content-Disposition: inline Message-Id: <200906221127.06461.florian@openwrt.org> X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 SUBJECT_FUZZY_TION Attempt to obfuscate words in Subject: Cc: David Woodhouse X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch makes the physmap driver use the partition parsers that we enable in the kernel configuration as the list of partition parsers to use when probing the flash chip. Signed-off-by: Florian Fainelli diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 29a9011..2095b60 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -80,7 +80,16 @@ static const char *rom_probe_types[] = { "map_rom", NULL }; #ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; +static const char *part_probe_types[] = { +#ifdef CONFIG_MTD_CMDLINE_PARTS + "cmdlinepart", +#elif defined CONFIG_MTD_REDBOOT_PARTS + "RedBoot", +#elif defined CONFIG_MTD_AR7_PARTS + "ar7part", +#endif + NULL +}; #endif static int physmap_flash_probe(struct platform_device *dev)