From 6940235ae655dcbf816b3974672f7f55efb0ad12 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Mon, 19 Jan 2009 01:37:09 +0000 Subject: [PATCH] Add a dedicated function to query debug action to board_api On the devices where we have only 2 physical buttons, one of those buttons (i.e. POWER) is connected directly to PMU. The other button (AUX) is connected directly to S3C pin and we can get its state immediately, it is currently used to skip a boot possibility. To allow user to debug boot problems we can use the POWER button, but we cannot poll for it too many times as it slows down the boot considerably, therefore a dedicated function is needed. --- qiboot/include/qi.h | 1 + qiboot/src/phase2.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qiboot/include/qi.h b/qiboot/include/qi.h index 2592cd4..be25626 100644 --- a/qiboot/include/qi.h +++ b/qiboot/include/qi.h @@ -104,6 +104,7 @@ struct board_api { void (*putc)(char); void (*close)(void); u8 (*get_ui_keys)(void); + u8 (*get_ui_debug)(void); void (*set_ui_indication)(enum ui_indication); struct kernel_source kernel_source[8]; diff --git a/qiboot/src/phase2.c b/qiboot/src/phase2.c index ab9802d..b733444 100644 --- a/qiboot/src/phase2.c +++ b/qiboot/src/phase2.c @@ -234,8 +234,8 @@ static void do_params(unsigned initramfs_len, * to have the debugging options added to the commandline */ - if (this_board->commandline_board_debug && this_board->get_ui_keys) - if ((this_board->get_ui_keys)() & UI_ACTION_SKIPKERNEL) + if (this_board->commandline_board_debug && this_board->get_ui_debug) + if ((this_board->get_ui_debug)()) cmdline += strlen(strcpy(cmdline, this_board-> commandline_board_debug));