diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-06-21 18:02:13 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-23 21:48:09 +0000 |
| commit | dd5883dee60a06995bb167badc2352bf42a8aee5 (patch) | |
| tree | 05d186cef5025c5f04da3372e5401716e378d949 | |
| parent | 5b63803f6cfd55edb8cafa598aed9b9ec9d5211c (diff) | |
| download | vboot-dd5883dee60a06995bb167badc2352bf42a8aee5.tar.gz | |
vboot2: Allow platform dependent debug logging
TEST=Built with VBOOT_DEBUG on/off. Booted Nyan Blaze. Verified debut output.
BUG=None
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: Id189231f16ca8719dfff0ef3c9a8d4982b741d5f
Reviewed-on: https://chromium-review.googlesource.com/205157
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/2lib/include/2api.h | 1 | ||||
| -rw-r--r-- | firmware/2lib/include/2common.h | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 7e95d24b..4684d54b 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -372,4 +372,5 @@ int vb2ex_read_resource(struct vb2_context *ctx, void *buf, uint32_t size); +void vb2ex_printf(const char *func, const char *fmt, ...); #endif /* VBOOT_2_API_H_ */ diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h index 326f8919..10ecf808 100644 --- a/firmware/2lib/include/2common.h +++ b/firmware/2lib/include/2common.h @@ -8,6 +8,7 @@ #ifndef VBOOT_REFERENCE_VBOOT_2COMMON_H_ #define VBOOT_REFERENCE_VBOOT_2COMMON_H_ +#include "2api.h" #include "2return_codes.h" #include "2sha.h" #include "2struct.h" @@ -23,13 +24,16 @@ struct vb2_public_key; #endif /* - * Debug output. Defaults to printf(), but can be overridden on a per-platform - * basis. + * Debug output. printf() for tests. otherwise, it's platform-dependent. */ -#if defined(VBOOT_DEBUG) && !defined(VB2_DEBUG) -#define VB2_DEBUG(format, args...) printf(format, ## args) +#if defined(VBOOT_DEBUG) +# if defined(FOR_TEST) +# define VB2_DEBUG(format, args...) printf(format, ## args) +# else +# define VB2_DEBUG(format, args...) vb2ex_printf(__func__, format, ## args) +# endif #else -#define VB2_DEBUG(format, args...) +# define VB2_DEBUG(format, args...) #endif /* Alignment for work buffer pointers/allocations */ |