OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8f1e938db9
linux/arch/powerpc/configs
History
Linus Torvalds 1197ab2942 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
  powerpc/p3060qds: Add support for P3060QDS board
  powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
  powerpc/85xx: Make kexec to interate over online cpus
  powerpc/fsl_booke: Fix comment in head_fsl_booke.S
  powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
  powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
  powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
  powerpc/86xx: Correct Gianfar support for GE boards
  powerpc/cpm: Clear muram before it is in use.
  drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
  powerpc/fsl_msi: add support for "msi-address-64" property
  powerpc/85xx: Setup secondary cores PIR with hard SMP id
  powerpc/fsl-booke: Fix settlbcam for 64-bit
  powerpc/85xx: Adding DCSR node to dtsi device trees
  powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
  powerpc/85xx: fix PHYS_64BIT selection for P1022DS
  powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
  powerpc: respect mem= setting for early memory limit setup
  powerpc: Update corenet64_smp_defconfig
  powerpc: Update mpc85xx/corenet 32-bit defconfigs
  ...

Fix up trivial conflicts in:
 - arch/powerpc/configs/40x/hcu4_defconfig
	removed stale file, edited elsewhere
 - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
	added opal and gelic drivers vs added ePAPR driver
 - drivers/tty/serial/8250.c
	moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
2011-11-06 17:12:03 -08:00
..
40x Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
44x net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
52xx rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
83xx powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
85xx gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
86xx powerpc/86xx: enable the framebuffer console on the MPC8610 HPCD 2011-06-27 08:36:18 -05:00
adder875_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
amigaone_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
c2k_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
cell_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
celleb_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
chrp32_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
corenet32_smp_defconfig powerpc/p3060qds: Add support for P3060QDS board 2011-11-03 13:20:47 -05:00
corenet64_smp_defconfig powerpc: Update corenet64_smp_defconfig 2011-10-11 23:28:40 -05:00
ep88xc_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ep8248e_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
g5_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
gamecube_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
holly_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
iseries_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
linkstation_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
maple_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
mgcoge_defconfig powerpc/82xx: updates for mgcoge 2011-10-11 16:18:41 -05:00
mpc83xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc85xx_defconfig powerpc: Update mpc85xx/corenet 32-bit defconfigs 2011-10-11 23:28:38 -05:00
mpc85xx_smp_defconfig powerpc: Update mpc85xx/corenet 32-bit defconfigs 2011-10-11 23:28:38 -05:00
mpc86xx_defconfig powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
mpc512x_defconfig powerpc: update 512x-defconfig 2011-09-23 00:20:07 +02:00
mpc866_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc885_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc5200_defconfig powerpc/5200: enable audio in the defconfig 2011-09-22 23:24:06 +02:00
mpc7448_hpc2_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc8272_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pasemi_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
pmac32_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
ppc6xx_defconfig gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
ppc40x_defconfig Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
ppc44x_defconfig net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
ppc64_defconfig powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs 2011-07-19 15:13:06 +10:00
ppc64e_defconfig powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig 2010-10-14 00:55:19 -05:00
pq2fads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
prpmc2800_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
ps3_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
pseries_defconfig powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs 2011-07-19 15:13:06 +10:00
storcenter_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tqm8xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
wii_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00