Skip to contentSkip to conversation

ppc4xx: Big header cleanup

PATCH New Stefan Roese 1 participant 2 messages Sep 13, 2010 – Sep 22, 2010

lore
Share & tools
lore
#0 lore raw

cover ppc4xx: Big header cleanup

This patchset tries to cleanup and the PPC4xx headers. To do this the following things are done:

- Move headers from include/* to arch/powerpc/include/asm/* to not clutter the toplevel include directory that much

- Create header files for each PPC4xx SoC variant and move SoC specific defines into these headers

- Removal of unreferenced defines

- Coding style cleanups

The result of this cleanup is the removal of the #ifdef mess from the ppc405.h and ppc440.h headers.

This patchset is already based on the "next" branch and should be used (if nobody objects) as bases for further PPC4xx (APM) SoC additions like the APM812xx support. If needed I could also push a branch with these patches online. Just let me know.

Here the status info:

Stefan Roese (5):
ppc4xx: Remove unreferenced file include/405_dimm.h
ppc4xx: Move ppc4xx headers to powerpc include directory
ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
ppc4xx: Big header cleanup, mostly PPC440 related
ppc4xx: Big header cleanup part 2, mostly PPC405 related

 arch/blackfin/cpu/cmd_gpio.c                       |    2 +-
 arch/blackfin/cpu/gpio.c                           |    2 +-
 arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c            |    2 +-
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c              |    2 +-
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c             |    4 +-
 arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c   |    2 +-
 arch/powerpc/cpu/ppc4xx/4xx_pci.c                  |   36 +-
 arch/powerpc/cpu/ppc4xx/4xx_pcie.c                 |    2 +-
 arch/powerpc/cpu/ppc4xx/4xx_uart.c                 |    6 +-
 arch/powerpc/cpu/ppc4xx/cache.S                    |    2 +-
 arch/powerpc/cpu/ppc4xx/cmd_ecctest.c              |    2 +-
 arch/powerpc/cpu/ppc4xx/cpu.c                      |   14 +-
 arch/powerpc/cpu/ppc4xx/cpu_init.c                 |   16 +-
 arch/powerpc/cpu/ppc4xx/dcr.S                      |    2 +-
 arch/powerpc/cpu/ppc4xx/denali_data_eye.c          |    2 +-
 arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c          |    2 +-
 arch/powerpc/cpu/ppc4xx/ecc.c                      |    2 +-
 arch/powerpc/cpu/ppc4xx/fdt.c                      |    2 +-
 arch/powerpc/cpu/ppc4xx/gpio.c                     |    7 +-
 arch/powerpc/cpu/ppc4xx/interrupts.c               |    2 +-
 arch/powerpc/cpu/ppc4xx/kgdb.S                     |    2 +-
 arch/powerpc/cpu/ppc4xx/miiphy.c                   |    4 +-
 arch/powerpc/cpu/ppc4xx/reginfo.c                  |    8 +-
 arch/powerpc/cpu/ppc4xx/sdram.c                    |    2 +-
 arch/powerpc/cpu/ppc4xx/speed.c                    |    4 +-
 arch/powerpc/cpu/ppc4xx/start.S                    |    2 +-
 arch/powerpc/cpu/ppc4xx/tlb.c                      |    2 +-
 arch/powerpc/cpu/ppc4xx/uic.c                      |    2 +-
 arch/powerpc/cpu/ppc4xx/xilinx_irq.c               |    2 +-
 arch/powerpc/include/asm/4xx_pcie.h                |    2 +-
 arch/powerpc/include/asm/ppc405.h                  |   80 +
 arch/powerpc/include/asm/ppc405cr.h                |  100 +
 arch/powerpc/include/asm/ppc405ep.h                |  247 +++
 arch/powerpc/include/asm/ppc405ex.h                |   85 +
 arch/powerpc/include/asm/ppc405ez.h                |   97 +
 arch/powerpc/include/asm/ppc405gp.h                |  103 +
 arch/powerpc/include/asm/ppc440.h                  |  193 ++
 arch/powerpc/include/asm/ppc440ep_gr.h             |  234 +++
 arch/powerpc/include/asm/ppc440epx_grx.h           |  458 +++++
 arch/powerpc/include/asm/ppc440gp.h                |   62 +
 arch/powerpc/include/asm/ppc440gx.h                |   91 +
 arch/powerpc/include/asm/ppc440sp.h                |   87 +
 arch/powerpc/include/asm/ppc440spe.h               |  104 ++
 arch/powerpc/include/asm/ppc460ex_gt.h             |  211 +++
 arch/powerpc/include/asm/ppc460sx.h                |   38 +
 .../powerpc/include/asm/ppc4xx-emac.h              |    8 +-
 arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} |    0
 .../powerpc/include/asm/ppc4xx-i2c.h               |    0
 arch/powerpc/include/asm/ppc4xx-mal.h              |  168 ++
 arch/powerpc/include/asm/ppc4xx-sdram.h            |    2 -
 arch/powerpc/include/asm/ppc4xx.h                  |  328 ++++
 board/amcc/acadia/memory.c                         |    2 +-
 board/amcc/acadia/pll.c                            |   30 +-
 board/amcc/bamboo/bamboo.c                         |    6 +-
 board/amcc/bamboo/bamboo.h                         |   11 -
 board/amcc/bamboo/flash.c                          |    6 +-
 board/amcc/bubinga/flash.c                         |    2 +-
 board/amcc/canyonlands/canyonlands.c               |    4 +-
 board/amcc/common/flash.c                          |    2 +-
 board/amcc/ebony/flash.c                           |    2 +-
 board/amcc/katmai/katmai.c                         |    4 +-
 board/amcc/kilauea/kilauea.c                       |    4 +-
 board/amcc/luan/flash.c                            |    2 +-
 board/amcc/luan/luan.c                             |    2 +-
 board/amcc/makalu/makalu.c                         |    6 +-
 board/amcc/ocotea/flash.c                          |    2 +-
 board/amcc/ocotea/ocotea.c                         |    2 +-
 board/amcc/redwood/redwood.c                       |    2 +-
 board/amcc/sequoia/sdram.c                         |    2 +-
 board/amcc/sequoia/sequoia.c                       |    8 +-
 board/amcc/taihu/flash.c                           |    2 +-
 board/amcc/taihu/lcd.c                             |    2 +-
 board/amcc/taihu/taihu.c                           |    2 +-
 board/amcc/taishan/taishan.c                       |    2 +-
 board/amcc/walnut/flash.c                          |    2 +-
 board/amcc/yosemite/yosemite.c                     |    2 +-
 board/amcc/yucca/flash.c                           |    4 +-
 board/amcc/yucca/yucca.c                           |    2 +-
 board/amirix/ap1000/init.S                         |    2 +-
 board/amirix/ap1000/pci.c                          |    2 +-
 board/bf527-ezkit/bf527-ezkit.c                    |    2 +-
 board/bf533-stamp/bf533-stamp.c                    |    2 +-
 board/bf548-ezkit/bf548-ezkit.c                    |    2 +-
 board/bf548-ezkit/video.c                          |    2 +-
 board/blackstamp/blackstamp.c                      |    2 +-
 board/cm-bf527/gpio_cfi_flash.c                    |    2 +-
 board/cm-bf537e/gpio_cfi_flash.c                   |    2 +-
 board/cm-bf537u/gpio_cfi_flash.c                   |    2 +-
 board/cm-bf548/video.c                             |    2 +-
 board/cray/L1/L1.c                                 |    2 +-
 board/cray/L1/flash.c                              |    2 +-
 board/cray/L1/init.S                               |    2 +-
 board/csb272/csb272.c                              |    2 +-
 board/csb272/init.S                                |    2 +-
 board/csb472/csb472.c                              |    2 +-
 board/csb472/init.S                                |    2 +-
 board/dave/PPChameleonEVB/flash.c                  |    2 +-
 board/dave/common/pci.c                            |    2 +-
 board/eric/flash.c                                 |    2 +-
 board/eric/init.S                                  |    2 +-
 board/esd/adciop/flash.c                           |    2 +-
 board/esd/ar405/flash.c                            |    2 +-
 board/esd/ash405/flash.c                           |    2 +-
 board/esd/canbt/flash.c                            |    2 +-
 board/esd/cms700/flash.c                           |    2 +-
 board/esd/common/flash.c                           |    2 +-
 board/esd/common/pci.c                             |    2 +-
 board/esd/cpci2dp/flash.c                          |    2 +-
 board/esd/cpci405/flash.c                          |    2 +-
 board/esd/cpciiser4/flash.c                        |    2 +-
 board/esd/dasa_sim/flash.c                         |    2 +-
 board/esd/dp405/flash.c                            |    2 +-
 board/esd/du405/du405.c                            |    4 +-
 board/esd/du405/flash.c                            |    2 +-
 board/esd/du440/du440.c                            |    6 +-
 board/esd/hh405/flash.c                            |    2 +-
 board/esd/hub405/flash.c                           |    2 +-
 board/esd/ocrtc/flash.c                            |    2 +-
 board/esd/pci405/flash.c                           |    2 +-
 board/esd/pci405/pci405.c                          |    1 -
 board/esd/pci405/writeibm.S                        |    2 +-
 board/esd/plu405/flash.c                           |    2 +-
 board/esd/pmc405de/pmc405de.c                      |    2 +-
 board/esd/pmc440/pmc440.c                          |    6 +-
 board/esd/pmc440/sdram.c                           |    2 +-
 board/esd/tasreg/flash.c                           |    2 +-
 board/esd/voh405/flash.c                           |    2 +-
 board/esd/vom405/flash.c                           |    2 +-
 board/esd/wuh405/flash.c                           |    2 +-
 board/gdsys/dlvision/dlvision.c                    |    2 +-
 board/gdsys/gdppc440etx/gdppc440etx.c              |    2 +-
 board/gdsys/intip/intip.c                          |    4 +-
 board/jse/flash.c                                  |    2 +-
 board/jse/init.S                                   |    2 +-
 board/jse/jse.c                                    |    2 +-
 board/jse/sdram.c                                  |    2 +-
 board/korat/korat.c                                |    8 +-
 board/lwmon5/lwmon5.c                              |   12 +-
 board/lwmon5/sdram.c                               |    2 +-
 board/ml2/init.S                                   |    2 +-
 board/mosaixtech/icon/icon.c                       |    4 +-
 board/mpl/common/flash.c                           |    2 +-
 board/mpl/common/memtst.c                          |    2 +-
 board/mpl/mip405/init.S                            |    3 +-
 board/mpl/mip405/mip405.c                          |    3 +-
 board/mpl/pip405/init.S                            |    3 +-
 board/netstal/common/fixed_sdram.c                 |    2 +-
 board/netstal/hcu4/hcu4.c                          |    2 +-
 board/netstal/hcu5/hcu5.c                          |   26 +-
 board/netstal/hcu5/sdram.c                         |    2 +-
 board/netstal/mcu25/mcu25.c                        |    2 +-
 board/pcs440ep/pcs440ep.c                          |    2 +-
 board/prodrive/alpr/alpr.c                         |    2 +-
 board/prodrive/alpr/fpga.c                         |    2 +-
 board/quad100hd/nand.c                             |    2 +-
 board/quad100hd/quad100hd.c                        |    2 +-
 board/sandburst/common/flash.c                     |    2 +-
 board/sandburst/common/ppc440gx_i2c.c              |    4 +-
 board/sandburst/common/ppc440gx_i2c.h              |    4 +-
 board/sc3/init.S                                   |    2 +-
 board/sc3/sc3.c                                    |   10 +-
 board/snmc/qs850/flash.c                           |    2 +-
 board/snmc/qs860t/flash.c                          |    2 +-
 board/t3corp/t3corp.c                              |    4 +-
 board/tb0229/flash.c                               |    2 +-
 board/tcm-bf537/gpio_cfi_flash.c                   |    2 +-
 board/w7o/flash.c                                  |    2 +-
 board/w7o/init.S                                   |    2 +-
 board/w7o/post1.S                                  |    2 +-
 board/zeus/update.c                                |    2 +-
 board/zeus/zeus.c                                  |    2 +-
 drivers/i2c/ppc4xx_i2c.c                           |    4 +-
 drivers/i2c/soft_i2c.c                             |    2 +-
 drivers/misc/gpio_led.c                            |    2 +-
 drivers/mtd/nand/nand_plat.c                       |    2 +-
 drivers/mtd/nand/ndfc.c                            |    2 +-
 drivers/net/4xx_enet.c                             |    9 +-
 drivers/spi/bfin_spi.c                             |    2 +-
 include/405_dimm.h                                 |    4 -
 include/405_mal.h                                  |  129 --
 include/common.h                                   |    2 +-
 include/configs/ASH405.h                           |   10 +-
 include/configs/CATcenter.h                        |   12 +-
 include/configs/CMS700.h                           |   12 +-
 include/configs/DP405.h                            |   12 +-
 include/configs/G2000.h                            |   10 +-
 include/configs/HH405.h                            |   10 +-
 include/configs/HUB405.h                           |   10 +-
 include/configs/PLU405.h                           |   10 +-
 include/configs/PPChameleonEVB.h                   |   23 +-
 include/configs/VOH405.h                           |   10 +-
 include/configs/VOM405.h                           |   12 +-
 include/configs/WUH405.h                           |   10 +-
 include/configs/bubinga.h                          |   10 +-
 include/configs/quad100hd.h                        |   10 +-
 include/configs/zeus.h                             |   10 +-
 include/ppc405.h                                   |  832 ---------
 include/ppc440.h                                   | 1958 --------------------
 include/ppc4xx.h                                   |  225 ---
 nand_spl/board/amcc/bamboo/sdram.c                 |    2 +-
 nand_spl/board/amcc/canyonlands/ddr2_fixed.c       |    4 +-
 post/board/lwmon5/watchdog.c                       |    2 +-
 post/cpu/ppc4xx/denali_ecc.c                       |    2 +-
 post/cpu/ppc4xx/ether.c                            |    4 +-
 post/cpu/ppc4xx/fpu.c                              |    2 +-
 205 files changed, 3041 insertions(+), 3529 deletions(-)
 create mode 100644 arch/powerpc/include/asm/ppc405.h
 create mode 100644 arch/powerpc/include/asm/ppc405cr.h
 create mode 100644 arch/powerpc/include/asm/ppc405ep.h
 create mode 100644 arch/powerpc/include/asm/ppc405ex.h
 create mode 100644 arch/powerpc/include/asm/ppc405ez.h
 create mode 100644 arch/powerpc/include/asm/ppc405gp.h
 create mode 100644 arch/powerpc/include/asm/ppc440.h
 create mode 100644 arch/powerpc/include/asm/ppc440ep_gr.h
 create mode 100644 arch/powerpc/include/asm/ppc440epx_grx.h
 create mode 100644 arch/powerpc/include/asm/ppc440gp.h
 create mode 100644 arch/powerpc/include/asm/ppc440gx.h
 create mode 100644 arch/powerpc/include/asm/ppc440sp.h
 create mode 100644 arch/powerpc/include/asm/ppc440spe.h
 create mode 100644 arch/powerpc/include/asm/ppc460ex_gt.h
 create mode 100644 arch/powerpc/include/asm/ppc460sx.h
 rename include/ppc4xx_enet.h => arch/powerpc/include/asm/ppc4xx-emac.h (98%)
 rename arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} (100%)
 rename include/4xx_i2c.h => arch/powerpc/include/asm/ppc4xx-i2c.h (100%)
 create mode 100644 arch/powerpc/include/asm/ppc4xx-mal.h
 create mode 100644 arch/powerpc/include/asm/ppc4xx.h
 delete mode 100644 include/405_dimm.h
 delete mode 100644 include/405_mal.h
 delete mode 100644 include/ppc405.h
 delete mode 100644 include/ppc440.h
 delete mode 100644 include/ppc4xx.h
#1 lore raw

cover ppc4xx: Big header cleanup

Quoted 13 lines · On Monday 13 September 2010 10:28:39 Stefan Roese wrote:

This patchset tries to cleanup and the PPC4xx headers. To do this the following things are done:

- Move headers from include/* to arch/powerpc/include/asm/* to not clutter the toplevel include directory that much

- Create header files for each PPC4xx SoC variant and move SoC specific defines into these headers

- Removal of unreferenced defines

- Coding style cleanups

Quoted 7 lines

The result of this cleanup is the removal of the #ifdef mess from the ppc405.h and ppc440.h headers.

This patchset is already based on the "next" branch and should be used (if nobody objects) as bases for further PPC4xx (APM) SoC additions like the APM812xx support. If needed I could also push a branch with these patches online. Just let me know.

Patchset applied to u-boot-ppc4xx/next. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de