X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fcmd_universe.c;h=58384f3b8bec3a0d485aeaea933182294a7a1133;hb=d510859bed4165ebf2635c74c40a037cd2819fce;hp=8bf0b1f1e28da4d93233a9665fbc63e811ef4cf2;hpb=93f798346033a1f6d22090b47abad4be88243b04;p=karo-tx-uboot.git

diff --git a/common/cmd_universe.c b/common/cmd_universe.c
index 8bf0b1f1e2..58384f3b8b 100644
--- a/common/cmd_universe.c
+++ b/common/cmd_universe.c
@@ -28,8 +28,6 @@
 
 #include <universe.h>
 
-#if defined(CONFIG_CMD_UNIVERSE)
-
 #define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
 #define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
 
@@ -48,7 +46,7 @@ static UNI_DEV   *dev;
 
 int universe_init(void)
 {
-	int j, result, lastError = 0;
+	int j, result;
 	pci_dev_t busdevfn;
 	unsigned int val;
 
@@ -128,8 +126,6 @@ int universe_init(void)
  break_30:
 	free(dev);
  break_20:
-	lastError = result;
-
 	return result;
 }
 
@@ -319,7 +315,7 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
 /*
  * Tundra Universe configuration
  */
-int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	ulong addr1 = 0, addr2 = 0, size = 0, vam = 0, pms = 0, vdw = 0;
 	char cmd = 'x';
@@ -366,7 +362,7 @@ int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
 	universe,	8,	1,	do_universe,
-	"universe- initialize and configure Turndra Universe\n",
+	"initialize and configure Turndra Universe",
 	"init\n"
 	"    - initialize universe\n"
 	"universe vme [vme_addr] [pci_addr] [size] [vam] [pms]\n"
@@ -384,7 +380,5 @@ U_BOOT_CMD(
 	"                                      03 -> Configuration Space\n"
 	"    [vdw] = VMEbus Maximum Datawidth: 01 -> D8 Data Width\n"
 	"                                      02 -> D16 Data Width\n"
-	"                                      03 -> D32 Data Width\n"
+	"                                      03 -> D32 Data Width"
 );
-
-#endif