Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gingerbread #3

Open
wants to merge 4 commits into
base: gingerbread
Choose a base branch
from
Open

Gingerbread #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c88324e
libreboot: prepare extended reboot modes (2nd parameter)
tpruvot Jan 7, 2012
47c8849
fix merge
wanggjghost Jan 23, 2012
e600e94
use custom graphic.c
SunRain Jan 27, 2012
fc59a30
remove extra #endif
wanggjghost Feb 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions libreboot/reboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,14 @@ int reboot_wrapper(const char* reason) {
if (strlen(reason) > 8 && sscanf(reason, "%s %s", dummy, ext_reason) > 0) {
// allow "bootmenu recovery" or "bootmenu shell"
ret = fputs(ext_reason, config);
pr_debug("bootmenu %s " BOARD_BOOTMODE_CONFIG_FILE " (%d)\n", ext_reason, ret);
#if (DBG_LEVEL)
printf("reboot: %s->bootmenu " BOARD_BOOTMODE_CONFIG_FILE " (%d)\n", ext_reason, ret);
#endif
} else {
ret = fputs(reason, config);
pr_debug("%s->bootmenu " BOARD_BOOTMODE_CONFIG_FILE " (%d)\n", reason, ret);
#if (DBG_LEVEL)
printf("reboot: %s->bootmenu " BOARD_BOOTMODE_CONFIG_FILE " (%d)\n", reason, ret);
#endif
}
need_clear_reason = 1;

Expand Down
9 changes: 8 additions & 1 deletion minui/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := graphics.c events.c resources.c
LOCAL_SRC_FILES := events.c resources.c

ifneq ($(BOARD_CUSTOM_BOOTMENU_GRAPHICS),)
LOCAL_SRC_FILES += $(BOARD_CUSTOM_BOOTMENU_GRAPHICS)
else
LOCAL_SRC_FILES += graphics.c
endif


LOCAL_C_INCLUDES +=\
external/libpng\
Expand Down