disk: convert part_* files to COBJ-$(CONFIG_XXX) style
PATCH 1/1 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 <[email protected]>
--- disk/Makefile | 10 +++++----- disk/part_amiga.c | 10 +++++----- disk/part_dos.c | 12 ++++++------ disk/part_efi.c | 12 ++++++------ disk/part_iso.c | 12 ++++++------ disk/part_mac.c | 12 ++++++------ 6 files changed, 34 insertions(+), 34 deletions(-)
disk/Makefile +5 -5
@@ -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)
disk/part_amiga.c +5 -5
@@ -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
disk/part_dos.c +6 -6
@@ -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 */
disk/part_efi.c +6 -6
@@ -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 */
disk/part_iso.c +6 -6
@@ -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 */
disk/part_mac.c +6 -6
@@ -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
Signature · 1 line
1.6.1.1
Wolfgang Denk
AppliedPATCH 1/1 disk: convert part_* files to COBJ-$(CONFIG_XXX) style
Dear Mike Frysinger,
Quoted 4 lines · In message <[email protected]> you wrote:
Move the
CONFIG_XXXout of thepart_XXX.cfile and intoMakefileto avoid pointless compiles.Signed-off-by Mike Frysinger <[email protected]>
Quoted 8 lines
--- disk/Makefile | 10 +++++----- disk/part_amiga.c | 10 +++++----- disk/part_dos.c | 12 ++++++------ disk/part_efi.c | 12 ++++++------ disk/part_iso.c | 12 ++++++------ disk/part_mac.c | 12 ++++++------ 6 files changed, 34 insertions(+), 34 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Consistency requires you to be as ignorant today as you were a year ago." - Bernard Berenson