aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arc/kernel/setup.c')
-rw-r--r--arch/arc/kernel/setup.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index a3d186211ed3..18cc01591c96 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -142,17 +142,22 @@ static void read_arc_build_cfg_regs(void)
142} 142}
143 143
144static const struct cpuinfo_data arc_cpu_tbl[] = { 144static const struct cpuinfo_data arc_cpu_tbl[] = {
145#ifdef CONFIG_ISA_ARCOMPACT
145 { {0x20, "ARC 600" }, 0x2F}, 146 { {0x20, "ARC 600" }, 0x2F},
146 { {0x30, "ARC 700" }, 0x33}, 147 { {0x30, "ARC 700" }, 0x33},
147 { {0x34, "ARC 700 R4.10"}, 0x34}, 148 { {0x34, "ARC 700 R4.10"}, 0x34},
148 { {0x35, "ARC 700 R4.11"}, 0x35}, 149 { {0x35, "ARC 700 R4.11"}, 0x35},
149 { {0x50, "ARC HS38" }, 0x51}, 150#else
151 { {0x50, "ARC HS38 R2.0"}, 0x51},
152 { {0x52, "ARC HS38 R2.1"}, 0x52},
153#endif
150 { {0x00, NULL } } 154 { {0x00, NULL } }
151}; 155};
152 156
153#define IS_AVAIL1(v, str) ((v) ? str : "") 157#define IS_AVAIL1(v, s) ((v) ? s : "")
154#define IS_USED(cfg) (IS_ENABLED(cfg) ? "" : "(not used) ") 158#define IS_USED_RUN(v) ((v) ? "" : "(not used) ")
155#define IS_AVAIL2(v, str, cfg) IS_AVAIL1(v, str), IS_AVAIL1(v, IS_USED(cfg)) 159#define IS_USED_CFG(cfg) IS_USED_RUN(IS_ENABLED(cfg))
160#define IS_AVAIL2(v, s, cfg) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_USED_CFG(cfg))
156 161
157static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) 162static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
158{ 163{
@@ -226,7 +231,7 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
226 n += scnprintf(buf + n, len - n, "mpy[opt %d] ", opt); 231 n += scnprintf(buf + n, len - n, "mpy[opt %d] ", opt);
227 } 232 }
228 n += scnprintf(buf + n, len - n, "%s", 233 n += scnprintf(buf + n, len - n, "%s",
229 IS_USED(CONFIG_ARC_HAS_HW_MPY)); 234 IS_USED_CFG(CONFIG_ARC_HAS_HW_MPY));
230 } 235 }
231 236
232 n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n", 237 n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n",