summaryrefslogtreecommitdiff
path: root/board/fads/fads.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-16 19:50:53 +0200
committerStefan Roese <sr@denx.de>2007-08-16 19:50:53 +0200
commitfc9970137c8f187b5938e4926224e0f3d46c3476 (patch)
tree8d7a004483b1ec71ab7779cab468dece8382d13b /board/fads/fads.h
parent07bc20560cb9d3d186cca268c05c82762e8c55ad (diff)
parentd35b508a55508535b6e8445b718585d27df733d3 (diff)
downloadu-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.zip
u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.gz
u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/fads/fads.h')
-rw-r--r--board/fads/fads.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/board/fads/fads.h b/board/fads/fads.h
index c6f7ccd..a7fe2e9 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -71,7 +71,10 @@
#undef CONFIG_BOOTARGS
#undef CONFIG_WATCHDOG /* watchdog disabled */
+
+#if !defined(CONFIG_MPC885ADS)
#define CONFIG_BZIP2 /* include support for bzip2 compressed images */
+#endif
/*
* New MPC86xADS and MPC885ADS provide two Ethernet connectivity options: