Patchwork [U-Boot] disk/partition: Fix the depend for all the partitions file

login
register
mail settings
Submitter seedshope
Date July 21, 2012, 8:48 a.m.
Message ID <1342860534-4710-1-git-send-email-bocui107@gmail.com>
Download mbox | patch
Permalink /patch/172415/
State Changes Requested
Headers show

Comments

seedshope - July 21, 2012, 8:48 a.m.
From: Zhong Hongbo <bocui107@gmail.com>

all the patitions should depend CONFIG_PARTITIONS, no the
CONFIG_CMD_$(device). The device symbol may be SATA, SCSI,
USB, MMC, SYSTEMACE. Or else when the filesystem command be
enabled, But board's configure file can not include any
CONFIG_CMD_$(device), The u-boot will fail build. For example:
CONFIG_CMD_EXT2 is defined in smdk6400.h, but the boards can
not define any disk device. The error of build as following:
---
 disk/part.c       |   21 +++------------------
 disk/part_amiga.c |    6 +-----
 disk/part_dos.c   |    7 +------
 disk/part_efi.c   |    7 +------
 disk/part_iso.c   |    7 +------
 disk/part_mac.c   |    7 +------
 6 files changed, 8 insertions(+), 47 deletions(-)
Wolfgang Denk - Aug. 7, 2012, 8:58 p.m.
Dear Zhong Hongbo,

In message <1342860534-4710-1-git-send-email-bocui107@gmail.com> you wrote:
> From: Zhong Hongbo <bocui107@gmail.com>
> 
> all the patitions should depend CONFIG_PARTITIONS, no the
> CONFIG_CMD_$(device). The device symbol may be SATA, SCSI,
> USB, MMC, SYSTEMACE. Or else when the filesystem command be
> enabled, But board's configure file can not include any
> CONFIG_CMD_$(device), The u-boot will fail build. For example:
> CONFIG_CMD_EXT2 is defined in smdk6400.h, but the boards can
> not define any disk device. The error of build as following:
> ---

It appears some text is missing here - most of all you SoB line...

Best regards,

Wolfgang Denk
seedshope - Aug. 14, 2012, 2:16 p.m.
On 08/08/2012 04:58 AM, Wolfgang Denk wrote:
> Dear Zhong Hongbo,
> 
> In message <1342860534-4710-1-git-send-email-bocui107@gmail.com> you wrote:
>> From: Zhong Hongbo <bocui107@gmail.com>
>>
>> all the patitions should depend CONFIG_PARTITIONS, no the
>> CONFIG_CMD_$(device). The device symbol may be SATA, SCSI,
>> USB, MMC, SYSTEMACE. Or else when the filesystem command be
>> enabled, But board's configure file can not include any
>> CONFIG_CMD_$(device), The u-boot will fail build. For example:
>> CONFIG_CMD_EXT2 is defined in smdk6400.h, but the boards can
>> not define any disk device. The error of build as following:
>> ---
> 
> It appears some text is missing here - most of all you SoB line...
Hi Wolfgang,

Ok, I will fix it.

Thanks,
hongbo
> 
> Best regards,
> 
> Wolfgang Denk
>

Patch

diff --git a/disk/part.c b/disk/part.c
index 76f3939..d296a55 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -34,12 +34,7 @@ 
 #define PRINTF(fmt,args...)
 #endif
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SATA) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC) || \
-     defined(CONFIG_SYSTEMACE) )
+#ifdef CONFIG_PARTITIONS
 
 struct block_drvr {
 	char *name;
@@ -103,12 +98,7 @@  block_dev_desc_t *get_dev(char* ifname, int dev)
 }
 #endif
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SATA) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC) || \
-     defined(CONFIG_SYSTEMACE) )
+#ifdef CONFIG_PARTITIONS
 
 /* ------------------------------------------------------------------------- */
 /*
@@ -238,12 +228,7 @@  void dev_print (block_dev_desc_t *dev_desc)
 }
 #endif
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SATA) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC)		|| \
-     defined(CONFIG_SYSTEMACE) )
+#ifdef CONFIG_PARTITIONS
 
 #if defined(CONFIG_MAC_PARTITION) || \
     defined(CONFIG_DOS_PARTITION) || \
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index dc7d462..5df55c8 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -26,11 +26,7 @@ 
 #include <ide.h>
 #include "part_amiga.h"
 
-#if defined(CONFIG_CMD_IDE) || \
-    defined(CONFIG_CMD_SCSI) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC) || \
-    defined(CONFIG_SYSTEMACE)
+#ifdef CONFIG_PARTITIONS
 
 #undef AMIGA_DEBUG
 
diff --git a/disk/part_dos.c b/disk/part_dos.c
index a43dd9c..b49ebe2 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -35,12 +35,7 @@ 
 #include <ide.h>
 #include "part_dos.h"
 
-#if defined(CONFIG_CMD_IDE) || \
-    defined(CONFIG_CMD_SATA) || \
-    defined(CONFIG_CMD_SCSI) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC) || \
-    defined(CONFIG_SYSTEMACE)
+#ifdef CONFIG_PARTITIONS
 
 /* Convert char[4] in little endian format to the host format integer
  */
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 02927a0..22dc0ea 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -37,12 +37,7 @@ 
 #include "part_efi.h"
 #include <linux/ctype.h>
 
-#if defined(CONFIG_CMD_IDE) || \
-    defined(CONFIG_CMD_SATA) || \
-    defined(CONFIG_CMD_SCSI) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC) || \
-    defined(CONFIG_SYSTEMACE)
+#ifdef CONFIG_PARTITIONS
 
 /* Convert char[2] in little endian format to the host format integer
  */
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 4401790..f929563 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -25,12 +25,7 @@ 
 #include <command.h>
 #include "part_iso.h"
 
-#if defined(CONFIG_CMD_IDE) || \
-    defined(CONFIG_CMD_SCSI) || \
-    defined(CONFIG_CMD_SATA) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC) || \
-    defined(CONFIG_SYSTEMACE)
+#ifdef CONFIG_PARTITIONS
 
 /* #define	ISO_PART_DEBUG */
 
diff --git a/disk/part_mac.c b/disk/part_mac.c
index c1afc8c..c3b2aa3 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -34,12 +34,7 @@ 
 #include <ide.h>
 #include "part_mac.h"
 
-#if defined(CONFIG_CMD_IDE) || \
-    defined(CONFIG_CMD_SCSI) || \
-    defined(CONFIG_CMD_SATA) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC) || \
-    defined(CONFIG_SYSTEMACE)
+#ifdef CONFIG_PARTITIONS
 
 /* stdlib.h causes some compatibility problems; should fixe these! -- wd */
 #ifndef __ldiv_t_defined