diff options
| author | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
|---|---|---|
| committer | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
| commit | 0377dca227cc883bbaacbe1c442cef5bd6b0e121 (patch) | |
| tree | 6c11795538a28ebd3ddb2389510e91d80c6ef1eb /common/Makefile | |
| parent | 7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b (diff) | |
| parent | 038ccac511214b062c56f22b9413f784b86bcd87 (diff) | |
| download | u-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.zip u-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.tar.gz u-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.tar.bz2 | |
Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 7dbf84a..7e45a7c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -37,7 +37,7 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \ cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \ cmd_load.o cmd_log.o \ cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \ - cmd_nand.o cmd_net.o cmd_nvedit.o \ + cmd_nand.o cmd_nand_new.o cmd_net.o cmd_nvedit.o \ cmd_pci.o cmd_pcmcia.o cmd_portio.o \ cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o \ cmd_usb.o cmd_vfd.o \ |