From: Wolfgang Wallner Date: Tue, 25 Feb 2020 12:19:48 +0000 (+0100) Subject: x86: apl: Use cpu_x86_get_count() for cpu_ops.get_count X-Git-Tag: v2020.04-rc4~22^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c64d11e3239b5b3cf29c911fd9cdb6ebb3880d6;p=oweals%2Fu-boot.git x86: apl: Use cpu_x86_get_count() for cpu_ops.get_count Use cpu_x86_get_count() to read the number of cores. cpu_x86_get_count() reads the number of CPUs from the device tree. Using this function we can support multiple Apollo Lake variants, e.g.: E3940 (4 cores) and E3930 (2 cores). This was tested on the E3940 and E3930 Apollo Lake variants. Signed-off-by: Wolfgang Wallner Reviewed-by: Bin Meng --- diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c index 3d05c82a5c..aa7a3dbd63 100644 --- a/arch/x86/cpu/apollolake/cpu.c +++ b/arch/x86/cpu/apollolake/cpu.c @@ -14,15 +14,10 @@ static int apl_get_info(struct udevice *dev, struct cpu_info *info) return cpu_intel_get_info(info, INTEL_BCLK_MHZ); } -static int apl_get_count(struct udevice *dev) -{ - return 4; -} - static const struct cpu_ops cpu_x86_apl_ops = { .get_desc = cpu_x86_get_desc, .get_info = apl_get_info, - .get_count = apl_get_count, + .get_count = cpu_x86_get_count, .get_vendor = cpu_x86_get_vendor, };