diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 | 
| commit | 4b7a6dd89633d60dc4b58476d5ce48247f82a3ca (patch) | |
| tree | d3cfeccec77867d855289809d6a472617d16c0cc /include/common.h | |
| parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f (diff) | |
| parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 (diff) | |
| download | olio-uboot-2014.01-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.tar.xz olio-uboot-2014.01-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.zip | |
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
Conflicts:
	common/cmd_bootm.c
	common/cmd_log.c
	include/common.h
	post/board/lwmon5/Makefile
	post/board/lwmon5/dsp.c
	post/board/lwmon5/dspic.c
	post/board/lwmon5/fpga.c
	post/board/lwmon5/gdc.c
	post/board/lwmon5/sysmon.c
	post/board/lwmon5/watchdog.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/include/common.h b/include/common.h index 0ac1f8017..f12e3bd0d 100644 --- a/include/common.h +++ b/include/common.h @@ -681,4 +681,8 @@ int cpu_reset(int nr);  int cpu_release(int nr, int argc, char *argv[]);  #endif +#ifdef CONFIG_POST +#define CONFIG_HAS_POST +#endif +  #endif	/* __COMMON_H_ */ |