Message ID | 1489650534-6613-1-git-send-email-t-kristo@ti.com |
---|---|
State | Accepted |
Commit | a051a99f0d76d767d57b8d7f12f64acd28bd1ce7 |
Delegated to: | Tom Rini |
Headers | show |
On Thu, 16 Mar 2017 09:48:54 +0200 Tero Kristo <t-kristo@ti.com> wrote: > Currently, AM43xx just re-uses the version strings from AM33xx which > is wrong; the actual values for AM43xx are different. Fix this by > adding a separate version string array for AM43xx and use this > instead. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > Reported-by: Sekhar Nori <nsekhar@ti.com> > --- > arch/arm/mach-omap2/am33xx/sys_info.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c > b/arch/arm/mach-omap2/am33xx/sys_info.c index f0f72fa..e4fc461 100644 > --- a/arch/arm/mach-omap2/am33xx/sys_info.c > +++ b/arch/arm/mach-omap2/am33xx/sys_info.c > @@ -74,6 +74,10 @@ static char *cpu_revs[] = { > "2.0", > "2.1"}; > > +static char *cpu_revs_am43xx[] = { > + "1.0", > + "1.1", > + "1.2"}; > > static char *dev_types[] = { > "TST", > @@ -87,6 +91,7 @@ static char *dev_types[] = { > int print_cpuinfo(void) > { > char *cpu_s, *sec_s, *rev_s; > + char **cpu_rev_arr = cpu_revs; > > switch (get_cpu_type()) { > case AM335X: > @@ -97,6 +102,7 @@ int print_cpuinfo(void) > break; > case AM437X: > cpu_s = "AM437X"; > + cpu_rev_arr = cpu_revs_am43xx; > break; > default: > cpu_s = "Unknown CPU type"; > @@ -104,7 +110,7 @@ int print_cpuinfo(void) > } > > if (get_cpu_rev() < ARRAY_SIZE(cpu_revs)) > - rev_s = cpu_revs[get_cpu_rev()]; > + rev_s = cpu_rev_arr[get_cpu_rev()]; > else > rev_s = "?"; > Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Thu, Mar 16, 2017 at 09:48:54AM +0200, Tero Kristo wrote: > Currently, AM43xx just re-uses the version strings from AM33xx which is > wrong; the actual values for AM43xx are different. Fix this by adding > a separate version string array for AM43xx and use this instead. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > Reported-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Thu, Mar 16, 2017 at 09:48:54AM +0200, Tero Kristo wrote: > Currently, AM43xx just re-uses the version strings from AM33xx which is > wrong; the actual values for AM43xx are different. Fix this by adding > a separate version string array for AM43xx and use this instead. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > Reported-by: Sekhar Nori <nsekhar@ti.com> > Reviewed-by: Lukasz Majewski <lukma@denx.de> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c index f0f72fa..e4fc461 100644 --- a/arch/arm/mach-omap2/am33xx/sys_info.c +++ b/arch/arm/mach-omap2/am33xx/sys_info.c @@ -74,6 +74,10 @@ static char *cpu_revs[] = { "2.0", "2.1"}; +static char *cpu_revs_am43xx[] = { + "1.0", + "1.1", + "1.2"}; static char *dev_types[] = { "TST", @@ -87,6 +91,7 @@ static char *dev_types[] = { int print_cpuinfo(void) { char *cpu_s, *sec_s, *rev_s; + char **cpu_rev_arr = cpu_revs; switch (get_cpu_type()) { case AM335X: @@ -97,6 +102,7 @@ int print_cpuinfo(void) break; case AM437X: cpu_s = "AM437X"; + cpu_rev_arr = cpu_revs_am43xx; break; default: cpu_s = "Unknown CPU type"; @@ -104,7 +110,7 @@ int print_cpuinfo(void) } if (get_cpu_rev() < ARRAY_SIZE(cpu_revs)) - rev_s = cpu_revs[get_cpu_rev()]; + rev_s = cpu_rev_arr[get_cpu_rev()]; else rev_s = "?";
Currently, AM43xx just re-uses the version strings from AM33xx which is wrong; the actual values for AM43xx are different. Fix this by adding a separate version string array for AM43xx and use this instead. Signed-off-by: Tero Kristo <t-kristo@ti.com> Reported-by: Sekhar Nori <nsekhar@ti.com> --- arch/arm/mach-omap2/am33xx/sys_info.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)