diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
| commit | 3f2175fa840925e2028c5d482e4cefa787cc8703 (patch) | |
| tree | 37dab4aa866865e647beda2993e710b4f246fb8f /include | |
| parent | d1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
| download | u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.zip u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.gz u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.bz2 | |
Merge branch 'denx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 6 | ||||
| -rw-r--r-- | include/configs/munices.h | 2 | ||||
| -rw-r--r-- | include/configs/trizepsiv.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index c4ee3e2..13428b3 100644 --- a/include/common.h +++ b/include/common.h @@ -203,8 +203,8 @@ void init_cmd_timeout(void); void reset_cmd_timeout(void); /* lib_$(ARCH)/board.c */ -void board_init_f (ulong); -void board_init_r (gd_t *, ulong); +void board_init_f (ulong) __attribute__ ((noreturn)); +void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); int checkboard (void); int checkflash (void); int checkdram (void); @@ -665,4 +665,6 @@ void inline show_boot_progress (int val); #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README. #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #endif /* __COMMON_H_ */ diff --git a/include/configs/munices.h b/include/configs/munices.h index 2372b57..38b27bb 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -48,7 +48,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 84998d4..7a15d97 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -140,7 +140,7 @@ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ /* #define CONFIG_INITRD_TAG 1 */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif |