eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dm-pull-20aug22' of https://source.denx.de/u-boot/custodians/u-boot-dm

Browse Source 
binman fixes for various things
binman clean-up of compression and addition of utilities
This commit is contained in:
Tom Rini
2022-08-22 12:41:07 -04:00
parent 61e887fb9c cd15b640b0
commit 850ac7ceb7
40 changed files with 1099 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/bootstage.h
View File

@@ -268,12 +268,27 @@ ulong bootstage_add_record(enum bootstage_id id, const char *name,
/**
* Mark a time stamp for the current boot stage.
*/
ulong bootstage_mark(enum bootstage_id id);
ulong bootstage_error(enum bootstage_id id);
#define bootstage_mark(id) bootstage_mark_name(id, __func__)
#define bootstage_error(id) bootstage_error_name(id, __func__)
/**
* bootstage_mark_name - record bootstage with passing id and name
* @id: Bootstage id to record this timestamp against
* @name: Textual name to display for this id in the report
*
* Return: recorded time stamp
*/
ulong bootstage_mark_name(enum bootstage_id id, const char *name);
/**
* bootstage_error_name - record bootstage error with passing id and name
* @id: Bootstage id to record this timestamp against
* @name: Textual name to display for this id in the report
*
* Return: recorded time stamp
*/
ulong bootstage_error_name(enum bootstage_id id, const char *name);
/**
* Mark a time stamp in the given function and line number
*

18
include/log.h
View File

@@ -130,18 +130,6 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
int line, const char *func, const char *fmt, ...)
__attribute__ ((format (__printf__, 6, 7)));
static inline int _log_nop(enum log_category_t cat, enum log_level_t level,
const char *file, int line, const char *func,
const char *fmt, ...)
__attribute__ ((format (__printf__, 6, 7)));
static inline int _log_nop(enum log_category_t cat, enum log_level_t level,
const char *file, int line, const char *func,
const char *fmt, ...)
{
return 0;
}
/**
* _log_buffer - Internal function to print data buffer in hex and ascii form
*
@@ -240,12 +228,6 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level,
})
#endif
#define log_nop(_cat, _level, _fmt, _args...) ({ \
int _l = _level; \
_log_nop((enum log_category_t)(_cat), _l, __FILE__, __LINE__, \
__func__, pr_fmt(_fmt), ##_args); \
})
#ifdef DEBUG
#define _DEBUG 1
#else