summaryrefslogtreecommitdiffstats
path: root/common/startup.c
diff options
context:
space:
mode:
authorSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-09-27 12:21:12 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-09-27 12:21:12 +0200
commit811acbb52d8012bedb56ce07a2942fb327d03c36 (patch)
treeadc8152c05ca53fe4d7cf0bb7d5a883e6205e334 /common/startup.c
parentccb593dfde59db940f78ec1094de81968642993e (diff)
downloadbarebox-811acbb52d8012bedb56ce07a2942fb327d03c36.tar.gz
barebox-811acbb52d8012bedb56ce07a2942fb327d03c36.tar.xz
indention
Diffstat (limited to 'common/startup.c')
-rw-r--r--common/startup.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/common/startup.c b/common/startup.c
index 76ced6275c..ade4bb4c57 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -41,7 +41,8 @@
#define CONFIG_IDENT_STRING ""
#endif
-extern initcall_t __u_boot_initcalls_start[], __u_boot_early_initcalls_end[], __u_boot_initcalls_end[];
+extern initcall_t __u_boot_initcalls_start[], __u_boot_early_initcalls_end[],
+ __u_boot_initcalls_end[];
const char version_string[] =
"U-Boot " UTS_RELEASE " (" __DATE__ " - " __TIME__ ")"CONFIG_IDENT_STRING;
@@ -75,7 +76,8 @@ void early_init (void)
{
/* copy the early initdata segment to early init RAM */
memcpy((void *)EARLY_INITDATA, RELOC(&__early_init_data_begin),
- (ulong)&__early_init_data_end - (ulong)&__early_init_data_begin);
+ (ulong)&__early_init_data_end -
+ (ulong)&__early_init_data_begin);
early_console_start(RELOC("psc3"), 115200);
display_banner();
@@ -114,7 +116,8 @@ void start_uboot (void)
* early RAM to RAM
*/
memcpy(&__early_init_data_begin, init_data_ptr,
- (ulong)&__early_init_data_end - (ulong)&__early_init_data_begin);
+ (ulong)&__early_init_data_end -
+ (ulong)&__early_init_data_begin);
init_data_ptr = &__early_init_data_begin;
#endif /* CONFIG_HAS_EARLY_INIT */
@@ -141,7 +144,8 @@ void start_uboot (void)
#ifdef CONFIG_CMD_ENVIRONMENT
if (envfs_load("/dev/env0", "/env")) {
#ifdef CONFIG_DEFAULT_ENVIRONMENT
- printf("using default environment\n");
+ printf("no valid environment found on /dev/env0."
+ "using default environment\n");
envfs_load("/dev/defaultenv", "/env");
#endif
}