summaryrefslogtreecommitdiff
path: root/board/esd/dasa_sim
diff options
context:
space:
mode:
Diffstat (limited to 'board/esd/dasa_sim')
-rw-r--r--board/esd/dasa_sim/Makefile3
-rw-r--r--board/esd/dasa_sim/cmd_dasa_sim.c299
-rw-r--r--board/esd/dasa_sim/eeprom.c8
-rw-r--r--board/esd/dasa_sim/flash.c22
-rw-r--r--board/esd/dasa_sim/u-boot.lds5
5 files changed, 171 insertions, 166 deletions
diff --git a/board/esd/dasa_sim/Makefile b/board/esd/dasa_sim/Makefile
index 29aaf3b..e3b1c87 100644
--- a/board/esd/dasa_sim/Makefile
+++ b/board/esd/dasa_sim/Makefile
@@ -1,3 +1,4 @@
+
#
# (C) Copyright 2000
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -28,7 +29,7 @@ LIB = lib$(BOARD).a
OBJS = $(BOARD).o flash.o cmd_dasa_sim.o eeprom.o ../common/pci.o
$(LIB): $(OBJS)
- $(AR) crv $@ $^
+ $(AR) crv $@ $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c
index 4608da7..0ebe09e 100644
--- a/board/esd/dasa_sim/cmd_dasa_sim.c
+++ b/board/esd/dasa_sim/cmd_dasa_sim.c
@@ -42,195 +42,194 @@ extern u_long pci9054_iobase;
*
*/
-static unsigned int PciEepromReadLongVPD(int offs)
+static unsigned int PciEepromReadLongVPD (int offs)
{
- unsigned int value;
- unsigned int ret;
- int count;
-
- pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x4c, (offs<<16) | 0x0003);
- count = 0;
-
- for (;;)
- {
- udelay(10 * 1000);
- pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x4c, &ret);
- if ((ret & 0x80000000) != 0)
- {
- break;
- }
- else
- {
- count++;
- if (count > 10)
- {
- printf("\nTimeout: ret=%08x - Please try again!\n", ret);
- break;
- }
- }
- }
-
- pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x50, &value);
-
- return value;
+ unsigned int value;
+ unsigned int ret;
+ int count;
+
+ pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c,
+ (offs << 16) | 0x0003);
+ count = 0;
+
+ for (;;) {
+ udelay (10 * 1000);
+ pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret);
+ if ((ret & 0x80000000) != 0) {
+ break;
+ } else {
+ count++;
+ if (count > 10) {
+ printf ("\nTimeout: ret=%08x - Please try again!\n", ret);
+ break;
+ }
+ }
+ }
+
+ pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x50, &value);
+
+ return value;
}
-static int PciEepromWriteLongVPD(int offs, unsigned int value)
+static int PciEepromWriteLongVPD (int offs, unsigned int value)
{
- unsigned int ret;
- int count;
-
- pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x50, value);
- pci_write_config_dword(CFG_PCI9054_DEV_FN, 0x4c, (offs<<16) | 0x80000003);
- count = 0;
-
- for (;;)
- {
- udelay(10 * 1000);
- pci_read_config_dword(CFG_PCI9054_DEV_FN, 0x4c, &ret);
- if ((ret & 0x80000000) == 0)
- {
- break;
- }
- else
- {
- count++;
- if (count > 10)
- {
- printf("\nTimeout: ret=%08x - Please try again!\n", ret);
- break;
- }
- }
- }
-
- return TRUE;
+ unsigned int ret;
+ int count;
+
+ pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x50, value);
+ pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c,
+ (offs << 16) | 0x80000003);
+ count = 0;
+
+ for (;;) {
+ udelay (10 * 1000);
+ pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret);
+ if ((ret & 0x80000000) == 0) {
+ break;
+ } else {
+ count++;
+ if (count > 10) {
+ printf ("\nTimeout: ret=%08x - Please try again!\n", ret);
+ break;
+ }
+ }
+ }
+
+ return TRUE;
}
-static void showPci9054(void)
+static void showPci9054 (void)
{
- int val;
- int l, i;
-
- /* read 9054-values */
- for (l=0; l<6; l++)
- {
- printf("%02x: ", l*0x10);
- for (i=0; i<4; i++)
- {
- pci_read_config_dword(CFG_PCI9054_DEV_FN, l*16+i*4, &val);
- printf("%08x ", val);
- }
- printf("\n");
- }
- printf("\n");
-
- for (l=0; l<7; l++)
- {
- printf("%02x: ", l*0x10);
- for (i=0; i<4; i++)
- printf("%08x ", PciEepromReadLongVPD((i+l*4)*4));
- printf("\n");
- }
- printf("\n");
+ int val;
+ int l, i;
+
+ /* read 9054-values */
+ for (l = 0; l < 6; l++) {
+ printf ("%02x: ", l * 0x10);
+ for (i = 0; i < 4; i++) {
+ pci_read_config_dword (CFG_PCI9054_DEV_FN,
+ l * 16 + i * 4,
+ &val);
+ printf ("%08x ", val);
+ }
+ printf ("\n");
+ }
+ printf ("\n");
+
+ for (l = 0; l < 7; l++) {
+ printf ("%02x: ", l * 0x10);
+ for (i = 0; i < 4; i++)
+ printf ("%08x ",
+ PciEepromReadLongVPD ((i + l * 4) * 4));
+ printf ("\n");
+ }
+ printf ("\n");
}
-static void updatePci9054(void)
+static void updatePci9054 (void)
{
- int val;
+ int val;
- /*
- * Set EEPROM write-protect register to 0
- */
- out32(pci9054_iobase+0x0c, in32(pci9054_iobase+0x0c) & 0xffff00ff);
+ /*
+ * Set EEPROM write-protect register to 0
+ */
+ out32 (pci9054_iobase + 0x0c,
+ in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
- /* Long Serial EEPROM Load Registers... */
- val = PciEepromWriteLongVPD(0x00, 0x905410b5);
- val = PciEepromWriteLongVPD(0x04, 0x09800001); /* other input controller */
- val = PciEepromWriteLongVPD(0x08, 0x28140100);
+ /* Long Serial EEPROM Load Registers... */
+ val = PciEepromWriteLongVPD (0x00, 0x905410b5);
+ val = PciEepromWriteLongVPD (0x04, 0x09800001); /* other input controller */
+ val = PciEepromWriteLongVPD (0x08, 0x28140100);
- val = PciEepromWriteLongVPD(0x0c, 0x00000000); /* MBOX0... */
- val = PciEepromWriteLongVPD(0x10, 0x00000000);
+ val = PciEepromWriteLongVPD (0x0c, 0x00000000); /* MBOX0... */
+ val = PciEepromWriteLongVPD (0x10, 0x00000000);
- /* las0: fpga access (0x0000.0000 ... 0x0003.ffff) */
- val = PciEepromWriteLongVPD(0x14, 0xfffc0000); /* LAS0RR... */
- val = PciEepromWriteLongVPD(0x18, 0x00000001); /* LAS0BA */
+ /* las0: fpga access (0x0000.0000 ... 0x0003.ffff) */
+ val = PciEepromWriteLongVPD (0x14, 0xfffc0000); /* LAS0RR... */
+ val = PciEepromWriteLongVPD (0x18, 0x00000001); /* LAS0BA */
- val = PciEepromWriteLongVPD(0x1c, 0x00200000); /* MARBR... */
- val = PciEepromWriteLongVPD(0x20, 0x00300500); /* LMISC/BIGEND */
+ val = PciEepromWriteLongVPD (0x1c, 0x00200000); /* MARBR... */
+ val = PciEepromWriteLongVPD (0x20, 0x00300500); /* LMISC/BIGEND */
- val = PciEepromWriteLongVPD(0x24, 0x00000000); /* EROMRR... */
- val = PciEepromWriteLongVPD(0x28, 0x00000000); /* EROMBA */
+ val = PciEepromWriteLongVPD (0x24, 0x00000000); /* EROMRR... */
+ val = PciEepromWriteLongVPD (0x28, 0x00000000); /* EROMBA */
- val = PciEepromWriteLongVPD(0x2c, 0x43030000); /* LBRD0... */
+ val = PciEepromWriteLongVPD (0x2c, 0x43030000); /* LBRD0... */
- val = PciEepromWriteLongVPD(0x30, 0x00000000); /* DMRR... */
- val = PciEepromWriteLongVPD(0x34, 0x00000000);
- val = PciEepromWriteLongVPD(0x38, 0x00000000);
+ val = PciEepromWriteLongVPD (0x30, 0x00000000); /* DMRR... */
+ val = PciEepromWriteLongVPD (0x34, 0x00000000);
+ val = PciEepromWriteLongVPD (0x38, 0x00000000);
- val = PciEepromWriteLongVPD(0x3c, 0x00000000); /* DMPBAM... */
- val = PciEepromWriteLongVPD(0x40, 0x00000000);
+ val = PciEepromWriteLongVPD (0x3c, 0x00000000); /* DMPBAM... */
+ val = PciEepromWriteLongVPD (0x40, 0x00000000);
- /* Extra Long Serial EEPROM Load Registers... */
- val = PciEepromWriteLongVPD(0x44, 0x010212fe); /* PCISID... */
+ /* Extra Long Serial EEPROM Load Registers... */
+ val = PciEepromWriteLongVPD (0x44, 0x010212fe); /* PCISID... */
- /* las1: 505-sram access (0x0004.0000 ... 0x001f.ffff) */
- /* Offset to LAS1: Group 1: 0x00040000 */
- /* Group 2: 0x00080000 */
- /* Group 3: 0x000c0000 */
- val = PciEepromWriteLongVPD(0x48, 0xffe00000); /* LAS1RR */
- val = PciEepromWriteLongVPD(0x4c, 0x00040001); /* LAS1BA */
- val = PciEepromWriteLongVPD(0x50, 0x00000208); /* LBRD1 */ /* so wars bisher */
+ /* las1: 505-sram access (0x0004.0000 ... 0x001f.ffff) */
+ /* Offset to LAS1: Group 1: 0x00040000 */
+ /* Group 2: 0x00080000 */
+ /* Group 3: 0x000c0000 */
+ val = PciEepromWriteLongVPD (0x48, 0xffe00000); /* LAS1RR */
+ val = PciEepromWriteLongVPD (0x4c, 0x00040001); /* LAS1BA */
+ val = PciEepromWriteLongVPD (0x50, 0x00000208); /* LBRD1 */ /* so wars bisher */
- val = PciEepromWriteLongVPD(0x54, 0x00004c06); /* HotSwap... */
+ val = PciEepromWriteLongVPD (0x54, 0x00004c06); /* HotSwap... */
- printf("Finished writing defaults into PLX PCI9054 EEPROM!\n");
+ printf ("Finished writing defaults into PLX PCI9054 EEPROM!\n");
}
-static void clearPci9054(void)
+static void clearPci9054 (void)
{
- int val;
+ int val;
- /*
- * Set EEPROM write-protect register to 0
- */
- out32(pci9054_iobase+0x0c, in32(pci9054_iobase+0x0c) & 0xffff00ff);
+ /*
+ * Set EEPROM write-protect register to 0
+ */
+ out32 (pci9054_iobase + 0x0c,
+ in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
- /* Long Serial EEPROM Load Registers... */
- val = PciEepromWriteLongVPD(0x00, 0xffffffff);
- val = PciEepromWriteLongVPD(0x04, 0xffffffff); /* other input controller */
+ /* Long Serial EEPROM Load Registers... */
+ val = PciEepromWriteLongVPD (0x00, 0xffffffff);
+ val = PciEepromWriteLongVPD (0x04, 0xffffffff); /* other input controller */
- printf("Finished clearing PLX PCI9054 EEPROM!\n");
+ printf ("Finished clearing PLX PCI9054 EEPROM!\n");
}
/* ------------------------------------------------------------------------- */
-int do_pci9054(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_pci9054 (cmd_tbl_t * cmdtp, int flag, int argc,
+ char *argv[])
{
- if (strcmp(argv[1], "info") == 0)
- {
- showPci9054();
- return 0;
- }
-
- if (strcmp(argv[1], "update") == 0)
- {
- updatePci9054();
- return 0;
- }
-
- if (strcmp(argv[1], "clear") == 0)
- {
- clearPci9054();
- return 0;
- }
-
- printf("Usage:\n%s\n", cmdtp->usage);
- return 1;
+ if (strcmp (argv[1], "info") == 0) {
+ showPci9054 ();
+ return 0;
+ }
+
+ if (strcmp (argv[1], "update") == 0) {
+ updatePci9054 ();
+ return 0;
+ }
+
+ if (strcmp (argv[1], "clear") == 0) {
+ clearPci9054 ();
+ return 0;
+ }
+
+ printf ("Usage:\n%s\n", cmdtp->usage);
+ return 1;
}
+cmd_tbl_t U_BOOT_CMD (pci9054) = MK_CMD_ENTRY(
+ "pci9054", 3, 1, do_pci9054,
+ "pci9054 - PLX PCI9054 EEPROM access\n",
+ "pci9054 info - print EEPROM values\n"
+ "pci9054 update - updates EEPROM with default values\n"
+);
+
/* ------------------------------------------------------------------------- */
diff --git a/board/esd/dasa_sim/eeprom.c b/board/esd/dasa_sim/eeprom.c
index 59ef1d6..1b4c7b3 100644
--- a/board/esd/dasa_sim/eeprom.c
+++ b/board/esd/dasa_sim/eeprom.c
@@ -46,7 +46,7 @@ unsigned int eepromReadLong(int offs)
ret = *(unsigned short *)EEPROM_CAP;
if ((ret & 0x8000) != 0)
- break;
+ break;
}
value = *(unsigned long *)EEPROM_DATA;
@@ -83,7 +83,7 @@ void eepromWriteLong(int offs, unsigned int value)
ret = *(unsigned short *)EEPROM_CAP;
if ((ret & 0x8000) == 0)
- break;
+ break;
}
}
@@ -107,7 +107,7 @@ void i2c_read (uchar *addr, int alen, uchar *buffer, int len)
int i;
int len2, ptr;
- /* printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); // test-only */
+ /* printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); /###* test-only */
ptr = *(short *)addr;
@@ -146,7 +146,7 @@ void i2c_write (uchar *addr, int alen, uchar *buffer, int len)
int i;
int len2, ptr;
- /* printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); // test-only */
+ /* printf("\naddr=%x alen=%x buffer=%x len=%x", addr[0], addr[1], *(short *)addr, alen, buffer, len); /###* test-only */
ptr = *(short *)addr;
diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c
index 32cd64c..d2ac13f 100644
--- a/board/esd/dasa_sim/flash.c
+++ b/board/esd/dasa_sim/flash.c
@@ -43,8 +43,8 @@ static void flash_get_offsets (ulong base, flash_info_t *info);
unsigned long flash_init (void)
{
unsigned long size_b0;
- int i;
- unsigned long base_b0;
+ int i;
+ unsigned long base_b0;
/* Init: no FLASHes known */
for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -60,18 +60,18 @@ unsigned long flash_init (void)
size_b0, size_b0<<20);
}
- /* Setup offsets */
- flash_get_offsets (-size_b0, &flash_info[0]);
+ /* Setup offsets */
+ flash_get_offsets (-size_b0, &flash_info[0]);
- base_b0 = -size_b0;
+ base_b0 = -size_b0;
- /* Monitor protection ON by default */
- (void)flash_protect(FLAG_PROTECT_SET,
- -monitor_flash_len,
- 0xffffffff,
- &flash_info[0]);
+ /* Monitor protection ON by default */
+ (void)flash_protect(FLAG_PROTECT_SET,
+ -monitor_flash_len,
+ 0xffffffff,
+ &flash_info[0]);
- flash_info[0].size = size_b0;
+ flash_info[0].size = size_b0;
return (size_b0);
}
diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index 03c0cef..5e7b225 100644
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -133,6 +133,11 @@ SECTIONS
_edata = .;
PROVIDE (edata = .);
+ __u_boot_cmd_start = .;
+ .u_boot_cmd : { *(.u_boot_cmd) }
+ __u_boot_cmd_end = .;
+
+
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;
generated by cgit v1.1 at 2024-12-02 23:15:39 +0000