Fix XU4 kernel by adding the arch timer back

This commit is contained in:
zador-blood-stained 2017-09-16 18:52:49 +03:00
parent 616832f17e
commit 2133d9cc0a
2 changed files with 36 additions and 23 deletions

View file

@ -0,0 +1,36 @@
From d5cecd656ea0eb5be54080455cd751150866f66b Mon Sep 17 00:00:00 2001
From: Brian Kim <brian.kim@hardkernel.com>
Date: Wed, 23 Aug 2017 14:09:37 +0900
Subject: [PATCH] ARM: dts: exynos: Add timer node for exynos5420
This patch adds timer node for exynos542x/5800.
Generic Timer Architecture is needed by KVM.
[Brian: fix different lines for odroidxu4-4.9.y branch]
Signed-off-by: Adel Belhouane <bugs.a.b@free.fr>
Signed-off-by: Brian Kim <brian.kim@hardkernel.com>
---
arch/arm/boot/dts/exynos5420.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 8b9793256ea53..919bec041194b 100755
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -1321,6 +1321,16 @@
#include "exynos5420-trip-points.dtsi"
};
};
+
+ timer {
+ compatible = "arm,cortex-a15-timer",
+ "arm,armv7-timer";
+ interrupts = <1 13 0xf08>,
+ <1 14 0xf08>,
+ <1 11 0xf08>,
+ <1 10 0xf08>;
+ clock-frequency = <24000000>;
+ };
};
&dp {

View file

@ -1,23 +0,0 @@
diff --git a/cmd/cfgload.c b/cmd/cfgload.c
index 6f5aa22..e406029 100644
--- a/cmd/cfgload.c
+++ b/cmd/cfgload.c
@@ -43,7 +43,7 @@ static int valid_command(const char* p)
return !(p == q);
}
-/* Read boot.ini from FAT partition
+/* Read boot.ini from FAT or EXT4 partition
*/
static char* read_cfgload(void)
{
@@ -57,7 +57,8 @@ static char* read_cfgload(void)
setenv("filesize", "0");
- sprintf(cmd, "fatload mmc 0:1 0x%p boot.ini", (void *)p);
+ sprintf(cmd, "ext4load mmc 0:1 0x%p /boot/boot.ini || fatload mmc 0:1 0x%p boot.ini || ext4load mmc 0:1 0x%p boot.ini",
+ (void *)p, (void *)p, (void *)p);
run_command(cmd, 0);
filesize = getenv_ulong("filesize", 16, 0);