Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot

[oweals/u-boot.git] / disk / part_mac.c

diff --git a/disk/part_mac.c b/disk/part_mac.c
index 3952b8d37932cb9d894e475590ed20e097151a75..8b2c004027cf11d1ec44a9dbe7bb2ee34a7793d4 100644 (file)
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -19,7 +18,7 @@
 #include <ide.h>
 #include "part_mac.h"
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
 /* stdlib.h causes some compatibility problems; should fixe these! -- wd */
 #ifndef __ldiv_t_defined
@@ -47,7 +46,10 @@ static int part_test_mac(struct blk_desc *dev_desc)
        ulong i, n;
 
        if (part_mac_read_ddb (dev_desc, ddesc)) {
-               /* error reading Driver Desriptor Block, or no valid Signature */
+               /*
+                * error reading Driver Descriptor Block,
+                * or no valid Signature
+                */
                return (-1);
        }
 
@@ -71,7 +73,10 @@ static void part_print_mac(struct blk_desc *dev_desc)
        ldiv_t mb, gb;
 
        if (part_mac_read_ddb (dev_desc, ddesc)) {
-               /* error reading Driver Desriptor Block, or no valid Signature */
+               /*
+                * error reading Driver Descriptor Block,
+                * or no valid Signature
+                */
                return;
        }
 
@@ -153,15 +158,11 @@ static int part_mac_read_ddb(struct blk_desc *dev_desc,
                             mac_driver_desc_t *ddb_p)
 {
        if (blk_dread(dev_desc, 0, 1, (ulong *)ddb_p) != 1) {
-               printf ("** Can't read Driver Desriptor Block **\n");
+               debug("** Can't read Driver Descriptor Block **\n");
                return (-1);
        }
 
        if (ddb_p->signature != MAC_DRIVER_MAGIC) {
-#if 0
-               printf ("** Bad Signature: expected 0x%04x, got 0x%04x\n",
-                       MAC_DRIVER_MAGIC, ddb_p->signature);
-#endif
                return (-1);
        }
        return (0);
@@ -239,6 +240,7 @@ static int part_get_info_mac(struct blk_desc *dev_desc, int part,
 U_BOOT_PART_TYPE(mac) = {
        .name           = "MAC",
        .part_type      = PART_TYPE_MAC,
+       .max_entries    = MAC_ENTRY_NUMBERS,
        .get_info       = part_get_info_mac,
        .print          = part_print_mac,
        .test           = part_test_mac,