Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
uboot-imx
Commits
d52fb7e3
Commit
d52fb7e3
authored
Mar 11, 2006
by
Wolfgang Denk
Browse files
Some code cleanup for GCC 4.x
parent
4367a010
Changes
24
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
d52fb7e3
...
...
@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4:
======================================================================
* Some code cleanup for GCC 4.x
* Fixes to support environment in NAND flash;
enable NAND flash based environment for delta board.
...
...
board/at91rm9200dk/at45.c
View file @
d52fb7e3
...
...
@@ -593,7 +593,7 @@ int AT91F_DataFlashRead(
if
(
AT91F_DataFlashWaitReady
(
pDataFlash
->
pDataFlashDesc
,
AT91C_TIMEOUT_WRDY
)
!=
DATAFLASH_OK
)
return
-
1
;
if
(
AT91F_DataFlashContinuousRead
(
pDataFlash
,
addr
,
buffer
,
SizeToRead
)
!=
DATAFLASH_OK
)
if
(
AT91F_DataFlashContinuousRead
(
pDataFlash
,
addr
,
(
uchar
*
)
buffer
,
SizeToRead
)
!=
DATAFLASH_OK
)
return
-
1
;
size
-=
SizeToRead
;
...
...
board/at91rm9200dk/flash.c
View file @
d52fb7e3
...
...
@@ -393,8 +393,7 @@ outahere:
* Copy memory to flash
*/
volatile
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
{
volatile
u16
*
addr
=
(
volatile
u16
*
)
dest
;
ulong
result
;
...
...
@@ -409,7 +408,6 @@ volatile static int write_word (flash_info_t * info, ulong dest,
if
((
result
&
data
)
!=
data
)
return
ERR_NOT_ERASED
;
/*
* Disable interrupts which might cause a timeout
* here. Remember that our exception vectors are
...
...
board/cmc_pu2/load_sernum_ethaddr.c
View file @
d52fb7e3
...
...
@@ -69,8 +69,8 @@ int i2c_read (unsigned char chip, unsigned int addr, int alen,
void
load_sernum_ethaddr
(
void
)
{
struct
manufacturer_data
data
;
unsigned
char
serial
[
9
];
unsigned
char
ethaddr
[
18
];
char
ethaddr
[
18
];
char
serial
[
9
];
unsigned
short
chksum
;
unsigned
char
*
p
;
unsigned
short
i
,
is
,
id
;
...
...
board/delta/nand.c
View file @
d52fb7e3
...
...
@@ -229,7 +229,7 @@ static void wait_us(unsigned long us)
}
}
static
void
dfc_clear_nddb
()
static
void
dfc_clear_nddb
(
void
)
{
NDCR
&=
~
NDCR_ND_RUN
;
wait_us
(
CFG_NAND_OTHER_TO
);
...
...
@@ -263,7 +263,7 @@ static unsigned long dfc_wait_event(unsigned long event)
}
/* we don't always wan't to do this */
static
void
dfc_new_cmd
()
static
void
dfc_new_cmd
(
void
)
{
int
retry
=
0
;
unsigned
long
status
;
...
...
@@ -398,7 +398,7 @@ static void dfc_cmdfunc(struct mtd_info *mtd, unsigned command,
return
;
}
static
void
dfc_gpio_init
()
static
void
dfc_gpio_init
(
void
)
{
DFC_DEBUG2
(
"Setting up DFC GPIO's.
\n
"
);
...
...
board/lart/flash.c
View file @
d52fb7e3
...
...
@@ -348,7 +348,7 @@ outahere:
* Copy memory to flash
*/
volatile
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
{
vu_long
*
addr
=
(
vu_long
*
)
dest
;
ulong
result
;
...
...
board/lpd7a40x/flash.c
View file @
d52fb7e3
...
...
@@ -351,8 +351,7 @@ outahere:
* Copy memory to flash
*/
volatile
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
{
vu_long
*
addr
=
(
vu_long
*
)
dest
;
ulong
result
;
...
...
board/netstar/crcek
View file @
d52fb7e3
No preview for this file type
board/netstar/eeprom
View file @
d52fb7e3
No preview for this file type
board/netstar/flash.c
View file @
d52fb7e3
...
...
@@ -230,7 +230,7 @@ out:
* Copy memory to flash
*/
volatile
static
int
write_hword
(
flash_info_t
*
info
,
ulong
dest
,
ushort
data
)
static
int
write_hword
(
flash_info_t
*
info
,
ulong
dest
,
ushort
data
)
{
vu_short
*
addr
=
(
vu_short
*
)
dest
;
ushort
result
;
...
...
board/netstar/nand.c
View file @
d52fb7e3
...
...
@@ -48,10 +48,12 @@ static void netstar_nand_hwcontrol(struct mtd_info *mtd, int cmd)
/*
* chip R/B detection
*/
/***
static int netstar_nand_ready(struct mtd_info *mtd)
{
return (*(volatile ushort *)GPIO_DATA_INPUT_REG) & 0x02;
}
***/
void
board_nand_init
(
struct
nand_chip
*
nand
)
{
...
...
board/shannon/flash.c
View file @
d52fb7e3
...
...
@@ -315,7 +315,7 @@ outahere:
* Copy memory to flash
*/
volatile
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
static
int
write_word
(
flash_info_t
*
info
,
ulong
dest
,
ulong
data
)
{
vu_long
*
addr
=
(
vu_long
*
)
dest
;
ulong
result
;
...
...
common/env_nand.c
View file @
d52fb7e3
...
...
@@ -112,7 +112,8 @@ int env_init(void)
*/
int
saveenv
(
void
)
{
int
total
,
ret
=
0
;
ulong
total
;
int
ret
=
0
;
puts
(
"Erasing Nand..."
);
if
(
nand_erase
(
&
nand_info
[
0
],
CFG_ENV_OFFSET
,
CFG_ENV_SIZE
))
...
...
@@ -120,8 +121,7 @@ int saveenv(void)
puts
(
"Writing to Nand... "
);
total
=
CFG_ENV_SIZE
;
ret
=
nand_write
(
&
nand_info
[
0
],
CFG_ENV_OFFSET
,
&
total
,
(
u_char
*
)
env_ptr
);
ret
=
nand_write
(
&
nand_info
[
0
],
CFG_ENV_OFFSET
,
&
total
,
(
u_char
*
)
env_ptr
);
if
(
ret
||
total
!=
CFG_ENV_SIZE
)
return
1
;
...
...
@@ -138,11 +138,11 @@ int saveenv(void)
void
env_relocate_spec
(
void
)
{
#if !defined(ENV_IS_EMBEDDED)
int
ret
,
total
;
ulong
total
;
int
ret
;
total
=
CFG_ENV_SIZE
;
ret
=
nand_read
(
&
nand_info
[
0
],
CFG_ENV_OFFSET
,
&
total
,
(
u_char
*
)
env_ptr
);
ret
=
nand_read
(
&
nand_info
[
0
],
CFG_ENV_OFFSET
,
&
total
,
(
u_char
*
)
env_ptr
);
if
(
ret
||
total
!=
CFG_ENV_SIZE
)
return
use_default
();
...
...
cpu/arm920t/at91rm9200/i2c.c
View file @
d52fb7e3
...
...
@@ -111,7 +111,7 @@ at91_xfer(unsigned char chip, unsigned int addr, int alen,
int
i2c_probe
(
unsigned
char
chip
)
{
char
buffer
[
1
];
unsigned
char
buffer
[
1
];
return
at91_xfer
(
chip
,
0
,
0
,
buffer
,
1
,
1
);
}
...
...
@@ -191,7 +191,7 @@ i2c_init(int speed, int slaveaddr)
uchar
i2c_reg_read
(
uchar
i2c_addr
,
uchar
reg
)
{
char
buf
;
unsigned
char
buf
;
i2c_read
(
i2c_addr
,
reg
,
1
,
&
buf
,
1
);
...
...
drivers/dataflash.c
View file @
d52fb7e3
...
...
@@ -174,8 +174,7 @@ void dataflash_print_info (void)
/* Function Name : AT91F_DataflashSelect */
/* Object : Select the correct device */
/*------------------------------------------------------------------------------*/
AT91PS_DataFlash
AT91F_DataflashSelect
(
AT91PS_DataFlash
pFlash
,
unsigned
int
*
addr
)
AT91PS_DataFlash
AT91F_DataflashSelect
(
AT91PS_DataFlash
pFlash
,
unsigned
long
*
addr
)
{
char
addr_valid
=
0
;
int
i
;
...
...
@@ -291,7 +290,7 @@ int i,j, area1, area2, addr_valid = 0;
/*------------------------------------------------------------------------------*/
int
read_dataflash
(
unsigned
long
addr
,
unsigned
long
size
,
char
*
result
)
{
int
AddrToRead
=
addr
;
unsigned
long
AddrToRead
=
addr
;
AT91PS_DataFlash
pFlash
=
&
DataFlashInst
;
pFlash
=
AT91F_DataflashSelect
(
pFlash
,
&
AddrToRead
);
...
...
@@ -313,7 +312,7 @@ int read_dataflash (unsigned long addr, unsigned long size, char *result)
int
write_dataflash
(
unsigned
long
addr_dest
,
unsigned
long
addr_src
,
unsigned
long
size
)
{
int
AddrToWrite
=
addr_dest
;
unsigned
long
AddrToWrite
=
addr_dest
;
AT91PS_DataFlash
pFlash
=
&
DataFlashInst
;
pFlash
=
AT91F_DataflashSelect
(
pFlash
,
&
AddrToWrite
);
...
...
@@ -330,7 +329,7 @@ int write_dataflash (unsigned long addr_dest, unsigned long addr_src,
if
(
AddrToWrite
==
-
1
)
return
-
1
;
return
AT91F_DataFlashWrite
(
pFlash
,
(
char
*
)
addr_src
,
AddrToWrite
,
size
);
return
AT91F_DataFlashWrite
(
pFlash
,
(
u
char
*
)
addr_src
,
AddrToWrite
,
size
);
}
...
...
drivers/lan91c96.c
View file @
d52fb7e3
...
...
@@ -185,21 +185,21 @@ static int smc_rcv (void);
. If an EEPROM is present it really should be consulted.
*/
int
smc_get_ethaddr
(
bd_t
*
bd
);
int
get_rom_mac
(
char
*
v_rom_mac
);
int
get_rom_mac
(
unsigned
char
*
v_rom_mac
);
/* ------------------------------------------------------------
* Internal routines
* ------------------------------------------------------------
*/
static
char
smc_mac_addr
[]
=
{
0xc0
,
0x00
,
0x00
,
0x1b
,
0x62
,
0x9c
};
static
unsigned
char
smc_mac_addr
[]
=
{
0xc0
,
0x00
,
0x00
,
0x1b
,
0x62
,
0x9c
};
/*
* This function must be called before smc_open() if you want to override
* the default mac address.
*/
void
smc_set_mac_addr
(
const
char
*
addr
)
void
smc_set_mac_addr
(
const
unsigned
char
*
addr
)
{
int
i
;
...
...
@@ -883,7 +883,7 @@ int smc_get_ethaddr (bd_t * bd)
char
*
s
=
NULL
;
char
*
e
=
NULL
;
char
*
v_mac
,
es
[]
=
"11:22:33:44:55:66"
;
u
char
s_env_mac
[
64
];
char
s_env_mac
[
64
];
uchar
v_env_mac
[
6
];
uchar
v_rom_mac
[
6
];
...
...
@@ -905,7 +905,7 @@ int smc_get_ethaddr (bd_t * bd)
if
(
!
env_present
)
{
/* if NO env */
if
(
rom_valid
)
{
/* but ROM is valid */
v_mac
=
v_rom_mac
;
v_mac
=
(
char
*
)
v_rom_mac
;
sprintf
(
s_env_mac
,
"%02X:%02X:%02X:%02X:%02X:%02X"
,
v_mac
[
0
],
v_mac
[
1
],
v_mac
[
2
],
v_mac
[
3
],
v_mac
[
4
],
v_mac
[
5
]);
...
...
@@ -915,7 +915,7 @@ int smc_get_ethaddr (bd_t * bd)
return
(
-
1
);
}
}
else
{
/* good env, don't care ROM */
v_mac
=
v_env_mac
;
/* always use a good env over a ROM */
v_mac
=
(
char
*
)
v_env_mac
;
/* always use a good env over a ROM */
}
if
(
env_present
&&
rom_valid
)
{
/* if both env and ROM are good */
...
...
@@ -935,7 +935,7 @@ int smc_get_ethaddr (bd_t * bd)
}
}
memcpy
(
bd
->
bi_enetaddr
,
v_mac
,
6
);
/* update global address to match env (allows env changing) */
smc_set_mac_addr
(
v_mac
);
/* use old function to update smc default */
smc_set_mac_addr
(
(
unsigned
char
*
)
v_mac
);
/* use old function to update smc default */
PRINTK
(
"Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
v_mac
[
0
],
v_mac
[
1
],
v_mac
[
2
],
v_mac
[
3
],
v_mac
[
4
],
v_mac
[
5
]);
return
(
0
);
...
...
@@ -946,7 +946,7 @@ int smc_get_ethaddr (bd_t * bd)
* Note, this has omly been tested for the OMAP730 P2.
*/
int
get_rom_mac
(
char
*
v_rom_mac
)
int
get_rom_mac
(
unsigned
char
*
v_rom_mac
)
{
#ifdef HARDCODE_MAC
/* used for testing or to supress run time warnings */
char
hw_mac_addr
[]
=
{
0x02
,
0x80
,
0xad
,
0x20
,
0x31
,
0xb8
};
...
...
drivers/lan91c96.h
View file @
d52fb7e3
...
...
@@ -51,7 +51,7 @@
* in order to override the default mac address.
*/
void
smc_set_mac_addr
(
const
char
*
addr
);
void
smc_set_mac_addr
(
const
unsigned
char
*
addr
);
/* I want some simple types */
...
...
drivers/nand/nand_base.c
View file @
d52fb7e3
...
...
@@ -897,7 +897,7 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
int
i
,
status
;
u_char
ecc_code
[
32
];
int
eccmode
=
oobsel
->
useecc
?
this
->
eccmode
:
NAND_ECC_NONE
;
int
*
oob_config
=
oobsel
->
eccpos
;
u
int
*
oob_config
=
oobsel
->
eccpos
;
int
datidx
=
0
,
eccidx
=
0
,
eccsteps
=
this
->
eccsteps
;
int
eccbytes
=
0
;
...
...
@@ -1119,7 +1119,8 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
u_char
ecc_calc
[
32
];
u_char
ecc_code
[
32
];
int
eccmode
,
eccsteps
;
int
*
oob_config
,
datidx
;
unsigned
*
oob_config
;
int
datidx
;
int
blockcheck
=
(
1
<<
(
this
->
phys_erase_shift
-
this
->
page_shift
))
-
1
;
int
eccbytes
;
int
compareecc
=
1
;
...
...
drivers/smc91111.c
View file @
d52fb7e3
...
...
@@ -210,7 +210,7 @@ static int smc_rcv(void);
. If an EEPROM is present it really should be consulted.
*/
int
smc_get_ethaddr
(
bd_t
*
bd
);
int
get_rom_mac
(
char
*
v_rom_mac
);
int
get_rom_mac
(
u
char
*
v_rom_mac
);
/*
------------------------------------------------------------
...
...
@@ -276,17 +276,23 @@ static inline void SMC_outb(byte value, dword offset)
static
inline
void
SMC_insw
(
dword
offset
,
volatile
uchar
*
buf
,
dword
len
)
{
volatile
word
*
p
=
(
volatile
word
*
)
buf
;
while
(
len
--
>
0
)
{
*
((
word
*
)
buf
)
++
=
SMC_inw
(
offset
);
barrier
();
*
((
volatile
u32
*
)(
0xc0000000
));
*
p
++
=
SMC_inw
(
offset
);
barrier
();
*
((
volatile
u32
*
)(
0xc0000000
));
}
}
static
inline
void
SMC_outsw
(
dword
offset
,
uchar
*
buf
,
dword
len
)
{
volatile
word
*
p
=
(
volatile
word
*
)
buf
;
while
(
len
--
>
0
)
{
SMC_outw
(
*
((
word
*
)
buf
)
++
,
offset
);
barrier
();
*
(
volatile
u32
*
)(
0xc0000000
);
SMC_outw
(
*
p
++
,
offset
);
barrier
();
*
(
volatile
u32
*
)(
0xc0000000
);
}
}
#endif
/* CONFIG_SMC_USE_IOFUNCS */
...
...
@@ -298,7 +304,7 @@ static char unsigned smc_mac_addr[6] = {0x02, 0x80, 0xad, 0x20, 0x31, 0xb8};
* the default mac address.
*/
void
smc_set_mac_addr
(
const
char
*
addr
)
{
void
smc_set_mac_addr
(
const
unsigned
char
*
addr
)
{
int
i
;
for
(
i
=
0
;
i
<
sizeof
(
smc_mac_addr
);
i
++
){
...
...
@@ -1524,7 +1530,8 @@ int smc_get_ethaddr (bd_t * bd)
{
int
env_size
,
rom_valid
,
env_present
=
0
,
reg
;
char
*
s
=
NULL
,
*
e
,
*
v_mac
,
es
[]
=
"11:22:33:44:55:66"
;
uchar
s_env_mac
[
64
],
v_env_mac
[
6
],
v_rom_mac
[
6
];
char
s_env_mac
[
64
];
uchar
v_env_mac
[
6
],
v_rom_mac
[
6
];
env_size
=
getenv_r
(
"ethaddr"
,
s_env_mac
,
sizeof
(
s_env_mac
));
if
((
env_size
>
0
)
&&
(
env_size
<
sizeof
(
es
)))
{
/* exit if env is bad */
...
...
@@ -1547,7 +1554,7 @@ int smc_get_ethaddr (bd_t * bd)
if
(
!
env_present
)
{
/* if NO env */
if
(
rom_valid
)
{
/* but ROM is valid */
v_mac
=
v_rom_mac
;
v_mac
=
(
char
*
)
v_rom_mac
;
sprintf
(
s_env_mac
,
"%02X:%02X:%02X:%02X:%02X:%02X"
,
v_mac
[
0
],
v_mac
[
1
],
v_mac
[
2
],
v_mac
[
3
],
v_mac
[
4
],
v_mac
[
5
]);
...
...
@@ -1557,7 +1564,7 @@ int smc_get_ethaddr (bd_t * bd)
return
(
-
1
);
}
}
else
{
/* good env, don't care ROM */
v_mac
=
v_env_mac
;
/* always use a good env over a ROM */
v_mac
=
(
char
*
)
v_env_mac
;
/* always use a good env over a ROM */
}
if
(
env_present
&&
rom_valid
)
{
/* if both env and ROM are good */
...
...
@@ -1577,13 +1584,13 @@ int smc_get_ethaddr (bd_t * bd)
}
}
memcpy
(
bd
->
bi_enetaddr
,
v_mac
,
6
);
/* update global address to match env (allows env changing) */
smc_set_mac_addr
(
v_mac
);
/* use old function to update smc default */
smc_set_mac_addr
(
(
uchar
*
)
v_mac
);
/* use old function to update smc default */
PRINTK
(
"Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
v_mac
[
0
],
v_mac
[
1
],
v_mac
[
2
],
v_mac
[
3
],
v_mac
[
4
],
v_mac
[
5
]);
return
(
0
);
}
int
get_rom_mac
(
char
*
v_rom_mac
)
int
get_rom_mac
(
u
char
*
v_rom_mac
)
{
#ifdef HARDCODE_MAC
/* used for testing or to supress run time warnings */
char
hw_mac_addr
[]
=
{
0x02
,
0x80
,
0xad
,
0x20
,
0x31
,
0xb8
};
...
...
drivers/smc91111.h
View file @
d52fb7e3
...
...
@@ -49,7 +49,7 @@
* in order to override the default mac address.
*/
void
smc_set_mac_addr
(
const
char
*
addr
);
void
smc_set_mac_addr
(
const
unsigned
char
*
addr
);
/* I want some simple types */
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment