From: Max Filippov <jcmvbkbc@gmail.com>
Date: Sun, 8 Dec 2019 09:54:43 +0000 (-0800)
Subject: target/xtensa: import xtensa/config/core-isa.h
X-Git-Tag: v5.0.0-rc0~160^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca3c979d6be82e88bd19ade3f6e4c9c2bc4887ea;p=thirdparty%2Fqemu.git

target/xtensa: import xtensa/config/core-isa.h

Import core-isa.h from its canonical place in the configuration overlay.
Drop --xform option from the tar command line.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index e4a2e39f635..97c3219debf 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -19,8 +19,8 @@ exit
 
 [ $# -ge 3 ] && FREQ="$3"
 mkdir -p "$TARGET"
-tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \
-    --xform='s/core/core-isa/' config/core.h
+tar -xf "$OVERLAY" -C "$TARGET" --strip-components=2 \
+    xtensa/config/core-isa.h
 tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \
     sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c
 #