diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-09 01:55:26 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-09 01:55:33 +0400 |
| commit | d0f2a5ba07ac8dc671c0acb89d0114352b41e936 (patch) | |
| tree | 8b1e1594553dbb6a8480bc8d033d2bb0077f41fc /arch/arm/configs | |
| parent | e05f9ac42c1b87a1a266e3e83191ed00211576bc (diff) | |
| parent | 0cfb1c8bec551c8eb7c6b263baebc9537d2b910c (diff) | |
| download | linux-d0f2a5ba07ac8dc671c0acb89d0114352b41e936.tar.xz | |
Merge branch 'hisi/soc' into next/soc
* hisi/soc:
ARM: dts: rename hi4511 dts file
ARM: hisi: remove init_time
ARM: hisi: rename hi3xxx to hisi
ARM: dts: enable clock binding on Hi3620
ARM: hi3xxx: add hotplug support
ARM: hi3xxx: add smp support
ARM: config: add defconfig for Hi3xxx
ARM: config: enable hi3xxx in multi_v7_defconfig
ARM: dts: enable hi4511 with device tree
ARM: hi3xxx: add board support with device tree
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/hi3xxx_defconfig | 56 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
2 files changed, 57 insertions, 0 deletions
diff --git a/arch/arm/configs/hi3xxx_defconfig b/arch/arm/configs/hi3xxx_defconfig new file mode 100644 index 000000000000..f186bdfa2369 --- /dev/null +++ b/arch/arm/configs/hi3xxx_defconfig @@ -0,0 +1,56 @@ +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_RD_LZMA=y +CONFIG_ARCH_HI3xxx=y +CONFIG_SMP=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_NET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_NETDEVICES=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_SPI=y +CONFIG_SPI_PL022=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_GPIO_GENERIC_PLATFORM=y +CONFIG_REGULATOR_GPIO=y +CONFIG_DRM=y +CONFIG_FB_SIMPLE=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MXC=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_DMADEVICES=y +CONFIG_DW_DMAC=y +CONFIG_PL330_DMA=y +CONFIG_PWM=y +CONFIG_EXT4_FS=y +CONFIG_TMPFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOCKUP_DETECTOR=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7e3f5cba7cfd..0ae6dc35209f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -12,6 +12,7 @@ CONFIG_MACH_BERLIN_BG2=y CONFIG_MACH_BERLIN_BG2CD=y CONFIG_GPIO_PCA953X=y CONFIG_ARCH_HIGHBANK=y +CONFIG_ARCH_HI3xxx=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_MXC=y CONFIG_MACH_IMX51_DT=y |