diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2020-02-24 13:00:50 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2020-02-27 08:33:25 -0800 |
commit | 953aa74a2ebb844b387b4e84e1e314f0d9a92b3a (patch) | |
tree | 5dee1d3dc74880f8597dd1e641480de02ab72df2 | |
parent | 1d60dea8a20d7f539485e292d99b9560f0159e52 (diff) | |
download | meta-xilinx-953aa74a2ebb844b387b4e84e1e314f0d9a92b3a.tar.gz |
newlib: Move microblaze support
meta-xilinx-standalone is only for baremetal work. Theoretically the
newlib items can be used on other configurations, so move the microblaze
newlib/libgloss work into meta-xilinx-bsp. This mirrors how other
microblaze specific work has been handled.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0006-MB-X-intial-commit.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0006-MB-X-intial-commit.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch (renamed from meta-xilinx-standalone/recipes-bsp/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/libgloss_3.1.%.bbappend | 6 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/microblaze-newlib.inc | 15 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/newlib/newlib_3.1.%.bbappend | 7 | ||||
-rw-r--r-- | meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend | 23 | ||||
-rw-r--r-- | meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend | 21 |
16 files changed, 28 insertions, 44 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch index 950e0b30..950e0b30 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch index 51785d9a..51785d9a 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch index 21c55800..21c55800 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch index f56f6187..f56f6187 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch index 6e32e177..6e32e177 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0006-MB-X-intial-commit.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0006-MB-X-intial-commit.patch index 18b78f09..18b78f09 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0006-MB-X-intial-commit.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0006-MB-X-intial-commit.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch index c62a9919..c62a9919 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch index 9f27cd60..9f27cd60 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch index 38508b55..38508b55 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch index d1f19a74..d1f19a74 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch index c8d13af0..c8d13af0 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch | |||
diff --git a/meta-xilinx-bsp/recipes-microblaze/newlib/libgloss_3.1.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/newlib/libgloss_3.1.%.bbappend new file mode 100644 index 00000000..3dee0f06 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/libgloss_3.1.%.bbappend | |||
@@ -0,0 +1,6 @@ | |||
1 | require microblaze-newlib.inc | ||
2 | |||
3 | do_configure_prepend_microblaze() { | ||
4 | # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) | ||
5 | export CC="${CC} -L${S}/libgloss/microblaze" | ||
6 | } | ||
diff --git a/meta-xilinx-bsp/recipes-microblaze/newlib/microblaze-newlib.inc b/meta-xilinx-bsp/recipes-microblaze/newlib/microblaze-newlib.inc new file mode 100644 index 00000000..5e7a1139 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/microblaze-newlib.inc | |||
@@ -0,0 +1,15 @@ | |||
1 | # Add MicroBlaze Patches | ||
2 | FILESEXTRAPATHS_append_microblaze := "${THISDIR}/files:" | ||
3 | SRC_URI_append_microblaze = " \ | ||
4 | file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \ | ||
5 | file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \ | ||
6 | file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \ | ||
7 | file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \ | ||
8 | file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \ | ||
9 | file://0006-MB-X-intial-commit.patch \ | ||
10 | file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \ | ||
11 | file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \ | ||
12 | file://0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch \ | ||
13 | file://0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch \ | ||
14 | file://0011-Removing-the-Assembly-implementation-of-64bit-string.patch \ | ||
15 | " | ||
diff --git a/meta-xilinx-bsp/recipes-microblaze/newlib/newlib_3.1.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/newlib/newlib_3.1.%.bbappend new file mode 100644 index 00000000..d459bf19 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/newlib/newlib_3.1.%.bbappend | |||
@@ -0,0 +1,7 @@ | |||
1 | require microblaze-newlib.inc | ||
2 | |||
3 | do_configure_prepend_microblaze() { | ||
4 | # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) | ||
5 | export CC="${CC} -L${S}/libgloss/microblaze" | ||
6 | } | ||
7 | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend b/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend index 53660019..ce6773ca 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend | |||
@@ -1,30 +1,7 @@ | |||
1 | DEPENDS += "${MLPREFIX}newlib" | 1 | DEPENDS += "${MLPREFIX}newlib" |
2 | 2 | ||
3 | do_configure_prepend_microblaze() { | ||
4 | # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) | ||
5 | export CC="${CC} -L${S}/libgloss/microblaze" | ||
6 | } | ||
7 | |||
8 | |||
9 | # The following isnt necessary on decoupling, since libxil is actually built | 3 | # The following isnt necessary on decoupling, since libxil is actually built |
10 | # We use libgloss as if it was libxil, to avoid linking issues | 4 | # We use libgloss as if it was libxil, to avoid linking issues |
11 | # do_install_append_microblaze-pmu(){ | 5 | # do_install_append_microblaze-pmu(){ |
12 | # cp ${D}/${libdir}/libgloss.a ${D}/${libdir}/libxil.a | 6 | # cp ${D}/${libdir}/libgloss.a ${D}/${libdir}/libxil.a |
13 | # } | 7 | # } |
14 | |||
15 | |||
16 | # Add MicroBlaze Patches | ||
17 | FILESEXTRAPATHS_append := "${THISDIR}/files:" | ||
18 | SRC_URI_append = " \ | ||
19 | file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \ | ||
20 | file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \ | ||
21 | file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \ | ||
22 | file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \ | ||
23 | file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \ | ||
24 | file://0006-MB-X-intial-commit.patch \ | ||
25 | file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \ | ||
26 | file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \ | ||
27 | file://0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch \ | ||
28 | file://0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch \ | ||
29 | file://0011-Removing-the-Assembly-implementation-of-64bit-string.patch \ | ||
30 | " | ||
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend b/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend index 9f5774fb..d44c8bdc 100644 --- a/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend | |||
@@ -1,11 +1,6 @@ | |||
1 | # Some of the currently required multilibs require specific workarounds. | 1 | # Some of the currently required multilibs require specific workarounds. |
2 | # The override values below are linked specifically to the baremetal toolchain BSPs | 2 | # The override values below are linked specifically to the baremetal toolchain BSPs |
3 | 3 | ||
4 | do_configure_prepend_microblaze() { | ||
5 | # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) | ||
6 | export CC="${CC} -L${S}/libgloss/microblaze" | ||
7 | } | ||
8 | |||
9 | do_configure_prepend(){ | 4 | do_configure_prepend(){ |
10 | export CC_FOR_TARGET="${CC}" | 5 | export CC_FOR_TARGET="${CC}" |
11 | } | 6 | } |
@@ -15,19 +10,3 @@ do_install_prepend() { | |||
15 | mkdir -p $(dirname ${D}${libdir}) | 10 | mkdir -p $(dirname ${D}${libdir}) |
16 | mkdir -p $(dirname ${D}${includedir}) | 11 | mkdir -p $(dirname ${D}${includedir}) |
17 | } | 12 | } |
18 | |||
19 | # Add MicroBlaze Patches | ||
20 | FILESEXTRAPATHS_append := "${THISDIR}/files:" | ||
21 | SRC_URI_append = " \ | ||
22 | file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \ | ||
23 | file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \ | ||
24 | file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \ | ||
25 | file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \ | ||
26 | file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \ | ||
27 | file://0006-MB-X-intial-commit.patch \ | ||
28 | file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \ | ||
29 | file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \ | ||
30 | file://0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch \ | ||
31 | file://0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch \ | ||
32 | file://0011-Removing-the-Assembly-implementation-of-64bit-string.patch \ | ||
33 | " | ||