public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 19/27] ARM: tegra: Import cbootargs value from cboot DTB
Date: Mon, 15 Apr 2019 11:32:31 +0200	[thread overview]
Message-ID: <20190415093239.27509-20-thierry.reding@gmail.com> (raw)
In-Reply-To: <20190415093239.27509-1-thierry.reding@gmail.com>

From: Thierry Reding <treding@nvidia.com>

Read the boot arguments passed by cboot via the /chosen/bootargs
property and store it in the cbootargs environment variable.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/mach-tegra/cboot.c | 47 +++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 628909f29137..a829ef794f2d 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -8,7 +8,9 @@
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include <linux/ctype.h>
 #include <linux/sizes.h>
 
 #include <asm/arch/tegra.h>
@@ -546,10 +548,49 @@ out:
 	return err;
 }
 
+static char *strip(const char *ptr)
+{
+	const char *end;
+
+	while (*ptr && isblank(*ptr))
+		ptr++;
+
+	/* empty string */
+	if (*ptr == '\0')
+		return strdup(ptr);
+
+	end = ptr;
+
+	while (end[1])
+		end++;
+
+	while (isblank(*end))
+		end--;
+
+	return strndup(ptr, end - ptr + 1);
+}
+
+static char *cboot_get_bootargs(const void *fdt)
+{
+	const char *args;
+	int offset, len;
+
+	offset = fdt_path_offset(fdt, "/chosen");
+	if (offset < 0)
+		return NULL;
+
+	args = fdt_getprop(fdt, offset, "bootargs", &len);
+	if (!args)
+		return NULL;
+
+	return strip(args);
+}
+
 int cboot_late_init(void)
 {
 	const void *fdt = (const void *)cboot_boot_x0;
 	uint8_t mac[ETH_ALEN];
+	char *bootargs;
 	int err;
 
 	set_calculated_env_vars();
@@ -569,5 +610,11 @@ int cboot_late_init(void)
 			printf("failed to set MAC address %pM: %d\n", mac, err);
 	}
 
+	bootargs = cboot_get_bootargs(fdt);
+	if (bootargs) {
+		env_set("cbootargs", bootargs);
+		free(bootargs);
+	}
+
 	return 0;
 }
-- 
2.21.0

  parent reply	other threads:[~2019-04-15  9:32 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15  9:32 [U-Boot] [PATCH v5 00/27] ARM: tegra: Miscalleneous improvements Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 01/27] fdtdec: Add fdtdec_set_ethernet_mac_address() Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 02/27] lib: Implement strndup() Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 03/27] ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210 Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 04/27] ARM: tegra: Remove disp1 clock initialization " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 05/27] ARM: tegra: Use common header for PMU declarations Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 06/27] ARM: tegra: Guard clock code with a Kconfig symbol Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 07/27] ARM: tegra: Guard GP pad control " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 08/27] ARM: tegra: Guard memory controller " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 09/27] ARM: tegra: Guard pin " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 10/27] ARM: tegra: Guard powergate " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 11/27] ARM: tegra: Fix save_boot_params() prototype Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 12/27] ARM: tegra: Allow boards to override boot target devices Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 13/27] ARM: tegra: Support TZ-only access to PMC Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 14/27] ARM: tegra: Workaround UDC boot issues only if necessary Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 15/27] ARM: tegra: Restore DRAM bank count Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 16/27] ARM: tegra: Unify Tegra186 builds Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 17/27] ARM: tegra: Implement cboot_save_boot_params() in C Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 18/27] ARM: tegra: Implement cboot_get_ethaddr() Thierry Reding
2019-04-15  9:32 ` Thierry Reding [this message]
2019-04-15  9:32 ` [U-Boot] [PATCH v5 20/27] ARM: tegra: Enable position independent build for 64-bit Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 21/27] p2371-2180: Pass Ethernet MAC to the kernel Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 22/27] p2771-0000: " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 23/27] p2371-2180: Add support for framebuffer carveouts Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 24/27] p2771-0000: " Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 25/27] ARM: tegra: Rename pcie-controller to pcie Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 26/27] ARM: tegra: Mark built-in Ethernet as default on Jetson TX2 Thierry Reding
2019-04-15  9:32 ` [U-Boot] [PATCH v5 27/27] ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support Thierry Reding
2019-04-15 20:26 ` [U-Boot] [PATCH v5 00/27] ARM: tegra: Miscalleneous improvements Tom Warren

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=20190415093239.27509-20-thierry.reding@gmail.com \
    --to=thierry.reding@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox