diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-01-29 20:02:07 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-18 00:50:51 +0100 |
| commit | 7bd2722e890bc877a3c057d7ccddc80451c99939 (patch) | |
| tree | 2d5fc7c352117c0c76ffc0c8dce2fc7d59eac6eb /disk | |
| parent | f05fa9205e04986176dc7ab8b710bcb5fbe9f338 (diff) | |
| download | u-boot-7bd2722e890bc877a3c057d7ccddc80451c99939.tar.gz u-boot-7bd2722e890bc877a3c057d7ccddc80451c99939.tar.xz u-boot-7bd2722e890bc877a3c057d7ccddc80451c99939.zip | |
disk: convert part_* files to COBJ-$(CONFIG_XXX) style
Move the CONFIG_XXX out of the part_XXX.c file and into Makefile to
avoid pointless compiles.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/Makefile | 10 | ||||
| -rw-r--r-- | disk/part_amiga.c | 10 | ||||
| -rw-r--r-- | disk/part_dos.c | 12 | ||||
| -rw-r--r-- | disk/part_efi.c | 12 | ||||
| -rw-r--r-- | disk/part_iso.c | 12 | ||||
| -rw-r--r-- | disk/part_mac.c | 12 |
6 files changed, 34 insertions, 34 deletions
diff --git a/disk/Makefile b/disk/Makefile index c4791451c4..128db77df6 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -28,11 +28,11 @@ include $(TOPDIR)/config.mk LIB = $(obj)libdisk.a COBJS-y += part.o -COBJS-y += part_mac.o -COBJS-y += part_dos.o -COBJS-y += part_iso.o -COBJS-y += part_amiga.o -COBJS-y += part_efi.o +COBJS-$(CONFIG_MAC_PARTITION) += part_mac.o +COBJS-$(CONFIG_DOS_PARTITION) += part_dos.o +COBJS-$(CONFIG_ISO_PARTITION) += part_iso.o +COBJS-$(CONFIG_AMIGA_PARTITION) += part_amiga.o +COBJS-$(CONFIG_EFI_PARTITION) += part_efi.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 6c3d748970..c2daf6a600 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -26,11 +26,11 @@ #include <ide.h> #include "part_amiga.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) #undef AMIGA_DEBUG diff --git a/disk/part_dos.c b/disk/part_dos.c index 4d778ec5b2..4ab0b40601 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -35,12 +35,12 @@ #include <ide.h> #include "part_dos.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SATA) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_DOS_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) /* Convert char[4] in little endian format to the host format integer */ diff --git a/disk/part_efi.c b/disk/part_efi.c index d8a81115c5..70f62cc9af 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -36,12 +36,12 @@ #include <malloc.h> #include "part_efi.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SATA) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_EFI_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) /* Convert char[2] in little endian format to the host format integer */ diff --git a/disk/part_iso.c b/disk/part_iso.c index 72ff8689d0..719b9495c8 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -25,12 +25,12 @@ #include <command.h> #include "part_iso.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_SATA) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_ISO_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) /* #define ISO_PART_DEBUG */ diff --git a/disk/part_mac.c b/disk/part_mac.c index 1922fe53a9..c1afc8c20a 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -34,12 +34,12 @@ #include <ide.h> #include "part_mac.h" -#if (defined(CONFIG_CMD_IDE) || \ - defined(CONFIG_CMD_SCSI) || \ - defined(CONFIG_CMD_SATA) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_MAC_PARTITION) +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) /* stdlib.h causes some compatibility problems; should fixe these! -- wd */ #ifndef __ldiv_t_defined |