mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Alexander Kurz <akurz@blala.de>
To: barebox@lists.infradead.org, Sascha Hauer <s.hauer@pengutronix.de>
Cc: Alexander Kurz <akurz@blala.de>
Subject: [PATCH] ARM: i.MX50: Amazon Kindle: fix setup of board specific environment
Date: Sun, 18 Mar 2018 21:10:46 +0000	[thread overview]
Message-ID: <20180318211046.14239-1-akurz@blala.de> (raw)

With patch 5b92cfceff38 ("startup: Load default environment earlier")
loading of the default environment moved from environment_initcall
four initcalls up to fs_initcall. At this time, most of the board specific
environment patches inserted via defaultenv_append_directory() have not
been processed yet (mostly done in device_initcall) and will not appear
in the environment.
Fix this problem for the mx50 kindles by moving defaultenv_append_directory()
one initcall in front of fs_initcall.
Similar patches may be necessary for all other board implementations and the
efi implementation using defaultenv_append_directory() in device_initcall.

Signed-off-by: Alexander Kurz <akurz@blala.de>
---
 arch/arm/boards/kindle-mx50/board.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c
index 089dd8ebb..86cf54a46 100644
--- a/arch/arm/boards/kindle-mx50/board.c
+++ b/arch/arm/boards/kindle-mx50/board.c
@@ -127,6 +127,13 @@ static int is_mx50_kindle(void)
 		of_machine_is_compatible("amazon,kindle-ey21");
 }
 
+static int kindle_mx50_coredev_init(void)
+{
+	defaultenv_append_directory(defaultenv_kindle_mx50);
+	return 0;
+}
+coredevice_initcall(kindle_mx50_coredev_init);
+
 static int kindle_mx50_late_init(void)
 {
 	if (!is_mx50_kindle())
@@ -164,8 +171,6 @@ static int kindle_mx50_devices_init(void)
 	if (dev)
 		dev_set_param(dev, "probe", "1");
 
-	defaultenv_append_directory(defaultenv_kindle_mx50);
-
 	return 0;
 }
 device_initcall(kindle_mx50_devices_init);
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2018-03-18 21:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-18 21:10 Alexander Kurz [this message]
2018-03-19  8:28 ` 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=20180318211046.14239-1-akurz@blala.de \
    --to=akurz@blala.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox