From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shinya Kuribayashi <skuribay@pobox.com>
Date: Tue, 15 Mar 2011 12:16:58 +0900
Subject: [U-Boot] [PATCH v6 7/7] modify files for ben nanonote board
In-Reply-To: <1298876234-28115-8-git-send-email-xiangfu@openmobilefree.net>
References: <1298876234-28115-1-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-2-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-3-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-4-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-5-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-6-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-7-git-send-email-xiangfu@openmobilefree.net>
	<1298876234-28115-8-git-send-email-xiangfu@openmobilefree.net>
Message-ID: <4D7EDA2A.702@pobox.com>
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 02/28/2011 03:57 PM, Xiangfu Liu wrote:
> diff --git a/Makefile b/Makefile
> index dc2e3d8..758daf2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1093,6 +1093,19 @@ smdk6400_config	:	unconfig
>  	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
>  
>  #========================================================================
> +# MIPS
> +#========================================================================
> +#########################################################################
> +## MIPS32 XBurst jz4740
> +#########################################################################
> +qi_lb60_config  : unconfig
> +	@mkdir -p $(obj)include
> +	@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
> +	@echo "Compile NAND boot image for QI LB60"
> +	@$(MKCONFIG) -a qi_lb60 mips xburst nanonote xburst
> +	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
> +
> +#========================================================================
>  # Nios
>  #========================================================================

(In PATCH v6 6/7)
> diff --git a/boards.cfg b/boards.cfg
> index 45c3102..cb8c6a0 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -243,6 +243,7 @@ vct_platinumavc              mips        mips        vct                 microna
>  vct_platinumavc_small        mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
>  vct_platinumavc_onenand      mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
>  vct_platinumavc_onenand_small mips       mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
> +qi_lb60                      mips        mips
>  PCI5441                      nios2       nios2       pci5441             psyent
>  PK1C20                       nios2       nios2       pk1c20              psyent
>  EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260

You added targets with the same name to two places.  In this case,
boards.cfg will be used to configure qi_lb60.  All MIPS targets can
be configured through boards.cfg now, so please 1) remove $(TOPDIR)/
Makefile part, and 2) get 'qi_lb60' entry work as expected, instead.