Commit f8c3301e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix modular build of ide-pmac when mediabay is built in
  powerpc/pasemi: Fix build error on UP
  powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK
  maintainers: Fix PS3 patterns
  powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning
  powerpc/32: Don't clobber personality flags on exec
  powerpc: Fix crash on CPU hotplug
  powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover
  powerpc/85xx: Added SMP defconfig
  powerpc/85xx: Enabled a bunch of FSL specific drivers/options
  powerpc/85xx: Updated generic mpc85xx_defconfig
  powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD
  fsl_rio: Pass the proper device to dma mapping routines
  powerpc: Fix of_node_put() exit path in of_irq_map_one()
  powerpc/5200: defconfig updates
  powerpc/5200: Add FLASH nodes to lite5200 device tree
  powerpc/device-tree: Document MTD nodes with multiple "reg" tuples
  powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of
  powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back
parents 437f7fdb 6329db8b

Documentation/powerpc/booting-without-of.txt

+12 −77
Original line number Diff line number Diff line
@@ -43,12 +43,11 @@ Table of Contents 
    2) Representing devices without a current OF specification

      a) PHY nodes

      b) Interrupt controllers

      c) CFI or JEDEC memory-mapped NOR flash

      d) 4xx/Axon EMAC ethernet nodes

      e) Xilinx IP cores

      f) USB EHCI controllers

      g) MDIO on GPIOs

      h) SPI busses

      c) 4xx/Axon EMAC ethernet nodes

      d) Xilinx IP cores

      e) USB EHCI controllers

      f) MDIO on GPIOs

      g) SPI busses



  VII - Marvell Discovery mv64[345]6x System Controller chips

    1) The /system-controller node
@@ -1287,71 +1286,7 @@ platforms are moved over to use the flattened-device-tree model. 
		device_type = "open-pic";

	};



   c) CFI or JEDEC memory-mapped NOR flash



    Flash chips (Memory Technology Devices) are often used for solid state

    file systems on embedded devices.



     - compatible : should contain the specific model of flash chip(s)

       used, if known, followed by either "cfi-flash" or "jedec-flash"

     - reg : Address range of the flash chip

     - bank-width : Width (in bytes) of the flash bank.  Equal to the

       device width times the number of interleaved chips.

     - device-width : (optional) Width of a single flash chip.  If

       omitted, assumed to be equal to 'bank-width'.

     - #address-cells, #size-cells : Must be present if the flash has

       sub-nodes representing partitions (see below).  In this case

       both #address-cells and #size-cells must be equal to 1.



    For JEDEC compatible devices, the following additional properties

    are defined:



     - vendor-id : Contains the flash chip's vendor id (1 byte).

     - device-id : Contains the flash chip's device id (1 byte).



    In addition to the information on the flash bank itself, the

    device tree may optionally contain additional information

    describing partitions of the flash address space.  This can be

    used on platforms which have strong conventions about which

    portions of the flash are used for what purposes, but which don't

    use an on-flash partition table such as RedBoot.



    Each partition is represented as a sub-node of the flash device.

    Each node's name represents the name of the corresponding

    partition of the flash device.



    Flash partitions

     - reg : The partition's offset and size within the flash bank.

     - label : (optional) The label / name for this flash partition.

       If omitted, the label is taken from the node name (excluding

       the unit address).

     - read-only : (optional) This parameter, if present, is a hint to

       Linux that this flash partition should only be mounted

       read-only.  This is usually used for flash partitions

       containing early-boot firmware images or data which should not

       be clobbered.



    Example:



	flash@ff000000 {

		compatible = "amd,am29lv128ml", "cfi-flash";

		reg = <ff000000 01000000>;

		bank-width = <4>;

		device-width = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		fs@0 {

			label = "fs";

			reg = <0 f80000>;

		};

		firmware@f80000 {

			label ="firmware";

			reg = <f80000 80000>;

			read-only;

		};

	};



    d) 4xx/Axon EMAC ethernet nodes

    c) 4xx/Axon EMAC ethernet nodes



    The EMAC ethernet controller in IBM and AMCC 4xx chips, and also

    the Axon bridge.  To operate this needs to interact with a ths
@@ -1499,7 +1434,7 @@ platforms are moved over to use the flattened-device-tree model. 
			   available.

			   For Axon: 0x0000012a



   e) Xilinx IP cores

   d) Xilinx IP cores



   The Xilinx EDK toolchain ships with a set of IP cores (devices) for use

   in Xilinx Spartan and Virtex FPGAs.  The devices cover the whole range
@@ -1793,7 +1728,7 @@ platforms are moved over to use the flattened-device-tree model. 
       - reg-offset : A value of 3 is required

       - reg-shift : A value of 2 is required



    f) USB EHCI controllers

    e) USB EHCI controllers



    Required properties:

      - compatible : should be "usb-ehci".
@@ -1819,7 +1754,7 @@ platforms are moved over to use the flattened-device-tree model. 
		   big-endian;

	   };



   g) MDIO on GPIOs

   f) MDIO on GPIOs



   Currently defined compatibles:

   - virtual,gpio-mdio
@@ -1839,7 +1774,7 @@ platforms are moved over to use the flattened-device-tree model. 
			 &qe_pio_c 6>;

	};



    h) SPI (Serial Peripheral Interface) busses

    g) SPI (Serial Peripheral Interface) busses



    SPI busses can be described with a node for the SPI master device

    and a set of child nodes for each SPI slave on the bus.  For this

Documentation/powerpc/dts-bindings/mtd-physmap.txt

0 → 100644
+80 −0
Original line number Diff line number Diff line 
CFI or JEDEC memory-mapped NOR flash



Flash chips (Memory Technology Devices) are often used for solid state

file systems on embedded devices.



 - compatible : should contain the specific model of flash chip(s)

   used, if known, followed by either "cfi-flash" or "jedec-flash"

 - reg : Address range(s) of the flash chip(s)

   It's possible to (optionally) define multiple "reg" tuples so that

   non-identical NOR chips can be described in one flash node.

 - bank-width : Width (in bytes) of the flash bank.  Equal to the

   device width times the number of interleaved chips.

 - device-width : (optional) Width of a single flash chip.  If

   omitted, assumed to be equal to 'bank-width'.

 - #address-cells, #size-cells : Must be present if the flash has

   sub-nodes representing partitions (see below).  In this case

   both #address-cells and #size-cells must be equal to 1.



For JEDEC compatible devices, the following additional properties

are defined:



 - vendor-id : Contains the flash chip's vendor id (1 byte).

 - device-id : Contains the flash chip's device id (1 byte).



In addition to the information on the flash bank itself, the

device tree may optionally contain additional information

describing partitions of the flash address space.  This can be

used on platforms which have strong conventions about which

portions of the flash are used for what purposes, but which don't

use an on-flash partition table such as RedBoot.



Each partition is represented as a sub-node of the flash device.

Each node's name represents the name of the corresponding

partition of the flash device.



Flash partitions

 - reg : The partition's offset and size within the flash bank.

 - label : (optional) The label / name for this flash partition.

   If omitted, the label is taken from the node name (excluding

   the unit address).

 - read-only : (optional) This parameter, if present, is a hint to

   Linux that this flash partition should only be mounted

   read-only.  This is usually used for flash partitions

   containing early-boot firmware images or data which should not

   be clobbered.



Example:



	flash@ff000000 {

		compatible = "amd,am29lv128ml", "cfi-flash";

		reg = <ff000000 01000000>;

		bank-width = <4>;

		device-width = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		fs@0 {

			label = "fs";

			reg = <0 f80000>;

		};

		firmware@f80000 {

			label ="firmware";

			reg = <f80000 80000>;

			read-only;

		};

	};



Here an example with multiple "reg" tuples:



	flash@f0000000,0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "intel,PC48F4400P0VB", "cfi-flash";

		reg = <0 0x00000000 0x02000000

		       0 0x02000000 0x02000000>;

		bank-width = <2>;

		partition@0 {

			label = "test-part1";

			reg = <0 0x04000000>;

		};

	};

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -1337,12 +1337,9 @@ L: cbe-oss-dev@ozlabs.org 
W:	http://www.ibm.com/developerworks/power/cell/

S:	Supported

F:	arch/powerpc/include/asm/cell*.h

F:	arch/powerpc/include/asm/lv1call.h

F:	arch/powerpc/include/asm/ps3*.h

F:	arch/powerpc/include/asm/spu*.h

F:	arch/powerpc/oprofile/*cell*

F:	arch/powerpc/platforms/cell/

F:	arch/powerpc/platforms/ps3/



CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:

P:	David Vrabel
@@ -4507,7 +4504,9 @@ F: arch/powerpc/include/asm/ps3*.h 
F:	arch/powerpc/platforms/ps3/

F:	drivers/*/ps3*

F:	drivers/ps3/

F:	drivers/rtc/rtc-ps3.c

F:	drivers/usb/host/*ps3.c

F:	sound/ppc/snd_ps3*



PS3VRAM DRIVER

P:	Jim Paris

arch/powerpc/boot/dts/lite5200b.dts

+39 −0
Original line number Diff line number Diff line
@@ -293,4 +293,43 @@ 
			  0x02000000 0 0xa0000000 0xa0000000 0 0x10000000

			  0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;

	};



	localbus {

		compatible = "fsl,mpc5200b-lpb","fsl,mpc5200-lpb","simple-bus";



		#address-cells = <2>;

		#size-cells = <1>;



		ranges = <0 0 0xfe000000 0x02000000>;



		flash@0,0 {

			compatible = "cfi-flash";

			reg = <0 0 0x02000000>;

			bank-width = <1>;

			#size-cells = <1>;

			#address-cells = <1>;



			partition@0 {

				label = "kernel";

				reg = <0x00000000 0x00200000>;

			};

			partition@200000 {

				label = "rootfs";

				reg = <0x00200000 0x01d00000>;

			};

			partition@1f00000 {

				label = "u-boot";

				reg = <0x01f00000 0x00060000>;

			};

			partition@1f60000 {

				label = "u-boot-env";

				reg = <0x01f60000 0x00020000>;

			};

			partition@1f80000 {

				label = "dtb";

				reg = <0x01f80000 0x00080000>;

			};

		};

	};



};

arch/powerpc/configs/52xx/cm5200_defconfig

+50 −19
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Mon Jan 26 21:41:58 2009

# Linux kernel version: 2.6.30-rc2

# Sat Apr 18 00:47:44 2009

#

# CONFIG_PPC64 is not set
@@ -14,6 +14,7 @@ CONFIG_6xx=y 
# CONFIG_40x is not set

# CONFIG_44x is not set

# CONFIG_E200 is not set

CONFIG_PPC_BOOK3S=y

CONFIG_PPC_FPU=y

# CONFIG_ALTIVEC is not set

CONFIG_PPC_STD_MMU=y
@@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y 
CONFIG_DEFAULT_UIMAGE=y

# CONFIG_PPC_DCR_NATIVE is not set

# CONFIG_PPC_DCR_MMIO is not set

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#
@@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y 
# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_KALLSYMS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

# CONFIG_EPOLL is not set

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -115,10 +120,12 @@ CONFIG_SHMEM=y 
CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

CONFIG_HAVE_IOREMAP_PROT=y
@@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y 
CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_CLK=y

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -133,7 +141,6 @@ CONFIG_BASE_SMALL=0 
# CONFIG_MODULES is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -154,8 +161,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

CONFIG_CLASSIC32=y

# CONFIG_PPC_CHRP is not set

# CONFIG_MPC5121_ADS is not set

# CONFIG_MPC5121_GENERIC is not set
@@ -163,6 +168,7 @@ CONFIG_PPC_MPC52xx=y 
CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_EFIKA is not set

# CONFIG_PPC_LITE5200 is not set

# CONFIG_PPC_MEDIA5200 is not set

# CONFIG_PPC_MPC5200_BUGFIX is not set

# CONFIG_PPC_MPC5200_GPIO is not set

# CONFIG_PPC_PMAC is not set
@@ -173,6 +179,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y 
# CONFIG_PPC_83xx is not set

# CONFIG_PPC_86xx is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_AMIGAONE is not set

CONFIG_PPC_OF_BOOT_TRAMPOLINE=y

# CONFIG_IPIC is not set

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set
@@ -232,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1 
CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_PPC_256K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set
@@ -275,7 +286,6 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -331,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -343,7 +354,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

# CONFIG_WIRELESS is not set

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set
@@ -440,7 +450,6 @@ CONFIG_MTD_PHYSMAP_OF=y 
# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images
@@ -505,10 +514,12 @@ CONFIG_CHR_DEV_SG=y 
# CONFIG_SCSI_SRP_ATTRS is not set

# CONFIG_SCSI_LOWLEVEL is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

# CONFIG_MACINTOSH_DRIVERS is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -537,6 +548,8 @@ CONFIG_LXT_PHY=y 
# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_ETHOC is not set

# CONFIG_DNET is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -555,7 +568,6 @@ CONFIG_FEC_MPC52xx_MDIO=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -657,7 +669,6 @@ CONFIG_I2C_MPC=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set
@@ -786,11 +797,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may

#



#

# see USB_STORAGE Help for more information

# also be needed; see USB_STORAGE Help for more info

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -831,7 +842,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set
@@ -846,6 +856,7 @@ CONFIG_USB_STORAGE=y 
#

# OTG and related infrastructure

#

# CONFIG_NOP_USB_XCEIV is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -853,6 +864,7 @@ CONFIG_USB_STORAGE=y 
# CONFIG_EDAC is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -863,6 +875,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set
@@ -884,6 +897,11 @@ CONFIG_INOTIFY_USER=y 
# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -941,6 +959,7 @@ CONFIG_CRAMFS=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -953,7 +972,6 @@ CONFIG_LOCKD_V4=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1024,6 +1042,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines
@@ -1039,11 +1058,12 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y

CONFIG_NLATTR=y



#

# Kernel hacking
@@ -1061,6 +1081,9 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set
@@ -1089,9 +1112,12 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers
@@ -1099,17 +1125,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 
# CONFIG_FUNCTION_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_PRINT_STACK_DEPTH=64

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_CODE_PATCHING_SELFTEST is not set

# CONFIG_FTR_FIXUP_SELFTEST is not set

# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1140,10 +1168,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y 
CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set
@@ -1211,6 +1241,7 @@ CONFIG_CRYPTO_DES=y 
# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set



#

CRA Git | Maintained and supported by SUSTech CRA and CCSE