please pull powerpc-merge.git

Paul Mackerras paulus at samba.org
Sun Jan 15 21:12:17 EST 2006


Linus,

Please do a pull from

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git

There are 7 commits there:

Benjamin Herrenschmidt:
      powerpc: Fix Maple build
      powerpc: Update pmac32_defconfig

Haren Myneni:
      powerpc: Fix kdump copy regs and dynamic allocate per-cpu crash notes
      powerpc: Kconfig changes for CRASH_DUMP

Paul Mackerras:
      powerpc/32: Generate miboot images with ARCH=powerpc
      ppc: Remove powermac support from ARCH=ppc
      powerpc: Make ARCH=powerpc the default for 32-bit ppc

The 3 commits of mine complete the move of 32-bit powermac support to
ARCH=powerpc, and remove the powermac support from ARCH=ppc.  The
powermac support in arch/ppc was broken, and Ben H says he is not
going to fix or maintain it.

Note that the last commit listed there modifies the top-level Makefile
to default to ARCH=powerpc if uname -m gives either "ppc" or "ppc64".
Most people who would be likely to build their own kernels natively on
ppc32 machines will be using powermacs (or possibly CHRP workstations,
which are also supported with ARCH=powerpc now).  Embedded developers
who are using ports that haven't been moved over to ARCH=powerpc can
put ARCH=ppc explicitly on the command line, or hack the top-level
Makefile.  (Many of them would be cross-compiling already, anyway.)

The other commits are minor fixes and a defconfig update.  I didn't
put in Ben's patch to get rid of the dependence on the _machine
variable, but I suspect he will argue for its inclusion before
2.6.16. :)

Thanks,
Paul.

 Makefile                                  |    2 
 arch/powerpc/Kconfig                      |   21 
 arch/powerpc/boot/Makefile                |   29 
 arch/powerpc/boot/dummy.c                 |    4 
 arch/powerpc/configs/pmac32_defconfig     |  105 +
 arch/powerpc/kernel/crash.c               |   77 -
 arch/powerpc/kernel/prom_init.c           |    3 
 arch/powerpc/platforms/maple/pci.c        |    1 
 arch/powerpc/platforms/maple/setup.c      |   85 -
 arch/powerpc/platforms/maple/time.c       |   23 
 arch/ppc/Kconfig                          |   73 -
 arch/ppc/boot/Makefile                    |    2 
 arch/ppc/boot/openfirmware/Makefile       |   96 -
 arch/ppc/boot/openfirmware/coffmain.c     |  101 -
 arch/ppc/boot/openfirmware/newworldmain.c |   94 -
 arch/ppc/kernel/Makefile                  |    2 
 arch/ppc/kernel/misc.S                    |   72 -
 arch/ppc/kernel/pci.c                     |  240 --
 arch/ppc/kernel/ppc_ksyms.c               |    9 
 arch/ppc/kernel/setup.c                   |   34 
 arch/ppc/kernel/traps.c                   |   13 
 arch/ppc/mm/init.c                        |   29 
 arch/ppc/platforms/Makefile               |   11 
 arch/ppc/platforms/chrp_pci.c             |    2 
 arch/ppc/platforms/chrp_setup.c           |   73 +
 arch/ppc/platforms/chrp_time.c            |   64 +
 arch/ppc/platforms/pmac_backlight.c       |  202 --
 arch/ppc/platforms/pmac_cache.S           |  359 ---
 arch/ppc/platforms/pmac_cpufreq.c         |  735 -------
 arch/ppc/platforms/pmac_feature.c         | 3023 -----------------------------
 arch/ppc/platforms/pmac_low_i2c.c         |  511 -----
 arch/ppc/platforms/pmac_nvram.c           |  584 ------
 arch/ppc/platforms/pmac_pci.c             | 1124 -----------
 arch/ppc/platforms/pmac_pic.c             |  693 -------
 arch/ppc/platforms/pmac_pic.h             |   11 
 arch/ppc/platforms/pmac_setup.c           |  745 -------
 arch/ppc/platforms/pmac_sleep.S           |  396 ----
 arch/ppc/platforms/pmac_smp.c             |  692 -------
 arch/ppc/platforms/pmac_time.c            |  291 ---
 arch/ppc/syslib/Makefile                  |    2 
 arch/ppc/syslib/prom.c                    |   21 
 arch/ppc/xmon/start.c                     |  161 --
 arch/ppc/xmon/xmon.c                      |   13 
 drivers/video/aty/radeon_pm.c             |    6 
 include/asm-powerpc/kexec.h               |   85 +
 include/asm-ppc/prom.h                    |    8 
 46 files changed, 452 insertions(+), 10475 deletions(-)
 create mode 100644 arch/powerpc/boot/dummy.c
 delete mode 100644 arch/ppc/boot/openfirmware/coffmain.c
 delete mode 100644 arch/ppc/boot/openfirmware/newworldmain.c
 delete mode 100644 arch/ppc/platforms/pmac_backlight.c
 delete mode 100644 arch/ppc/platforms/pmac_cache.S
 delete mode 100644 arch/ppc/platforms/pmac_cpufreq.c
 delete mode 100644 arch/ppc/platforms/pmac_feature.c
 delete mode 100644 arch/ppc/platforms/pmac_low_i2c.c
 delete mode 100644 arch/ppc/platforms/pmac_nvram.c
 delete mode 100644 arch/ppc/platforms/pmac_pci.c
 delete mode 100644 arch/ppc/platforms/pmac_pic.c
 delete mode 100644 arch/ppc/platforms/pmac_pic.h
 delete mode 100644 arch/ppc/platforms/pmac_setup.c
 delete mode 100644 arch/ppc/platforms/pmac_sleep.S
 delete mode 100644 arch/ppc/platforms/pmac_smp.c
 delete mode 100644 arch/ppc/platforms/pmac_time.c



More information about the Linuxppc64-dev mailing list