ARM: uniphier: remove part number info from the boot log

As is often the case with SoC development, slightly different
products (i.e. different part number) are developed based on the
same silicon-die.  Such fine grained information is unmaintainable.

Also, "SoC:" is a better fit that "CPU:".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-07-13 20:32:17 +09:00
parent 673ac334fc
commit b8faf5f12b

View file

@ -20,37 +20,37 @@ int print_cpuinfo(void)
model = uniphier_get_soc_model(); model = uniphier_get_soc_model();
rev = uniphier_get_soc_revision(); rev = uniphier_get_soc_revision();
puts("CPU: "); puts("SoC: ");
switch (id) { switch (id) {
case UNIPHIER_SLD3_ID: case UNIPHIER_SLD3_ID:
puts("sLD3 (MN2WS0220)"); puts("sLD3");
required_model = 2; required_model = 2;
break; break;
case UNIPHIER_LD4_ID: case UNIPHIER_LD4_ID:
puts("LD4 (MN2WS0250)"); puts("LD4");
required_rev = 2; required_rev = 2;
break; break;
case UNIPHIER_PRO4_ID: case UNIPHIER_PRO4_ID:
puts("Pro4 (MN2WS0230)"); puts("Pro4");
break; break;
case UNIPHIER_SLD8_ID: case UNIPHIER_SLD8_ID:
puts("sLD8 (MN2WS0270)"); puts("sLD8");
break; break;
case UNIPHIER_PRO5_ID: case UNIPHIER_PRO5_ID:
puts("Pro5 (MN2WS0300)"); puts("Pro5");
break; break;
case UNIPHIER_PXS2_ID: case UNIPHIER_PXS2_ID:
puts("PXs2 (MN2WS0310)"); puts("PXs2");
break; break;
case UNIPHIER_LD6B_ID: case UNIPHIER_LD6B_ID:
puts("LD6b (MN2WS0320)"); puts("LD6b");
break; break;
case UNIPHIER_LD11_ID: case UNIPHIER_LD11_ID:
puts("LD11 (SC1405AP1)"); puts("LD11");
break; break;
case UNIPHIER_LD20_ID: case UNIPHIER_LD20_ID:
puts("LD20 (SC1401AJ1)"); puts("LD20");
break; break;
case UNIPHIER_PXS3_ID: case UNIPHIER_PXS3_ID:
puts("PXs3"); puts("PXs3");
@ -60,7 +60,7 @@ int print_cpuinfo(void)
return -ENOTSUPP; return -ENOTSUPP;
} }
printf(" model %d (revision %d)\n", model, rev); printf(" (model %d, revision %d)\n", model, rev);
if (model < required_model) { if (model < required_model) {
printf("Only model %d or newer is supported.\n", printf("Only model %d or newer is supported.\n",