diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-08-10 16:48:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-10 16:48:51 -0700 |
| commit | b9157b3f6520f46e788157fbfe9753b209efe9b7 (patch) | |
| tree | 80d72e25837f3b569734ba476df84d3462617e29 /modules/devices/arm/processor.c | |
| parent | 7db082583f72598e2118553faf1ba3206d7c3ee7 (diff) | |
| parent | 4827b88fa34807425640d2a9f07bbf4ac4119ab3 (diff) | |
Merge branch 'master' into usb3
Diffstat (limited to 'modules/devices/arm/processor.c')
| -rw-r--r-- | modules/devices/arm/processor.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c index 87200335..a1b7f81a 100644 --- a/modules/devices/arm/processor.c +++ b/modules/devices/arm/processor.c @@ -311,10 +311,10 @@ gchar *clocks_summary(GSList * processors) gchar * processor_get_detailed_info(Processor *processor) { - gchar *tmp_flags, *tmp_imp, *tmp_part, *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret; + gchar *tmp_flags, *tmp_imp = NULL, *tmp_part = NULL, + *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret; tmp_flags = processor_get_capabilities_from_flags(processor->flags); - tmp_imp = (char*)arm_implementer(processor->cpu_implementer); - tmp_part = (char*)arm_part(processor->cpu_implementer, processor->cpu_part); + arm_part(processor->cpu_implementer, processor->cpu_part, &tmp_imp, &tmp_part); tmp_arch = (char*)arm_arch_more(processor->cpu_architecture); tmp_topology = cputopo_section_str(processor->cputopo); @@ -375,9 +375,10 @@ gchar *processor_name(GSList *processors) { char *vendor; char *soc; } dt_compat_searches[] = { - { "brcm,bcm2837", "Broadcom", "BCM2837" }, // RPi 1 + { "brcm,bcm2838", "Broadcom", "BCM2838" }, // RPi 4 + { "brcm,bcm2837", "Broadcom", "BCM2837" }, // RPi 3 { "brcm,bcm2836", "Broadcom", "BCM2836" }, // RPi 2 - { "brcm,bcm2835", "Broadcom", "BCM2835" }, // RPi 3 + { "brcm,bcm2835", "Broadcom", "BCM2835" }, // RPi 1 { "rockchip,rk3288", "Rockchip", "RK3288" }, // Asus Tinkerboard { "rockchip,rk3328", "Rockchip", "RK3328" }, // Firefly Renegade { "rockchip,rk3399", "Rockchip", "RK3399" }, // Firefly Renegade Elite |