projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch from archive libraries to partial linking
[oweals/u-boot.git]
/
common
/
cmd_universe.c
diff --git
a/common/cmd_universe.c
b/common/cmd_universe.c
index 8bf0b1f1e28da4d93233a9665fbc63e811ef4cf2..a86a5746b0d80a6a88af765a7c336fe4794100e8 100644
(file)
--- a/
common/cmd_universe.c
+++ b/
common/cmd_universe.c
@@
-28,8
+28,6
@@
#include <universe.h>
#include <universe.h>
-#if defined(CONFIG_CMD_UNIVERSE)
-
#define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
#define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
#define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
#define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
@@
-319,7
+317,7
@@
int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
/*
* Tundra Universe configuration
*/
/*
* 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';
{
ulong addr1 = 0, addr2 = 0, size = 0, vam = 0, pms = 0, vdw = 0;
char cmd = 'x';
@@
-366,7
+364,7
@@
int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
universe, 8, 1, do_universe,
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"
"init\n"
" - initialize universe\n"
"universe vme [vme_addr] [pci_addr] [size] [vam] [pms]\n"
@@
-384,7
+382,5
@@
U_BOOT_CMD(
" 03 -> Configuration Space\n"
" [vdw] = VMEbus Maximum Datawidth: 01 -> D8 Data Width\n"
" 02 -> D16 Data Width\n"
" 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