Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ae46147 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Benjamin Herrenschmidt:
 "I meant to sent that earlier but got swamped with other things, so
  here are some powerpc fixes for 3.6.  A few regression fixes and some
  bug fixes that I deemed should still make it.

  There's a FSL update from Kumar with a bunch of defconfig updates
  along with a few embedded fixes.

  I also reverted my g5_defconfig update that I merged earlier as it was
  completely busted, not too sure what happened there, I'll do a new one
  later."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  Revert "powerpc: Update g5_defconfig"
  powerpc/perf: Use pmc_overflow() to detect rolled back events
  powerpc: Fix VMX in interrupt check in POWER7 copy loops
  powerpc: POWER7 copy_to_user/copy_from_user patch applied twice
  powerpc: Fix personality handling in ppc64_personality()
  powerpc/dma-iommu: Fix IOMMU window check
  powerpc: Remove unnecessary ifdefs
  powerpc/kgdb: Restore current_thread_info properly
  powerpc/kgdb: Bail out of KGDB when we've been triggered
  powerpc/kgdb: Do not set kgdb_single_step on ppc
  powerpc/mpic_msgr: Add missing includes
  powerpc: Fix null pointer deref in perf hardware breakpoints
  powerpc: Fixup whitespace in xmon
  powerpc: Fix xmon dl command for new printk implementation
  powerpc/fsl: fix "Failed to mount /dev: No such device" errors
  powerpc/fsl: update defconfigs
  booke/wdt: some ioctls do not return values properly
  powerpc/p4080ds: dts - add usb controller version info and port0
  powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS
  powerpc/fsl-pci: Only scan PCI bus if configured as a host
parents 6ec9776c 2c39bf49

arch/powerpc/boot/dts/fsl/p4080si-post.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -345,6 +345,13 @@ 
/include/ "qoriq-duart-1.dtsi"

/include/ "qoriq-gpio-0.dtsi"

/include/ "qoriq-usb2-mph-0.dtsi"

	usb@210000 {

		compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";

		port0;

	};

/include/ "qoriq-usb2-dr-0.dtsi"

	usb@211000 {

		compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";

	};

/include/ "qoriq-sec4.0-0.dtsi"

};

arch/powerpc/configs/85xx/p1023rds_defconfig

+10 −21
Original line number Diff line number Diff line
@@ -6,28 +6,27 @@ CONFIG_SYSVIPC=y 
CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_AUDIT=y

CONFIG_SPARSE_IRQ=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_EMBEDDED=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_P1023_RDS=y

CONFIG_QUICC_ENGINE=y

CONFIG_QE_GPIO=y

CONFIG_CPM2=y

CONFIG_GPIO_MPC8XXX=y

CONFIG_HIGHMEM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_MATH_EMULATION=y
@@ -63,11 +62,11 @@ CONFIG_INET_ESP=y 
CONFIG_IPV6=y

CONFIG_IP_SCTP=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=131072

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_LEGACY=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y
@@ -80,15 +79,14 @@ CONFIG_SATA_FSL=y 
CONFIG_SATA_SIL24=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_FS_ENET=y

CONFIG_FSL_PQ_MDIO=y

CONFIG_E1000E=y

CONFIG_MARVELL_PHY=y

CONFIG_DAVICOM_PHY=y

CONFIG_CICADA_PHY=y

CONFIG_VITESSE_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_FS_ENET=y

CONFIG_E1000E=y

CONFIG_FSL_PQ_MDIO=y

CONFIG_INPUT_FF_MEMLESS=m

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set
@@ -98,16 +96,15 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_QE=m

CONFIG_HW_RANDOM=y

CONFIG_NVRAM=y

CONFIG_I2C=y

CONFIG_I2C_CPM=m

CONFIG_I2C_MPC=y

CONFIG_GPIO_MPC8XXX=y

# CONFIG_HWMON is not set

CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_SOUND=y
@@ -123,7 +120,6 @@ CONFIG_DMADEVICES=y 
CONFIG_FSL_DMA=y

# CONFIG_NET_DMA is not set

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -150,22 +146,15 @@ CONFIG_QNX4FS_FS=m 
CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_CRC_T10DIF=y

CONFIG_FRAME_WARN=8092

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

arch/powerpc/configs/corenet32_smp_defconfig

+9 −20
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ CONFIG_SYSVIPC=y 
CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_AUDIT=y

CONFIG_SPARSE_IRQ=y

CONFIG_RCU_TRACE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -21,23 +21,22 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_P2041_RDB=y

CONFIG_P3041_DS=y

CONFIG_P4080_DS=y

CONFIG_P5020_DS=y

CONFIG_HIGHMEM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_FSL_LBC=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_MSI=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_MSI=y

CONFIG_RAPIDIO=y

CONFIG_FSL_RIO=y

CONFIG_NET=y
@@ -70,6 +69,7 @@ CONFIG_INET_IPCOMP=y 
CONFIG_IPV6=y

CONFIG_IP_SCTP=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y
@@ -77,17 +77,14 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC=y

CONFIG_MTD_NAND_IDS=y

CONFIG_MTD_NAND_FSL_IFC=y

CONFIG_MTD_NAND_FSL_ELBC=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND_FSL_IFC=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=131072

CONFIG_MISC_DEVICES=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y
@@ -115,11 +112,9 @@ CONFIG_SERIO_LIBPS2=y 
CONFIG_PPC_EPAPR_HV_BYTECHAN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_HW_RANDOM=y

CONFIG_NVRAM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y
@@ -132,7 +127,6 @@ CONFIG_SPI_FSL_ESPI=y 
CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_FSL=y
@@ -142,8 +136,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 
CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_OF=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y
@@ -170,19 +162,16 @@ CONFIG_HUGETLBFS=y 
CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_RCU_TRACE=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_MD4=y

arch/powerpc/configs/corenet64_smp_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_INET_ESP=y 
CONFIG_IPV6=y

CONFIG_IP_SCTP=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

arch/powerpc/configs/g5_defconfig

+73 −30
Original line number Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_ALTIVEC=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_BLK_DEV_INITRD=y
@@ -13,15 +15,16 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_KEXEC=y

# CONFIG_RELOCATABLE is not set

# CONFIG_PPC_PSERIES is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_PMAC64=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

# CONFIG_MIGRATION is not set

CONFIG_PCI_MSI=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -49,6 +52,7 @@ CONFIG_NF_CT_NETLINK=m 
CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_QUEUE=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y
@@ -56,6 +60,8 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 
CONFIG_CDROM_PKTCDVD=m

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDE_PMAC=y

CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y
@@ -79,24 +85,33 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_MACINTOSH_DRIVERS=y

CONFIG_IEEE1394=y

CONFIG_IEEE1394_OHCI1394=y

CONFIG_IEEE1394_SBP2=m

CONFIG_IEEE1394_ETH1394=m

CONFIG_IEEE1394_RAWIO=y

CONFIG_IEEE1394_VIDEO1394=m

CONFIG_IEEE1394_DV1394=m

CONFIG_ADB_PMU=y

CONFIG_PMAC_SMU=y

CONFIG_MAC_EMUMOUSEBTN=y

CONFIG_THERM_PM72=y

CONFIG_WINDFARM=y

CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y

CONFIG_WINDFARM_PM112=y

CONFIG_WINDFARM_PM121=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_MII=y

CONFIG_BONDING=m

CONFIG_TUN=m

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_SUNGEM=y

CONFIG_ACENIC=m

CONFIG_ACENIC_OMIT_TIGON_I=y

CONFIG_TIGON3=y

CONFIG_E1000=y

CONFIG_SUNGEM=y

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPPOE=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_TIGON3=y

CONFIG_USB_CATC=m

CONFIG_USB_KAWETH=m

CONFIG_USB_PEGASUS=m
@@ -106,24 +121,36 @@ CONFIG_USB_USBNET=m 
# CONFIG_USB_NET_NET1080 is not set

# CONFIG_USB_NET_CDC_SUBSET is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPPOE=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_JOYDEV=m

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_MOUSE_PS2 is not set

# CONFIG_SERIO_I8042 is not set

# CONFIG_SERIO_SERPORT is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_HW_RANDOM is not set

CONFIG_GEN_RTC=y

CONFIG_RAW_DRIVER=y

CONFIG_I2C_CHARDEV=y

# CONFIG_HWMON is not set

CONFIG_AGP=y

CONFIG_DRM=y

CONFIG_DRM_NOUVEAU=y

CONFIG_AGP=m

CONFIG_AGP_UNINORTH=m

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_OF=y

CONFIG_FB_NVIDIA=y

CONFIG_FB_NVIDIA_I2C=y

CONFIG_FB_RADEON=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m
@@ -131,7 +158,15 @@ CONFIG_SND_SEQUENCER=m 
CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

CONFIG_SND_POWERMAC=m

CONFIG_SND_AOA=m

CONFIG_SND_AOA_FABRIC_LAYOUT=m

CONFIG_SND_AOA_ONYX=m

CONFIG_SND_AOA_TAS=m

CONFIG_SND_AOA_TOONIE=m

CONFIG_SND_USB_AUDIO=m

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_HID_GYRATION=y

CONFIG_LOGITECH_FF=y

CONFIG_HID_PANTHERLORD=y
@@ -139,12 +174,13 @@ CONFIG_HID_PETALYNX=y 
CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_HCD_PPC_OF is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=y

CONFIG_USB_STORAGE=y
@@ -208,6 +244,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y 
CONFIG_REISERFS_FS_SECURITY=y

CONFIG_XFS_FS=m

CONFIG_XFS_POSIX_ACL=y

CONFIG_INOTIFY=y

CONFIG_AUTOFS_FS=m

CONFIG_ISO9660_FS=y

CONFIG_JOLIET=y

CONFIG_ZISOFS=y
@@ -221,12 +259,14 @@ CONFIG_HFS_FS=m 
CONFIG_HFSPLUS_FS=m

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFSD=y

CONFIG_NFSD_V3_ACL=y

CONFIG_NFSD_V4=y

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_1250=y

CONFIG_NLS_CODEPAGE_1251=y
@@ -234,23 +274,29 @@ CONFIG_NLS_ASCII=y 
CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_UTF8=y

CONFIG_CRC_T10DIF=y

CONFIG_LIBCRC32C=m

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_LATENCYTOP=y

CONFIG_STRICT_DEVMEM=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BOOTX_TEXT=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m
@@ -260,6 +306,3 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set
 
# CONFIG_VIRTUALIZATION is not set

CONFIG_CRC_T10DIF=y

CONFIG_LIBCRC32C=m