projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cpci750: i2c cleanup
[oweals/u-boot.git]
/
board
/
barco
/
barco.c
diff --git
a/board/barco/barco.c
b/board/barco/barco.c
index f8b2084c454cf9362bfcce9bfe8552ff9cad810e..a19e1edabb24ba2ef8702190b274eb4827454bc4 100644
(file)
--- a/
board/barco/barco.c
+++ b/
board/barco/barco.c
@@
-90,7
+90,7
@@
phys_size_t initdram (int board_type)
long mear1;
long emear1;
long mear1;
long emear1;
- size = get_ram_size (C
FG_SDRAM_BASE, CFG
_MAX_RAM_SIZE);
+ size = get_ram_size (C
ONFIG_SYS_SDRAM_BASE, CONFIG_SYS
_MAX_RAM_SIZE);
new_bank0_end = size - 1;
mear1 = mpc824x_mpc107_getreg (MEAR1);
new_bank0_end = size - 1;
mear1 = mpc824x_mpc107_getreg (MEAR1);
@@
-188,14
+188,14
@@
unsigned update_flash (unsigned char *buf)
unsigned scan_flash (void)
{
char section[] = "kernel";
unsigned scan_flash (void)
{
char section[] = "kernel";
- int cfgFileLen = (C
FG
_FLASH_ERASE_SECTOR_LENGTH >> 1);
+ int cfgFileLen = (C
ONFIG_SYS
_FLASH_ERASE_SECTOR_LENGTH >> 1);
int sectionPtr = 0;
int foundItem = 0; /* 0: None, 1: section found, 2: "=" found */
int bufPtr;
unsigned char *buf;
int sectionPtr = 0;
int foundItem = 0; /* 0: None, 1: section found, 2: "=" found */
int bufPtr;
unsigned char *buf;
- buf = (unsigned char*)(C
FG_FLASH_RANGE_BASE + CFG
_FLASH_RANGE_SIZE \
- - C
FG
_FLASH_ERASE_SECTOR_LENGTH);
+ buf = (unsigned char*)(C
ONFIG_SYS_FLASH_RANGE_BASE + CONFIG_SYS
_FLASH_RANGE_SIZE \
+ - C
ONFIG_SYS
_FLASH_ERASE_SECTOR_LENGTH);
for (bufPtr = 0; bufPtr < cfgFileLen; ++bufPtr) {
if ((buf[bufPtr]==0xFF) && (*(int*)(buf+bufPtr)==0xFFFFFFFF)) {
return BOOT_DEFAULT;
for (bufPtr = 0; bufPtr < cfgFileLen; ++bufPtr) {
if ((buf[bufPtr]==0xFF) && (*(int*)(buf+bufPtr)==0xFFFFFFFF)) {
return BOOT_DEFAULT;
@@
-236,14
+236,14
@@
TSBootInfo* find_boot_info (void)
switch (bootimage) {
case TRY_WORKING:
switch (bootimage) {
case TRY_WORKING:
- info->address = C
FG
_WORKING_KERNEL_ADDRESS;
+ info->address = C
ONFIG_SYS
_WORKING_KERNEL_ADDRESS;
break;
case BOOT_WORKING :
break;
case BOOT_WORKING :
- info->address = C
FG
_WORKING_KERNEL_ADDRESS;
+ info->address = C
ONFIG_SYS
_WORKING_KERNEL_ADDRESS;
break;
case BOOT_DEFAULT:
default:
break;
case BOOT_DEFAULT:
default:
- info->address= C
FG
_DEFAULT_KERNEL_ADDRESS;
+ info->address= C
ONFIG_SYS
_DEFAULT_KERNEL_ADDRESS;
}
info->size = *((unsigned int *)(info->address ));
}
info->size = *((unsigned int *)(info->address ));
@@
-292,7
+292,7
@@
int barcobcd_boot_image (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
#if 0
if (argc > 1) {
{
#if 0
if (argc > 1) {
-
printf ("Usage:\n (%d) %s\n", argc, cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
}
#endif
return 1;
}
#endif
@@
-306,19
+306,19
@@
int barcobcd_boot_image (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD (
try_working, 1, 1, barcobcd_boot_image,
U_BOOT_CMD (
try_working, 1, 1, barcobcd_boot_image,
- "
try_working - check flash value and boot the appropriate image\n
",
+ "
check flash value and boot the appropriate image
",
"\n"
);
U_BOOT_CMD (
boot_working, 1, 1, barcobcd_boot_image,
"\n"
);
U_BOOT_CMD (
boot_working, 1, 1, barcobcd_boot_image,
- "
boot_working - check flash value and boot the appropriate image\n
",
+ "
check flash value and boot the appropriate image
",
"\n"
);
U_BOOT_CMD (
boot_default, 1, 1, barcobcd_boot_image,
"\n"
);
U_BOOT_CMD (
boot_default, 1, 1, barcobcd_boot_image,
- "
boot_default - check flash value and boot the appropriate image\n
",
+ "
check flash value and boot the appropriate image
",
"\n"
);
/*
"\n"
);
/*