From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 18 Nov 2009 19:10:49 -0500
Subject: [U-Boot] [PATCH v2] Condense some lines in common/Makefile for
	readability.
In-Reply-To: <alpine.LFD.2.00.0911180600170.19749@localhost>
References: <alpine.LFD.2.00.0911180600170.19749@localhost>
Message-ID: <200911181910.49928.vapier@gentoo.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Wednesday 18 November 2009 06:01:52 Robert P. J. Day wrote:
> Collect object files corresponding to the same CONFIG variable on the
> same line for better readability.
> 
>   clearly no *functional* difference but it follows the standard set
> out in the rest of the file.  compile tested for a beagle, for what
> it's worth.
> 
>   and the slight change to this version is that a duplicate and
> redundant check for ENV_IS_IN_EEPROM further down the file was also
> removed.
> 
> diff --git a/common/Makefile b/common/Makefile
> index 3781738..b3d66aa 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -50,15 +50,12 @@ COBJS-y += cmd_nvedit.o
>  # environment
>  COBJS-y += env_common.o
>  COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
> -COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
> +COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o env_eeprom.o
>  COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
> -COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
> -COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
> -COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
> -COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
> +COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o env_flash.o
> +COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o env_nvram.o
>  COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
>  COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
> -COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
>  COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
>  COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
>  COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
> @@ -84,7 +81,6 @@ COBJS-$(CONFIG_CMD_DIAG) += cmd_diag.o
>  endif
>  COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
>  COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
> -COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
>  COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
>  COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
>  COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o

the env_embedded.o lines are kept sep on purpose and i'd prefer to keep it 
this way seeing as how i have patches to simply delete these.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091118/dd3c7e3e/attachment.pgp