From: Thierry Reding <thierry.reding@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 13/15] ARM: tegra: Implement cboot_save_boot_params() in C
Date: Tue, 19 Mar 2019 00:24:20 +0100 [thread overview]
Message-ID: <20190318232422.24404-14-thierry.reding@gmail.com> (raw)
In-Reply-To: <20190318232422.24404-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
This is easier to deal with and works just as well for this simple
function.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
arch/arm/mach-tegra/Makefile | 2 +-
arch/arm/mach-tegra/cboot.c | 12 ++++++++++++
arch/arm/mach-tegra/cboot_ll.S | 20 --------------------
3 files changed, 13 insertions(+), 21 deletions(-)
delete mode 100644 arch/arm/mach-tegra/cboot_ll.S
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 41ba674edff4..7165d70a60da 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_TEGRA_PINCTRL) += pinmux-common.o
obj-$(CONFIG_TEGRA_PMC) += powergate.o
obj-y += xusb-padctl-dummy.o
-obj-$(CONFIG_ARM64) += arm64-mmu.o cboot_ll.o cboot.o
+obj-$(CONFIG_ARM64) += arm64-mmu.o cboot.o
obj-y += dt-setup.o
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
obj-$(CONFIG_TEGRA_GPU) += gpu.o
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 2bca98c92898..8708c4ec9727 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -52,6 +52,18 @@ static u64 ram_top __attribute__((section(".data")));
/* The base address of the region of RAM that ends at ram_top */
static u64 region_base __attribute__((section(".data")));
+/*
+ * Explicitly put this in the .data section because it is written before the
+ * .bss section is zeroed out but it needs to persist.
+ */
+unsigned long cboot_boot_x0 __attribute__((section(".data")));
+
+void cboot_save_boot_params(unsigned long x0, unsigned long x1,
+ unsigned long x2, unsigned long x3)
+{
+ cboot_boot_x0 = x0;
+}
+
int cboot_dram_init(void)
{
unsigned int na, ns;
diff --git a/arch/arm/mach-tegra/cboot_ll.S b/arch/arm/mach-tegra/cboot_ll.S
deleted file mode 100644
index 4c9ddacc2b39..000000000000
--- a/arch/arm/mach-tegra/cboot_ll.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Save cboot-related boot-time CPU state
- *
- * (C) Copyright 2015-2016 NVIDIA Corporation <www.nvidia.com>
- */
-
-#include <config.h>
-#include <linux/linkage.h>
-
-.align 8
-.globl cboot_boot_x0
-cboot_boot_x0:
- .dword 0
-
-ENTRY(cboot_save_boot_params)
- adr x8, cboot_boot_x0
- str x0, [x8]
- b save_boot_params_ret
-ENDPROC(cboot_save_boot_params)
--
2.21.0
next prev parent reply other threads:[~2019-03-18 23:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 23:24 [U-Boot] [PATCH v2 00/15] ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 01/15] ARM: tegra: Use common header for PMU declarations Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 02/15] ARM: tegra: Guard clock code with a Kconfig symbol Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 03/15] ARM: tegra: Guard GP pad control " Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 04/15] ARM: tegra: Guard memory controller " Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 05/15] ARM: tegra: Guard pin " Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 06/15] ARM: tegra: Guard powergate " Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 07/15] ARM: tegra: Fix save_boot_params() prototype Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 08/15] ARM: tegra: Allow boards to override boot target devices Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 09/15] ARM: tegra: Support TZ-only access to PMC Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 10/15] ARM: tegra: Workaround UDC boot issues only if necessary Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 11/15] ARM: tegra: Restore DRAM bank count Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 12/15] ARM: tegra: Unify Tegra186 builds Thierry Reding
2019-03-18 23:24 ` Thierry Reding [this message]
2019-03-18 23:24 ` [U-Boot] [PATCH v2 14/15] ARM: tegra: Implement cboot_get_ethaddr() Thierry Reding
2019-03-18 23:24 ` [U-Boot] [PATCH v2 15/15] ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support Thierry Reding
2019-03-19 17:18 ` Stephen Warren
2019-03-20 10:37 ` Thierry Reding
2019-03-20 11:22 ` [U-Boot] [PATCH v2 00/15] " Peter Robinson
2019-03-26 16:00 ` Thierry Reding
2019-03-26 16:06 ` Peter Robinson
2019-03-26 17:19 ` Thierry Reding
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=20190318232422.24404-14-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