imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / common / cmd_pci.c

diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 45085462fc8d66872e8b3e1f9f8f73a53da32f41..8a260df8bb1d7b07c216482fe326abed472aeae3 100755 (executable)
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -30,18 +30,11 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_PCI
-
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCI)
-
-extern int cmd_get_data_size(char* arg, int default_size);
-
 unsigned char  ShortPCIListing = 1;
 
 /*
@@ -55,7 +48,7 @@ void pci_header_show_brief(pci_dev_t dev);
  * Subroutine:  pciinfo
  *
  * Description: Show information about devices on PCI bus.
- *                             Depending on the define CFG_SHORT_PCI_LISTING
+ *                             Depending on the define CONFIG_SYS_SHORT_PCI_LISTING
  *                             the output will be more or less exhaustive.
  *
  * Inputs:     bus_no          the number of the bus to be scanned.
@@ -178,7 +171,7 @@ static char *pci_classes_str(u8 class)
  * Subroutine:  pci_header_show_brief
  *
  * Description: Reads and prints the header of the
- *             specified PCI device in short form.
+ *             specified PCI device in short form.
  *
  * Inputs:     dev      Bus+Device+Function number
  *
@@ -541,7 +534,7 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        return 1;
  usage:
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 
@@ -550,7 +543,7 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        pci,    5,      1,      do_pci,
-       "pci     - list and access PCI Configuration Space\n",
+       "list and access PCI Configuration Space",
        "[bus] [long]\n"
        "    - short or long list of PCI devices on bus 'bus'\n"
        "pci header b.d.f\n"
@@ -562,9 +555,5 @@ U_BOOT_CMD(
        "pci modify[.b, .w, .l] b.d.f address\n"
        "    -  modify, auto increment CFG address\n"
        "pci write[.b, .w, .l] b.d.f address value\n"
-       "    - write to CFG address\n"
+       "    - write to CFG address"
 );
-
-#endif /* (CONFIG_COMMANDS & CFG_CMD_PCI) */
-
-#endif /* CONFIG_PCI */