Commit d3a6532c authored by Wolfgang Denk's avatar Wolfgang Denk

Coding Style cleanup; update CHANGELOG

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 694976af
This diff is collapsed.
......@@ -22,7 +22,7 @@ U-Boot machine/arch independent API for external apps
- the U-Boot integral part of the API is meant to be thin and non-intrusive,
leaving as much processing as possible on the consumer application side,
for example it doesn't keep states, but relies on hints from the app and
so on
so on
- optional (CONFIG_API)
......
......@@ -231,7 +231,7 @@ static int API_dev_enum(va_list ap)
/* start over - clean up enumeration */
dev_enum_reset(); /* XXX shouldn't the name contain 'stor'? */
debugf("RESTART ENUM\n");
/* net device enumeration first */
if (dev_enum_net(di))
return 0;
......@@ -365,7 +365,7 @@ static int API_dev_write(va_list ap)
return API_EINVAL;
if (di->type & DEV_TYP_STOR)
/*
/*
* write to storage is currently not supported by U-Boot:
* no storage device implements block_write() method
*/
......@@ -523,7 +523,7 @@ static int API_env_enum(va_list ap)
char *last, **next;
last = (char *)va_arg(ap, u_int32_t);
if ((next = (char **)va_arg(ap, u_int32_t)) == NULL)
return API_EINVAL;
......@@ -540,7 +540,7 @@ static int API_env_enum(va_list ap)
return 0;
}
}
if (envmatch((uchar *)last, i) < 0)
continue;
......@@ -567,7 +567,7 @@ static cfp_t calls_table[API_MAXCALL] = { NULL, };
* serviced until finished.
*
* e.g. syscall(1, int *, u_int32_t, u_int32_t, u_int32_t, u_int32_t);
*
*
* call: syscall number
*
* retval: points to the return value placeholder, this is the place the
......@@ -655,7 +655,7 @@ void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long siz
if (!si->mr || !size || (flags == 0))
return;
/* find free slot */
for (i = 0; i < si->mr_no; i++)
if (si->mr[i].flags == 0) {
......
......@@ -75,7 +75,7 @@ int dev_close_net(void *cookie)
return 0;
}
/*
/*
* There can only be one active eth interface at a time - use what is
* currently set to eth_current
*/
......
......@@ -71,7 +71,7 @@ $(BIN):
$(obj)%.bin: $(obj)%
$(OBJCOPY) -O binary $< $@ 2>/dev/null
$(obj)crc32.c:
$(obj)crc32.c:
@rm -f $(obj)crc32.c
ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
......
......@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
/* enumerate devices */
printf("\n*** Enumerate devices ***\n");
devs_no = ub_dev_enum();
printf("Number of devices found: %d\n", devs_no);
if (devs_no == 0)
return -1;
......
......@@ -150,7 +150,7 @@ struct sys_info * ub_get_sys_info(void)
* timing
*
****************************************/
void ub_udelay(unsigned long usec)
{
syscall(API_UDELAY, NULL, &usec);
......@@ -298,7 +298,7 @@ int ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start)
if (!syscall(API_DEV_READ, &err, di, buf, &len, &start, &act_len))
return -1;
if (err)
if (err)
return err;
if (act_len != len)
......
......@@ -140,7 +140,7 @@ testdram(void)
for (p = pstart; p < pend; p++) {
printf ("DRAM test attempting to write 0xaaaaaaaa at: %08x\n", (uint) p);
*p = 0xaaaaaaaa;
}
}
for (p = pstart; p < pend; p++) {
if (*p != 0xaaaaaaaa) {
......@@ -191,7 +191,7 @@ pci_init_board(void)
debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n",
devdisr, io_sel, host_agent);
/* explicitly set 'Clock out select register' to echo SYSCLK input to our CPLD */
/* explicitly set 'Clock out select register' to echo SYSCLK input to our CPLD */
gur->clkocr |= MPC85xx_ATUM_CLKOCR;
if (io_sel & 1) {
......@@ -376,7 +376,7 @@ pci_init_board(void)
int last_stage_init(void)
{
int ic = icache_status ();
int ic = icache_status ();
printf ("icache_status: %d\n", ic);
return 0;
}
......
......@@ -70,7 +70,7 @@ tlb1_entry:
/*
* Number of TLB0 and TLB1 entries in the following table
*/
.long (2f-1f)/16
.long (2f-1f)/16
1:
#if (CFG_CCSRBAR_DEFAULT != CFG_CCSRBAR)
......@@ -182,15 +182,15 @@ tlb1_entry:
/*
* LAW(Local Access Window) configuration:
*
* 0x0000_0000 0x7fff_ffff DDR 2G
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
* 0xa000_0000 0xbfff_ffff PCIe MEM 512M
* 0xc000_0000 0xdfff_ffff PCI2 MEM 512M
* 0xe000_0000 0xe000_ffff CCSR 1M
* 0xe200_0000 0xe10f_ffff PCI1 IO 1M
* 0xe280_0000 0xe20f_ffff PCI2 IO 1M
* 0xe300_0000 0xe30f_ffff PCIe IO 1M
* 0xf800_0000 0xffff_ffff FLASH (boot bank) 128M
* 0x0000_0000 0x7fff_ffff DDR 2G
* 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
* 0xa000_0000 0xbfff_ffff PCIe MEM 512M
* 0xc000_0000 0xdfff_ffff PCI2 MEM 512M
* 0xe000_0000 0xe000_ffff CCSR 1M
* 0xe200_0000 0xe10f_ffff PCI1 IO 1M
* 0xe280_0000 0xe20f_ffff PCI2 IO 1M
* 0xe300_0000 0xe30f_ffff PCIe IO 1M
* 0xf800_0000 0xffff_ffff FLASH (boot bank) 128M
*
* Notes:
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
......@@ -227,7 +227,7 @@ law_entry:
.long (CFG_PCIE1_IO_PHYS>>12) & 0xfffff
.long LAWAR_EN | LAWAR_TRGT_PCIE | (LAWAR_SIZE & LAWAR_SIZE_1M)
/* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
/* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
.long (CFG_LBC_CACHE_BASE>>12) & 0xfffff
.long LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_256M)
......
......@@ -566,4 +566,3 @@ ft_board_setup(void *blob, bd_t *bd)
#endif
}
#endif
......@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data)
{
u32 cecr;
u32 cecr;
if (cmd == QE_RESET) {
out_be32(&qe_immr->cp.cecr,(u32) (cmd | QE_CR_FLG));
......@@ -357,10 +357,10 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
return -EPERM;
}
/*
* Validate the CRC. We would normally call crc32_no_comp(), but that
* function isn't available unless you turn on JFFS support.
*/
/*
* Validate the CRC. We would normally call crc32_no_comp(), but that
* function isn't available unless you turn on JFFS support.
*/
crc = be32_to_cpu(*(u32 *)((void *)firmware + calc_size));
if (crc != (crc32(-1, (const void *) firmware, calc_size) ^ -1)) {
printf("Firmware CRC is invalid\n");
......@@ -438,10 +438,10 @@ static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return -EINVAL;
}
/*
* If a length was supplied, compare that with the 'length'
* field.
*/
/*
* If a length was supplied, compare that with the 'length'
* field.
*/
if (argc > 3) {
ulong length = simple_strtoul(argv[3], NULL, 16);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment