From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 08/14] bootm: remove image handler options
Date: Mon, 28 Nov 2011 09:02:14 +0100 [thread overview]
Message-ID: <1322467340-10596-9-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1322467340-10596-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/bootm.c | 55 +-----------------------------------------------------
include/boot.h | 4 ---
2 files changed, 1 insertions(+), 58 deletions(-)
diff --git a/commands/bootm.c b/commands/bootm.c
index 17139f7..316ed1f 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -141,25 +141,6 @@ static struct image_handle *get_fake_image_handle(struct image_data *data, int n
return handle;
}
-static int handler_parse_options(struct image_data *data, int opt, char *optarg)
-{
- struct image_handler *handler;
- int ret;
-
- list_for_each_entry(handler, &handler_list, list) {
- if (!handler->cmdline_parse)
- continue;
-
- ret = handler->cmdline_parse(data, opt, optarg);
- if (ret > 0)
- continue;
-
- return ret;
- }
-
- return -1;
-}
-
static int do_bootm(struct command *cmdtp, int argc, char *argv[])
{
int opt;
@@ -168,32 +149,15 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
struct image_handler *handler;
struct image_data data;
u32 initrd_start;
- char options[53]; /* worst case: whole alphabet with colons */
memset(&data, 0, sizeof(struct image_data));
data.verify = 1;
- /* Collect options from registered handlers */
- strcpy(options, "nhr:L:");
- list_for_each_entry(handler, &handler_list, list) {
- if (handler->cmdline_options)
- strcat(options, handler->cmdline_options);
- }
-
- while((opt = getopt(argc, argv, options)) > 0) {
+ while ((opt = getopt(argc, argv, "nr:L:")) > 0) {
switch(opt) {
case 'n':
data.verify = 0;
break;
- case 'h':
- printf("bootm advanced options:\n");
-
- list_for_each_entry(handler, &handler_list, list) {
- if (handler->help_string)
- printf("%s\n", handler->help_string);
- }
-
- return 0;
case 'L':
if (!data.initrd) {
eprintf("Warning -L ingnored. Specify the initrd first\n");
@@ -237,23 +201,6 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
goto err_out;
}
- optind = 0;
-
- while((opt = getopt(argc, argv, options)) > 0) {
- switch(opt) {
- case 'h':
- case 'n':
- case 'L':
- case 'r':
- break;
- default:
- if (!handler_parse_options(&data, opt, optarg))
- continue;
-
- return 1;
- }
- }
-
/*
* We have reached the point of no return: we are going to
* overwrite all exception vector code, so we cannot easily
diff --git a/include/boot.h b/include/boot.h
index 623f443..4901598 100644
--- a/include/boot.h
+++ b/include/boot.h
@@ -14,10 +14,6 @@ struct image_data {
struct image_handler {
struct list_head list;
- char *cmdline_options;
- int (*cmdline_parse)(struct image_data *data, int opt, char *optarg);
- char *help_string;
-
int image_type;
int (*bootm)(struct image_data *data);
};
--
1.7.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-11-28 8:02 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 8:02 bootm work Sascha Hauer
2011-11-28 8:02 ` [PATCH 01/14] bootm: remove dead code Sascha Hauer
2011-11-28 8:02 ` [PATCH 02/14] factor out iminfo command Sascha Hauer
2011-11-28 8:02 ` [PATCH 03/14] compile in simple_strtoull Sascha Hauer
2011-11-28 8:02 ` [PATCH 04/14] introduce some env helpers Sascha Hauer
2011-11-28 8:02 ` [PATCH 05/14] armlinux: cleanup linux vars Sascha Hauer
2011-11-28 11:03 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 11:12 ` Sascha Hauer
2011-11-29 4:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-29 7:23 ` Robert Schwebel
2011-11-29 8:13 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-29 10:09 ` Sascha Hauer
2011-11-28 8:02 ` [PATCH 06/14] ARM bootm: remove now obsolete args Sascha Hauer
2011-11-28 8:02 ` [PATCH 07/14] bootm: handle initrds inline Sascha Hauer
2011-12-06 15:08 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-07 9:19 ` Sascha Hauer
2011-12-07 13:26 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 8:02 ` Sascha Hauer [this message]
2011-11-28 8:02 ` [PATCH 09/14] bootm: fix various memory leaks Sascha Hauer
2011-11-28 8:02 ` [PATCH 10/14] bootm: do not require -L after -r Sascha Hauer
2011-11-28 8:02 ` [PATCH 11/14] bootm: fix typo, update help str Sascha Hauer
2011-11-28 11:00 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 8:02 ` [PATCH 12/14] bootm relocate_image: honour load_address Sascha Hauer
2011-11-28 8:02 ` [PATCH 13/14] bootm: push relocate_image up to the generic command Sascha Hauer
2011-11-28 8:02 ` [PATCH 14/14] bootm: use initrd_address and initrd_size Sascha Hauer
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=1322467340-10596-9-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox