diff mbox

[OpenWrt-Devel,001/001,brcm63xx] Display the correct detected CPU ID

Message ID CAD2Yd_Y44wsassxuHyvYRJRrkOyTfyvSDSturv3zKd_kpFAv0Q@mail.gmail.com
State Superseded, archived
Headers show

Commit Message

Graham Fairweather May 4, 2016, 3:40 p.m. UTC 
From: Graham Fairweather <xotic750@gmail.com>

This patch fixes the logged detected CPU ID when an equivalent is
used, like in the case where we have a bcm6369 and configuration for a
bcm6368 is used. More info can be found
at:https://forum.openwrt.org/viewtopic.php?id=64621https://github.com/Xotic750/openwrt/tree/fix_logged_cpu_id_bcm63xx
Signed-off-by: Graham Fairweather <xotic750@gmail.com>
---
target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
| 9 +++++++++
target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
| 9 +++++++++
2 files changed, 18 insertions(+)
 @@ -19,6 +19,7 @@
diff mbox

Patch

diff --git a/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
b/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
index 661abf6..23491aa 100644
--- a/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
+++ b/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
@@ -41,6 +41,15 @@  Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu
variant helper
  	bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;

  	switch (bcm63xx_cpu_id) {
+@@ -377,7 +387,7 @@ void __init bcm63xx_cpu_init(void)
+ 	bcm63xx_memory_size = detect_memory_size();
+
+ 	printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n",
+-	       bcm63xx_cpu_id, bcm63xx_cpu_rev);
++	       bcm63xx_cpu_variant, bcm63xx_cpu_rev);
+ 	printk(KERN_INFO "CPU frequency is %u MHz\n",
+ 	       bcm63xx_cpu_freq / 1000000);
+ 	printk(KERN_INFO "%uMB of RAM installed\n",
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
 @@ -19,6 +19,7 @@
diff --git a/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
b/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
index 661abf6..23491aa 100644
--- a/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
+++ b/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch
@@ -41,6 +41,15 @@  Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu
variant helper
  	bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;

  	switch (bcm63xx_cpu_id) {
+@@ -377,7 +387,7 @@ void __init bcm63xx_cpu_init(void)
+ 	bcm63xx_memory_size = detect_memory_size();
+
+ 	printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n",
+-	       bcm63xx_cpu_id, bcm63xx_cpu_rev);
++	       bcm63xx_cpu_variant, bcm63xx_cpu_rev);
+ 	printk(KERN_INFO "CPU frequency is %u MHz\n",
+ 	       bcm63xx_cpu_freq / 1000000);
+ 	printk(KERN_INFO "%uMB of RAM installed\n",
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h