|
@@ -159,7 +159,7 @@ arches = {
|
|
|
'prefix': 'riscv32',
|
|
|
},
|
|
|
'riscv64-lp64d': {
|
|
|
- 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'],
|
|
|
+ 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D', 'BR2_USE_MMU'],
|
|
|
'prefix': 'riscv64',
|
|
|
},
|
|
|
's390x-z13': {
|
|
@@ -312,13 +312,15 @@ class Toolchain:
|
|
|
selects.append("BR2_TOOLCHAIN_EXTERNAL_UCLIBC")
|
|
|
elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC"):
|
|
|
# glibc needs mmu support
|
|
|
- depends.append("BR2_USE_MMU")
|
|
|
+ if "BR2_USE_MMU" not in depends:
|
|
|
+ depends.append("BR2_USE_MMU")
|
|
|
# glibc doesn't support static only configuration
|
|
|
depends.append("!BR2_STATIC_LIBS")
|
|
|
selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC")
|
|
|
elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL"):
|
|
|
# musl needs mmu support
|
|
|
- depends.append("BR2_USE_MMU")
|
|
|
+ if "BR2_USE_MMU" not in depends:
|
|
|
+ depends.append("BR2_USE_MMU")
|
|
|
selects.append("BR2_TOOLCHAIN_EXTERNAL_MUSL")
|
|
|
|
|
|
# gcc version
|