From dd2d9899720895881e5c60fb38f91f22c53c97cc Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Thu, 12 Sep 2019 15:31:22 +0900 Subject: autoboot: add necessary dependency at AUTOBOOT_MENU_SHOW Otherwise, menu_show() will be undefined in bootdelay_process(). Signed-off-by: AKASHI Takahiro --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd') diff --git a/cmd/Kconfig b/cmd/Kconfig index 98647f58b7a..c61c8516229 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -172,6 +172,7 @@ config AUTOBOOT_MENUKEY config AUTOBOOT_MENU_SHOW bool "Show a menu on boot" + depends on CMD_BOOTMENU help This enables the boot menu, controlled by environment variables defined by the board. The menu starts after running the 'preboot' -- cgit v1.2.3 From 400b9554cc3ef6d301940d43a2a6f9c098df5fb9 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Fri, 20 Sep 2019 15:59:18 +0200 Subject: cmd: part: number: return hexadecimal value At this point we are using part number sub-command to retrieve UUID of the partition using it's name. e.g.: part number mmc $mmcdev system_a system_a_index part uuid mmc $mmcdev:${system_a_index} system_a_uuid Since 'part uuid' sub-command expects partition index in hex format and 'part number' returns decimal value, 'part uuid' command will provide wrong UUID or fail. Fixes: be683756f62034 ("cmd: part: Add 'number' sub-command") Cc: Dirk Behme Reported-by: Pontus Fuchs Signed-off-by: Roman Stratiienko Signed-off-by: Eugeniu Rosca Reviewed-by: Tom Rini Reviewed-by: Igor Opaniuk --- cmd/part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/part.c b/cmd/part.c index 6cfb67b2795..5e4e45ca6d8 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -152,7 +152,7 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param) snprintf(buf, sizeof(buf), LBAF, info.size); break; case CMD_PART_INFO_NUMBER: - snprintf(buf, sizeof(buf), "%d", part); + snprintf(buf, sizeof(buf), "0x%x", part); break; default: printf("** Unknown cmd_part_info value: %d\n", param); -- cgit v1.2.3 From 4b0bcfa7c4ecd5d5e02c5e7d10d128a7da53414b Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 20 Sep 2019 17:36:50 -0400 Subject: Kconfig: Migrate CONFIG_BOOTM_* options Migrate all of the existing OS support options that are under CONFIG_BOOTM_* to Kconfig. Signed-off-by: Tom Rini --- cmd/Kconfig | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'cmd') diff --git a/cmd/Kconfig b/cmd/Kconfig index c61c8516229..8fcb1b84741 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -268,6 +268,54 @@ config CMD_BOOTEFI help Boot an EFI image from memory. +config BOOTM_LINUX + bool "Support booting Linux OS images" + depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI + default y + help + Support booting the Linux kernel directly via a command such as bootm + or booti or bootz. + +config BOOTM_NETBSD + bool "Support booting NetBSD (non-EFI) loader images" + depends on CMD_BOOTM + default y + help + Support booting NetBSD via the bootm command. + +config BOOTM_OPENRTOS + bool "Support booting OPENRTOS / FreeRTOS images" + depends on CMD_BOOTM + help + Support booting OPENRTOS / FreeRTOS via the bootm command. + +config BOOTM_OSE + bool "Support booting Enea OSE images" + depends on CMD_BOOTM + help + Support booting Enea OSE images via the bootm command. + +config BOOTM_PLAN9 + bool "Support booting Plan9 OS images" + depends on CMD_BOOTM + default y + help + Support booting Plan9 images via the bootm command. + +config BOOTM_RTEMS + bool "Support booting RTEMS OS images" + depends on CMD_BOOTM + default y + help + Support booting RTEMS images via the bootm command. + +config BOOTM_VXWORKS + bool "Support booting VxWorks OS images" + depends on CMD_BOOTM + default y + help + Support booting VxWorks images via the bootm command. + config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing" depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX -- cgit v1.2.3 From 60a9aebdc3a77bfd00391992a3b8b722c73c4618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 23 Sep 2019 22:43:41 +0100 Subject: Kconfig: fix a typo in the description of bmp command. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrius Štikonas --- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/Kconfig b/cmd/Kconfig index 8fcb1b84741..4e61565aab1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1517,7 +1517,7 @@ config CMD_BMP bool "Enable 'bmp' command" depends on LCD || DM_VIDEO || VIDEO help - This provides a way to obtain information about a BMP-format iamge + This provides a way to obtain information about a BMP-format image and to display it. BMP (which presumably stands for BitMaP) is a file format defined by Microsoft which supports images of various depths, formats and compression methods. Headers on the file -- cgit v1.2.3