]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'master' of http://www.kernel.org/pub/scm/linux/kernel/git/torvalds... edk_10.1.1
authorJohn Linn <john.linn@xilinx.com>
Fri, 13 Jun 2008 15:19:50 +0000 (09:19 -0600)
committerJohn Linn <john.linn@xilinx.com>
Fri, 13 Jun 2008 19:22:24 +0000 (12:22 -0700)
Conflicts:

Documentation/powerpc/booting-without-of.txt
Makefile
arch/powerpc/boot/.gitignore
arch/powerpc/boot/Makefile
arch/powerpc/boot/ns16550.c
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/head_44x.S
arch/powerpc/platforms/40x/virtex.c
arch/powerpc/sysdev/xilinx_intc.c
drivers/char/xilinx_hwicap/xilinx_hwicap.c
drivers/i2c/algos/Kconfig
drivers/input/serio/Makefile
drivers/of/Kconfig

38 files changed:
1  2 
Documentation/powerpc/booting-without-of.txt
arch/powerpc/Kconfig
arch/powerpc/boot/.gitignore
arch/powerpc/boot/Makefile
arch/powerpc/boot/wrapper
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/head_44x.S
arch/powerpc/platforms/40x/virtex.c
arch/powerpc/platforms/44x/Kconfig
arch/powerpc/platforms/44x/Makefile
arch/powerpc/platforms/44x/virtex.c
arch/powerpc/platforms/Kconfig
arch/ppc/Kconfig
drivers/Kconfig
drivers/Makefile
drivers/char/Kconfig
drivers/char/Makefile
drivers/i2c/algos/Kconfig
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/serio/Kconfig
drivers/input/serio/Makefile
drivers/misc/Kconfig
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/uclinux.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/of/Kconfig
drivers/serial/Kconfig
drivers/serial/uartlite.c
drivers/video/Kconfig
include/asm-powerpc/dcr-native.h
include/asm-powerpc/irq.h
include/asm-ppc/mmu.h
include/linux/console.h
mm/nommu.c

Simple merge
index d916459bf26bede66f2c34c59a1c00f522b066f8,2f50acd11a6029a82fa22c98d5fb2d30e5e47d39..4421e9c76bf4558010954848b50dadb85fc7b095
@@@ -31,10 -33,6 +33,7 @@@ zImage.*ld
  zImage.miboot
  zImage.pmac
  zImage.pseries
- zImage.redboot*
- zImage.sandpoint
 +zImage.virtex
- zImage.vmode
  zconf.h
  zlib.h
  zutil.h
index ebf008eb2b13f33d07efc0ce66a8ae6dce43b008,d53b84e761a959401e3f587616b7b58264df6e84..444721de210d81279288d5866f954174687eae82
@@@ -64,7 -65,8 +65,8 @@@ src-plat := of.c cuboot-52xx.c cuboot-8
                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
                fixed-head.S ep88xc.c ep405.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-               cuboot-warp.c cuboot-85xx-cpm2.c virtex.c
+               cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
 -              virtex405-head.S
++              virtex.c virtex405-head.S
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
@@@ -192,10 -194,9 +194,10 @@@ image-$(CONFIG_PPC_CHRP)         += zImage.chr
  image-$(CONFIG_PPC_EFIKA)             += zImage.chrp
  image-$(CONFIG_PPC_PMAC)              += zImage.pmac
  image-$(CONFIG_PPC_HOLLY)             += zImage.holly
- image-$(CONFIG_PPC_PRPMC2800)         += zImage.prpmc2800
+ image-$(CONFIG_PPC_PRPMC2800)         += dtbImage.prpmc2800
  image-$(CONFIG_PPC_ISERIES)           += zImage.iseries
  image-$(CONFIG_DEFAULT_UIMAGE)                += uImage
 +image-$(CONFIG_XILINX_VIRTEX)         += zImage.virtex
  
  #
  # Targets which embed a device tree blob
@@@ -289,17 -282,18 +293,17 @@@ endi
  # Don't put the ramdisk on the pattern rule; when its missing make will try
  # the pattern rule with less dependencies that also matches (even with the
  # hard dependency listed).
 -$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)
 -      $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)
 -
 -$(obj)/zImage.%: vmlinux $(wrapperbits)
 -      $(call if_changed,wrap,$*)
 +$(obj)/zImage.initrd.%: vmlinux $(wrapperbits) $(dts)
 +      $(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz)
  
 +$(obj)/zImage.%: vmlinux $(wrapperbits) $(dts)
 +      $(call if_changed,wrap,$*,$(dts))
  # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
- $(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
-       $(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
+ $(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
+       $(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
  
- $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
-       $(call if_changed,wrap,$*,$(dtstree)/$*.dts)
+ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
+       $(call if_changed,wrap,$*,,$(obj)/$*.dtb)
  
  # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
  # prefix
@@@ -312,18 -306,25 +316,28 @@@ $(obj)/zImage.iseries: vmlinu
  $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
  
- $(obj)/cuImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
-       $(call if_changed,wrap,cuboot-$*,$(dtstree)/$*.dts)
+ $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
  
- $(obj)/treeImage.initrd.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
-       $(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
+ $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
  
- $(obj)/treeImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
-       $(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts)
+ $(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
+ $(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
+ # Rule to build device tree blobs
+ $(obj)/%.dtb: $(dtstree)/%.dts $(obj)/dtc
+       $(obj)/dtc -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(dtstree)/$*.dts
  
 +$(obj)/zImage.raw: vmlinux $(dts) $(wrapperbits)
 +      $(call if_changed,wrap,raw,$(dts))
 +
  # If there isn't a platform selected then just strip the vmlinux.
  ifeq (,$(image-y))
  image-y := vmlinux.strip
Simple merge
index 626e87c1c9451c61dbfdbdc9f8e5c8ff92266b63,e44d5530f0a6d5ea0457d137d1856fac559a7b82..ae3660ba2e075473e30ddb6afde017efdae2ed2d
@@@ -1397,18 -1410,41 +1410,51 @@@ static struct cpu_spec __initdata cpu_s
                .machine_check          = machine_check_440A,
                .platform               = "ppc440",
        },
 +      { /* 440 in Xilinx Virtex-5 FXT */
 +              .pvr_mask               = 0xfffffff0,
 +              .pvr_value              = 0x7ff21910,
 +              .cpu_name               = "440 in Virtex-5 FXT",
 +              .cpu_features           = CPU_FTRS_44X,
 +              .cpu_user_features      = COMMON_USER_BOOKE,
 +              .icache_bsize           = 32,
 +              .dcache_bsize           = 32,
 +              .platform               = "ppc440",
 +      },
+       { /* 460EX */
+               .pvr_mask               = 0xffff0002,
+               .pvr_value              = 0x13020002,
+               .cpu_name               = "460EX",
+               .cpu_features           = CPU_FTRS_44X,
+               .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_460ex,
+               .machine_check          = machine_check_440A,
+               .platform               = "ppc440",
+       },
+       { /* 460GT */
+               .pvr_mask               = 0xffff0002,
+               .pvr_value              = 0x13020000,
+               .cpu_name               = "460GT",
+               .cpu_features           = CPU_FTRS_44X,
+               .cpu_user_features      = COMMON_USER_BOOKE,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .machine_check          = machine_check_440A,
+               .platform               = "ppc440",
+       },
+       {       /* default match */
+               .pvr_mask               = 0x00000000,
+               .pvr_value              = 0x00000000,
+               .cpu_name               = "(generic 44x PPC)",
+               .cpu_features           = CPU_FTRS_44X,
+               .cpu_user_features      = COMMON_USER_BOOKE,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .machine_check          = machine_check_4xx,
+               .platform               = "ppc440",
+       }
  #endif /* CONFIG_44x */
- #ifdef CONFIG_FSL_BOOKE
  #ifdef CONFIG_E200
        {       /* e200z5 */
                .pvr_mask               = 0xfff00000,
Simple merge
index f47e3f48436d01bcf25022ae7ee32dfa7457e1e1,c2b9dc4fce5d24a4021972f5337d66828faca918..b5f09e9fe8e6aacb12ba656f7b71e9f8ae926860
@@@ -697,10 -653,14 +697,17 @@@ finish_tlb_load
        rlwimi  r10, r11, 0, 26, 26             /* UX = HWEXEC & USER */
  
        rlwimi  r12, r10, 0, 26, 31             /* Insert static perms */
-       rlwinm  r12, r12, 0, 20, 15             /* Clear U0-U3 */
+       /*
+        * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added
+        * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see
+        * include/asm-powerpc/pgtable-ppc32.h for details).
+        */
+       rlwinm  r12, r12, 0, 20, 10
 +#ifdef CONFIG_XILINX_DISABLE_44x_CACHE
 +      ori     r12, r12, PPC44x_TLB_I
 +#endif
        tlbwe   r12, r13, PPC44x_TLB_ATTRIB     /* Write ATTRIB */
  
        /* Done...restore registers and get out of here.
index 41f079c7e72e5edba730ae3ba91d1631d62c3359,fc7fb001276ce6ae6606440a34ed216eab0a91ec..44036eb9215e06122ce4d6e5be1fc1573158d233
  #include <asm/prom.h>
  #include <asm/time.h>
  #include <asm/xilinx_intc.h>
- #include <asm/reg.h>
- #include "40x.h"
+ #include <asm/ppc4xx.h>
  
  static struct of_device_id xilinx_of_bus_ids[] __initdata = {
 +      { .compatible = "simple-bus", },
        { .compatible = "xlnx,plb-v46-1.00.a", },
 +      { .compatible = "xlnx,plb-v46-1.02.a", },
        { .compatible = "xlnx,plb-v34-1.01.a", },
        { .compatible = "xlnx,plb-v34-1.02.a", },
        { .compatible = "xlnx,opb-v20-1.10.c", },
Simple merge
index b0a9252f8306c70e59caeffaf88218aec7308350,774165f9acdde26378651c0afb6daf0466fb0031..e3a9337062e1a6cff9ee64299d48bde421b75cd0
@@@ -2,8 -2,8 +2,9 @@@ obj-$(CONFIG_44x)        := misc_44x.o idle.
  obj-$(CONFIG_EBONY)   += ebony.o
  obj-$(CONFIG_TAISHAN) += taishan.o
  obj-$(CONFIG_BAMBOO)  += bamboo.o
+ obj-$(CONFIG_YOSEMITE)        += bamboo.o
  obj-$(CONFIG_SEQUOIA) += sequoia.o
 +obj-$(CONFIG_XILINX_ML507)    += virtex.o
  obj-$(CONFIG_KATMAI)  += katmai.o
  obj-$(CONFIG_RAINIER) += rainier.o
  obj-$(CONFIG_WARP)    += warp.o
index 2bcff974fe01c8fe9a2e0d0aa5ff8527d4b56529,0000000000000000000000000000000000000000..42ca337f37eafd85422009bcea7d23074ef4806f
mode 100644,000000..100644
--- /dev/null
@@@ -1,57 -1,0 +1,58 @@@
-       .restart                = ppc44x_reset_system,
 +/*
 + * Xilinx Virtex 5FXT based board support
 + *
 + * Copyright 2007 Secret Lab Technologies Ltd.
 + *
 + * This file is licensed under the terms of the GNU General Public License
 + * version 2. This program is licensed "as is" without any warranty of any
 + * kind, whether express or implied.
 + */
 +
 +#include <linux/init.h>
 +#include <linux/of_platform.h>
 +#include <asm/machdep.h>
 +#include <asm/prom.h>
 +#include <asm/time.h>
 +#include <asm/xilinx_intc.h>
 +#include <asm/reg.h>
++#include <asm/ppc4xx.h>
 +#include "44x.h"
 +
 +static struct of_device_id xilinx_of_bus_ids[] __initdata = {
 +      { .compatible = "simple-bus", },
 +      { .compatible = "xlnx,plb-v46-1.00.a", },
 +      { .compatible = "xlnx,plb-v46-1.02.a", },
 +      { .compatible = "xlnx,plb-v34-1.01.a", },
 +      { .compatible = "xlnx,plb-v34-1.02.a", },
 +      { .compatible = "xlnx,opb-v20-1.10.c", },
 +      { .compatible = "xlnx,dcr-v29-1.00.a", },
 +      { .compatible = "xlnx,compound", },
 +      {}
 +};
 +
 +static int __init virtex_device_probe(void)
 +{
 +      of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL);
 +
 +      return 0;
 +}
 +machine_device_initcall(virtex, virtex_device_probe);
 +
 +static int __init virtex_probe(void)
 +{
 +      unsigned long root = of_get_flat_dt_root();
 +
 +      if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))
 +              return 0;
 +
 +      return 1;
 +}
 +
 +define_machine(virtex) {
 +      .name                   = "Xilinx Virtex",
 +      .probe                  = virtex_probe,
 +      .init_IRQ               = xilinx_intc_init_tree,
 +      .get_irq                = xilinx_intc_get_irq,
 +      .calibrate_decr         = generic_calibrate_decr,
++      .restart                = ppc4xx_reset_system,
 +};
Simple merge
Simple merge
diff --cc drivers/Kconfig
index cc10c172450540b812d496bba912a2b7fa77e635,59f33fa6af3ea8f332bc8e23682eda538a0acb08..e5caf97055220ad172e666ff22afad81f5c3e1c3
@@@ -96,7 -98,7 +98,9 @@@ source "drivers/dca/Kconfig
  
  source "drivers/auxdisplay/Kconfig"
  
 +source "drivers/xilinx_common/Kconfig"
 +
  source "drivers/uio/Kconfig"
+ source "drivers/xen/Kconfig"
  endmenu
Simple merge
Simple merge
Simple merge
index b10906fb8d6ad26dc5fa2eb564f80dcfd9e36b82,7137a17402fe150e3e3189b7355a77495a2c5e8e..b05443e885d7a748477c22ccb825aac9545ca7bf
@@@ -1,51 -1,16 +1,22 @@@
  #
- # Character device configuration
+ # I2C algorithm drivers configuration
  #
  
- menu "I2C Algorithms"
  config I2C_ALGOBIT
-       tristate "I2C bit-banging interfaces"
-       help
-         This allows you to use a range of I2C adapters called bit-banging
-         adapters.  Say Y if you own an I2C adapter belonging to this class
-         and then say Y to the specific driver for you adapter below.
-         This support is also available as a module.  If so, the module 
-         will be called i2c-algo-bit.
+       tristate
  
  config I2C_ALGOPCF
-       tristate "I2C PCF 8584 interfaces"
-       help
-         This allows you to use a range of I2C adapters called PCF adapters.
-         Say Y if you own an I2C adapter belonging to this class and then say
-         Y to the specific driver for you adapter below.
-         This support is also available as a module.  If so, the module 
-         will be called i2c-algo-pcf.
+       tristate
  
  config I2C_ALGOPCA
-       tristate "I2C PCA 9564 interfaces"
-       help
-         This allows you to use a range of I2C adapters called PCA adapters.
-         Say Y if you own an I2C adapter belonging to this class and then say
-         Y to the specific driver for you adapter below.
-         This support is also available as a module.  If so, the module 
-         will be called i2c-algo-pca.
+       tristate
  
  config I2C_ALGO_SGI
-       tristate "I2C SGI interfaces"
+       tristate
        depends on SGI_IP22 || SGI_IP32 || X86_VISWS
-       help
-         Supports the SGI interfaces like the ones found on SGI Indy VINO
-         or SGI O2 MACE.
 +
 +config XILINX_IIC
 +      tristate "Xilinx IIC interface"
 +      depends on I2C && XILINX_DRIVERS
 +      help
 +        Supports the Xilinx IIC interface.
- endmenu
Simple merge
Simple merge
Simple merge
index 340d3e9f4fa63468a3d5c261f3900af1b8f2368b,38b886887cbc2459aeae5d76c850b3031780061b..d4fab2ee4208b4162fe35522b0f8c5920dcdfc0e
@@@ -4,21 -4,20 +4,22 @@@
  
  # Each configuration option enables a list of files.
  
- obj-$(CONFIG_SERIO)                   += serio.o
- obj-$(CONFIG_SERIO_I8042)             += i8042.o
- obj-$(CONFIG_SERIO_PARKBD)            += parkbd.o
- obj-$(CONFIG_SERIO_SERPORT)           += serport.o
- obj-$(CONFIG_SERIO_CT82C710)          += ct82c710.o
- obj-$(CONFIG_SERIO_RPCKBD)            += rpckbd.o
- obj-$(CONFIG_SERIO_SA1111)            += sa1111ps2.o
- obj-$(CONFIG_SERIO_AMBAKMI)           += ambakmi.o
- obj-$(CONFIG_SERIO_Q40KBD)            += q40kbd.o
- obj-$(CONFIG_SERIO_GSCPS2)            += gscps2.o
- obj-$(CONFIG_HP_SDC)                  += hp_sdc.o
- obj-$(CONFIG_HIL_MLC)                 += hp_sdc_mlc.o hil_mlc.o
- obj-$(CONFIG_SERIO_PCIPS2)            += pcips2.o
- obj-$(CONFIG_SERIO_MACEPS2)           += maceps2.o
- obj-$(CONFIG_SERIO_LIBPS2)            += libps2.o
+ obj-$(CONFIG_SERIO)           += serio.o
+ obj-$(CONFIG_SERIO_I8042)     += i8042.o
+ obj-$(CONFIG_SERIO_PARKBD)    += parkbd.o
+ obj-$(CONFIG_SERIO_SERPORT)   += serport.o
+ obj-$(CONFIG_SERIO_CT82C710)  += ct82c710.o
+ obj-$(CONFIG_SERIO_RPCKBD)    += rpckbd.o
+ obj-$(CONFIG_SERIO_SA1111)    += sa1111ps2.o
+ obj-$(CONFIG_SERIO_AMBAKMI)   += ambakmi.o
+ obj-$(CONFIG_SERIO_AT32PSIF)  += at32psif.o
+ obj-$(CONFIG_SERIO_Q40KBD)    += q40kbd.o
+ obj-$(CONFIG_SERIO_GSCPS2)    += gscps2.o
+ obj-$(CONFIG_HP_SDC)          += hp_sdc.o
+ obj-$(CONFIG_HIL_MLC)         += hp_sdc_mlc.o hil_mlc.o
+ obj-$(CONFIG_SERIO_PCIPS2)    += pcips2.o
+ obj-$(CONFIG_SERIO_MACEPS2)   += maceps2.o
+ obj-$(CONFIG_SERIO_LIBPS2)    += libps2.o
 +obj-$(CONFIG_SERIO_XILINXPS2)         += xilinx_ps2/
 +obj-$(CONFIG_SERIO_XILINX_XPS_PS2)    += xilinx_ps2.o
- obj-$(CONFIG_SERIO_RAW)                       += serio_raw.o
+ obj-$(CONFIG_SERIO_RAW)               += serio_raw.o
index 085b480f4d3b07886ab9964b40e945a66ee861d0,636af2862308fab614b4f9f9b2395ce0a24c7e4f..db1af65ea819cdffd8530c2936a4cbe7fb241e30
@@@ -327,32 -379,16 +379,44 @@@ config ENCLOSURE_SERVICE
          driver (SCSI/ATA) which supports enclosures
          or a SCSI enclosure device (SES) to use these services.
  
+ config SGI_XP
+       tristate "Support communication between SGI SSIs"
+       depends on IA64_GENERIC || IA64_SGI_SN2
+       select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       ---help---
+         An SGI machine can be divided into multiple Single System
+         Images which act independently of each other and have
+         hardware based memory protection from the others.  Enabling
+         this feature will allow for direct communication between SSIs
+         based on a network adapter and DMA messaging.
  endif # MISC_DEVICES
 +
 +
 +#
 +# Xilinx devices and common device driver infrastructure
 +#
 +
 +config XILINX_DRIVERS
 +      bool
 +      depends on PPC32 || MICROBLAZE
 +   default y
 +      ---help---
 +        This option is used to enable all of the Xilinx drivers on
 +        supported architectures.  This is often useful if you have a
 +        Xilinx FPGA in a system, either using embedded processors
 +        internal to the FPGA or external processors.
 +
 +config NEED_XILINX_DMAV3
 +  bool
 +
 +config NEED_XILINX_LLDMA
 +  bool
 +
 +config NEED_XILINX_IPIF
 +  bool
 +
 +config NEED_XILINX_PPC_DCR
 +  bool
 +
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 007c328797e38a5b0ad8f6b97346903df315ba0f,3a7a11a75fb464017ce284d34a41388f2875dd15..d877a5925b57bc1edb238e6ee7bd59fa8ab1d6ee
@@@ -1,3 -1,15 +1,15 @@@
  config OF_DEVICE
        def_bool y
 -      depends on OF && (SPARC || PPC_OF)
 +      depends on OF && (SPARC || PPC_OF || MICROBLAZE)
+ config OF_GPIO
+       def_bool y
+       depends on OF && PPC_OF && HAVE_GPIO_LIB
+       help
+         OpenFirmware GPIO accessors
+ config OF_I2C
+       def_tristate I2C
+       depends on PPC_OF && I2C
+       help
+         OpenFirmware I2C accessors
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/nommu.c
Simple merge