public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Matthew McClintock <msm@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] disk/part.c: Make features optional
Date: Mon, 23 May 2011 13:29:11 -0500	[thread overview]
Message-ID: <1306175353-2983-1-git-send-email-msm@freescale.com> (raw)

If we don't want to build support for any partition types we can now
add #undef CONFIG_PARTITIONS in a board config file to keep this from
being compiled in. Otherwise boards assume this is compiled in by
default

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 common/cmd_mmc.c          |    2 ++
 disk/Makefile             |    2 +-
 drivers/mmc/mmc.c         |    2 ++
 include/config_defaults.h |    1 +
 4 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 6166749..8e65720 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -168,7 +168,9 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			mmc_dev = mmc_get_dev(dev);
 			if (mmc_dev != NULL &&
 			    mmc_dev->type != DEV_TYPE_UNKNOWN) {
+#ifdef CONFIG_PARTITIONS
 				print_part(mmc_dev);
+#endif
 				return 0;
 			}
 
diff --git a/disk/Makefile b/disk/Makefile
index 17266a2..5affe34 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)libdisk.o
 
-COBJS-y += part.o
+COBJS-$(CONFIG_PARTITIONS) 	+= part.o
 COBJS-$(CONFIG_MAC_PARTITION)   += part_mac.o
 COBJS-$(CONFIG_DOS_PARTITION)   += part_dos.o
 COBJS-$(CONFIG_ISO_PARTITION)   += part_iso.o
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 7e69faf..ea5cdcb 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1012,7 +1012,9 @@ int mmc_startup(struct mmc *mmc)
 			(mmc->cid[1] >> 8) & 0xff, mmc->cid[1] & 0xff);
 	sprintf(mmc->block_dev.revision, "%d.%d", mmc->cid[2] >> 28,
 			(mmc->cid[2] >> 24) & 0xf);
+#ifdef CONFIG_PARTITIONS
 	init_part(&mmc->block_dev);
+#endif
 
 	return 0;
 }
diff --git a/include/config_defaults.h b/include/config_defaults.h
index 0337163..d023c63 100644
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -16,5 +16,6 @@
 
 #define CONFIG_GZIP 1
 #define CONFIG_ZLIB 1
+#define CONFIG_PARTITIONS 1
 
 #endif
-- 
1.7.3.4

             reply	other threads:[~2011-05-23 18:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-23 18:29 Matthew McClintock [this message]
2011-05-23 18:29 ` [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm Matthew McClintock
2011-05-23 18:29   ` [U-Boot] [PATCH 3/3] common/cmd_ximg.c: add ifdef protection for gzip uncompression Matthew McClintock
2011-05-24  3:10     ` Mike Frysinger
2011-05-24 15:48       ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-07-26 12:28         ` Wolfgang Denk
2011-05-24  3:12   ` [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm Mike Frysinger
2011-05-24 15:47     ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-06-01 15:10       ` Mike Frysinger
2011-06-01 15:55         ` McClintock Matthew-B29882
2011-06-01 16:59           ` Mike Frysinger
2011-06-01 17:58             ` McClintock Matthew-B29882
2011-06-01 17:56         ` Scott Wood
2011-06-01 19:21         ` Wolfgang Denk
2011-06-02 14:56           ` Mike Frysinger
2011-05-23 21:21 ` [U-Boot] [PATCH 1/3] disk/part.c: Make features optional Kumar Gala
2011-05-23 21:49   ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-05-24  3:08     ` Mike Frysinger
2011-05-24 15:31       ` [U-Boot] [PATCH v3 " Matthew McClintock

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1306175353-2983-1-git-send-email-msm@freescale.com \
    --to=msm@freescale.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox