Kconfig: Move boot timing under boot options

This relates to booting, so move it under the boot menu.

Signed-off-by: Simon Glass <sjg@chromium.org>

1 files changed, 0 insertions, 291 deletions

diff --git a/common/Kconfig b/common/Kconfig
index f234240ec9..826a9d5ba6 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,296 +1,5 @@
 source "common/Kconfig.boot"
 
-menu "Boot timing"
-
-config BOOTSTAGE
-	bool "Boot timing and reporting"
-	help
-	  Enable recording of boot time while booting. To use it, insert
-	  calls to bootstage_mark() with a suitable BOOTSTAGE_ID from
-	  bootstage.h. Only a single entry is recorded for each ID. You can
-	  give the entry a name with bootstage_mark_name(). You can also
-	  record elapsed time in a particular stage using bootstage_start()
-	  before starting and bootstage_accum() when finished. Bootstage will
-	  add up all the accumulated time and report it.
-
-	  Normally, IDs are defined in bootstage.h but a small number of
-	  additional 'user' IDs can be used by passing BOOTSTAGE_ID_ALLOC
-	  as the ID.
-
-	  Calls to show_boot_progress() will also result in log entries but
-	  these will not have names.
-
-config SPL_BOOTSTAGE
-	bool "Boot timing and reported in SPL"
-	depends on BOOTSTAGE
-	help
-	  Enable recording of boot time in SPL. To make this visible to U-Boot
-	  proper, enable BOOTSTAGE_STASH as well. This will stash the timing
-	  information when SPL finishes and load it when U-Boot proper starts
-	  up.
-
-config TPL_BOOTSTAGE
-	bool "Boot timing and reported in TPL"
-	depends on BOOTSTAGE
-	help
-	  Enable recording of boot time in SPL. To make this visible to U-Boot
-	  proper, enable BOOTSTAGE_STASH as well. This will stash the timing
-	  information when TPL finishes and load it when U-Boot proper starts
-	  up.
-
-config BOOTSTAGE_REPORT
-	bool "Display a detailed boot timing report before booting the OS"
-	depends on BOOTSTAGE
-	help
-	  Enable output of a boot time report just before the OS is booted.
-	  This shows how long it took U-Boot to go through each stage of the
-	  boot process. The report looks something like this:
-
-		Timer summary in microseconds:
-		       Mark    Elapsed  Stage
-			  0          0  reset
-		  3,575,678  3,575,678  board_init_f start
-		  3,575,695         17  arch_cpu_init A9
-		  3,575,777         82  arch_cpu_init done
-		  3,659,598     83,821  board_init_r start
-		  3,910,375    250,777  main_loop
-		 29,916,167 26,005,792  bootm_start
-		 30,361,327    445,160  start_kernel
-
-config BOOTSTAGE_RECORD_COUNT
-	int "Number of boot stage records to store"
-	default 30
-	help
-	  This is the size of the bootstage record list and is the maximum
-	  number of bootstage records that can be recorded.
-
-config SPL_BOOTSTAGE_RECORD_COUNT
-	int "Number of boot stage records to store for SPL"
-	default 5
-	help
-	  This is the size of the bootstage record list and is the maximum
-	  number of bootstage records that can be recorded.
-
-config TPL_BOOTSTAGE_RECORD_COUNT
-	int "Number of boot stage records to store for TPL"
-	default 5
-	help
-	  This is the size of the bootstage record list and is the maximum
-	  number of bootstage records that can be recorded.
-
-config BOOTSTAGE_FDT
-	bool "Store boot timing information in the OS device tree"
-	depends on BOOTSTAGE
-	help
-	  Stash the bootstage information in the FDT. A root 'bootstage'
-	  node is created with each bootstage id as a child. Each child
-	  has a 'name' property and either 'mark' containing the
-	  mark time in microseconds, or 'accum' containing the
-	  accumulated time for that bootstage id in microseconds.
-	  For example:
-
-		bootstage {
-			154 {
-				name = "board_init_f";
-				mark = <3575678>;
-			};
-			170 {
-				name = "lcd";
-				accum = <33482>;
-			};
-		};
-
-	  Code in the Linux kernel can find this in /proc/devicetree.
-
-config BOOTSTAGE_STASH
-	bool "Stash the boot timing information in memory before booting OS"
-	depends on BOOTSTAGE
-	help
-	  Some OSes do not support device tree. Bootstage can instead write
-	  the boot timing information in a binary format at a given address.
-	  This happens through a call to bootstage_stash(), typically in
-	  the CPU's cleanup_before_linux() function. You can use the
-	  'bootstage stash' and 'bootstage unstash' commands to do this on
-	  the command line.
-
-config BOOTSTAGE_STASH_ADDR
-	hex "Address to stash boot timing information"
-	default 0
-	help
-	  Provide an address which will not be overwritten by the OS when it
-	  starts, so that it can read this information when ready.
-
-config BOOTSTAGE_STASH_SIZE
-	hex "Size of boot timing stash region"
-	default 0x1000
-	help
-	  This should be large enough to hold the bootstage stash. A value of
-	  4096 (4KiB) is normally plenty.
-
-config SHOW_BOOT_PROGRESS
-	bool "Show boot progress in a board-specific manner"
-	help
-	  Defining this option allows to add some board-specific code (calling
-	  a user-provided function show_boot_progress(int) that enables you to
-	  show the system's boot progress on some display (for example, some
-	  LEDs) on your board. At the moment, the following checkpoints are
-	  implemented:
-
-	  Legacy uImage format:
-
-	  Arg	Where			When
-	    1	common/cmd_bootm.c	before attempting to boot an image
-	   -1	common/cmd_bootm.c	Image header has bad	 magic number
-	    2	common/cmd_bootm.c	Image header has correct magic number
-	   -2	common/cmd_bootm.c	Image header has bad	 checksum
-	    3	common/cmd_bootm.c	Image header has correct checksum
-	   -3	common/cmd_bootm.c	Image data   has bad	 checksum
-	    4	common/cmd_bootm.c	Image data   has correct checksum
-	   -4	common/cmd_bootm.c	Image is for unsupported architecture
-	    5	common/cmd_bootm.c	Architecture check OK
-	   -5	common/cmd_bootm.c	Wrong Image Type (not kernel, multi)
-	    6	common/cmd_bootm.c	Image Type check OK
-	   -6	common/cmd_bootm.c	gunzip uncompression error
-	   -7	common/cmd_bootm.c	Unimplemented compression type
-	    7	common/cmd_bootm.c	Uncompression OK
-	    8	common/cmd_bootm.c	No uncompress/copy overwrite error
-	   -9	common/cmd_bootm.c	Unsupported OS (not Linux, BSD, VxWorks, QNX)
-
-	    9	common/image.c		Start initial ramdisk verification
-	  -10	common/image.c		Ramdisk header has bad	   magic number
-	  -11	common/image.c		Ramdisk header has bad	   checksum
-	   10	common/image.c		Ramdisk header is OK
-	  -12	common/image.c		Ramdisk data   has bad	   checksum
-	   11	common/image.c		Ramdisk data   has correct checksum
-	   12	common/image.c		Ramdisk verification complete, start loading
-	  -13	common/image.c		Wrong Image Type (not PPC Linux ramdisk)
-	   13	common/image.c		Start multifile image verification
-	   14	common/image.c		No initial ramdisk, no multifile, continue.
-
-	   15	arch/<arch>/lib/bootm.c All preparation done, transferring control to OS
-
-	  -30	arch/powerpc/lib/board.c	Fatal error, hang the system
-	  -31	post/post.c		POST test failed, detected by post_output_backlog()
-	  -32	post/post.c		POST test failed, detected by post_run_single()
-
-	   34	common/cmd_doc.c	before loading a Image from a DOC device
-	  -35	common/cmd_doc.c	Bad usage of "doc" command
-	   35	common/cmd_doc.c	correct usage of "doc" command
-	  -36	common/cmd_doc.c	No boot device
-	   36	common/cmd_doc.c	correct boot device
-	  -37	common/cmd_doc.c	Unknown Chip ID on boot device
-	   37	common/cmd_doc.c	correct chip ID found, device available
-	  -38	common/cmd_doc.c	Read Error on boot device
-	   38	common/cmd_doc.c	reading Image header from DOC device OK
-	  -39	common/cmd_doc.c	Image header has bad magic number
-	   39	common/cmd_doc.c	Image header has correct magic number
-	  -40	common/cmd_doc.c	Error reading Image from DOC device
-	   40	common/cmd_doc.c	Image header has correct magic number
-	   41	common/cmd_ide.c	before loading a Image from a IDE device
-	  -42	common/cmd_ide.c	Bad usage of "ide" command
-	   42	common/cmd_ide.c	correct usage of "ide" command
-	  -43	common/cmd_ide.c	No boot device
-	   43	common/cmd_ide.c	boot device found
-	  -44	common/cmd_ide.c	Device not available
-	   44	common/cmd_ide.c	Device available
-	  -45	common/cmd_ide.c	wrong partition selected
-	   45	common/cmd_ide.c	partition selected
-	  -46	common/cmd_ide.c	Unknown partition table
-	   46	common/cmd_ide.c	valid partition table found
-	  -47	common/cmd_ide.c	Invalid partition type
-	   47	common/cmd_ide.c	correct partition type
-	  -48	common/cmd_ide.c	Error reading Image Header on boot device
-	   48	common/cmd_ide.c	reading Image Header from IDE device OK
-	  -49	common/cmd_ide.c	Image header has bad magic number
-	   49	common/cmd_ide.c	Image header has correct magic number
-	  -50	common/cmd_ide.c	Image header has bad	 checksum
-	   50	common/cmd_ide.c	Image header has correct checksum
-	  -51	common/cmd_ide.c	Error reading Image from IDE device
-	   51	common/cmd_ide.c	reading Image from IDE device OK
-	   52	common/cmd_nand.c	before loading a Image from a NAND device
-	  -53	common/cmd_nand.c	Bad usage of "nand" command
-	   53	common/cmd_nand.c	correct usage of "nand" command
-	  -54	common/cmd_nand.c	No boot device
-	   54	common/cmd_nand.c	boot device found
-	  -55	common/cmd_nand.c	Unknown Chip ID on boot device
-	   55	common/cmd_nand.c	correct chip ID found, device available
-	  -56	common/cmd_nand.c	Error reading Image Header on boot device
-	   56	common/cmd_nand.c	reading Image Header from NAND device OK
-	  -57	common/cmd_nand.c	Image header has bad magic number
-	   57	common/cmd_nand.c	Image header has correct magic number
-	  -58	common/cmd_nand.c	Error reading Image from NAND device
-	   58	common/cmd_nand.c	reading Image from NAND device OK
-
-	  -60	common/env_common.c	Environment has a bad CRC, using default
-
-	   64	net/eth.c		starting with Ethernet configuration.
-	  -64	net/eth.c		no Ethernet found.
-	   65	net/eth.c		Ethernet found.
-
-	  -80	common/cmd_net.c	usage wrong
-	   80	common/cmd_net.c	before calling net_loop()
-	  -81	common/cmd_net.c	some error in net_loop() occurred
-	   81	common/cmd_net.c	net_loop() back without error
-	  -82	common/cmd_net.c	size == 0 (File with size 0 loaded)
-	   82	common/cmd_net.c	trying automatic boot
-	   83	common/cmd_net.c	running "source" command
-	  -83	common/cmd_net.c	some error in automatic boot or "source" command
-	   84	common/cmd_net.c	end without errors
-
-	  FIT uImage format:
-
-	  Arg	Where			When
-	  100	common/cmd_bootm.c	Kernel FIT Image has correct format
-	  -100	common/cmd_bootm.c	Kernel FIT Image has incorrect format
-	  101	common/cmd_bootm.c	No Kernel subimage unit name, using configuration
-	  -101	common/cmd_bootm.c	Can't get configuration for kernel subimage
-	  102	common/cmd_bootm.c	Kernel unit name specified
-	  -103	common/cmd_bootm.c	Can't get kernel subimage node offset
-	  103	common/cmd_bootm.c	Found configuration node
-	  104	common/cmd_bootm.c	Got kernel subimage node offset
-	  -104	common/cmd_bootm.c	Kernel subimage hash verification failed
-	  105	common/cmd_bootm.c	Kernel subimage hash verification OK
-	  -105	common/cmd_bootm.c	Kernel subimage is for unsupported architecture
-	  106	common/cmd_bootm.c	Architecture check OK
-	  -106	common/cmd_bootm.c	Kernel subimage has wrong type
-	  107	common/cmd_bootm.c	Kernel subimage type OK
-	  -107	common/cmd_bootm.c	Can't get kernel subimage data/size
-	  108	common/cmd_bootm.c	Got kernel subimage data/size
-	  -108	common/cmd_bootm.c	Wrong image type (not legacy, FIT)
-	  -109	common/cmd_bootm.c	Can't get kernel subimage type
-	  -110	common/cmd_bootm.c	Can't get kernel subimage comp
-	  -111	common/cmd_bootm.c	Can't get kernel subimage os
-	  -112	common/cmd_bootm.c	Can't get kernel subimage load address
-	  -113	common/cmd_bootm.c	Image uncompress/copy overwrite error
-
-	  120	common/image.c		Start initial ramdisk verification
-	  -120	common/image.c		Ramdisk FIT image has incorrect format
-	  121	common/image.c		Ramdisk FIT image has correct format
-	  122	common/image.c		No ramdisk subimage unit name, using configuration
-	  -122	common/image.c		Can't get configuration for ramdisk subimage
-	  123	common/image.c		Ramdisk unit name specified
-	  -124	common/image.c		Can't get ramdisk subimage node offset
-	  125	common/image.c		Got ramdisk subimage node offset
-	  -125	common/image.c		Ramdisk subimage hash verification failed
-	  126	common/image.c		Ramdisk subimage hash verification OK
-	  -126	common/image.c		Ramdisk subimage for unsupported architecture
-	  127	common/image.c		Architecture check OK
-	  -127	common/image.c		Can't get ramdisk subimage data/size
-	  128	common/image.c		Got ramdisk subimage data/size
-	  129	common/image.c		Can't get ramdisk load address
-	  -129	common/image.c		Got ramdisk load address
-
-	  -130	common/cmd_doc.c	Incorrect FIT image format
-	  131	common/cmd_doc.c	FIT image format OK
-
-	  -140	common/cmd_ide.c	Incorrect FIT image format
-	  141	common/cmd_ide.c	FIT image format OK
-
-	  -150	common/cmd_nand.c	Incorrect FIT image format
-	  151	common/cmd_nand.c	FIT image format OK
-
-endmenu
-
 menu "Boot media"
 
 config NOR_BOOT