From df3fc52608daa1e10332f59cd2f226ba400d1c98 Mon Sep 17 00:00:00 2001
From: Matthew McClintock <msm@freescale.com>
Date: Tue, 24 May 2011 05:31:19 +0000
Subject: disk/part.c: Make features optional

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_ide.c     | 2 ++
 common/cmd_sata.c    | 2 ++
 common/cmd_scsi.c    | 3 ++-
 common/usb_storage.c | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 7fbc053310..2e8c6e044a 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -719,10 +719,12 @@ void ide_init (void)
 
 /* ------------------------------------------------------------------------- */
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t * ide_get_dev(int dev)
 {
 	return (dev < CONFIG_SYS_IDE_MAXDEVICE) ? &ide_dev_desc[dev] : NULL;
 }
+#endif
 
 
 #ifdef CONFIG_IDE_8xx_DIRECT
diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index 7efa8597ad..f62c0cb4f2 100644
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -57,10 +57,12 @@ int __sata_initialize(void)
 }
 int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t *sata_get_dev(int dev)
 {
 	return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
 }
+#endif
 
 int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 8e8e930869..fa10751b70 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -194,11 +194,12 @@ void scsi_init(void)
 }
 #endif
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t * scsi_get_dev(int dev)
 {
 	return (dev < CONFIG_SYS_SCSI_MAX_DEVICE) ? &scsi_dev_desc[dev] : NULL;
 }
-
+#endif
 
 /******************************************************************************
  * scsi boot command intepreter. Derived from diskboot
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 9ecf165d1a..16667f3948 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -173,11 +173,12 @@ unsigned long usb_stor_write(int device, unsigned long blknr,
 struct usb_device * usb_get_dev_index(int index);
 void uhci_show_temp_int_td(void);
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t *usb_stor_get_dev(int index)
 {
 	return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL;
 }
-
+#endif
 
 void usb_show_progress(void)
 {
-- 
cgit v1.2.1