diff options
author | Terry Lv <r65388@freescale.com> | 2012-02-10 23:51:42 +0800 |
---|---|---|
committer | Terry Lv <r65388@freescale.com> | 2012-02-13 23:44:25 +0800 |
commit | eb479419488cdde24634257f6581de2d6ab3a2a9 (patch) | |
tree | 2c263d6a4af856fd346dfcae1ff9375b0fff82e7 /disk | |
parent | 2b3df5c8607ddad855a7e6b194d4028610b3a6f2 (diff) | |
download | u-boot-imx-eb479419488cdde24634257f6581de2d6ab3a2a9.zip u-boot-imx-eb479419488cdde24634257f6581de2d6ab3a2a9.tar.gz u-boot-imx-eb479419488cdde24634257f6581de2d6ab3a2a9.tar.bz2 |
ENGR00174104-4: Fix iram build error in imx6
Fix a build error when part.c is built in iram u-boot building.
part.c:94: error: redefinition of 'get_dev'
/home/r65388/uboot-imx-v2009.08/uboot-imx/include/part.h:117: error:
previous definition of 'get_dev' was here
make[1]: *** [part.o] Error 1
make[1]: Leaving directory
`/home/r65388/uboot-imx-v2009.08/uboot-imx/disk'
make: *** [disk/libdisk.a] Error 2
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'disk')
-rw-r--r-- | disk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/disk/Makefile b/disk/Makefile index 128db77..f186625 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libdisk.a -COBJS-y += part.o +COBJS-$(CONFIG_PARTITIONS) += part.o COBJS-$(CONFIG_MAC_PARTITION) += part_mac.o COBJS-$(CONFIG_DOS_PARTITION) += part_dos.o COBJS-$(CONFIG_ISO_PARTITION) += part_iso.o |