diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-07-23 13:05:45 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-23 17:37:53 -0700 |
| commit | cb1f7306b34507b3d9481cd4327271b2227747b8 (patch) | |
| tree | a6862df1fbcfa4432743de4cd9ae0f1b64e3c344 /include/util.h | |
| parent | a1699727a83758defb2e80deab59d34a18bfe581 (diff) | |
| download | chrome-ec-cb1f7306b34507b3d9481cd4327271b2227747b8.tar.gz | |
Clean up debug config options
All of these were defined on all but a few platforms, and those
explicitly #undef them. So define them as enabled by default in
config.h so the board.h files are cleaner.
No functional changes; just rearranging/renaming config constants.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms; FEATURES=test emerge-falco chromeos-ec
Change-Id: I1201a1472ae29641e9e219c2a0347691ca64cd28
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63102
Reviewed-by: Vic Yang <victoryang@chromium.org>
Diffstat (limited to 'include/util.h')
| -rw-r--r-- | include/util.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/util.h b/include/util.h index dc9cffdee0..ed30ed4e46 100644 --- a/include/util.h +++ b/include/util.h @@ -16,19 +16,19 @@ * Trigger a debug exception if the condition * is not verified at runtime. */ -#ifdef CONFIG_DEBUG -# ifdef CONFIG_ASSERT_HELP -# define ASSERT(cond) do { \ +#ifdef CONFIG_DEBUG_ASSERT +#ifdef CONFIG_DEBUG_ASSERT_REBOOTS +#define ASSERT(cond) do { \ if (!(cond)) \ panic_assert_fail(#cond, __func__, __FILE__, \ __LINE__); \ - } while (0); -# else -# define ASSERT(cond) do { \ + } while (0) +#else +#define ASSERT(cond) do { \ if (!(cond)) \ __asm("bkpt"); \ - } while (0); -# endif + } while (0) +#endif #else #define ASSERT(cond) #endif |