summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Smirnov <eu.smirnoff@gmail.com>2018-11-23 13:49:14 +0100
committerEugene Smirnov <eu.smirnoff@gmail.com>2018-11-23 13:50:52 +0100
commitfc4a8b0b15ad88dd941d94794857446f1e2ce393 (patch)
treec2a5797160a0f29976f4f47c1c295ae5bf47b6ce
parentea1f1ec11396e4231c3b3da0eeebf1e0d671012f (diff)
Add a patch for u-boot-ota to work with qemueel
Change-Id: Ia49a74134cc1262fcbc7e6aa9a8cdc69a37b8e7b Signed-off-by: Eugene Smirnov <eu.smirnoff@gmail.com>
-rw-r--r--meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota/0003-U-Boot-Move-Cache-As-RAM-memory-from-area-mapped-to-ROM-in-QEMU.patch41
-rw-r--r--meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota_2015.07.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota/0003-U-Boot-Move-Cache-As-RAM-memory-from-area-mapped-to-ROM-in-QEMU.patch b/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota/0003-U-Boot-Move-Cache-As-RAM-memory-from-area-mapped-to-ROM-in-QEMU.patch
new file mode 100644
index 0000000..a6e9757
--- /dev/null
+++ b/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota/0003-U-Boot-Move-Cache-As-RAM-memory-from-area-mapped-to-ROM-in-QEMU.patch
@@ -0,0 +1,41 @@
+From patchwork Fri Nov 10 17:51:02 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] Move Cache-As-RAM memory from area mapped to ROM in QEMU
+X-Patchwork-Submitter: Anton Gerasimov <anton@advancedtelematic.com>
+X-Patchwork-Id: 836810
+X-Patchwork-Delegate: bmeng.cn@gmail.com
+Message-Id: <20171110175102.21746-1-anton@advancedtelematic.com>
+To: u-boot@lists.denx.de,
+ bmeng.cn@gmail.com
+Date: Fri, 10 Nov 2017 18:51:02 +0100
+From: Anton Gerasimov <anton@advancedtelematic.com>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+ROM has been made read-only in qemu recently (namely commit
+208fa0e43645edd0b0d8f838857dfc79daff40a8), so this patch restores
+compatibility between u-boot and qemu. It is still broken for me
+unless I set CONFIG_SMP=n and disable lapic (i.e. revert patch
+aaaa55751ab1e5a5cfa0962d604593a7e6f33ff6 in u-boot), but these are
+separate issues
+
+Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
+Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
+---
+ arch/x86/cpu/qemu/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig
+index 6808c9a6b9..f4b9922a34 100644
+--- a/arch/x86/cpu/qemu/Kconfig
++++ b/arch/x86/cpu/qemu/Kconfig
+@@ -11,7 +11,7 @@ if QEMU
+
+ config SYS_CAR_ADDR
+ hex
+- default 0xd0000
++ default 0x10000
+
+ config SYS_CAR_SIZE
+ hex
diff --git a/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota_2015.07.bb b/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
index 37abc5a..9b7dca5 100644
--- a/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
+++ b/meta-agl-bsp/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
@@ -14,6 +14,7 @@ SRC_URI = "\
file://0001-Set-up-environment-for-OSTree-integration.patch \
file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
file://0001-fixup-build-with-gcc6.patch \
+ file://0003-U-Boot-Move-Cache-As-RAM-memory-from-area-mapped-to-ROM-in-QEMU.patch \
"
S = "${WORKDIR}/git"