diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-09-19 08:51:24 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-09-19 08:51:24 -0500 |
commit | afa98843e4665add11b69496341053b268156e3a (patch) | |
tree | 116878b6b94920a5f282d0a16e4b9ad9dfaf57ff /board/zylonite/config.mk | |
parent | b440d0ef72e6278973d3220c10136a4c0624c286 (diff) | |
parent | aeec782b020930732eab075af97212c3f03afcae (diff) | |
download | u-boot-imx-afa98843e4665add11b69496341053b268156e3a.zip u-boot-imx-afa98843e4665add11b69496341053b268156e3a.tar.gz u-boot-imx-afa98843e4665add11b69496341053b268156e3a.tar.bz2 |
Merge branch 'master' of http://www.denx.de/git/u-boot
Conflicts:
board/stxxtc/Makefile
Diffstat (limited to 'board/zylonite/config.mk')
-rw-r--r-- | board/zylonite/config.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/board/zylonite/config.mk b/board/zylonite/config.mk index b5d5955..09b0f71 100644 --- a/board/zylonite/config.mk +++ b/board/zylonite/config.mk @@ -2,5 +2,3 @@ #TEXT_BASE = 0xa1700000 #TEXT_BASE = 0xa3080000 TEXT_BASE = 0xa3008000 - -BOARDLIBS = drivers/nand/libnand.a |