From: Holger Brunck <holger.brunck@keymile.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 7/8] km/common: simplify default environment
Date: Wed, 11 May 2011 08:58:27 +0200 [thread overview]
Message-ID: <4DCA3393.5060508@keymile.com> (raw)
In-Reply-To: <20110510212458.6D759D6F237@gemini.denx.de>
Hello,
On 05/10/2011 11:24 PM, Wolfgang Denk wrote:
> Dear Holger Brunck,
>
> In message <0bbf514662e171fe0a8ef9b53a4819c7839e187e.1304508448.git.holger.brunck@keymile.com> you wrote:
>> This is a first step to simplify the default environment. Move all
>> the environment variables which are only needed for debugging
>> purpose to textfiles in the scripts directory. In case of debugging
>> these files can be loaded via tftp into RAM and set via the env import
>> command. Other variables are identified as obsolete and were removed.
>>
>> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
>> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
>> Acked-by: Heiko Schocher <hs@denx.de>
>> cc: Wolfgang Denk <wd@denx.de>
>> cc: Detlev Zundel <dzu@denx.de>
>> ---
>> Changes for v2:
>> - split up first large patch serie to three independent smaller
>> patch series
>> - no change in the content of this patch
>>
>> board/keymile/scripts/README | 23 +++++
>> board/keymile/scripts/debug-arm-env.txt | 2 +
>> board/keymile/scripts/debug-common-env.txt | 9 ++
>> board/keymile/scripts/debug-ppc-env.txt | 2 +
>> include/configs/km/keymile-common.h | 128 +++-------------------------
>> include/configs/km/km-powerpc.h | 12 +--
>> include/configs/km/km_arm.h | 5 +-
>> 7 files changed, 55 insertions(+), 126 deletions(-)
>> create mode 100644 board/keymile/scripts/README
>> create mode 100644 board/keymile/scripts/debug-arm-env.txt
>> create mode 100644 board/keymile/scripts/debug-common-env.txt
>> create mode 100644 board/keymile/scripts/debug-ppc-env.txt
>
> This does not apply cleanly:
>
> pplying patch #94008 to current directory
> Description: [U-Boot,v2,7/8] km/common: simplify default environment
> Applying: km/common: simplify default environment
> fatal: sha1 information is lacking or useless
> (include/configs/km/keymile-common.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 km/common: simplify default environment
>
>
> Stopping here. Please resubmit 4/8, 7/8 and 8/8.
>
Yes there are some dependencies if 4/8 is missing. I fix this an resubmit the
missing pieces. I assume that I should only resubmit a patch serie with this
three patches and not the whole serie?
Thanks!
Best regards
Holger
next prev parent reply other threads:[~2011-05-11 6:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 11:47 [U-Boot] [PATCH v2 0/8] km/common mainlining Holger Brunck
2011-05-04 11:47 ` [U-Boot] [PATCH v2 1/8] km/common: fix initial_boot_bank for bootpackages Holger Brunck
2011-05-10 21:17 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 2/8] common/hush: make get_local_var visible for other users Holger Brunck
2011-05-10 21:19 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 3/8] km/common: implement setboardid command Holger Brunck
2011-05-10 21:20 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 4/8] km/common: implement boardId HWkey checks as u-boot cmd Holger Brunck
2011-05-04 22:11 ` Wolfgang Denk
2011-05-05 13:51 ` Holger Brunck
2011-05-05 18:29 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 5/8] km/common: fix coding style issues in generic header Holger Brunck
2011-05-10 21:21 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 6/8] keymile boards: move keymile specific header in subdir Holger Brunck
2011-05-10 21:22 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 7/8] km/common: simplify default environment Holger Brunck
2011-05-10 21:23 ` Wolfgang Denk
2011-05-10 21:24 ` Wolfgang Denk
2011-05-11 6:58 ` Holger Brunck [this message]
2011-05-11 7:43 ` Wolfgang Denk
2011-05-04 11:47 ` [U-Boot] [PATCH v2 8/8] km/common: add pnvramsize to " Holger Brunck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DCA3393.5060508@keymile.com \
--to=holger.brunck@keymile.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.