summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-imx/clocksource.c4
-rw-r--r--arch/arm/mach-netx/generic.c22
-rw-r--r--arch/ppc/lib/time.c4
-rw-r--r--arch/ppc/mach-mpc5xxx/start.S4
-rw-r--r--board/eco920/eco920.c24
-rw-r--r--board/ipe337/ipe337.c6
-rw-r--r--board/netx/netx.c6
-rw-r--r--board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c42
-rw-r--r--board/scb9328/scb9328.c28
-rw-r--r--commands/echo.c4
-rw-r--r--commands/flash.c2
-rw-r--r--commands/mem.c66
-rw-r--r--common/console.c14
-rw-r--r--common/env.c110
-rw-r--r--common/startup.c14
15 files changed, 175 insertions, 175 deletions
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index d2434d1c1a..79008786f6 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -58,9 +58,9 @@ static int clocksource_init (void)
TCTL1 &= ~TCTL_TEN;
TCTL1 |= TCTL_TEN; /* Enable timer */
- cs.mult = clocksource_hz2mult(get_PERCLK1(), cs.shift);
+ cs.mult = clocksource_hz2mult(get_PERCLK1(), cs.shift);
- init_clock(&cs);
+ init_clock(&cs);
return 0;
}
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index abfedb45e1..d904908edc 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -24,11 +24,11 @@
#include "eth_firmware.h"
struct fw_header {
- unsigned int magic;
- unsigned int type;
- unsigned int version;
+ unsigned int magic;
+ unsigned int type;
+ unsigned int version;
unsigned int table_size;
- unsigned int reserved[4];
+ unsigned int reserved[4];
} __attribute__((packed));
static int xc_check_ptr(int xcno, unsigned long adr, unsigned int size)
@@ -47,17 +47,17 @@ static int xc_check_ptr(int xcno, unsigned long adr, unsigned int size)
static int xc_patch(int xcno, void *patch, int count)
{
- unsigned int adr, val, *p = patch;
+ unsigned int adr, val, *p = patch;
/* printf("%s: patch: %p size: %d\n",__FUNCTION__,patch,count); */
- int i;
- for(i=0; i<count; i++) {
- adr = *p++;
- val = *p++;
+ int i;
+ for(i=0; i<count; i++) {
+ adr = *p++;
+ val = *p++;
if( xc_check_ptr(xcno, adr, 1) < 0)
return -1;
- *(volatile unsigned int *)adr = val;
- }
+ *(volatile unsigned int *)adr = val;
+ }
return 0;
}
diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c
index 94d5b2608d..9db04601c0 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/ppc/lib/time.c
@@ -64,9 +64,9 @@ static int clocksource_init (void)
{
init_timebase();
- cs.mult = clocksource_hz2mult(get_timebase_clock(), cs.shift);
+ cs.mult = clocksource_hz2mult(get_timebase_clock(), cs.shift);
- init_clock(&cs);
+ init_clock(&cs);
return 0;
}
diff --git a/arch/ppc/mach-mpc5xxx/start.S b/arch/ppc/mach-mpc5xxx/start.S
index 933215c4f2..75d653d501 100644
--- a/arch/ppc/mach-mpc5xxx/start.S
+++ b/arch/ppc/mach-mpc5xxx/start.S
@@ -170,9 +170,9 @@ lowboot_reentry:
mr r3, r21
/* r3: BOOTFLAG */
bl initdram /* initialize sdram */
- /* r3: End of RAM */
+ /* r3: End of RAM */
- b _continue_init
+ b _continue_init
/*
* Vector Table
*/
diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index 74d47fb8bd..ff065461c0 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -43,28 +43,28 @@ static struct cfi_platform_data cfi_info = {
};
struct device_d cfi_dev = {
- .name = "cfi_flash",
- .id = "nor0",
+ .name = "cfi_flash",
+ .id = "nor0",
- .map_base = 0x11000000,
- .size = 16 * 1024 * 1024,
+ .map_base = 0x11000000,
+ .size = 16 * 1024 * 1024,
- .platform_data = &cfi_info,
+ .platform_data = &cfi_info,
};
struct device_d sdram_dev = {
- .name = "ram",
- .id = "ram0",
+ .name = "ram",
+ .id = "ram0",
- .map_base = 0x20000000,
- .size = 32 * 1024 * 1024,
+ .map_base = 0x20000000,
+ .size = 32 * 1024 * 1024,
};
static struct device_d at91_ath_dev = {
- .name = "at91_eth",
- .id = "eth0",
+ .name = "at91_eth",
+ .id = "eth0",
- .type = DEVICE_TYPE_ETHER,
+ .type = DEVICE_TYPE_ETHER,
};
static int devices_init (void)
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index e7d57a439a..c123b275ae 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -52,11 +52,11 @@ static int ipe337_devices_init(void) {
device_initcall(ipe337_devices_init);
static struct device_d blackfin_serial_device = {
- .name = "blackfin_serial",
- .id = "cs0",
+ .name = "blackfin_serial",
+ .id = "cs0",
.map_base = 0,
.size = 4096,
- .type = DEVICE_TYPE_CONSOLE,
+ .type = DEVICE_TYPE_CONSOLE,
};
static int blackfin_console_init(void)
diff --git a/board/netx/netx.c b/board/netx/netx.c
index e1f8f690c6..63a33f0dea 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -87,11 +87,11 @@ static int netx_devices_init(void) {
device_initcall(netx_devices_init);
static struct device_d netx_serial_device = {
- .name = "netx_serial",
- .id = "cs0",
+ .name = "netx_serial",
+ .id = "cs0",
.map_base = NETX_PA_UART0,
.size = 0x40,
- .type = DEVICE_TYPE_CONSOLE,
+ .type = DEVICE_TYPE_CONSOLE,
};
static int netx_console_init(void)
diff --git a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c b/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c
index 6d65175b1e..3334090ead 100644
--- a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c
+++ b/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c
@@ -44,40 +44,40 @@
#endif
struct device_d cfi_dev = {
- .name = "cfi_flash",
- .id = "nor0",
+ .name = "cfi_flash",
+ .id = "nor0",
- .map_base = 0xff000000,
- .size = 16 * 1024 * 1024,
+ .map_base = 0xff000000,
+ .size = 16 * 1024 * 1024,
};
struct device_d sdram_dev = {
- .name = "ram",
- .id = "ram0",
+ .name = "ram",
+ .id = "ram0",
- .map_base = 0x0,
- .size = 64 * 1024 * 1024,
+ .map_base = 0x0,
+ .size = 64 * 1024 * 1024,
.type = DEVICE_TYPE_DRAM,
};
struct device_d scratch_dev = {
- .name = "ram",
- .id = "scratch0",
+ .name = "ram",
+ .id = "scratch0",
.type = DEVICE_TYPE_DRAM,
};
static struct mpc5xxx_fec_platform_data fec_info = {
- .xcv_type = MII100,
+ .xcv_type = MII100,
};
struct device_d eth_dev = {
- .name = "fec_mpc5xxx",
- .id = "eth0",
+ .name = "fec_mpc5xxx",
+ .id = "eth0",
- .platform_data = &fec_info,
+ .platform_data = &fec_info,
- .type = DEVICE_TYPE_ETHER,
+ .type = DEVICE_TYPE_ETHER,
};
#define SCRATCHMEM_SIZE (1024 * 1024 * 4)
@@ -101,19 +101,19 @@ static int devices_init (void)
device_initcall(devices_init);
static struct device_d psc3 = {
- .name = "mpc5xxx_serial",
- .id = "psc3",
+ .name = "mpc5xxx_serial",
+ .id = "psc3",
.map_base = MPC5XXX_PSC3,
.size = 4096,
- .type = DEVICE_TYPE_CONSOLE,
+ .type = DEVICE_TYPE_CONSOLE,
};
static struct device_d psc6 = {
- .name = "mpc5xxx_serial",
- .id = "psc6",
+ .name = "mpc5xxx_serial",
+ .id = "psc6",
.map_base = MPC5XXX_PSC6,
.size = 4096,
- .type = DEVICE_TYPE_CONSOLE,
+ .type = DEVICE_TYPE_CONSOLE,
};
static int console_init(void)
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index f922f22689..706ad2489e 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -30,28 +30,28 @@
#include <fcntl.h>
static struct device_d cfi_dev = {
- .name = "cfi_flash",
- .id = "nor0",
+ .name = "cfi_flash",
+ .id = "nor0",
- .map_base = 0x10000000,
- .size = 16 * 1024 * 1024,
+ .map_base = 0x10000000,
+ .size = 16 * 1024 * 1024,
};
static struct device_d sdram_dev = {
- .name = "ram",
- .id = "ram0",
+ .name = "ram",
+ .id = "ram0",
- .map_base = 0x08000000,
- .size = 16 * 1024 * 1024,
+ .map_base = 0x08000000,
+ .size = 16 * 1024 * 1024,
.type = DEVICE_TYPE_DRAM,
};
static struct device_d dm9000_dev = {
- .name = "dm9000",
- .id = "eth0",
+ .name = "dm9000",
+ .id = "eth0",
- .type = DEVICE_TYPE_ETHER,
+ .type = DEVICE_TYPE_ETHER,
};
static int scb9328_devices_init(void) {
@@ -69,11 +69,11 @@ static int scb9328_devices_init(void) {
device_initcall(scb9328_devices_init);
static struct device_d scb9328_serial_device = {
- .name = "imx_serial",
- .id = "cs0",
+ .name = "imx_serial",
+ .id = "cs0",
.map_base = IMX_UART1_BASE,
.size = 4096,
- .type = DEVICE_TYPE_CONSOLE,
+ .type = DEVICE_TYPE_CONSOLE,
};
static int scb9328_console_init(void)
diff --git a/commands/echo.c b/commands/echo.c
index b8e59e760f..b49adf37aa 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -29,8 +29,8 @@
static int do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
int i, optind = 1;
- int fd = stdout, opt, newline = 1;
- char *file = NULL;
+ int fd = stdout, opt, newline = 1;
+ char *file = NULL;
int oflags = O_WRONLY | O_CREAT;
/* We can't use getopt() here because we want to
diff --git a/commands/flash.c b/commands/flash.c
index 8df796b228..1b0a5cbb5c 100644
--- a/commands/flash.c
+++ b/commands/flash.c
@@ -68,7 +68,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (argc == 2)
parse_area_spec(argv[optind], &start, &size);
- if(erase(fd, size, start)) {
+ if(erase(fd, size, start)) {
perror("erase");
return 1;
}
diff --git a/commands/mem.c b/commands/mem.c
index f78232521e..2acfbf581e 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -58,7 +58,7 @@ int memory_display(char *addr, ulong offs, ulong nbytes, int size)
ulong linebytes, i;
u_char *cp;
- /* Print the lines.
+ /* Print the lines.
*
* We buffer all read data, so we can make sure data is read only
* once, and all accesses are with the specified bus width.
@@ -69,7 +69,7 @@ int memory_display(char *addr, ulong offs, ulong nbytes, int size)
ushort *usp = (ushort *)linebuf;
u_char *ucp = (u_char *)linebuf;
- printf("%08lx:", offs);
+ printf("%08lx:", offs);
linebytes = (nbytes>DISP_LINE_LEN)?DISP_LINE_LEN:nbytes;
for (i=0; i<linebytes; i+= size) {
@@ -81,10 +81,10 @@ int memory_display(char *addr, ulong offs, ulong nbytes, int size)
printf(" %02x", (*ucp++ = *((u_char *)addr)));
}
addr += size;
- offs += size;
+ offs += size;
}
- puts (" ");
+ puts (" ");
cp = (u_char *)linebuf;
for (i=0; i<linebytes; i++) {
if ((*cp < 0x20) || (*cp > 0x7e))
@@ -157,9 +157,9 @@ static int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
now = min(size, RW_BUF_SIZE);
r = read(fd, rw_buf, now);
if (r < 0) {
- perror("read");
+ perror("read");
goto out;
- }
+ }
if (!r)
goto out;
@@ -380,7 +380,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
ulong count, offset, now;
int ret;
- struct memarea_info dst, src;
+ struct memarea_info dst, src;
int size;
@@ -394,20 +394,20 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if ((size = cmd_get_data_size(argv[0], 4)) < 0)
return 1;
- if (spec_str_to_info(argv[1], &src)) {
- printf("-ENOPARSE\n");
- return -1;
- }
+ if (spec_str_to_info(argv[1], &src)) {
+ printf("-ENOPARSE\n");
+ return -1;
+ }
- if (spec_str_to_info(argv[2], &dst)) {
- printf("-ENOPARSE\n");
- return -1;
- }
+ if (spec_str_to_info(argv[2], &dst)) {
+ printf("-ENOPARSE\n");
+ return -1;
+ }
- if (!src.size || !dst.size)
- count = dst.size | src.size;
- else
- count = min(src.size, dst.size);
+ if (!src.size || !dst.size)
+ count = dst.size | src.size;
+ else
+ count = min(src.size, dst.size);
printf("copy from 0x%08x to 0x%08x count %d\n",src.start, dst.start, count);
@@ -439,30 +439,30 @@ U_BOOT_CMD(
#endif
static struct device_d mem_dev = {
- .name = "mem",
+ .name = "mem",
.id = "mem",
- .map_base = 0,
- .size = ~0, /* FIXME: should be 0x100000000, ahem... */
+ .map_base = 0,
+ .size = ~0, /* FIXME: should be 0x100000000, ahem... */
};
static struct driver_d mem_drv = {
- .name = "mem",
- .probe = dummy_probe,
+ .name = "mem",
+ .probe = dummy_probe,
.read = mem_read,
.write = mem_write,
};
static struct driver_d ram_drv = {
- .name = "ram",
- .probe = dummy_probe,
+ .name = "ram",
+ .probe = dummy_probe,
.read = mem_read,
.write = mem_write,
.type = DEVICE_TYPE_DRAM,
};
static struct driver_d rom_drv = {
- .name = "rom",
- .probe = dummy_probe,
+ .name = "rom",
+ .probe = dummy_probe,
.read = mem_read,
};
@@ -474,11 +474,11 @@ static int mem_init(void)
return -1;
}
- register_device(&mem_dev);
- register_driver(&mem_drv);
- register_driver(&ram_drv);
- register_driver(&rom_drv);
- return 0;
+ register_device(&mem_dev);
+ register_driver(&mem_drv);
+ register_driver(&ram_drv);
+ register_driver(&rom_drv);
+ return 0;
}
device_initcall(mem_init);
diff --git a/common/console.c b/common/console.c
index f65e15b1a6..47dcfe41d4 100644
--- a/common/console.c
+++ b/common/console.c
@@ -93,7 +93,7 @@ static int console_baudrate_set(struct device_d *dev, struct param_d *param,
int console_register(struct console_device *newcdev)
{
- struct console_device *cdev = first_console;
+ struct console_device *cdev = first_console;
struct device_d *dev = newcdev->dev;
if (newcdev->setbrg) {
@@ -125,12 +125,12 @@ int console_register(struct console_device *newcdev)
}
while (1) {
- if (!cdev->next) {
- cdev->next = newcdev;
- return 0;
- }
- cdev = cdev->next;
- }
+ if (!cdev->next) {
+ cdev->next = newcdev;
+ return 0;
+ }
+ cdev = cdev->next;
+ }
}
int getc (void)
diff --git a/common/env.c b/common/env.c
index 4bd0deee46..b481854f98 100644
--- a/common/env.c
+++ b/common/env.c
@@ -28,8 +28,8 @@
#include <errno.h>
struct variable_d {
- struct variable_d *next;
- char data[0];
+ struct variable_d *next;
+ char data[0];
};
#define VARIABLE_D_SIZE(name, value) (sizeof(struct variable_d) + strlen(name) + strlen(value) + 2)
@@ -39,17 +39,17 @@ static struct variable_d *env_list = &_env_list;
static char *var_val(struct variable_d *var)
{
- return &var->data[strlen(var->data) + 1];
+ return &var->data[strlen(var->data) + 1];
}
static char *var_name(struct variable_d *var)
{
- return var->data;
+ return var->data;
}
const char *getenv (const char *name)
{
- struct variable_d *var;
+ struct variable_d *var;
if (strchr(name, '.')) {
const char *ret = 0;
@@ -66,11 +66,11 @@ const char *getenv (const char *name)
return ret;
}
- var = env_list->next;
+ var = env_list->next;
- while (var) {
- if (!strcmp(var_name(var), name))
- return var_val(var);
+ while (var) {
+ if (!strcmp(var_name(var), name))
+ return var_val(var);
var = var->next;
}
return 0;
@@ -78,8 +78,8 @@ const char *getenv (const char *name)
int setenv (const char *name, const char *value)
{
- struct variable_d *var = env_list;
- struct variable_d *newvar = NULL;
+ struct variable_d *var = env_list;
+ struct variable_d *newvar = NULL;
char *par;
if ((par = strchr(name, '.'))) {
@@ -92,60 +92,60 @@ int setenv (const char *name, const char *value)
perror("set parameter");
errno = 0;
} else {
- errno = -ENODEV;
- perror("set parameter");
- }
+ errno = -ENODEV;
+ perror("set parameter");
+ }
return errno;
}
- if (value) {
- newvar = xzalloc(VARIABLE_D_SIZE(name, value));
- strcpy(&newvar->data[0], name);
- strcpy(&newvar->data[strlen(name) + 1], value);
- }
-
- while (var->next) {
- if (!strcmp(var->next->data, name)) {
- if (value) {
- newvar->next = var->next->next;
- free(var->next);
- var->next = newvar;
- return 0;
- } else {
- struct variable_d *tmp;
- tmp = var->next;
- var->next = var->next->next;
- free(var->next);
- return 0;
- }
- }
- var = var->next;
- }
- var->next = newvar;
+ if (value) {
+ newvar = xzalloc(VARIABLE_D_SIZE(name, value));
+ strcpy(&newvar->data[0], name);
+ strcpy(&newvar->data[strlen(name) + 1], value);
+ }
+
+ while (var->next) {
+ if (!strcmp(var->next->data, name)) {
+ if (value) {
+ newvar->next = var->next->next;
+ free(var->next);
+ var->next = newvar;
+ return 0;
+ } else {
+ struct variable_d *tmp;
+ tmp = var->next;
+ var->next = var->next->next;
+ free(var->next);
+ return 0;
+ }
+ }
+ var = var->next;
+ }
+ var->next = newvar;
return 0;
}
int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- struct variable_d *var = env_list->next;
+ struct variable_d *var = env_list->next;
if (argc == 2) {
- const char *val = getenv(argv[1]);
- if (val) {
- printf("%s=%s\n", argv[1], val);
- return 0;
- }
- printf("## Error: \"%s\" not defined\n", argv[1]);
- return -EINVAL;
- }
-
- while (var) {
- printf("%s=%s\n", var_name(var), var_val(var));
- var = var->next;
- }
-
- return 0;
+ const char *val = getenv(argv[1]);
+ if (val) {
+ printf("%s=%s\n", argv[1], val);
+ return 0;
+ }
+ printf("## Error: \"%s\" not defined\n", argv[1]);
+ return -EINVAL;
+ }
+
+ while (var) {
+ printf("%s=%s\n", var_name(var), var_val(var));
+ var = var->next;
+ }
+
+ return 0;
}
U_BOOT_CMD_START(printenv)
@@ -168,7 +168,7 @@ int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
setenv(argv[1], argv[2]);
- return 0;
+ return 0;
}
U_BOOT_CMD_START(setenv)
diff --git a/common/startup.c b/common/startup.c
index 643077343e..a8f20fb103 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -97,8 +97,8 @@ static void register_default_env(void)
void start_uboot (void)
{
- initcall_t *initcall;
- int result;
+ initcall_t *initcall;
+ int result;
struct stat s;
#ifdef CONFIG_HAS_EARLY_INIT
@@ -114,10 +114,10 @@ void start_uboot (void)
initcall < __u_boot_initcalls_end; initcall++) {
PUTHEX_LL(*initcall);
PUTC_LL('\n');
- result = (*initcall)();
- if (result)
- hang();
- }
+ result = (*initcall)();
+ if (result)
+ hang();
+ }
#ifndef CONFIG_HAS_EARLY_INIT
display_banner();
@@ -142,7 +142,7 @@ void start_uboot (void)
run_command("exec /env/init", 0);
}
- /* main_loop() can return to retry autoboot, if so just run it again. */
+ /* main_loop() can return to retry autoboot, if so just run it again. */
for (;;)
main_loop ();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 04:25:38 +0000