projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc4xx: Big cleanup of PPC4xx defines
[platform/kernel/u-boot.git]
/
board
/
esd
/
cms700
/
cms700.c
diff --git
a/board/esd/cms700/cms700.c
b/board/esd/cms700/cms700.c
index
d0ee193
..
7a92401
100644
(file)
--- a/
board/esd/cms700/cms700.c
+++ b/
board/esd/cms700/cms700.c
@@
-31,14
+31,6
@@
DECLARE_GLOBAL_DATA_PTR;
extern void lxt971_no_sleep(void);
extern void lxt971_no_sleep(void);
-/* fpga configuration data - not compressed, generated by bin2c */
-const unsigned char fpgadata[] =
-{
-#include "fpgadata.c"
-};
-int filesize = sizeof(fpgadata);
-
-
int board_early_init_f (void)
{
/*
int board_early_init_f (void)
{
/*
@@
-64,7
+56,7
@@
int board_early_init_f (void)
/*
* EBC Configuration Register: set ready timeout to 512 ebc-clks -> ca. 15 us
*/
/*
* EBC Configuration Register: set ready timeout to 512 ebc-clks -> ca. 15 us
*/
- mtebc (
epcr
, 0xa8400000); /* ebc always driven */
+ mtebc (
EBC0_CFG
, 0xa8400000); /* ebc always driven */
/*
* Reset CPLD via GPIO12 (CS3) pin
/*
* Reset CPLD via GPIO12 (CS3) pin
@@
-95,14
+87,12
@@
int misc_init_r (void)
/*
* Check Board Identity:
*/
/*
* Check Board Identity:
*/
-
+#define LED_REG (CONFIG_SYS_PLD_BASE + 0x1000)
int checkboard (void)
{
char str[64];
int flashcnt;
int delay;
int checkboard (void)
{
char str[64];
int flashcnt;
int delay;
- volatile unsigned char *led_reg = (unsigned char *)((ulong)CONFIG_SYS_PLD_BASE + 0x1000);
- volatile unsigned char *ver_reg = (unsigned char *)((ulong)CONFIG_SYS_PLD_BASE + 0x1001);
puts ("Board: ");
puts ("Board: ");
@@
-112,20
+102,21
@@
int checkboard (void)
puts(str);
}
puts(str);
}
- printf(" (PLD-Version=%02d)\n", *ver_reg);
+ printf(" (PLD-Version=%02d)\n",
+ in_8((void *)(CONFIG_SYS_PLD_BASE + 0x1001)));
/*
* Flash LEDs
*/
for (flashcnt = 0; flashcnt < 3; flashcnt++) {
/*
* Flash LEDs
*/
for (flashcnt = 0; flashcnt < 3; flashcnt++) {
-
*led_reg = 0x00;
/* LEDs off */
+
out_8((void *)LED_REG, 0x00);
/* LEDs off */
for (delay = 0; delay < 100; delay++)
udelay(1000);
for (delay = 0; delay < 100; delay++)
udelay(1000);
-
*led_reg = 0x0f;
/* LEDs on */
+
out_8((void *)LED_REG, 0x0f);
/* LEDs on */
for (delay = 0; delay < 50; delay++)
udelay(1000);
}
for (delay = 0; delay < 50; delay++)
udelay(1000);
}
-
*led_reg = 0x70
;
+
out_8((void *)LED_REG, 0x70)
;
return 0;
}
return 0;
}
@@
-198,8
+189,9
@@
int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
/* ------------------------------------------------------------------------- */
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
/* ------------------------------------------------------------------------- */