From: Wolfgang Denk Date: Sun, 08 Aug 2010 22:30:27 +0200 Subject: [U-Boot] [PATCH v6] POST cleanup. In-Reply-To: References: <20100629195116.3973914EBF8@gemini.denx.de> Message-ID: <20100808203027.6FE211536EF@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 Michael Zaidman, In message you wrote: > > On Wed, Jun 30, 2010 at 7:16 PM, Michael Zaidman > wrote: > > - Revives POST for blackfin arch; > > - Removes redundant code: > > arch/blackfin/lib/post.c > > board/ssv/common/post.c > > arch/powerpc/cpu/ppc4xx/commproc.c > > arch/powerpc/cpu/mpc512x/common.c > > - fixes up the post_word_{load|store} usage; > > > > Signed-off-by: Michael Zaidman > > Acked-by: Detlev Zundel > > Tested-by: Anatolij Gustschin > > > > List of the maintainers of the affected by patch boards: > > Cc: Stephan Linz > > Cc: Denis Peter > > Cc: Matthias Fuchs > > Cc: Peter Tyser > > Cc: Stefan Roese > > Cc: Mike Frysinger > > Cc: Niklaus Giger > > Cc: Larry Johnson > > Cc: Feng Kan > > --- > > More than 5 week ago I rebased and resubmitted this patch as you asked > but did not receive any response yet. Sorry, but this does not apply any more: Applying: POST cleanup. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging arch/blackfin/lib/board.c CONFLICT (delete/modify): arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD. Version HEAD of arch/blackfin/lib/post.c left in tree. Removing arch/powerpc/cpu/mpc512x/common.c Auto-merging arch/powerpc/cpu/ppc4xx/Makefile Removing arch/powerpc/cpu/ppc4xx/commproc.c Auto-merging board/barco/barco.c Auto-merging board/bf537-stamp/Makefile CONFLICT (content): Merge conflict in board/bf537-stamp/Makefile Auto-merging include/common.h Auto-merging include/configs/bf537-stamp.h Auto-merging include/configs/bfin_adi_common.h Auto-merging include/configs/katmai.h Failed to merge in the changes. Patch failed at 0001 POST cleanup. The merge conflict in board/bf537-stamp/Makefile is trivial to resolve, but I'm not sure about the "arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD." Please rebase and resubmit. Thanks. 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 How does a project get to be a year late? ... One day at a time.