diff options
Diffstat (limited to 'meta/conf/machine/include/riscv')
| -rw-r--r-- | meta/conf/machine/include/riscv/arch-riscv.inc | 12 | ||||
| -rw-r--r-- | meta/conf/machine/include/riscv/qemuriscv.inc | 4 | ||||
| -rw-r--r-- | meta/conf/machine/include/riscv/tune-riscv.inc | 34 |
3 files changed, 25 insertions, 25 deletions
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc b/meta/conf/machine/include/riscv/arch-riscv.inc index eae2b88778..e5611a12a6 100644 --- a/meta/conf/machine/include/riscv/arch-riscv.inc +++ b/meta/conf/machine/include/riscv/arch-riscv.inc @@ -2,12 +2,12 @@ DEFAULTTUNE ?= "riscv64" -TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}" -TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" -TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', ' -mabi=lp64', ' ', d)}" -TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', ' -mabi=ilp32', ' ', d)}" +TUNE_ARCH = "${TUNE_ARCH:tune-${DEFAULTTUNE}}" +TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" +TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', ' -mabi=lp64', ' ', d)}" +TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', ' -mabi=ilp32', ' ', d)}" # Fix: ld: unrecognized option '--hash-style=sysv' -LINKER_HASH_STYLE_libc-newlib = "" +LINKER_HASH_STYLE:libc-newlib = "" # Fix: ld: unrecognized option '--hash-style=gnu' -LINKER_HASH_STYLE_libc-baremetal = "" +LINKER_HASH_STYLE:libc-baremetal = "" diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 20e2d465a1..14eaf5d64a 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -22,8 +22,8 @@ EXTRA_IMAGEDEPENDS += "opensbi" RISCV_SBI_PLAT ?= "generic" RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin" -UBOOT_ENTRYPOINT_riscv32 = "0x80400000" -UBOOT_ENTRYPOINT_riscv64 = "0x80200000" +UBOOT_ENTRYPOINT:riscv32 = "0x80400000" +UBOOT_ENTRYPOINT:riscv64 = "0x80200000" # qemuboot options QB_SMP = "-smp 4" diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc b/meta/conf/machine/include/riscv/tune-riscv.inc index 028548bf56..cc2896f277 100644 --- a/meta/conf/machine/include/riscv/tune-riscv.inc +++ b/meta/conf/machine/include/riscv/tune-riscv.inc @@ -11,23 +11,23 @@ TUNEVALID[bigendian] = "Big endian mode" AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf" # Default -TUNE_FEATURES_tune-riscv64 = "riscv64" -TUNE_ARCH_tune-riscv64 = "riscv64" -TUNE_PKGARCH_tune-riscv64 = "riscv64" -PACKAGE_EXTRA_ARCHS_tune-riscv64 = "riscv64" +TUNE_FEATURES:tune-riscv64 = "riscv64" +TUNE_ARCH:tune-riscv64 = "riscv64" +TUNE_PKGARCH:tune-riscv64 = "riscv64" +PACKAGE_EXTRA_ARCHS:tune-riscv64 = "riscv64" -TUNE_FEATURES_tune-riscv32 = "riscv32" -TUNE_ARCH_tune-riscv32 = "riscv32" -TUNE_PKGARCH_tune-riscv32 = "riscv32" -PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32" +TUNE_FEATURES:tune-riscv32 = "riscv32" +TUNE_ARCH:tune-riscv32 = "riscv32" +TUNE_PKGARCH:tune-riscv32 = "riscv32" +PACKAGE_EXTRA_ARCHS:tune-riscv32 = "riscv32" # No float -TUNE_FEATURES_tune-riscv64nf = "${TUNE_FEATURES_tune-riscv64} riscv64nf" -TUNE_ARCH_tune-riscv64nf = "riscv64" -TUNE_PKGARCH_tune-riscv64nf = "riscv64nf" -PACKAGE_EXTRA_ARCHS_tune-riscv64nf = "riscv64nf" - -TUNE_FEATURES_tune-riscv32nf = "${TUNE_FEATURES_tune-riscv32} riscv32nf" -TUNE_ARCH_tune-riscv32nf = "riscv32" -TUNE_PKGARCH_tune-riscv32nf = "riscv32nf" -PACKAGE_EXTRA_ARCHS_tune-riscv32nf = "riscv32nf" +TUNE_FEATURES:tune-riscv64nf = "${TUNE_FEATURES:tune-riscv64} riscv64nf" +TUNE_ARCH:tune-riscv64nf = "riscv64" +TUNE_PKGARCH:tune-riscv64nf = "riscv64nf" +PACKAGE_EXTRA_ARCHS:tune-riscv64nf = "riscv64nf" + +TUNE_FEATURES:tune-riscv32nf = "${TUNE_FEATURES:tune-riscv32} riscv32nf" +TUNE_ARCH:tune-riscv32nf = "riscv32" +TUNE_PKGARCH:tune-riscv32nf = "riscv32nf" +PACKAGE_EXTRA_ARCHS:tune-riscv32nf = "riscv32nf" |