Commit 153b5c56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull Microblaze update from Michal Simek:

 - enable CMA

 - add support for MB v11

 - defconfig updates

 - minor fixes

* tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add ID for Microblaze v11
  microblaze: Prevent the overflow of the start
  microblaze: Wire CMA allocator
  asm-generic: Make dma-contiguous.h a mandatory include/asm header
  microblaze: Sync defconfig with latest Kconfig layout
  microblaze: defconfig: Disable EXT2 driver and Enable EXT3 & EXT4 drivers
  microblaze: Align comments with register usage
parents 7f879e1a 6aa71ef9

arch/arm64/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ generic-y += bugs.h 
generic-y += delay.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-contiguous.h

generic-y += dma-mapping.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

arch/csky/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ generic-y += delay.h 
generic-y += device.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-contiguous.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config MICROBLAZE 
	select HAVE_ARCH_HASH

	select HAVE_ARCH_KGDB

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

arch/microblaze/configs/mmu_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_CMA=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -73,7 +74,7 @@ CONFIG_FB_XILINX=y 
CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

CONFIG_UIO_DMEM_GENIRQ=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

CONFIG_CRAMFS=y
@@ -82,10 +83,11 @@ CONFIG_NFS_FS=y 
CONFIG_CIFS=y

CONFIG_CIFS_STATS2=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_DMA_CMA=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_KDB=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

arch/microblaze/configs/nommu_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ CONFIG_XILINX_WATCHDOG=y 
CONFIG_FB=y

CONFIG_FB_XILINX=y

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE