From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfgang Denk Date: Wed, 22 Sep 2010 22:52:03 +0200 Subject: [U-Boot] [PATCH] ppc4xx: Fix CATcenter build and add it to MAKEALL In-Reply-To: <1284363714-11355-1-git-send-email-sr@denx.de> References: <1284363714-11355-1-git-send-email-sr@denx.de> Message-ID: <20100922205203.1FD0AEC2339@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Stefan Roese, In message <1284363714-11355-1-git-send-email-sr@denx.de> you wrote: > Signed-off-by: Stefan Roese > --- > MAKEALL | 1 + > include/configs/CATcenter.h | 23 ++--------------------- > 2 files changed, 3 insertions(+), 21 deletions(-) > > diff --git a/MAKEALL b/MAKEALL > index b34ae33..6002ade 100755 > --- a/MAKEALL > +++ b/MAKEALL > @@ -195,6 +195,7 @@ LIST_4xx=" \ > CANBT \ > canyonlands \ > canyonlands_nand \ > + CATcenter \ > CMS700 \ > CPCI2DP \ > CPCI405 \ This will result in a merge conflict when pulling into "next", where this entry does not exist any more as it gets auto-generated fro boards.cfg Can we please omit this from this patch? Best regards, Wolfgang Denk -- 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 "The glory of creation is in its infinite diversity." "And in the way our differences combine to create meaning and beauty." -- Dr. Miranda Jones and Spock, "Is There in Truth No Beauty?", stardate 5630.8