mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
Update to 3.9-rc1
This commit is contained in:
Joshua Coombs
parent
3290143577
commit
e8f93ab02b
7 changed files with 4624 additions and 381 deletions
|
|
@ -7,40 +7,36 @@ pkgbase=linux-kirkwood-dt
|
|||
pkgname=('linux-kirkwood-dt' 'linux-headers-kirkwood-dt')
|
||||
#pkgname=linux-test # Build kernel with a different name
|
||||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.8_rc2
|
||||
_basekernel=3.9_rc1
|
||||
pkgver=${_basekernel}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
cryptover=1.5
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
makedepends=('git' 'xmlto' 'docbook-xsl' 'uboot-mkimage')
|
||||
makedepends=('git' 'xmlto' 'docbook-xsl' 'uboot-mkimage' 'bc')
|
||||
options=('!strip')
|
||||
source=('support.patch'
|
||||
'config'
|
||||
'dts-bootarg-wipe.patch'
|
||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||
'rtl871x-arm.patch'
|
||||
'mvebu-clk.patch'
|
||||
'pending-3.8.patch'
|
||||
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch")
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.8.0-v6/0001-block-cgroups-kconfig-build-bits-for-BFQ-v6-3.8.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.8.0-v6/0002-block-introduce-the-BFQ-v6-I-O-sched-for-3.8.patch")
|
||||
|
||||
md5sums=('f5d3635da03cb45904bedd69b47133de'
|
||||
'729a6f753bd402efff95d68f111454b6'
|
||||
'6d955c1f4882be73618018fc3b419ebf'
|
||||
'b1e1817044cb15e57a02bcfbd4ddd77a'
|
||||
'd00814b57448895e65fbbc800e8a58ba'
|
||||
'c38fa5f5065be065282887e0a3e2dc63'
|
||||
'36ff44ed40baabfad659e11ce170ccd4'
|
||||
'a3d5a876ac8ac41457c104cc04ae9b47'
|
||||
'd5c4e024aa5843d645faba0ac256f782'
|
||||
'3a4b8d23c1708283e29477931d63ffb8'
|
||||
'9daa5f662145f91b25b91b9fbeb874d9'
|
||||
'c80954ae588d8c168a0b1ae9ffe84c0e')
|
||||
'03eca1c188c076041f8d74100d55d659'
|
||||
'90b11395c702610bf4b42e72913f23f8')
|
||||
|
||||
__gitroot="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
|
||||
__gitname="linux"
|
||||
__gitbranch="v3.8-rc2"
|
||||
__gitbranch="v3.9-rc1"
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"
|
||||
|
|
@ -57,9 +53,6 @@ build() {
|
|||
|
||||
msg "GIT checkout done or server timeout"
|
||||
|
||||
# Wipe preconfigured bootargs
|
||||
patch -Np1 -i "${srcdir}/dts-bootarg-wipe.patch"
|
||||
|
||||
# Add the USB_QUIRK_RESET_RESUME for several webcams
|
||||
# FS#26528
|
||||
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
||||
|
|
@ -67,26 +60,15 @@ build() {
|
|||
# Add requested additional support
|
||||
patch -Np1 -i "${srcdir}/support.patch"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
||||
# remove this when a Kconfig knob is made available by upstream
|
||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||
# patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||
# Full Mach-types table, not technically required for DT kernels...
|
||||
cp "${srcdir}/mach-types" arch/arm/tools
|
||||
|
||||
# Hack fix for an alignment bug in RTL8712 driver
|
||||
patch -Np1 -i "${srcdir}/rtl871x-arm.patch"
|
||||
|
||||
# Section Mismatch in mvebu clk
|
||||
patch -Np1 -i "${srcdir}/mvebu-clk.patch"
|
||||
|
||||
# General fixes queued for next release
|
||||
patch -Np1 -i "${srcdir}/pending-3.8.patch"
|
||||
|
||||
# Add BFQ patches
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v6-3.8.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v6-I-O-sched-for-3.8.patch"
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
# set extraversion to pkgrel
|
||||
|
|
@ -132,7 +114,7 @@ package_linux-kirkwood-dt() {
|
|||
groups=('base')
|
||||
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7' 'uboot-mkimage' 'uboot-env')
|
||||
optdepends=('crda: to set the correct wireless channels of your country')
|
||||
provides=('kernel26' 'aufs_friendly' 'cryptodev_friendly' 'linux=${pkgver}')
|
||||
provides=('kernel26' 'cryptodev_friendly' 'linux=${pkgver}')
|
||||
conflicts=('linux')
|
||||
install=${pkgname}.install
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.8.0-0 Kernel Configuration
|
||||
# Linux/arm 3.9.0-1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -18,7 +18,6 @@ CONFIG_VECTORS_BASE=0xffff0000
|
|||
CONFIG_ARM_PATCH_PHYS_VIRT=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_HAVE_IRQ_WORK=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_BUILDTIME_EXTABLE_SORT=y
|
||||
|
||||
|
|
@ -61,6 +60,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
|
|||
CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
# CONFIG_IRQ_DOMAIN_DEBUG is not set
|
||||
# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
|
|
@ -86,8 +86,10 @@ CONFIG_TASK_IO_ACCOUNTING=y
|
|||
#
|
||||
# RCU Subsystem
|
||||
#
|
||||
# CONFIG_TREE_PREEMPT_RCU is not set
|
||||
CONFIG_TINY_PREEMPT_RCU=y
|
||||
CONFIG_PREEMPT_RCU=y
|
||||
# CONFIG_RCU_STALL_COMMON is not set
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
# CONFIG_RCU_BOOST is not set
|
||||
CONFIG_IKCONFIG=y
|
||||
|
|
@ -167,6 +169,7 @@ CONFIG_OPROFILE=m
|
|||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_KPROBES=y
|
||||
CONFIG_JUMP_LABEL=y
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_KRETPROBES=y
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
|
|
@ -179,10 +182,13 @@ CONFIG_HAVE_CLK=y
|
|||
CONFIG_HAVE_DMA_API_DEBUG=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_HAVE_VIRT_TO_BUS=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
||||
CONFIG_MODULES_USE_ELF_REL=y
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
|
||||
#
|
||||
# GCOV-based kernel profiling
|
||||
|
|
@ -296,8 +302,7 @@ CONFIG_ARCH_KIRKWOOD=y
|
|||
# CONFIG_ARCH_NOMADIK is not set
|
||||
# CONFIG_PLAT_SPEAR is not set
|
||||
# CONFIG_ARCH_DAVINCI is not set
|
||||
# CONFIG_ARCH_OMAP is not set
|
||||
# CONFIG_ARCH_VT8500_SINGLE is not set
|
||||
# CONFIG_ARCH_OMAP1 is not set
|
||||
# CONFIG_GPIO_PCA953X is not set
|
||||
# CONFIG_KEYBOARD_GPIO_POLLED is not set
|
||||
|
||||
|
|
@ -312,6 +317,7 @@ CONFIG_ARCH_KIRKWOOD=y
|
|||
# CONFIG_MACH_ESATA_SHEEVAPLUG is not set
|
||||
# CONFIG_MACH_GURUPLUG is not set
|
||||
CONFIG_ARCH_KIRKWOOD_DT=y
|
||||
CONFIG_MACH_GURUPLUG_DT=y
|
||||
CONFIG_MACH_DREAMPLUG_DT=y
|
||||
CONFIG_MACH_ICONNECT_DT=y
|
||||
CONFIG_MACH_DLINK_KIRKWOOD_DT=y
|
||||
|
|
@ -344,7 +350,6 @@ CONFIG_MACH_TS41X=y
|
|||
# CONFIG_MACH_NET5BIG_V2 is not set
|
||||
# CONFIG_MACH_T5325 is not set
|
||||
CONFIG_MACH_NSA310_DT=y
|
||||
# CONFIG_ARCH_VT8500 is not set
|
||||
CONFIG_PLAT_ORION=y
|
||||
CONFIG_PLAT_ORION_LEGACY=y
|
||||
|
||||
|
|
@ -380,6 +385,7 @@ CONFIG_ARM_NR_BANKS=8
|
|||
#
|
||||
# Bus support
|
||||
#
|
||||
CONFIG_ARCH_NO_VIRT_TO_BUS=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_SYSCALL=y
|
||||
# CONFIG_PCI_DEBUG is not set
|
||||
|
|
@ -403,6 +409,7 @@ CONFIG_ARCH_NR_GPIO=0
|
|||
CONFIG_PREEMPT=y
|
||||
CONFIG_PREEMPT_COUNT=y
|
||||
CONFIG_HZ=100
|
||||
CONFIG_SCHED_HRTICK=y
|
||||
CONFIG_AEABI=y
|
||||
# CONFIG_OABI_COMPAT is not set
|
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||
|
|
@ -410,11 +417,10 @@ CONFIG_AEABI=y
|
|||
CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||
# CONFIG_HIGHMEM is not set
|
||||
CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_SELECT_MEMORY_MODEL=y
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
CONFIG_FLATMEM=y
|
||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||
CONFIG_HAVE_MEMBLOCK=y
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=999999
|
||||
# CONFIG_COMPACTION is not set
|
||||
|
|
@ -635,6 +641,7 @@ CONFIG_NETFILTER_XT_TARGET_LED=m
|
|||
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
||||
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
|
||||
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
|
||||
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
|
||||
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
|
||||
CONFIG_NETFILTER_XT_TARGET_TEE=m
|
||||
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
|
||||
|
|
@ -646,9 +653,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
|
|||
# Xtables matches
|
||||
#
|
||||
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
|
||||
# CONFIG_NETFILTER_XT_MATCH_BPF is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
|
||||
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
|
||||
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
|
||||
# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
|
||||
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
|
||||
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
|
||||
|
|
@ -777,11 +786,13 @@ CONFIG_L2TP=m
|
|||
CONFIG_STP=m
|
||||
CONFIG_BRIDGE=m
|
||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
# CONFIG_BRIDGE_VLAN_FILTERING is not set
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_VLAN_8021Q_GVRP is not set
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
CONFIG_LLC=m
|
||||
# CONFIG_LLC2 is not set
|
||||
|
|
@ -793,7 +804,6 @@ CONFIG_IPDDP=m
|
|||
# CONFIG_IPDDP_DECAP is not set
|
||||
# CONFIG_X25 is not set
|
||||
# CONFIG_LAPB is not set
|
||||
CONFIG_WAN_ROUTER=m
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
|
@ -862,6 +872,7 @@ CONFIG_NET_SCH_FIFO=y
|
|||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
# CONFIG_OPENVSWITCH is not set
|
||||
# CONFIG_VSOCKETS is not set
|
||||
# CONFIG_NETPRIO_CGROUP is not set
|
||||
CONFIG_BQL=y
|
||||
# CONFIG_BPF_JIT is not set
|
||||
|
|
@ -1033,6 +1044,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
|
|||
CONFIG_FW_LOADER=y
|
||||
CONFIG_FIRMWARE_IN_KERNEL=y
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
# CONFIG_DEBUG_DRIVER is not set
|
||||
# CONFIG_DEBUG_DEVRES is not set
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
|
|
@ -1169,7 +1181,7 @@ CONFIG_OF_EARLY_FLATTREE=y
|
|||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_OF_DEVICE=y
|
||||
CONFIG_OF_I2C=y
|
||||
CONFIG_OF_I2C=m
|
||||
CONFIG_OF_NET=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_OF_PCI=y
|
||||
|
|
@ -1199,6 +1211,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
|
|||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_MG_DISK is not set
|
||||
# CONFIG_BLK_DEV_RBD is not set
|
||||
# CONFIG_BLK_DEV_RSXX is not set
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
|
|
@ -1214,6 +1227,7 @@ CONFIG_SGI_IOC4=m
|
|||
CONFIG_TIFM_CORE=m
|
||||
CONFIG_TIFM_7XX1=m
|
||||
CONFIG_ICS932S401=m
|
||||
# CONFIG_ATMEL_SSC is not set
|
||||
CONFIG_ENCLOSURE_SERVICES=m
|
||||
CONFIG_HP_ILO=m
|
||||
# CONFIG_APDS9802ALS is not set
|
||||
|
|
@ -1230,6 +1244,7 @@ CONFIG_TI_DAC7512=m
|
|||
# CONFIG_BMP085_SPI is not set
|
||||
# CONFIG_PCH_PHUB is not set
|
||||
# CONFIG_USB_SWITCH_FSA9480 is not set
|
||||
# CONFIG_LATTICE_ECP3_CONFIG is not set
|
||||
CONFIG_C2PORT=m
|
||||
|
||||
#
|
||||
|
|
@ -1359,7 +1374,7 @@ CONFIG_SATA_PMP=y
|
|||
#
|
||||
# Controllers with non-SFF native interface
|
||||
#
|
||||
CONFIG_SATA_AHCI=y
|
||||
CONFIG_SATA_AHCI=y
|
||||
# CONFIG_SATA_AHCI_PLATFORM is not set
|
||||
# CONFIG_SATA_INIC162X is not set
|
||||
# CONFIG_SATA_ACARD_AHCI is not set
|
||||
|
|
@ -1459,6 +1474,7 @@ CONFIG_BLK_DEV_DM=m
|
|||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
# CONFIG_DM_THIN_PROVISIONING is not set
|
||||
# CONFIG_DM_CACHE is not set
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_RAID=m
|
||||
# CONFIG_DM_LOG_USERSPACE is not set
|
||||
|
|
@ -1636,7 +1652,6 @@ CONFIG_NET_VENDOR_REALTEK=y
|
|||
CONFIG_NET_VENDOR_RDC=y
|
||||
# CONFIG_R6040 is not set
|
||||
CONFIG_NET_VENDOR_SEEQ=y
|
||||
# CONFIG_SEEQ8005 is not set
|
||||
CONFIG_NET_VENDOR_SILAN=y
|
||||
# CONFIG_SC92031 is not set
|
||||
CONFIG_NET_VENDOR_SIS=y
|
||||
|
|
@ -1787,6 +1802,7 @@ CONFIG_CARL9170_LEDS=y
|
|||
CONFIG_CARL9170_WPC=y
|
||||
# CONFIG_ATH6KL is not set
|
||||
CONFIG_AR5523=m
|
||||
# CONFIG_WIL6210 is not set
|
||||
CONFIG_B43=m
|
||||
CONFIG_B43_SSB=y
|
||||
CONFIG_B43_PCI_AUTOSELECT=y
|
||||
|
|
@ -1867,13 +1883,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
|
|||
CONFIG_RT2X00_LIB_CRYPTO=y
|
||||
CONFIG_RT2X00_LIB_LEDS=y
|
||||
# CONFIG_RT2X00_DEBUG is not set
|
||||
CONFIG_RTLWIFI=m
|
||||
CONFIG_RTLWIFI_DEBUG=y
|
||||
CONFIG_RTL8192CE=m
|
||||
CONFIG_RTL8192SE=m
|
||||
CONFIG_RTL8192DE=m
|
||||
CONFIG_RTL8723AE=m
|
||||
CONFIG_RTL8192CU=m
|
||||
CONFIG_RTLWIFI=m
|
||||
CONFIG_RTLWIFI_DEBUG=y
|
||||
CONFIG_RTL8192C_COMMON=m
|
||||
# CONFIG_WL_TI is not set
|
||||
CONFIG_ZD1211RW=m
|
||||
|
|
@ -1943,6 +1959,7 @@ CONFIG_MOUSE_PS2=m
|
|||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS=y
|
||||
CONFIG_MOUSE_PS2_CYPRESS=y
|
||||
CONFIG_MOUSE_PS2_TRACKPOINT=y
|
||||
# CONFIG_MOUSE_PS2_ELANTECH is not set
|
||||
# CONFIG_MOUSE_PS2_SENTELIC is not set
|
||||
|
|
@ -1950,9 +1967,10 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
|
|||
CONFIG_MOUSE_SERIAL=m
|
||||
CONFIG_MOUSE_APPLETOUCH=m
|
||||
CONFIG_MOUSE_BCM5974=m
|
||||
# CONFIG_MOUSE_CYAPA is not set
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
# CONFIG_MOUSE_GPIO is not set
|
||||
CONFIG_MOUSE_SYNAPTICS_I2C=y
|
||||
CONFIG_MOUSE_SYNAPTICS_I2C=m
|
||||
# CONFIG_MOUSE_SYNAPTICS_USB is not set
|
||||
# CONFIG_INPUT_JOYSTICK is not set
|
||||
CONFIG_INPUT_TABLET=y
|
||||
|
|
@ -2038,6 +2056,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
#
|
||||
# Character devices
|
||||
#
|
||||
CONFIG_TTY=y
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
|
|
@ -2058,6 +2077,7 @@ CONFIG_LEGACY_PTY_COUNT=16
|
|||
#
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_DMA=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||
|
|
@ -2083,6 +2103,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
|
|||
# CONFIG_SERIAL_PCH_UART is not set
|
||||
# CONFIG_SERIAL_XILINX_PS_UART is not set
|
||||
# CONFIG_SERIAL_ARC is not set
|
||||
# CONFIG_SERIAL_RP2 is not set
|
||||
# CONFIG_HVC_DCC is not set
|
||||
# CONFIG_IPMI_HANDLER is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
|
|
@ -2094,7 +2115,7 @@ CONFIG_DEVPORT=y
|
|||
CONFIG_I2C=m
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C_COMPAT=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_CHARDEV=m
|
||||
# CONFIG_I2C_MUX is not set
|
||||
CONFIG_I2C_HELPER_AUTO=y
|
||||
|
||||
|
|
@ -2129,7 +2150,7 @@ CONFIG_I2C_HELPER_AUTO=y
|
|||
# CONFIG_I2C_EG20T is not set
|
||||
# CONFIG_I2C_GPIO is not set
|
||||
# CONFIG_I2C_INTEL_MID is not set
|
||||
CONFIG_I2C_MV64XXX=y
|
||||
CONFIG_I2C_MV64XXX=m
|
||||
# CONFIG_I2C_OCORES is not set
|
||||
# CONFIG_I2C_PCA_PLATFORM is not set
|
||||
# CONFIG_I2C_PXA_PCI is not set
|
||||
|
|
@ -2163,6 +2184,7 @@ CONFIG_SPI_MASTER=y
|
|||
# CONFIG_SPI_GPIO is not set
|
||||
# CONFIG_SPI_OC_TINY is not set
|
||||
CONFIG_SPI_ORION=y
|
||||
# CONFIG_SPI_PXA2XX is not set
|
||||
# CONFIG_SPI_PXA2XX_PCI is not set
|
||||
# CONFIG_SPI_SC18IS602 is not set
|
||||
# CONFIG_SPI_TOPCLIFF_PCH is not set
|
||||
|
|
@ -2212,12 +2234,13 @@ CONFIG_PINMUX=y
|
|||
CONFIG_PINCONF=y
|
||||
# CONFIG_DEBUG_PINCTRL is not set
|
||||
CONFIG_PINCTRL_SINGLE=y
|
||||
# CONFIG_PINCTRL_EXYNOS4 is not set
|
||||
# CONFIG_PINCTRL_EXYNOS is not set
|
||||
# CONFIG_PINCTRL_EXYNOS5440 is not set
|
||||
CONFIG_PINCTRL_MVEBU=y
|
||||
CONFIG_PINCTRL_KIRKWOOD=y
|
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_OF_GPIO=y
|
||||
# CONFIG_DEBUG_GPIO is not set
|
||||
|
|
@ -2286,6 +2309,7 @@ CONFIG_W1_MASTER_GPIO=m
|
|||
CONFIG_W1_SLAVE_THERM=m
|
||||
CONFIG_W1_SLAVE_SMEM=m
|
||||
# CONFIG_W1_SLAVE_DS2408 is not set
|
||||
# CONFIG_W1_SLAVE_DS2413 is not set
|
||||
CONFIG_W1_SLAVE_DS2423=m
|
||||
CONFIG_W1_SLAVE_DS2431=m
|
||||
CONFIG_W1_SLAVE_DS2433=m
|
||||
|
|
@ -2314,8 +2338,11 @@ CONFIG_POWER_SUPPLY=y
|
|||
# CONFIG_CHARGER_MANAGER is not set
|
||||
# CONFIG_CHARGER_BQ2415X is not set
|
||||
# CONFIG_CHARGER_SMB347 is not set
|
||||
# CONFIG_BATTERY_GOLDFISH is not set
|
||||
CONFIG_POWER_RESET=y
|
||||
CONFIG_POWER_RESET_GPIO=y
|
||||
CONFIG_POWER_RESET_QNAP=y
|
||||
CONFIG_POWER_RESET_RESTART=y
|
||||
# CONFIG_POWER_AVS is not set
|
||||
CONFIG_HWMON=m
|
||||
# CONFIG_HWMON_VID is not set
|
||||
|
|
@ -2382,6 +2409,7 @@ CONFIG_SENSORS_LM90=m
|
|||
# CONFIG_SENSORS_MAX6639 is not set
|
||||
# CONFIG_SENSORS_MAX6642 is not set
|
||||
# CONFIG_SENSORS_MAX6650 is not set
|
||||
# CONFIG_SENSORS_MAX6697 is not set
|
||||
# CONFIG_SENSORS_MCP3021 is not set
|
||||
# CONFIG_SENSORS_NTC_THERMISTOR is not set
|
||||
# CONFIG_SENSORS_PC87360 is not set
|
||||
|
|
@ -2406,6 +2434,7 @@ CONFIG_SENSORS_LM90=m
|
|||
# CONFIG_SENSORS_ADS7828 is not set
|
||||
# CONFIG_SENSORS_ADS7871 is not set
|
||||
# CONFIG_SENSORS_AMC6821 is not set
|
||||
# CONFIG_SENSORS_INA209 is not set
|
||||
# CONFIG_SENSORS_INA2XX is not set
|
||||
# CONFIG_SENSORS_THMC50 is not set
|
||||
# CONFIG_SENSORS_TMP102 is not set
|
||||
|
|
@ -2428,9 +2457,11 @@ CONFIG_THERMAL_HWMON=y
|
|||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
|
||||
# CONFIG_FAIR_SHARE is not set
|
||||
CONFIG_STEP_WISE=y
|
||||
# CONFIG_USER_SPACE is not set
|
||||
# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
|
||||
CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
# CONFIG_THERMAL_GOV_USER_SPACE is not set
|
||||
# CONFIG_THERMAL_EMULATION is not set
|
||||
CONFIG_KIRKWOOD_THERMAL=m
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_WATCHDOG_CORE=y
|
||||
# CONFIG_WATCHDOG_NOWAYOUT is not set
|
||||
|
|
@ -2536,6 +2567,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
|||
# CONFIG_REGULATOR_MAX8973 is not set
|
||||
# CONFIG_REGULATOR_LP3971 is not set
|
||||
# CONFIG_REGULATOR_LP3972 is not set
|
||||
# CONFIG_REGULATOR_LP8755 is not set
|
||||
# CONFIG_REGULATOR_TPS51632 is not set
|
||||
# CONFIG_REGULATOR_TPS62360 is not set
|
||||
# CONFIG_REGULATOR_TPS65023 is not set
|
||||
|
|
@ -2553,6 +2585,7 @@ CONFIG_MEDIA_SUPPORT=m
|
|||
# CONFIG_MEDIA_RC_SUPPORT is not set
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
# CONFIG_TTPCI_EEPROM is not set
|
||||
|
||||
#
|
||||
# Media drivers
|
||||
|
|
@ -2585,9 +2618,10 @@ CONFIG_DVB_TUNER_DIB0090=m
|
|||
CONFIG_VGA_ARB=y
|
||||
CONFIG_VGA_ARB_MAX_GPUS=16
|
||||
# CONFIG_DRM is not set
|
||||
# CONFIG_STUB_POULSBO is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
|
||||
# CONFIG_OF_DISPLAY_TIMING is not set
|
||||
# CONFIG_OF_VIDEOMODE is not set
|
||||
CONFIG_FB=m
|
||||
# CONFIG_FIRMWARE_EDID is not set
|
||||
# CONFIG_FB_DDC is not set
|
||||
|
|
@ -2637,6 +2671,7 @@ CONFIG_FB_MODE_HELPERS=y
|
|||
# CONFIG_FB_CARMINE is not set
|
||||
# CONFIG_FB_SMSCUFX is not set
|
||||
CONFIG_FB_UDL=m
|
||||
# CONFIG_FB_GOLDFISH is not set
|
||||
# CONFIG_FB_VIRTUAL is not set
|
||||
# CONFIG_FB_METRONOME is not set
|
||||
# CONFIG_FB_MB862XX is not set
|
||||
|
|
@ -2655,6 +2690,8 @@ CONFIG_LCD_CLASS_DEVICE=m
|
|||
# CONFIG_LCD_S6E63M0 is not set
|
||||
# CONFIG_LCD_LD9040 is not set
|
||||
# CONFIG_LCD_AMS369FG06 is not set
|
||||
# CONFIG_LCD_LMS501KF03 is not set
|
||||
# CONFIG_LCD_HX8357 is not set
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=m
|
||||
CONFIG_BACKLIGHT_GENERIC=m
|
||||
# CONFIG_BACKLIGHT_ADP8860 is not set
|
||||
|
|
@ -2783,6 +2820,7 @@ CONFIG_HID_ROCCAT=m
|
|||
CONFIG_HID_SAMSUNG=m
|
||||
CONFIG_HID_SONY=m
|
||||
CONFIG_HID_SPEEDLINK=m
|
||||
# CONFIG_HID_STEELSERIES is not set
|
||||
CONFIG_HID_SUNPLUS=m
|
||||
CONFIG_HID_GREENASIA=m
|
||||
CONFIG_GREENASIA_FF=y
|
||||
|
|
@ -2790,6 +2828,7 @@ CONFIG_HID_SMARTJOYPLUS=m
|
|||
CONFIG_SMARTJOYPLUS_FF=y
|
||||
# CONFIG_HID_TIVO is not set
|
||||
CONFIG_HID_TOPSEED=m
|
||||
# CONFIG_HID_THINGM is not set
|
||||
CONFIG_HID_THRUSTMASTER=m
|
||||
CONFIG_THRUSTMASTER_FF=y
|
||||
CONFIG_HID_WACOM=m
|
||||
|
|
@ -2827,6 +2866,7 @@ CONFIG_USB=y
|
|||
# CONFIG_USB_DYNAMIC_MINORS is not set
|
||||
CONFIG_USB_SUSPEND=y
|
||||
# CONFIG_USB_OTG is not set
|
||||
# CONFIG_USB_DWC3 is not set
|
||||
# CONFIG_USB_MON is not set
|
||||
CONFIG_USB_WUSB=m
|
||||
# CONFIG_USB_WUSB_CBAF is not set
|
||||
|
|
@ -2958,6 +2998,7 @@ CONFIG_USB_SERIAL_OPTION=m
|
|||
CONFIG_USB_SERIAL_OMNINET=m
|
||||
CONFIG_USB_SERIAL_OPTICON=m
|
||||
# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
|
||||
# CONFIG_USB_SERIAL_XSENS_MT is not set
|
||||
# CONFIG_USB_SERIAL_ZIO is not set
|
||||
# CONFIG_USB_SERIAL_ZTE is not set
|
||||
# CONFIG_USB_SERIAL_SSU100 is not set
|
||||
|
|
@ -2989,10 +3030,13 @@ CONFIG_USB_SISUSBVGA_CON=y
|
|||
CONFIG_USB_ISIGHTFW=m
|
||||
# CONFIG_USB_YUREX is not set
|
||||
CONFIG_USB_EZUSB_FX2=m
|
||||
# CONFIG_USB_HSIC_USB3503 is not set
|
||||
|
||||
#
|
||||
# USB Physical Layer drivers
|
||||
#
|
||||
# CONFIG_OMAP_USB3 is not set
|
||||
# CONFIG_OMAP_CONTROL_USB is not set
|
||||
# CONFIG_USB_ISP1301 is not set
|
||||
CONFIG_USB_RCAR_PHY=m
|
||||
# CONFIG_USB_GADGET is not set
|
||||
|
|
@ -3086,6 +3130,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
|||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_HCTOSYS=y
|
||||
CONFIG_RTC_SYSTOHC=y
|
||||
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
|
||||
# CONFIG_RTC_DEBUG is not set
|
||||
|
||||
|
|
@ -3134,6 +3179,7 @@ CONFIG_RTC_DRV_S35390A=m
|
|||
# CONFIG_RTC_DRV_RS5C348 is not set
|
||||
# CONFIG_RTC_DRV_DS3234 is not set
|
||||
# CONFIG_RTC_DRV_PCF2123 is not set
|
||||
# CONFIG_RTC_DRV_RX4581 is not set
|
||||
|
||||
#
|
||||
# Platform RTC drivers
|
||||
|
|
@ -3158,6 +3204,11 @@ CONFIG_RTC_DRV_S35390A=m
|
|||
#
|
||||
CONFIG_RTC_DRV_MV=y
|
||||
# CONFIG_RTC_DRV_SNVS is not set
|
||||
|
||||
#
|
||||
# HID Sensor RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
|
||||
CONFIG_DMADEVICES=y
|
||||
# CONFIG_DMADEVICES_DEBUG is not set
|
||||
|
||||
|
|
@ -3169,6 +3220,7 @@ CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
|
|||
CONFIG_MV_XOR=y
|
||||
# CONFIG_TIMB_DMA is not set
|
||||
CONFIG_DMA_ENGINE=y
|
||||
CONFIG_DMA_OF=y
|
||||
|
||||
#
|
||||
# DMA Clients
|
||||
|
|
@ -3197,6 +3249,7 @@ CONFIG_USBIP_HOST=m
|
|||
CONFIG_W35UND=m
|
||||
CONFIG_PRISM2_USB=m
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_COMEDI is not set
|
||||
CONFIG_ASUS_OLED=m
|
||||
CONFIG_R8187SE=m
|
||||
CONFIG_RTL8192U=m
|
||||
|
|
@ -3210,8 +3263,6 @@ CONFIG_USB_SERIAL_QUATECH2=m
|
|||
# CONFIG_VT6655 is not set
|
||||
# CONFIG_VT6656 is not set
|
||||
# CONFIG_DX_SEP is not set
|
||||
# CONFIG_ZRAM is not set
|
||||
# CONFIG_ZCACHE is not set
|
||||
# CONFIG_ZSMALLOC is not set
|
||||
# CONFIG_FB_SM7XX is not set
|
||||
# CONFIG_CRYSTALHD is not set
|
||||
|
|
@ -3235,13 +3286,12 @@ CONFIG_FB_XGI=m
|
|||
# CONFIG_USB_WPAN_HCD is not set
|
||||
# CONFIG_WIMAX_GDM72XX is not set
|
||||
# CONFIG_CSR_WIFI is not set
|
||||
CONFIG_ZCACHE2=y
|
||||
CONFIG_NET_VENDOR_SILICOM=y
|
||||
# CONFIG_SBYPASS is not set
|
||||
# CONFIG_BPCTL is not set
|
||||
# CONFIG_CED1401 is not set
|
||||
# CONFIG_DGRP is not set
|
||||
# CONFIG_SB105X is not set
|
||||
# CONFIG_ZCACHE is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
CONFIG_HAVE_CLK_PREPARE=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
|
|
@ -3257,16 +3307,17 @@ CONFIG_MVEBU_CLK_GATING=y
|
|||
# Hardware Spinlock drivers
|
||||
#
|
||||
CONFIG_CLKSRC_MMIO=y
|
||||
# CONFIG_MAILBOX is not set
|
||||
CONFIG_IOMMU_SUPPORT=y
|
||||
CONFIG_OF_IOMMU=y
|
||||
|
||||
#
|
||||
# Remoteproc drivers (EXPERIMENTAL)
|
||||
# Remoteproc drivers
|
||||
#
|
||||
# CONFIG_STE_MODEM_RPROC is not set
|
||||
|
||||
#
|
||||
# Rpmsg drivers (EXPERIMENTAL)
|
||||
# Rpmsg drivers
|
||||
#
|
||||
# CONFIG_VIRT_DRIVERS is not set
|
||||
# CONFIG_PM_DEVFREQ is not set
|
||||
|
|
@ -3275,6 +3326,7 @@ CONFIG_OF_IOMMU=y
|
|||
# CONFIG_IIO is not set
|
||||
# CONFIG_VME_BUS is not set
|
||||
# CONFIG_PWM is not set
|
||||
CONFIG_IRQCHIP=y
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
|
||||
#
|
||||
|
|
@ -3566,8 +3618,6 @@ CONFIG_DEBUG_PREEMPT=y
|
|||
# CONFIG_DEBUG_MUTEXES is not set
|
||||
# CONFIG_DEBUG_LOCK_ALLOC is not set
|
||||
# CONFIG_PROVE_LOCKING is not set
|
||||
# CONFIG_PROVE_RCU_DELAY is not set
|
||||
# CONFIG_SPARSE_RCU_POINTER is not set
|
||||
# CONFIG_LOCK_STAT is not set
|
||||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
|
||||
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
||||
|
|
@ -3585,6 +3635,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
|
|||
# CONFIG_DEBUG_NOTIFIERS is not set
|
||||
# CONFIG_DEBUG_CREDENTIALS is not set
|
||||
# CONFIG_BOOT_PRINTK_DELAY is not set
|
||||
|
||||
#
|
||||
# RCU Debugging
|
||||
#
|
||||
# CONFIG_PROVE_RCU_DELAY is not set
|
||||
# CONFIG_SPARSE_RCU_POINTER is not set
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_RCU_TRACE is not set
|
||||
# CONFIG_KPROBES_SANITY_TEST is not set
|
||||
|
|
@ -3606,7 +3662,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
|
|||
CONFIG_TRACE_CLOCK=y
|
||||
CONFIG_RING_BUFFER=y
|
||||
CONFIG_EVENT_TRACING=y
|
||||
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
|
||||
CONFIG_CONTEXT_SWITCH_TRACER=y
|
||||
CONFIG_RING_BUFFER_ALLOW_SWAP=y
|
||||
CONFIG_TRACING=y
|
||||
|
|
@ -3618,6 +3673,7 @@ CONFIG_FTRACE=y
|
|||
# CONFIG_SCHED_TRACER is not set
|
||||
# CONFIG_ENABLE_DEFAULT_TRACERS is not set
|
||||
# CONFIG_FTRACE_SYSCALLS is not set
|
||||
# CONFIG_TRACER_SNAPSHOT is not set
|
||||
CONFIG_BRANCH_PROFILE_NONE=y
|
||||
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
|
||||
# CONFIG_PROFILE_ALL_BRANCHES is not set
|
||||
|
|
@ -3643,6 +3699,7 @@ CONFIG_DEBUG_LL=y
|
|||
CONFIG_DEBUG_LL_UART_NONE=y
|
||||
# CONFIG_DEBUG_ICEDCC is not set
|
||||
# CONFIG_DEBUG_SEMIHOSTING is not set
|
||||
CONFIG_DEBUG_IMX_UART_PORT=1
|
||||
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
# CONFIG_ARM_KPROBES_TEST is not set
|
||||
|
|
@ -3739,6 +3796,7 @@ CONFIG_CRYPTO_VMAC=m
|
|||
# Digest
|
||||
#
|
||||
CONFIG_CRYPTO_CRC32C=y
|
||||
CONFIG_CRYPTO_CRC32=m
|
||||
CONFIG_CRYPTO_GHASH=m
|
||||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
|
|
@ -3805,7 +3863,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
|
|||
CONFIG_GENERIC_STRNLEN_USER=y
|
||||
CONFIG_GENERIC_PCI_IOMAP=y
|
||||
CONFIG_GENERIC_IO=y
|
||||
CONFIG_PERCPU_RWSEM=y
|
||||
CONFIG_CRC_CCITT=y
|
||||
CONFIG_CRC16=y
|
||||
# CONFIG_CRC_T10DIF is not set
|
||||
|
|
@ -3853,3 +3910,4 @@ CONFIG_LRU_CACHE=m
|
|||
CONFIG_AVERAGE=y
|
||||
# CONFIG_CORDIC is not set
|
||||
# CONFIG_DDR is not set
|
||||
# CONFIG_VIRTUALIZATION is not set
|
||||
|
|
|
|||
|
|
@ -1,194 +0,0 @@
|
|||
diff -ruN a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-dns320.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts 2012-12-24 11:35:26.000000000 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-dns325.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts 2012-12-24 11:35:43.000000000 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts 2012-12-24 11:36:38.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts 2012-12-24 11:36:58.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts 2012-12-24 11:37:18.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts 2012-12-24 11:37:36.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-12-24 11:38:01.000000000 -0500
|
||||
@@ -13,9 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
- linux,initrd-start = <0x4500040>;
|
||||
- linux,initrd-end = <0x4800000>;
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts 2012-12-24 11:38:17.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts 2012-12-24 11:38:58.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi 2012-12-24 11:39:36.000000000 -0500
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
/ {
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts 2012-12-24 11:39:56.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi 2012-12-24 11:40:11.000000000 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
/ {
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts 2012-12-24 11:41:02.000000000 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts 2012-12-24 11:41:20.000000000 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-topkick.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts 2012-12-24 11:41:40.000000000 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 2012-12-24 11:42:09.000000000 -0500
|
||||
@@ -10,7 +10,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
- bootargs = "console=ttyS0,115200n8";
|
||||
+ bootargs = "";
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood-dt
|
||||
KERNEL_VERSION=3.8.0-0-ARCH+
|
||||
KERNEL_VERSION=3.9.0-2-ARCH+
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
|||
4518
core/linux-kirkwood-dt/mach-types
Normal file
4518
core/linux-kirkwood-dt/mach-types
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,12 +0,0 @@
|
|||
diff -ruN a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c
|
||||
--- a/drivers/clk/mvebu/clk-gating-ctrl.c 2013-01-02 21:13:21.000000000 -0500
|
||||
+++ b/drivers/clk/mvebu/clk-gating-ctrl.c 2013-01-03 11:40:44.000000000 -0500
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw)
|
||||
|
||||
-static struct clk __init *mvebu_clk_gating_get_src(
|
||||
+static struct clk *mvebu_clk_gating_get_src(
|
||||
struct of_phandle_args *clkspec, void *data)
|
||||
{
|
||||
struct mvebu_gating_ctrl *ctrl = (struct mvebu_gating_ctrl *)data;
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
diff -ruN a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi 2012-12-25 14:07:54.000000000 -0500
|
||||
@@ -5,6 +5,10 @@
|
||||
compatible = "marvell,88f6282-pinctrl";
|
||||
reg = <0x10000 0x20>;
|
||||
|
||||
+ pmx_nand: pmx-nand {
|
||||
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3","mpp4", "mpp5", "mpp18", "mpp19";
|
||||
+ marvell,function = "nand";
|
||||
+ };
|
||||
pmx_sata0: pmx-sata0 {
|
||||
marvell,pins = "mpp5", "mpp21", "mpp23";
|
||||
marvell,function = "sata0";
|
||||
@@ -21,11 +25,14 @@
|
||||
marvell,pins = "mpp8", "mpp9";
|
||||
marvell,function = "twsi0";
|
||||
};
|
||||
+ pmx_twsi1: pmx-twsi1 {
|
||||
+ marvell,pins = "mpp36", "mpp37";
|
||||
+ marvell,function = "twsi1";
|
||||
+ };
|
||||
pmx_uart0: pmx-uart0 {
|
||||
marvell,pins = "mpp10", "mpp11";
|
||||
marvell,function = "uart0";
|
||||
};
|
||||
-
|
||||
pmx_uart1: pmx-uart1 {
|
||||
marvell,pins = "mpp13", "mpp14";
|
||||
marvell,function = "uart1";
|
||||
@@ -39,6 +46,7 @@
|
||||
#size-cells = <0>;
|
||||
interrupts = <32>;
|
||||
clock-frequency = <100000>;
|
||||
+ clocks = <&gate_clk 7>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-topkick.dts 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts 2012-12-25 14:00:09.000000000 -0500
|
||||
@@ -82,4 +82,21 @@
|
||||
gpios = <&gpio1 16 1>;
|
||||
};
|
||||
};
|
||||
+ regulators {
|
||||
+ compatible = "simple-bus";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ sata0_power: regulator@1 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ reg = <1>;
|
||||
+ regulator-name = "SATA0 Power";
|
||||
+ regulator-min-microvolt = <5000000>;
|
||||
+ regulator-max-microvolt = <5000000>;
|
||||
+ enable-active-high;
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ gpio = <&gpio1 4 0>;
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood.dtsi 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/boot/dts/kirkwood.dtsi 2012-12-25 14:01:42.000000000 -0500
|
||||
@@ -144,6 +144,7 @@
|
||||
compatible = "marvell,orion-ehci";
|
||||
reg = <0x50000 0x1000>;
|
||||
interrupts = <19>;
|
||||
+ clocks = <&gate_clk 3>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
|
||||
--- a/arch/arm/mach-kirkwood/board-dt.c 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/mach-kirkwood/board-dt.c 2012-12-25 13:58:18.000000000 -0500
|
||||
@@ -67,6 +67,9 @@
|
||||
orion_clkdev_add(NULL, "mv643xx_eth_port.1",
|
||||
of_clk_get_from_provider(&clkspec));
|
||||
|
||||
+ clkspec.args[0] = CGC_BIT_SDIO;
|
||||
+ orion_clkdev_add(NULL, "mvsdio",
|
||||
+ of_clk_get_from_provider(&clkspec));
|
||||
}
|
||||
|
||||
static void __init kirkwood_of_clk_init(void)
|
||||
diff -ruN a/arch/arm/mach-kirkwood/board-usi_topkick.c b/arch/arm/mach-kirkwood/board-usi_topkick.c
|
||||
--- a/arch/arm/mach-kirkwood/board-usi_topkick.c 2012-12-21 20:19:00.000000000 -0500
|
||||
+++ b/arch/arm/mach-kirkwood/board-usi_topkick.c 2012-12-25 14:01:01.000000000 -0500
|
||||
@@ -64,8 +64,6 @@
|
||||
0
|
||||
};
|
||||
|
||||
-#define TOPKICK_SATA0_PWR_ENABLE 36
|
||||
-
|
||||
void __init usi_topkick_init(void)
|
||||
{
|
||||
/*
|
||||
@@ -73,9 +71,6 @@
|
||||
*/
|
||||
kirkwood_mpp_conf(topkick_mpp_config);
|
||||
|
||||
- /* SATA0 power enable */
|
||||
- gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1);
|
||||
-
|
||||
kirkwood_ge00_init(&topkick_ge00_data);
|
||||
kirkwood_sdio_init(&topkick_mvsdio_data);
|
||||
}
|
||||
Loading…
Reference in a new issue