esd PMC405 board updated

[u-boot] / disk / part.c

diff --git a/disk/part.c b/disk/part.c
index 90d6644ae44b4049478dfe346971262b3f4ae0b0..2255e726cf5c687994e7e7d7c138413bc2acd374 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -36,7 +36,8 @@
 #if ((CONFIG_COMMANDS & CFG_CMD_IDE)   || \
      (CONFIG_COMMANDS & CFG_CMD_SCSI)  || \
      (CONFIG_COMMANDS & CFG_CMD_USB)   || \
-     (CONFIG_MMC) || (CONFIG_SYSTEMACE) )
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) )
 
 /* ------------------------------------------------------------------------- */
 /*
@@ -87,12 +88,8 @@ void dev_print (block_dev_desc_t *dev_desc)
        if ((dev_desc->lba * dev_desc->blksz)>0L) {
                ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem;
                lbaint_t lba;
-#ifdef CONFIG_LBA48
-               if (dev_desc->lba48support)
-                       lba = dev_desc->lba48;
-               else
-#endif
-                       lba = dev_desc->lba;
+
+               lba = dev_desc->lba;
 
                lba512 = (lba * (dev_desc->blksz/512));
                mb = (10 * lba512) / 2048;      /* 2048 = (1024 * 1024) / 512 MB */
@@ -104,7 +101,7 @@ void dev_print (block_dev_desc_t *dev_desc)
                gb_quot = gb / 10;
                gb_rem  = gb - (10 * gb_quot);
 #ifdef CONFIG_LBA48
-               if (dev_desc->lba48support)
+               if (dev_desc->lba48)
                        printf ("            Supports 48-bit addressing\n");
 #endif
 #if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF)