linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

bootstage: Drop unused options

Browse Source 
The CONFIG_BOOTSTAGE_USER_COUNT option is no-longer needed since we can now
support any number of user IDs. Also BOOTSTAGE_ID_COUNT is not needed now.

Drop these unused options.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2017-09-05 19:49:48 -06:00
committed by Bin Meng
parent 2ff50f5fa4
commit 066b25b6c4
7 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/Kconfig
View File

@ -46,15 +46,6 @@ config BOOTSTAGE_REPORT
29,916,167 26,005,792 bootm_start 29,916,167 26,005,792 bootm_start
30,361,327 445,160 start_kernel 30,361,327 445,160 start_kernel
config BOOTSTAGE_USER_COUNT
int "Number of boot ID numbers available for user use"
default 20
help
This is the number of available user bootstage records.
Each time you call bootstage_mark(BOOTSTAGE_ID_ALLOC, ...)
a new ID will be allocated from this stash. If you exceed
the limit, recording will stop.
config BOOTSTAGE_RECORD_COUNT config BOOTSTAGE_RECORD_COUNT
int "Number of boot stage records to store" int "Number of boot stage records to store"
default 30 default 30

2
common/bootstage.c
View File

@ -456,7 +456,7 @@ int bootstage_unstash(const void *base, int size)
if (data->rec_count + hdr->count > RECORD_COUNT) { if (data->rec_count + hdr->count > RECORD_COUNT) {
debug("%s: Bootstage has %d records, we have space for %d\n" debug("%s: Bootstage has %d records, we have space for %d\n"
"- please increase CONFIG_BOOTSTAGE_USER_COUNT\n", "- please increase CONFIG_BOOTSTAGE_RECORD_COUNT\n",
__func__, hdr->count, RECORD_COUNT - data->rec_count); __func__, hdr->count, RECORD_COUNT - data->rec_count);
return -ENOSPC; return -ENOSPC;
} }

1
configs/sandbox_defconfig
View File

@ -7,7 +7,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_REPORT=y
CONFIG_BOOTSTAGE_USER_COUNT=32
CONFIG_BOOTSTAGE_FDT=y CONFIG_BOOTSTAGE_FDT=y
CONFIG_BOOTSTAGE_STASH=y CONFIG_BOOTSTAGE_STASH=y
CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_ADDR=0x0

1
configs/sandbox_flattree_defconfig
View File

@ -7,7 +7,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_REPORT=y
CONFIG_BOOTSTAGE_USER_COUNT=32
CONFIG_BOOTSTAGE_FDT=y CONFIG_BOOTSTAGE_FDT=y
CONFIG_BOOTSTAGE_STASH=y CONFIG_BOOTSTAGE_STASH=y
CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_ADDR=0x0

1
configs/sandbox_noblk_defconfig
View File

@ -6,7 +6,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_REPORT=y
CONFIG_BOOTSTAGE_USER_COUNT=32
CONFIG_BOOTSTAGE_FDT=y CONFIG_BOOTSTAGE_FDT=y
CONFIG_BOOTSTAGE_STASH=y CONFIG_BOOTSTAGE_STASH=y
CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_ADDR=0x0

1
configs/sandbox_spl_defconfig
View File

@ -13,7 +13,6 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_REPORT=y
CONFIG_BOOTSTAGE_USER_COUNT=32
CONFIG_BOOTSTAGE_FDT=y CONFIG_BOOTSTAGE_FDT=y
CONFIG_BOOTSTAGE_STASH=y CONFIG_BOOTSTAGE_STASH=y
CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_ADDR=0x0

6
include/bootstage.h
View File

@ -12,11 +12,6 @@
#ifndef _BOOTSTAGE_H #ifndef _BOOTSTAGE_H
#define _BOOTSTAGE_H #define _BOOTSTAGE_H
/* Define this for host tools */
#ifndef CONFIG_BOOTSTAGE_USER_COUNT
#define CONFIG_BOOTSTAGE_USER_COUNT 20
#endif
/* Flags for each bootstage record */ /* Flags for each bootstage record */
enum bootstage_flags { enum bootstage_flags {
BOOTSTAGEF_ERROR = 1 << 0, /* Error record */ BOOTSTAGEF_ERROR = 1 << 0, /* Error record */
@ -208,7 +203,6 @@ enum bootstage_id {
/* a few spare for the user, from here */ /* a few spare for the user, from here */
BOOTSTAGE_ID_USER, BOOTSTAGE_ID_USER,
BOOTSTAGE_ID_COUNT = BOOTSTAGE_ID_USER + CONFIG_BOOTSTAGE_USER_COUNT,
BOOTSTAGE_ID_ALLOC, BOOTSTAGE_ID_ALLOC,
}; };