diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 17 | ||||
| -rw-r--r-- | common/menu.c | 21 | ||||
| -rw-r--r-- | common/version.c | 4 |
3 files changed, 35 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index 76fe407398..bfde73cd44 100644 --- a/common/Makefile +++ b/common/Makefile @@ -81,3 +81,20 @@ include/generated/barebox_default_env.h: barebox_default_env$(barebox_default_en CLEAN_FILES += include/generated/barebox_default_env.h barebox_default_env CLEAN_FILES += barebox_default_env.gz barebox_default_env.bz2 CLEAN_FILES += barebox_default_env.lzo + +# dependencies on generated files need to be listed explicitly +$(obj)/version.o: include/generated/compile.h + +# compile.h changes depending on hostname, generation number, etc, +# so we regenerate it always. +# mkcompile_h will make sure to only update the +# actual file if its content has changed. + + chk_compile.h = : + quiet_chk_compile.h = echo ' CHK $@' +silent_chk_compile.h = : +include/generated/compile.h: FORCE + @$($(quiet)chk_compile.h) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ + "$(UTS_MACHINE)" "$(CC) $(KBUILD_CFLAGS)" + diff --git a/common/menu.c b/common/menu.c index 50af36eebe..83821ec285 100644 --- a/common/menu.c +++ b/common/menu.c @@ -174,12 +174,17 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me, puts(" "); } - process_escape_sequence(me->display, m->display_buffer, - m->display_buffer_size); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + process_escape_sequence(me->display, m->display_buffer, + m->display_buffer_size); + printf(" %d: ", me->num); if (selected) puts("\e[7m"); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + puts(m->display_buffer); + else + puts(me->display); if (selected) puts("\e[m"); @@ -236,9 +241,13 @@ static void print_menu(struct menu *m) clear(); gotoXY(1, 2); if(m->display) { - process_escape_sequence(m->display, m->display_buffer, - m->display_buffer_size); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) { + process_escape_sequence(m->display, m->display_buffer, + m->display_buffer_size); + puts(m->display_buffer); + } else { + puts(m->display); + } } else { puts("Menu : "); puts(m->name); diff --git a/common/version.c b/common/version.c index 0af8ec160a..51a8e7c47d 100644 --- a/common/version.c +++ b/common/version.c @@ -1,8 +1,10 @@ #include <common.h> +#include <generated/compile.h> #include <generated/utsrelease.h> const char version_string[] = - "barebox " UTS_RELEASE " (" __DATE__ " - " __TIME__ ")"; + "barebox " UTS_RELEASE " " UTS_VERSION "\n"; + void barebox_banner (void) { |