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 /post/drivers | |
| parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f (diff) | |
| parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 (diff) | |
| download | u-boot-imx-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.zip u-boot-imx-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.tar.gz u-boot-imx-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.tar.bz2 | |
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 'post/drivers')
| -rw-r--r-- | post/drivers/Makefile | 6 | ||||
| -rw-r--r-- | post/drivers/i2c.c | 3 | ||||
| -rw-r--r-- | post/drivers/memory.c | 3 | ||||
| -rw-r--r-- | post/drivers/rtc.c | 3 |
4 files changed, 2 insertions, 13 deletions
diff --git a/post/drivers/Makefile b/post/drivers/Makefile index cb2f1de..0b6cdf5 100644 --- a/post/drivers/Makefile +++ b/post/drivers/Makefile @@ -20,12 +20,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # - - -SUBDIRS = +include $(TOPDIR)/config.mk LIB = libpostdrivers.a -COBJS = i2c.o memory.o rtc.o +COBJS-$(CONFIG_HAS_POST) += i2c.o memory.o rtc.o include $(TOPDIR)/post/rules.mk diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c index 1b2e644..f54fe99 100644 --- a/post/drivers/i2c.c +++ b/post/drivers/i2c.c @@ -23,8 +23,6 @@ #include <common.h> -#ifdef CONFIG_POST - /* * I2C test * @@ -91,4 +89,3 @@ int i2c_post_test (int flags) } #endif /* CONFIG_POST & CFG_POST_I2C */ -#endif /* CONFIG_POST */ diff --git a/post/drivers/memory.c b/post/drivers/memory.c index fb96985..e94d92c 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -150,8 +150,6 @@ * the whole RAM. */ -#ifdef CONFIG_POST - #include <post.h> #include <watchdog.h> @@ -483,4 +481,3 @@ int memory_post_test (int flags) } #endif /* CONFIG_POST & CFG_POST_MEMORY */ -#endif /* CONFIG_POST */ diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c index e3da5e6..66e5265 100644 --- a/post/drivers/rtc.c +++ b/post/drivers/rtc.c @@ -40,8 +40,6 @@ * nonleap-years. */ -#ifdef CONFIG_POST - #include <post.h> #include <rtc.h> @@ -195,4 +193,3 @@ int rtc_post_test (int flags) } #endif /* CONFIG_POST & CFG_POST_RTC */ -#endif /* CONFIG_POST */ |