projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'elf_reloc'
[oweals/u-boot.git]
/
board
/
esd
/
pf5200
/
pf5200.c
diff --git
a/board/esd/pf5200/pf5200.c
b/board/esd/pf5200/pf5200.c
index 1f30d454fff3f24e543d05ca8bca61ca9f0f088d..83dbfcbbda0db9d934459042543c42389dae6b58 100644
(file)
--- a/
board/esd/pf5200/pf5200.c
+++ b/
board/esd/pf5200/pf5200.c
@@
-32,6
+32,7
@@
#include <mpc5xxx.h>
#include <pci.h>
#include <command.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <command.h>
+#include <netdev.h>
#include "mt46v16m16-75.h"
#include "mt46v16m16-75.h"
@@
-80,11
+81,11
@@
static void sdram_start(int hi_addr)
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
- * use of C
FG_SDRAM_BASE. The code does not work if CFG
_SDRAM_BASE
+ * use of C
ONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS
_SDRAM_BASE
* is something else than 0x00000000.
*/
* is something else than 0x00000000.
*/
-
long in
t initdram(int board_type)
+
phys_size_
t initdram(int board_type)
{
ulong dramsize = 0;
ulong test1, test2;
{
ulong dramsize = 0;
ulong test1, test2;
@@
-105,9
+106,9
@@
long int initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *) C
FG
_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((long *) C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size((long *) C
FG
_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((long *) C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
if (test1 > test2) {
sdram_start(0);
@@
-143,9
+144,9
@@
long int initdram(int board_type)
#if 0
/* find RAM size using SDRAM CS1 only */
sdram_start(0);
#if 0
/* find RAM size using SDRAM CS1 only */
sdram_start(0);
- get_ram_size((ulong *) (C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ get_ram_size((ulong *) (C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
sdram_start(1);
sdram_start(1);
- get_ram_size((ulong *) (C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ get_ram_size((ulong *) (C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
sdram_start(0);
#endif
/* set SDRAM CS1 size according to the amount of RAM found */
sdram_start(0);
#endif
/* set SDRAM CS1 size according to the amount of RAM found */
@@
-179,10
+180,10
@@
void flash_afterinit(ulong size)
/* adjust mapping */
*(vu_long *) MPC5XXX_BOOTCS_START =
*(vu_long *) MPC5XXX_CS0_START =
/* adjust mapping */
*(vu_long *) MPC5XXX_BOOTCS_START =
*(vu_long *) MPC5XXX_CS0_START =
- START_REG(C
FG
_BOOTCS_START | size);
+ START_REG(C
ONFIG_SYS
_BOOTCS_START | size);
*(vu_long *) MPC5XXX_BOOTCS_STOP =
*(vu_long *) MPC5XXX_CS0_STOP =
*(vu_long *) MPC5XXX_BOOTCS_STOP =
*(vu_long *) MPC5XXX_CS0_STOP =
- STOP_REG(C
FG
_BOOTCS_START | size, size);
+ STOP_REG(C
ONFIG_SYS
_BOOTCS_START | size, size);
}
}
}
}
@@
-191,13
+192,12
@@
static struct pci_controller hose;
extern void pci_mpc5xxx_init(struct pci_controller *);
extern void pci_mpc5xxx_init(struct pci_controller *);
-void pci_init_board(void
- ) {
+void pci_init_board(void) {
pci_mpc5xxx_init(&hose);
}
#endif
pci_mpc5xxx_init(&hose);
}
#endif
-#if defined
(CFG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
+#if defined
(CONFIG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
void init_ide_reset(void)
{
void init_ide_reset(void)
{
@@
-218,7
+218,7
@@
void ide_set_reset(int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
-#endif
/* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)
@@
-258,13
+258,18
@@
void init_power_switch(void)
*(vu_long *) MPC5XXX_SIMPLEIO_GPIO_DATA_OUTPUT |= GPIO_USB0;
__asm__ volatile ("sync");
}
*(vu_long *) MPC5XXX_SIMPLEIO_GPIO_DATA_OUTPUT |= GPIO_USB0;
__asm__ volatile ("sync");
}
- *(vu_char *) C
FG_CS1_START = 0x02;
/* Red Power LED on */
+ *(vu_char *) C
ONFIG_SYS_CS1_START = 0x02;
/* Red Power LED on */
__asm__ volatile ("sync");
__asm__ volatile ("sync");
- *(vu_char *) (C
FG_CS1_START + 1) = 0x02;
/* Disable driver for KB11 */
+ *(vu_char *) (C
ONFIG_SYS_CS1_START + 1) = 0x02;
/* Disable driver for KB11 */
__asm__ volatile ("sync");
}
__asm__ volatile ("sync");
}
+int board_eth_init(bd_t *bis)
+{
+ return pci_eth_init(bis);
+}
+
void power_set_reset(int power)
{
debug("ide_set_reset(%d)\n", power);
void power_set_reset(int power)
{
debug("ide_set_reset(%d)\n", power);
@@
-283,13
+288,13
@@
void power_set_reset(int power)
}
}
}
}
-int do_poweroff(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_poweroff(cmd_tbl_t * cmdtp, int flag, int argc, char *
const
argv[])
{
power_set_reset(1);
return (0);
}
{
power_set_reset(1);
return (0);
}
-U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "
poweroff- Switch off power\n", NULL
);
+U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "
Switch off power", ""
);
int phypower(int flag)
{
int phypower(int flag)
{
@@
-320,7
+325,7
@@
int phypower(int flag)
return (status);
}
return (status);
}
-int do_phypower(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_phypower(cmd_tbl_t * cmdtp, int flag, int argc, char *
const
argv[])
{
int status;
{
int status;
@@
-333,9
+338,9
@@
int do_phypower(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
U_BOOT_CMD(phypower, 2, 2, do_phypower,
}
U_BOOT_CMD(phypower, 2, 2, do_phypower,
- "
phypower- Switch power of ethernet phy\n", NULL
);
+ "
Switch power of ethernet phy", ""
);
-int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *
const
argv[])
{
unsigned int addr;
unsigned int size;
{
unsigned int addr;
unsigned int size;
@@
-364,5
+369,7
@@
int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
U_BOOT_CMD(writepci, 3, 1, do_writepci,
}
U_BOOT_CMD(writepci, 3, 1, do_writepci,
- "writepci- Write some data to pcibus\n",
- "<addr> <size>\n" " - Write some data to pcibus.\n");
+ "Write some data to pcibus",
+ "<addr> <size>\n"
+ ""
+);