Revision tags: v00.04.15, v00.04.14, v00.04.13, v00.04.12, v00.04.11, v00.04.10, v00.04.09, v00.04.08, v00.04.07, v00.04.06, v00.04.05, v00.04.04, v00.04.03, v00.04.02, v00.04.01, v00.04.00, v2021.04, v00.03.03, v2021.01, v2020.10, v2020.07, v00.02.13, v2020.04, v2020.01, v2019.10, v00.02.05, v00.02.04, v00.02.03, v00.02.02, v00.02.01, v2019.07, v00.02.00, v2019.04, v2018.07 |
|
#
86fbad24 |
| 24-May-2018 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
menu: fix timeout duration
For distro-boot, the TIMEOUT directive in the boot script specifies how long to pause in units of 1/10 sec. [1]
Commit 8594753ba0a7 ("menu: only timeout when menu is disp
menu: fix timeout duration
For distro-boot, the TIMEOUT directive in the boot script specifies how long to pause in units of 1/10 sec. [1]
Commit 8594753ba0a7 ("menu: only timeout when menu is displayed") corrected this by simply dividing the timeout value by 10 in menu_interactive_choice().
I see two problems:
- For example, "TIMEOUT 5" should wait for 0.5 sec, but the current implementation cannot handle the granularity of 1/10 sec. In fact, it never breaks because "m->timeout / 10" is zero, which means no timeout.
- The menu API is used not only by cmd/pxe.c but also by common/autoboot.c . For the latter case, the unit of the timeout value is _second_ because its default is associated with CONFIG_BOOTDELAY.
To fix the first issue, use DIV_ROUND_UP() so that the timeout value is rounded up to the closest integer.
For the second issue, move the division to the boundary between cmd/pxe.c and common/menu.c . This is a more desirable place because the comment of struct pxe_menu says:
* timeout - time in tenths of a second to wait for a user key-press before * booting the default label.
Then, the comment of menu_create() says:
* timeout - A delay in seconds to wait for user input. If 0, timeout is * disabled, and the default choice will be returned unless prompt is 1.
[1] https://www.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
show more ...
|
#
83d290c5 |
| 06-May-2018 |
Tom Rini <trini@konsulko.com> |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
show more ...
|
Revision tags: v2018.03, v2018.01, v2017.11, v2016.07, openbmc-20160624-1 |
|
#
dd8d8da3 |
| 17-Mar-2016 |
Alexander Merkle <alexander.merkle@lauterbach.com> |
Fix typo choosen in comments and printf logs
Minor change: chosen is written with one "o". No code change here, only comment & printf.
Signed-off-by: Alexander Merkle <alexander.merkle@lauterbach.c
Fix typo choosen in comments and printf logs
Minor change: chosen is written with one "o". No code change here, only comment & printf.
Signed-off-by: Alexander Merkle <alexander.merkle@lauterbach.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
show more ...
|
Revision tags: v2016.01-rc1, v2015.10, v2015.10-rc5, v2015.10-rc4, v2015.10-rc3, v2015.10-rc2, v2015.10-rc1, v2015.07, v2015.07-rc3, v2015.07-rc2 |
|
#
9b081d88 |
| 07-May-2015 |
Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> |
menu: Return an error code if Ctrl-C is pressed
Previously, if the menu activated by the 'sysboot' command gets interrupted by a Ctrl-C, the behaviour is as if the menu timeout was reached - i.e. bo
menu: Return an error code if Ctrl-C is pressed
Previously, if the menu activated by the 'sysboot' command gets interrupted by a Ctrl-C, the behaviour is as if the menu timeout was reached - i.e. boot the default menu entry. This patch fixes that so a Ctrl-C now terminates the command as the user would expect.
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Reviewed-by: Simon Glass <sjg@chromium.org>
show more ...
|
Revision tags: v2015.07-rc1, v2015.04, v2015.04-rc5, v2015.04-rc4, v2015.04-rc3, v2015.04-rc2, v2015.04-rc1, v2015.01, v2015.01-rc4, v2015.01-rc3, v2015.01-rc2, v2015.01-rc1, v2014.10 |
|
#
002ad7b8 |
| 08-Oct-2014 |
Jeroen Hofstee <jeroen@myspectrum.nl> |
misc: use __weak
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
|
Revision tags: v2014.10-rc3, v2014.10-rc2, v2014.10-rc1 |
|
#
dab5e346 |
| 16-Jul-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts: boards.cfg
|
Revision tags: v2014.07, v2014.07-rc4 |
|
#
ed1d98d8 |
| 25-Jun-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
|
Revision tags: v2014.07-rc3, v2014.07-rc2, v2014.07-rc1, v2014.04 |
|
#
e1bf824d |
| 10-Apr-2014 |
Simon Glass <sjg@chromium.org> |
Add cli_ prefix to readline functions
This makes it clear where the code resides.
Signed-off-by: Simon Glass <sjg@chromium.org>
|
#
18d66533 |
| 10-Apr-2014 |
Simon Glass <sjg@chromium.org> |
move CLI prototypes to cli.h and add comments
Move the CLI prototypes from common.h to cli.h as part of an effort to reduce the size of common.h.
Signed-off-by: Simon Glass <sjg@chromium.org>
|
Revision tags: v2014.04-rc3, v2014.04-rc2, v2014.04-rc1, v2014.01, v2014.01-rc3, v2014.01-rc2, v2014.01-rc1, v2013.10, v2013.10-rc4, v2013.10-rc3, v2013.10-rc2, v2013.10-rc1 |
|
#
326ea986 |
| 31-Jul-2013 |
Stefano Babic <sbabic@denx.de> |
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <s
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
show more ...
|
#
8b485ba1 |
| 25-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into u-boot-arm/master
|
Revision tags: v2013.07, v2013.07-rc3 |
|
#
1a459660 |
| 08-Jul-2013 |
Wolfgang Denk <wd@denx.de> |
Add GPL-2.0+ SPDX-License-Identifier to source files
Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com>
|
Revision tags: v2013.07-rc2, v2013.07-rc1, v2013.04, v2013.04-rc3 |
|
#
18122019 |
| 12-Apr-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: drivers/video/exynos_fb.c
|
Revision tags: v2013.04-rc2 |
|
#
56443694 |
| 31-Mar-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
|
#
6a3439fd |
| 23-Mar-2013 |
Anatolij Gustschin <agust@denx.de> |
menu: export menu_default_choice() function
Checking the default menu item and obtaining its data can be useful in custom menu code. Export menu_default_choice() function which serves this purpose.
menu: export menu_default_choice() function
Checking the default menu item and obtaining its data can be useful in custom menu code. Export menu_default_choice() function which serves this purpose.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
show more ...
|
#
fc9d64ff |
| 23-Mar-2013 |
Pali Rohár <pali.rohar@gmail.com> |
menu: Add support for user defined item choice function
Selecting menu items is currently done in menu_interactive_choice() by reading the user input strings from standard input.
Extend menu_intera
menu: Add support for user defined item choice function
Selecting menu items is currently done in menu_interactive_choice() by reading the user input strings from standard input.
Extend menu_interactive_choice() to support user defined function for selecting menu items. This function and its argument can be specified when creating the menu.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
show more ...
|
Revision tags: v2013.04-rc1, v2013.01.01, v2013.01, v2013.01-rc3, v2013.01-rc2, v2013.01-rc1, v2012.10, v2012.10-rc3, v2012.10-rc2, v2012.10-rc1, v2012.07, v2012.07-rc3, v2012.07-rc2, v2012.07-rc1, v2012.04.01, v2012.04, v2012.04-rc3, v2012.04-rc2, v2012.04-rc1 |
|
#
8594753b |
| 28-Mar-2012 |
Rob Herring <rob.herring@calxeda.com> |
menu: only timeout when menu is displayed
Make the menu timeout apply only when prompt flag is set and after the menu is displayed. This allows auto boot to work no matter whether prompt is set or c
menu: only timeout when menu is displayed
Make the menu timeout apply only when prompt flag is set and after the menu is displayed. This allows auto boot to work no matter whether prompt is set or cleared. Use the default selection if the menu times out.
This also fixes the timeout value given to readline_into_buffer to be seconds instead of 10th of seconds.
Old behavior:
if prompt display menu and wait for choice else wait for timeout if key pressed display menu and wait for choice else exit command
New behavior:
if prompt display menu if key pressed wait for choice else boot default entry on timeout else boot default entry
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
show more ...
|
#
fc4fa6a1 |
| 16-Jan-2012 |
Heiko Schocher <hs@denx.de> |
common, menu: do not trigger timeout again, if a line is read
Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Jason Hobbs <jason.hobbs@calxeda.com> Acked-by: Jason Hobbs <jason.hobbs@calxeda.com>
|
#
e0611dd9 |
| 16-Jan-2012 |
Heiko Schocher <hs@denx.de> |
common, menu: add statusline support
add the possibility to show a statusline when printing a menu
Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Mike Frys
common, menu: add statusline support
add the possibility to show a statusline when printing a menu
Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
#
9c348311 |
| 16-Jan-2012 |
Heiko Schocher <hs@denx.de> |
common: add possibility for readline_into_buffer timeout
add possibility to add a timeout when reading a line into a buffer.
Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Mike Frysinger <vapier@ge
common: add possibility for readline_into_buffer timeout
add possibility to add a timeout when reading a line into a buffer.
Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
Revision tags: v2011.12, v2011.12-rc3, v2011.12-rc2, v2011.12-rc1 |
|
#
21574976 |
| 03-Dec-2011 |
Anatolij Gustschin <agust@denx.de> |
common/menu.c: Fix build warning
Fix: menu.c: In function 'menu_item_print': menu.c:91: warning: passing argument 1 of 'putc' makes integer from pointer without a cast
Signed-off-by: Anatolij Gusts
common/menu.c: Fix build warning
Fix: menu.c: In function 'menu_item_print': menu.c:91: warning: passing argument 1 of 'putc' makes integer from pointer without a cast
Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Heiko Schocher <hs@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Acked-by: Marek Vasut <marek.vasut@gmail.com>
show more ...
|
#
d887ad54 |
| 28-Nov-2011 |
Wolfgang Denk <wd@denx.de> |
menu.c: use puts() instead of printf() where possible
common/menu.c used printf() in a number of places to print user provided, constant strings (like the "title" string). printf() is dangerous her
menu.c: use puts() instead of printf() where possible
common/menu.c used printf() in a number of places to print user provided, constant strings (like the "title" string). printf() is dangerous here for example in case the user unwittingly embeds some '%' caracters that printf() would interpret as formatting and then pick up random arguments. Use puts() instead.
We also omit the trailing ':' in the title line - if a user wants this, he can provide it as part of the title string.
Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
a63d9652 |
| 28-Nov-2011 |
Wolfgang Denk <wd@denx.de> |
menu.c: use puts() instead of printf() where possible
common/menu.c used printf() in a number of places to print user provided, constant strings (like the "title" string). printf() is dangerous her
menu.c: use puts() instead of printf() where possible
common/menu.c used printf() in a number of places to print user provided, constant strings (like the "title" string). printf() is dangerous here for example in case the user unwittingly embeds some '%' caracters that printf() would interpret as formatting and then pick up random arguments. Use puts() instead.
We also omit the trailing ':' in the title line - if a user wants this, he can provide it as part of the title string.
Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
1b81f017 |
| 21-Oct-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master
* 'master' of /home/wd/git/u-boot/master: cosmetic: Fixup fixup_silent_linux() for checkpatch Correct dependency rule to fix SPL build Move
Merge branch 'master' of /home/wd/git/u-boot/master
* 'master' of /home/wd/git/u-boot/master: cosmetic: Fixup fixup_silent_linux() for checkpatch Correct dependency rule to fix SPL build Move timestamp and version files into 'generated' subdir sandbox: Makefile changes to build sandbox architecture Add generic gpio.h in asm-generic Adjust dependency rules to permit per-file flags sandbox: Use uintptr_t for 32/64-bit compatibility sandbox: Add basic config file sandbox: Add serial uart sandbox: Add main program sandbox: Add OS dependent layer sandbox: Force command sections to be 4-byte aligned sandbox: Disable standalone/API support sandbox: Disable built-in malloc sandbox: Add bootm support sandbox: Add board info for architecture sandbox: Add sandbox board sandbox: Add architecture lib files sandbox: Add cpu files sandbox: Add compiler defines to support a 64-bit x86_64 platform sandbox: Add architecture image support Fix use of int as pointer in image.c sandbox: Add architecture header files arm: ca9x4_ct_vxp: enable PXE BOOTP options support arm: ca9x4_ct_vxp: enable pxe command support Convert ca9x4_ct_vxp to standard env variables net: bootp: add PXE/RFC 4578 DHCP options support Add pxe command lib: add uuid_str_to_bin for use with bootp and PXE uuid README: document standard image variables Replace space and tab checks with isblank cosmetic: remove unneeded curly braces Add isblank common: add run_command2 for running simple or hush commands common, menu: use abortboot for menu timeout Add generic, reusable menu code DM9000:Add a byte swap macro for dm9000 io operation. kw_gpio: fix error in kw_gpio_direction_input Blackfin: bfin_spi: fix build error when DEBUG is defined Blackfin: define CONFIG_SYS_CACHELINE_SIZE video: Moving mx3fb.c to CONFIG_VIDEO mx31: make HSP clock for mx3fb driver available MX5: Make IPU display output and pixel format configurable VIDEO: MX5: export pix format VIDEO: MX5: Switch MX5 to CONFIG_VIDEO video: update the Freescale DIU driver to use linux/fb.h powerpc: cpm2 boards: update fcc register logic
show more ...
|
Revision tags: v2011.09, v2011.09-rc2, v2011.09-rc1 |
|
#
b41bc5a8 |
| 23-Aug-2011 |
Jason Hobbs <jason.hobbs@calxeda.com> |
common, menu: use abortboot for menu timeout
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
|