ARM: tegra: Implement cboot_save_boot_params() in C

This is easier to deal with and works just as well for this simple
function.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding 2019-04-15 11:32:29 +02:00 committed by Tom Warren
parent a0dbc1314c
commit ce353babdb
3 changed files with 13 additions and 21 deletions

View File

@ -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

View File

@ -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;

View File

@ -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)