summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-02-14 14:07:21 -0600
committerJon Loeliger <jdl@freescale.com>2008-02-14 14:07:21 -0600
commit746c4b9490495dc4381dbcc49f40078d423e0a48 (patch)
treee726020abb9e37df1fca19d8895bf203b27612d1 /include
parent3f2ac8f928c76cbd2374437b2d079f8b4324aaba (diff)
parentfe891ecf4d187e9d11dde869ed4623af52b54451 (diff)
downloadu-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.zip
u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.gz
u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'include')
-rw-r--r--include/common.h6
-rw-r--r--include/configs/munices.h2
-rw-r--r--include/configs/trizepsiv.h2
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