Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)
  microblaze: Disable heartbeat/enable emaclite in defconfigs
  microblaze: Support simpleImage.dts make target
  microblaze: Fix _start symbol to physical address
  microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections
  microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets
  microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C
  microblaze: Actually show KiB rather than pages in "Freeing initrd memory:"
  microblaze: Support ptrace syscall tracing.
  microblaze: Updated CPU version and FPGA family codes in PVR
  microblaze: Generate correct signal and siginfo for integer div-by-zero
  microblaze: Don't be noisy when userspace causes hardware exceptions
  microblaze: Remove ipc.h file which points to non-existing asm-generic file
  microblaze: Clear sticky FSR register after generating exception signals
  microblaze: Ensure CPU usermode is set on new userspace processes
  microblaze: Use correct kbuild variable KBUILD_CFLAGS
  microblaze: Save and restore msr in hw exception
  microblaze: Add architectural support for USB EHCI host controllers
  microblaze: Implement include/asm/syscall.h.
  microblaze: Improve checking mechanism for MSR instruction
  microblaze: Add checking mechanism for MSR instruction
  ...

diff --combined arch/microblaze/mm/init.c
index 1110784eb3f772b28efce57d8ea21ca79e2e9180,42cbc15e015a0752f4c3740e328dfe96d34621e6..a44892e7cd5b7e2839976585e69bc8c274c21509
--- 1/arch/microblaze/mm/init.c
--- 2/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@@ -180,7 -180,8 +180,8 @@@ void free_initrd_mem(unsigned long star
                totalram_pages++;
                pages++;
        }
-       printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+       printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n",
+                                       (int)(pages * (PAGE_SIZE / 1024)));
  }
  #endif
  
@@@ -204,7 -205,7 +205,7 @@@ void __init mem_init(void
        totalram_pages += free_all_bootmem();
  
        printk(KERN_INFO "Memory: %luk/%luk available\n",
 -             (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
 +             nr_free_pages() << (PAGE_SHIFT-10),
               num_physpages << (PAGE_SHIFT-10));
  #ifdef CONFIG_MMU
        mem_init_done = 1;

diff --combined drivers/mtd/Kconfig
index e4ec3659759a91acc38cedefb0160c3c0640c5e1,bf1997fd623297c551190cf9198f07cec8c439d7..ecf90f5c97c2bce84983d2567dc7933c8bb060c4
--- 1/drivers/mtd/Kconfig
--- 2/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@@ -25,14 -25,6 +25,14 @@@ config MTD_DEBUG_VERBOS
        help
          Determines the verbosity level of the MTD debugging messages.
  
 +config MTD_TESTS
 +      tristate "MTD tests support"
 +      depends on m
 +      help
 +        This option includes various MTD tests into compilation. The tests
 +        should normally be compiled as kernel modules. The modules perform
 +        various checks and verifications when loaded.
 +
  config MTD_CONCAT
        tristate "MTD concatenating support"
        help
@@@ -53,6 -45,14 +53,6 @@@ config MTD_PARTITION
          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  
 -config MTD_TESTS
 -      tristate "MTD tests support"
 -      depends on m
 -      help
 -        This option includes various MTD tests into compilation. The tests
 -        should normally be compiled as kernel modules. The modules perform
 -        various checks and verifications when loaded.
 -
  config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS
@@@ -159,7 -159,7 +159,7 @@@ config MTD_AFS_PART
  
  config MTD_OF_PARTS
        tristate "Flash partition map based on OF description"
-       depends on PPC_OF && MTD_PARTITIONS
+       depends on (MICROBLAZE || PPC_OF) && MTD_PARTITIONS
        help
          This provides a partition parsing function which derives
          the partition map from the children of the flash node,

diff --combined drivers/mtd/maps/Kconfig
index 3a9a960644b69464c45236803db90b0e832cdf17,5b82cd95256773eeaadf95b887c0a6a6b754d5a4..841e085ab74ab198fafe9e801e5a3df2307f0da3
--- 1/drivers/mtd/maps/Kconfig
--- 2/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@@ -74,7 -74,7 +74,7 @@@ config MTD_PHYSMAP_BANKWIDT
  
  config MTD_PHYSMAP_OF
        tristate "Flash device in physical memory map based on OF description"
-       depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
+       depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
        help
          This provides a 'mapping' driver which allows the NOR Flash and
          ROM driver code to communicate with chips which are mapped
@@@ -484,19 -484,9 +484,19 @@@ config MTD_BFIN_ASYN
  
          If compiled as a module, it will be called bfin-async-flash.
  
 +config MTD_GPIO_ADDR
 +      tristate "GPIO-assisted Flash Chip Support"
 +      depends on MTD_COMPLEX_MAPPINGS
 +      select MTD_PARTITIONS
 +      help
 +        Map driver which allows flashes to be partially physically addressed
 +        and assisted by GPIOs.
 +
 +        If compiled as a module, it will be called gpio-addr-flash.
 +
  config MTD_UCLINUX
        bool "Generic uClinux RAM/ROM filesystem support"
 -      depends on MTD_PARTITIONS && MTD_RAM && !MMU
 +      depends on MTD_PARTITIONS && MTD_RAM=y && !MMU
        help
          Map driver to support image based filesystems for uClinux.
  

diff --combined drivers/usb/Kconfig
index ebd7237230e34107398929f6b662a0a04f54fc40,b35025ae430395025a475962144b4212e1da1576..240750881d28d0a8c2d5c3d5a10312c701afe83b
--- 1/drivers/usb/Kconfig
--- 2/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -22,7 -22,6 +22,6 @@@ config USB_ARCH_HAS_HC
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default y if SUPERH                             # r8a66597-hcd
-       default y if MICROBLAZE
        default PCI
  
  # many non-PCI SOC chips embed OHCI
@@@ -39,7 -38,6 +38,7 @@@ config USB_ARCH_HAS_OHC
        default y if ARCH_AT91
        default y if ARCH_PNX4008 && I2C
        default y if MFD_TC6393XB
 +      default y if ARCH_W90X900
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@@ -59,8 -57,6 +58,8 @@@ config USB_ARCH_HAS_EHC
        default y if PPC_83xx
        default y if SOC_AU1200
        default y if ARCH_IXP4XX
 +      default y if ARCH_W90X900
 +      default y if ARCH_AT91SAM9G45
        default PCI
  
  # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.