projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input: Add generic keyboard input handler
[oweals/u-boot.git]
/
board
/
evb64260
/
zuma_pbb.c
diff --git
a/board/evb64260/zuma_pbb.c
b/board/evb64260/zuma_pbb.c
index c55d428f227a6ba4d1bb745d68306bcb32142b03..aa15fa015cfb2016337da093cbd38cbd002689d7 100644
(file)
--- a/
board/evb64260/zuma_pbb.c
+++ b/
board/evb64260/zuma_pbb.c
@@
-149,8
+149,10
@@
void zuma_init_pbb (void)
pci_read_config_dword (dev, PCI_BASE_ADDRESS_0, &iobase);
pci_read_config_dword (dev, PCI_BASE_ADDRESS_0, &iobase);
- zuma_pbb_reg =
- (PBB_DMA_REG_MAP *) (iobase & PCI_BASE_ADDRESS_MEM_MASK);
+ iobase &= PCI_BASE_ADDRESS_MEM_MASK;
+
+ zuma_pbb_reg = (PBB_DMA_REG_MAP *)iobase;
+
if (!zuma_pbb_reg) {
printf ("zuma pbb bar none! (hah hah, get it?)\n");
if (!zuma_pbb_reg) {
printf ("zuma pbb bar none! (hah hah, get it?)\n");
@@
-172,14
+174,14
@@
static int last_cmd = 4; /* write increment */
static int last_size = 64;
int
static int last_size = 64;
int
-do_zuma_init_pbb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_init_pbb (cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
zuma_init_pbb ();
return 0;
}
int
{
zuma_init_pbb ();
return 0;
}
int
-do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
if (argc > 1) {
last_cmd = simple_strtoul (argv[1], NULL, 10);
{
if (argc > 1) {
last_cmd = simple_strtoul (argv[1], NULL, 10);
@@
-192,7
+194,7
@@
do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
int
}
int
-do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
zuma_mbox_init ();
return 0;
{
zuma_mbox_init ();
return 0;
@@
-200,21
+202,19
@@
do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
zinit, 1, 0, do_zuma_init_pbb,
U_BOOT_CMD(
zinit, 1, 0, do_zuma_init_pbb,
- "
zinit - init zuma pbb\n
",
+ "
init zuma pbb
",
"\n"
"\n"
- " - init zuma pbb\n"
);
U_BOOT_CMD(
zdtest, 3, 1, do_zuma_test_dma,
);
U_BOOT_CMD(
zdtest, 3, 1, do_zuma_test_dma,
- "
zdtest - run dma test\n
",
+ "
run dma test
",
"[cmd [count]]\n"
"[cmd [count]]\n"
- " - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes
\n
"
+ " - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes"
);
U_BOOT_CMD(
zminit, 1, 0, do_zuma_init_mbox,
);
U_BOOT_CMD(
zminit, 1, 0, do_zuma_init_mbox,
- "
zminit - init zuma mbox\n
",
+ "
init zuma mbox
",
"\n"
"\n"
- " - init zuma mbox\n"
);
);
-#endif
/* CFG_CMD_BSP */
+#endif