[U-Boot] [PATCH 2/2] powerpc/8xxx: query feature reporting register for num cores on unknown cpus

[Wolfgang Denk]

Dear Kim,

In message <20100714194729.7405f880.kim.phillips at freescale.com> you wrote:
> doing so helps avant garde users, such as those using simulators that
> allow users to configure the number of cores, so as to not have to
> manually adjust u-boot sources.  h/w should also be reliably setting
> FRR NCPU in the future.
> 
> Signed-off-by: Kim Phillips <kim.phillips at freescale.com>
> ---
>  arch/powerpc/cpu/mpc8xxx/cpu.c        |   10 ++++++++--
>  arch/powerpc/include/asm/immap_85xx.h |    2 ++
>  2 files changed, 10 insertions(+), 2 deletions(-)

Unfortunately this commit breaks a number of boards, especially 86xx
ones. For example:

$ ./MAKEALL MPC8610HPCD
Configuring for MPC8610HPCD board...
cpu.c: In function 'cpu_numcores':
cpu.c:113: error: 'CONFIG_SYS_MPC85xx_PIC_ADDR' undeclared (first use in this function)
cpu.c:113: error: (Each undeclared identifier is reported only once
cpu.c:113: error: for each function it appears in.)
cpu.c:118: error: 'MPC85xx_PICFRR_NCPU_MASK' undeclared (first use in this function)
cpu.c:119: error: 'MPC85xx_PICFRR_NCPU_SHIFT' undeclared (first use in this function)
make[1]: *** [/work/wd/tmp-ppc/arch/powerpc/cpu/mpc8xxx/cpu.o] Error 1
make: *** [/work/wd/tmp-ppc/arch/powerpc/cpu/mpc8xxx/lib8xxx.a] Error 2
make: *** Waiting for unfinished jobs....
ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file


And git bisect says:

a37c36f4e70bada297f281b0e542539ad43e50f6 is the first bad commit
commit a37c36f4e70bada297f281b0e542539ad43e50f6
Author: Kim Phillips <kim.phillips at freescale.com>
Date:   Wed Jul 14 19:47:29 2010 -0500

    powerpc/8xxx: query feature reporting register for num cores on unknown cpus


Can you please have a look at it?


[Did both you and Kumar forget to run MAKEALL?]

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
For every complex problem, there is a solution that is simple,  neat,
and wrong.                                               - Mark Twain