diff options
| author | Wolfgang Denk <wd@denx.de> | 2013-11-19 08:01:44 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:41:55 -0500 |
| commit | a5750b805828f471469d6ad31e052e83a564de2e (patch) | |
| tree | 37bc6605d04b9f38b89df29e229792fecf58a7ef /arch/blackfin | |
| parent | 4d1584bd0df86044a17daf3812b4a3b48913d970 (diff) | |
| download | blackbird-obmc-uboot-a5750b805828f471469d6ad31e052e83a564de2e.tar.gz blackbird-obmc-uboot-a5750b805828f471469d6ad31e052e83a564de2e.zip | |
blackfin: don't use 'bool' when it causes problems
The use of 'bool' data types in globally used header files cases build
errors like this:
In file included from arch/blackfin/include/asm/blackfin.h:13:0,
from include/common.h:92,
from cmd_test.c:17:
arch/blackfin/include/asm/blackfin_local.h:54:1: error: unknown type name 'bool'
Use plain 'int' instead to avoid such kind of trouble.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/cpu/os_log.c | 6 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/blackfin_local.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/cpu/os_log.c b/arch/blackfin/cpu/os_log.c index e1c8e2948d..2092d9e3b6 100644 --- a/arch/blackfin/cpu/os_log.c +++ b/arch/blackfin/cpu/os_log.c @@ -12,12 +12,12 @@ #define OS_LOG_MAGIC_ADDR ((unsigned long *)0x4f0) #define OS_LOG_PTR_ADDR ((char **)0x4f4) -bool bfin_os_log_check(void) +int bfin_os_log_check(void) { if (*OS_LOG_MAGIC_ADDR != OS_LOG_MAGIC) - return false; + return 0; *OS_LOG_MAGIC_ADDR = 0; - return true; + return 1; } void bfin_os_log_dump(void) diff --git a/arch/blackfin/include/asm/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h index ab31dcb815..8ea8cde691 100644 --- a/arch/blackfin/include/asm/blackfin_local.h +++ b/arch/blackfin/include/asm/blackfin_local.h @@ -51,7 +51,7 @@ extern u_long get_dclk(void); # define bfin_revid() (bfin_read_CHIPID() >> 28) -extern bool bfin_os_log_check(void); +extern int bfin_os_log_check(void); extern void bfin_os_log_dump(void); extern void blackfin_icache_flush_range(const void *, const void *); |
