diff options
Diffstat (limited to 'meta-xilinx-standalone-experimental')
-rw-r--r-- | meta-xilinx-standalone-experimental/classes/esw.bbclass | 2 | ||||
-rwxr-xr-x | meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index 5de88bc8..df1c28a4 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass | |||
@@ -53,7 +53,7 @@ def get_xlnx_cmake_processor(tune, machine, d): | |||
53 | cmake_processor = 'plm_microblaze' | 53 | cmake_processor = 'plm_microblaze' |
54 | else: | 54 | else: |
55 | cmake_processor = 'microblaze' | 55 | cmake_processor = 'microblaze' |
56 | elif (tune in [ 'cortexr5', 'cortexr5f' ]): | 56 | elif tune == 'cortexr5': |
57 | cmake_processor = 'cortexr5' | 57 | cmake_processor = 'cortexr5' |
58 | elif tune.startswith('cortexa9'): | 58 | elif tune.startswith('cortexa9'): |
59 | cmake_processor = 'cortexa9' | 59 | cmake_processor = 'cortexa9' |
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh index 6c560ac1..243a2cfd 100755 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh | |||
@@ -466,7 +466,7 @@ cortex_r5_baremetal() { | |||
466 | cat <<EOF >"${conf_file}" | 466 | cat <<EOF >"${conf_file}" |
467 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" | 467 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" |
468 | ESW_MACHINE = "cortexr5-${machine}" | 468 | ESW_MACHINE = "cortexr5-${machine}" |
469 | DEFAULTTUNE = "cortexr5f" | 469 | DEFAULTTUNE = "cortexr5" |
470 | 470 | ||
471 | TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" | 471 | TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" |
472 | 472 | ||
@@ -518,7 +518,7 @@ cortex_r5_freertos() { | |||
518 | cat <<EOF >"${conf_file}" | 518 | cat <<EOF >"${conf_file}" |
519 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" | 519 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" |
520 | ESW_MACHINE = "cortexr5-${machine}" | 520 | ESW_MACHINE = "cortexr5-${machine}" |
521 | DEFAULTTUNE = "cortexr5f" | 521 | DEFAULTTUNE = "cortexr5" |
522 | 522 | ||
523 | TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" | 523 | TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" |
524 | 524 | ||