From: Peter Michael Green Date: Thu, 5 May 2016 19:38:10 +0000 (+0000) Subject: extract packaging changes from 4.4.6-1+rpi14 (33da3cd25ecef63a623a19de363dbb6abe8b6e4f) X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~12 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=27398241c5d97ef65b65d60c3a41b4590c62fe9c;p=linux-4.9.git extract packaging changes from 4.4.6-1+rpi14 (33da3cd25ecef63a623a19de363dbb6abe8b6e4f) --- diff --git a/debian/changelog b/debian/changelog index c7f32bed925d..4126629252e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux-4.4 (4.4.6-1+rpi14) jessie-staging; urgency=medium + + * Add a couple of settings to the rpi2 config based on looking at difference + between foundation rpi and rpi2 configs. + * Move a bunch of stuff from rpi config to rpix config. + + -- Peter Michael Green Thu, 05 May 2016 19:38:10 +0000 + linux-4.4 (4.4.6-1+rpi13) jessie-staging; urgency=medium * Remove more stuff from config.rpi because it's breaking udeb generation diff --git a/debian/config/armhf/config.rpi b/debian/config/armhf/config.rpi index f4c0c545e0cd..a9dc10a25db4 100644 --- a/debian/config/armhf/config.rpi +++ b/debian/config/armhf/config.rpi @@ -104,155 +104,3 @@ CONFIG_CIFS_SMB2=y CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_AES_ARM=m -CONFIG_KERNEL_GZIP=y -CONFIG_USELIB=y -CONFIG_TINY_RCU=y -CONFIG_IKCONFIG_PROC=y -CONFIG_SYSFS_SYSCALL=y -CONFIG_KALLSYMS_ALL=y -CONFIG_OPTPROBES=y -CONFIG_MAC_PARTITION=y -CONFIG_OABI_COMPAT=y -CONFIG_XFRM_ALGO=y -CONFIG_XFRM_USER=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_DNS_RESOLVER=y -CONFIG_NET_MPLS_GSO=m -CONFIG_HAMRADIO=y -CONFIG_AX25=m -CONFIG_AX25_DAMA_SLAVE=y -CONFIG_NETROM=m -CONFIG_ROSE=m -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_YAM=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRTTY_SIR=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_OID_REGISTRY=y - -# CONFIG_MEMORY is not set -# CONFIG_IIO_TRIGGER is not set -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_GFS2_FS_LOCKING_DLM is not set -# CONFIG_F2FS_FS_SECURITY is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set -# CONFIG_QUOTA_NETLINK_INTERFACE is not set -# CONFIG_PROC_CHILDREN is not set -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_ECRYPT_FS_MESSAGING is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -# CONFIG_JFFS2_LZO is not set -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -# CONFIG_LOGFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -# CONFIG_NFS_V4_1 is not set -# CONFIG_NFSD_PNFS is not set -# CONFIG_SUNRPC_DEBUG is not set -# CONFIG_CEPH_FS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_FSCACHE is not set -# CONFIG_9P_FS_SECURITY is not set -# CONFIG_NLS_MAC_ROMAN is not set -# CONFIG_NLS_MAC_CELTIC is not set -# CONFIG_NLS_MAC_CENTEURO is not set -# CONFIG_NLS_MAC_CROATIAN is not set -# CONFIG_NLS_MAC_CYRILLIC is not set -# CONFIG_NLS_MAC_GAELIC is not set -# CONFIG_NLS_MAC_GREEK is not set -# CONFIG_NLS_MAC_ICELAND is not set -# CONFIG_NLS_MAC_INUIT is not set -# CONFIG_NLS_MAC_ROMANIAN is not set -# CONFIG_NLS_MAC_TURKISH is not set -# CONFIG_DLM_DEBUG is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_SCHED_STACK_END_CHECK is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_KPROBE_EVENT is not set -# CONFIG_UPROBE_EVENT is not set -# CONFIG_PROBE_EVENTS is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_KGDB_TESTS is not set -# CONFIG_DEBUG_LL is not set -# CONFIG_ENCRYPTED_KEYS is not set -# CONFIG_SECURITY is not set -# CONFIG_SECURITYFS is not set -# CONFIG_CRYPTO_TEST is not set -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_VMAC is not set -# CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_CRCT10DIF is not set -# CONFIG_CRYPTO_POLY1305 is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_CHACHA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZ4 is not set -# CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_USER_API_HASH is not set -# CONFIG_CRYPTO_USER_API_AEAD is not set -# CONFIG_CRYPTO_HW is not set -# CONFIG_CRC_T10DIF is not set -# CONFIG_CORDIC is not set diff --git a/debian/config/armhf/config.rpi2 b/debian/config/armhf/config.rpi2 index a361345e1add..00adf4a3d2d2 100644 --- a/debian/config/armhf/config.rpi2 +++ b/debian/config/armhf/config.rpi2 @@ -3,12 +3,14 @@ #pi2 specific stuff CONFIG_ARCH_BCM2709=y +# CONFIG_CACHE_L2X0 is not set CONFIG_BCM2709_DT=y CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_VMSPLIT_2G=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_GPIO_BCM_VIRT=y CONFIG_CRYPTO_SHA1_ARM_NEON=m CONFIG_CRYPTO_SHA512_ARM_NEON=m CONFIG_CRYPTO_AES_ARM_BS=m diff --git a/debian/config/armhf/config.rpix b/debian/config/armhf/config.rpix index d296fadf327e..5c07c251a6b1 100644 --- a/debian/config/armhf/config.rpix +++ b/debian/config/armhf/config.rpix @@ -672,3 +672,158 @@ CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_JITTERENTROPY=m CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y + +# settings added for 4.4 kernels (probablly more than strictly needed but I +# CBA with further bisection) +CONFIG_KERNEL_GZIP=y +CONFIG_USELIB=y +CONFIG_TINY_RCU=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_KALLSYMS_ALL=y +CONFIG_OPTPROBES=y +CONFIG_MAC_PARTITION=y +CONFIG_OABI_COMPAT=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_DNS_RESOLVER=y +CONFIG_NET_MPLS_GSO=m +CONFIG_HAMRADIO=y +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_YAM=m +CONFIG_IRDA=m +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRTTY_SIR=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_OID_REGISTRY=y + +# CONFIG_MEMORY is not set +# CONFIG_IIO_TRIGGER is not set +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_GFS2_FS_LOCKING_DLM is not set +# CONFIG_F2FS_FS_SECURITY is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +# CONFIG_PROC_CHILDREN is not set +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS_MESSAGING is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +# CONFIG_LOGFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_NFS_V4_1 is not set +# CONFIG_NFSD_PNFS is not set +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FSCACHE is not set +# CONFIG_9P_FS_SECURITY is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +# CONFIG_DLM_DEBUG is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_KPROBE_EVENT is not set +# CONFIG_UPROBE_EVENT is not set +# CONFIG_PROBE_EVENTS is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_KGDB_TESTS is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_VMAC is not set +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRCT10DIF is not set +# CONFIG_CRYPTO_POLY1305 is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_CHACHA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CORDIC is not set