[U-Boot] [PATCH V2 0/10] PPC LBC/TLB cleanups; reginfo command for 85xx

Becky Bruce
2010-06-02T18:11:59Z

This somewhat random patch series got its start when I was asked to
create a reginfo command for 85xx by one of the internal teams here at
FSL to dump the BR/ORs, LAWs, and the TLBCAM entries. As I started doing
that, I began to notice that there was a lot of duplicated and inconsistent
code for manipulating the TLBs and LBC registers, which, in some cases,
would have caused me to have to write extra code to make reginfo useful
on multiple platforms. So I decided to clean this up. The bulk of
these patches are just merges of duplicated code and renames of things
to get to a consistent naming scheme.

These really need to be picked up by a single maintainer, as there's
a definite dependency chain here; I'll let Kumar and Wolfgang decide
who wants it.

Wolfgang, my makefile changes are going to conflict with your
top-level makefile changes that are posted on the list but not yet
in the tree - you should be able to just incorporate my changes, or
you can poke me when yours are in the tree and I can deal with it.

NOTE: Updated from the original version to incorporate feedback - removed
unnecessary volatiles in the upmconfig code, made the definition
of FSL_LBC dependent on 85xx/86xx/83xx, and moved the ohci readl/writel
defs into a header.

Diffstat below.

Cheers,
Becky

MAKEALL | 2 +
Makefile | 1 +
arch/powerpc/cpu/mpc83xx/cpu.c | 66 ------------
arch/powerpc/cpu/mpc83xx/cpu_init.c | 53 ++--------
arch/powerpc/cpu/mpc83xx/nand_init.c | 4 +-
arch/powerpc/cpu/mpc83xx/speed.c | 2 +-
arch/powerpc/cpu/mpc85xx/cpu.c | 78 +++-----------
arch/powerpc/cpu/mpc85xx/cpu_init.c | 58 +----------
arch/powerpc/cpu/mpc85xx/cpu_init_nand.c | 6 +-
arch/powerpc/cpu/mpc85xx/speed.c | 5 +-
arch/powerpc/cpu/mpc85xx/tlb.c | 70 ++++++++-----
arch/powerpc/cpu/mpc86xx/cpu.c | 15 +---
arch/powerpc/cpu/mpc86xx/cpu_init.c | 55 +----------
arch/powerpc/cpu/mpc86xx/speed.c | 5 +-
arch/powerpc/cpu/mpc8xxx/Makefile | 3 +
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 135 ++++++++++++++++++++++++
arch/powerpc/include/asm/config.h | 6 +
arch/powerpc/include/asm/fsl_law.h | 1 +
arch/powerpc/include/asm/fsl_lbc.h | 112 ++++++++++++--------
arch/powerpc/include/asm/immap_83xx.h | 13 ++-
arch/powerpc/include/asm/immap_85xx.h | 46 +--------
arch/powerpc/include/asm/immap_86xx.h | 49 +--------
arch/powerpc/include/asm/mmu.h | 2 +
board/atum8548/atum8548.c | 2 +-
board/esd/vme8349/vme8349.c | 2 +-
board/freescale/mpc8313erdb/sdram.c | 2 +-
board/freescale/mpc8349emds/mpc8349emds.c | 2 +-
board/freescale/mpc8349itx/mpc8349itx.c | 7 +-
board/freescale/mpc8360emds/mpc8360emds.c | 6 +-
board/freescale/mpc8360erdk/nand.c | 6 +-
board/freescale/mpc8540ads/mpc8540ads.c | 8 +-
board/freescale/mpc8541cds/mpc8541cds.c | 13 +--
board/freescale/mpc8544ds/mpc8544ds.c | 2 +-
board/freescale/mpc8548cds/mpc8548cds.c | 13 +--
board/freescale/mpc8555cds/mpc8555cds.c | 12 +--
board/freescale/mpc8560ads/mpc8560ads.c | 8 +-
board/freescale/mpc8568mds/mpc8568mds.c | 11 +--
board/freescale/mpc8569mds/mpc8569mds.c | 2 +-
board/mpc8540eval/mpc8540eval.c | 6 +-
board/pm854/pm854.c | 2 +-
board/pm856/pm856.c | 2 +-
board/sbc8349/sbc8349.c | 2 +-
board/sbc8548/sbc8548.c | 20 +---
board/sbc8560/sbc8560.c | 6 +-
board/sheldon/simpc8313/sdram.c | 2 +-
board/sheldon/simpc8313/simpc8313.c | 2 +-
board/socrates/socrates.c | 31 +++---
board/tqc/tqm834x/tqm834x.c | 8 +-
board/tqc/tqm85xx/nand.c | 12 +-
board/tqc/tqm85xx/tqm85xx.c | 35 +++---
board/xes/xpedite5170/xpedite5170.c | 10 +-
board/xes/xpedite5200/xpedite5200.c | 11 +-
board/xes/xpedite5370/xpedite5370.c | 9 +-
common/cmd_reginfo.c | 5 +
drivers/misc/fsl_law.c | 131 ++++++++++--------------
drivers/mtd/nand/fsl_elbc_nand.c | 18 ++--
drivers/usb/host/ohci-hcd.c | 11 --
drivers/usb/host/ohci.h | 13 +++
include/configs/MPC8313ERDB.h | 1 +
include/configs/MPC8315ERDB.h | 1 +
include/configs/MPC837XEMDS.h | 1 +
include/configs/MPC8536DS.h | 1 +
include/configs/MPC8540EVAL.h | 1 +
include/configs/MPC8541CDS.h | 1 +
include/configs/MPC8544DS.h | 1 +
include/configs/MPC8548CDS.h | 1 +
include/configs/MPC8555CDS.h | 1 +
include/configs/MPC8560ADS.h | 1 +
include/configs/MPC8568MDS.h | 1 +
include/configs/MPC8569MDS.h | 1 +
include/configs/MPC8572DS.h | 1 +
include/configs/P1_P2_RDB.h | 1 +
include/configs/P2020DS.h | 1 +
include/configs/PM854.h | 1 +
include/configs/PM856.h | 1 +
include/configs/SBC8540.h | 1 +
include/configs/SIMPC8313.h | 1 +
include/configs/TQM85xx.h | 1 +
include/configs/XPEDITE5200.h | 1 +
include/configs/XPEDITE5370.h | 2 +
include/configs/sbc8548.h | 1 +
include/configs/sbc8560.h | 1 +
include/configs/socrates.h | 1 +
include/configs/stxgp3.h | 1 +
include/configs/stxssa.h | 1 +
include/mpc85xx.h | 2 -
nand_spl/board/freescale/mpc8536ds/nand_boot.c | 5 +-
nand_spl/nand_boot_fsl_elbc.c | 4 +-