@@ -55,7 +55,10 @@ endchoice
5555
5656config ARCH
5757 string
58- default "$(if $(ARCH_AARCH64),aarch64,$(if $(ARCH_RISCV64),riscv64,$(if $(ARCH_X86_64),x86_64,$(if $(ARCH_LOONGARCH64),loongarch64,unknown)))) )"
58+ default "aarch64" if ARCH_AARCH64
59+ default "riscv64" if ARCH_RISCV64
60+ default "x86_64" if ARCH_X86_64
61+ default "loongarch64" if ARCH_LOONGARCH64
5962 help
6063 The name of the selected architecture.
6164
@@ -76,11 +79,6 @@ config PLATFORM_AARCH64_CROSVM_VIRT
7679config PLATFORM_AARCH64_RASPI
7780 bool "Raspberry Pi 4B"
7881
79- config PLATFORM
80- string
81- default "$(if $(PLATFORM_AARCH64_QEMU_VIRT),aarch64-qemu-virt,$(if $(PLATFORM_AARCH64_CROSVM_VIRT),aarch64-crosvm-virt,$(if $(PLATFORM_AARCH64_RASPI),raspi4b,unknown))))"
82-
83-
8482endchoice
8583
8684endif # ARCH_AARCH64
9492config PLATFORM_RISCV64_QEMU_VIRT
9593 bool "QEMU RISC-V 64 Virtual Machine"
9694
97- config PLATFORM
98- string
99- default "$(if $(PLATFORM_RISCV64_QEMU_VIRT),riscv64-qemu-virt,unknown)"
10095endchoice
10196
10297endif # ARCH_RISCV64
@@ -113,10 +108,6 @@ config PLATFORM_X86_64_QEMU_VIRT
113108config PLATFORM_X86_CSV
114109 bool "x86 CSV Platform"
115110
116- config PLATFORM
117- string
118- default "$(if $(PLATFORM_X86_64_QEMU_VIRT),x86_64-qemu-virt,$(if $(PLATFORM_X86_CSV),x86-csv,unknown))"
119-
120111endchoice
121112
122113endif # ARCH_X86_64
@@ -130,14 +121,23 @@ choice
130121config PLATFORM_LOONGARCH64_QEMU_VIRT
131122 bool "QEMU LoongArch64 Virtual Machine"
132123
133- config PLATFORM
134- string
135- default "$(if $(PLATFORM_LOONGARCH64_QEMU_VIRT),loongarch64-qemu-virt,unknown)"
136-
137124endchoice
138125
139126endif # ARCH_LOONGARCH64
140127
128+ config PLATFORM
129+ string
130+ default "aarch64-qemu-virt" if PLATFORM_AARCH64_QEMU_VIRT
131+ default "aarch64-crosvm-virt" if PLATFORM_AARCH64_CROSVM_VIRT
132+ default "aarch64-raspi4b" if PLATFORM_AARCH64_RASPI
133+ default "riscv64-qemu-virt" if PLATFORM_RISCV64_QEMU_VIRT
134+ default "x86_64-qemu-virt" if PLATFORM_X86_64_QEMU_VIRT
135+ default "x86-csv" if PLATFORM_X86_CSV
136+ default "loongarch64-qemu-virt" if PLATFORM_LOONGARCH64_QEMU_VIRT
137+ help
138+ The name of the selected platform.
139+
140+
141141endmenu
142142
143143menu "Kernel Features"
0 commit comments