]> git.baikalelectronics.ru Git - uboot.git/commitdiff
arm: imx: Drop custom lowlevel_init
authorMarek Vasut <marex@denx.de>
Thu, 22 Dec 2022 00:46:36 +0000 (01:46 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 31 Jan 2023 14:46:39 +0000 (15:46 +0100)
The custom lowlevel_init implementation is no longer necessary, since
it is responsible for routing and trapping SErrors in U-Boot in EL2,
which is implemented in common code since commit:
630b8afda19 ("armv8: Always unmask SErrors")

Signed-off-by: Marek Vasut <marex@denx.de>
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/lowlevel.S [deleted file]

index 61b4f4f8cd3998aa9de9cbb06bc2ff394171a866..4dfc60eedc43452b08edda3bc1e811d129f0c507 100644 (file)
@@ -235,8 +235,6 @@ endif
 
 targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx)
 
-obj-$(CONFIG_ARM64) += lowlevel.o
-
 obj-$(CONFIG_MX5) += mx5/
 obj-$(CONFIG_MX6) += mx6/
 obj-$(CONFIG_MX7) += mx7/
diff --git a/arch/arm/mach-imx/lowlevel.S b/arch/arm/mach-imx/lowlevel.S
deleted file mode 100644 (file)
index 158fdb7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2019 NXP
- */
-
-#include <linux/linkage.h>
-
-ENTRY(lowlevel_init)
-       mrs     x0, CurrentEL
-       cmp     x0, #8
-       b.eq    1f
-       ret
-1:
-       msr daifclr, #4
-
-       /* set HCR_EL2.AMO to catch SERROR */
-       mrs     x0, hcr_el2
-       orr     x0, x0, #0x20
-       msr     hcr_el2, x0
-       isb
-       ret
-ENDPROC(lowlevel_init)