summaryrefslogtreecommitdiff
path: root/board/fads
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-09-17 17:12:45 +0200
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-09-17 17:12:45 +0200
commitf930922f061ea7bf585296859d1c14194c24b840 (patch)
treec46b9f120f7c55f5baf8b6ac3048ba759e10a512 /board/fads
parent97213f32416ead885deafea86774e912ffd60ad0 (diff)
parent67c31036acaaaa992fc346cc89db0909a7e733c4 (diff)
downloadu-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.zip
u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.gz
u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/fads')
-rw-r--r--board/fads/fads.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/fads/fads.h b/board/fads/fads.h
index c6f7ccd..dea8a0d 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:
@@ -226,6 +229,7 @@
#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */
#define CFG_ENV_OFFSET CFG_ENV_SECT_SIZE
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */
+#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_DIRECT_FLASH_TFTP