| Message ID | 1306175353-2983-1-git-send-email-msm@freescale.com |
|---|---|
| State | Superseded |
| Headers | show |
On May 23, 2011, at 1:29 PM, Matthew McClintock wrote: > 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(-) Can you re-submit against at least v2011.06-rc1, this doesn't apply for me there. - k
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
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(-)