[PATCH 06/10] startup: use IS_ENABLED instead of ifdef
Sascha Hauer
s.hauer at pengutronix.de
Sun Jan 20 10:35:15 EST 2013
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
common/startup.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/startup.c b/common/startup.c
index c36bf7c..6513ba5 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -94,9 +94,7 @@ void start_barebox (void)
{
initcall_t *initcall;
int result;
-#ifdef CONFIG_COMMAND_SUPPORT
struct stat s;
-#endif
if (!IS_ENABLED(CONFIG_SHELL_NONE))
barebox_main = run_shell;
@@ -122,15 +120,16 @@ void start_barebox (void)
#endif
}
#endif
-#ifdef CONFIG_COMMAND_SUPPORT
- printf("running /env/bin/init...\n");
- if (!stat("/env/bin/init", &s)) {
- run_command("source /env/bin/init", 0);
- } else {
- printf("not found\n");
+ if (IS_ENABLED(CONFIG_COMMAND_SUPPORT)) {
+ printf("running /env/bin/init...\n");
+
+ if (!stat("/env/bin/init", &s)) {
+ run_command("source /env/bin/init", 0);
+ } else {
+ printf("not found\n");
+ }
}
-#endif
if (!barebox_main) {
printf("No main function! aborting.\n");
--
1.7.10.4
More information about the barebox
mailing list