diff options
| -rw-r--r-- | Makefile.config | 11 | ||||
| -rw-r--r-- | arm-export-read_current_timer.patch | 10 | ||||
| -rw-r--r-- | config-arm-generic | 137 | ||||
| -rw-r--r-- | config-arm-highbank | 7 | ||||
| -rw-r--r-- | config-arm-imx | 73 | ||||
| -rw-r--r-- | config-arm-kirkwood | 38 | ||||
| -rw-r--r-- | config-arm-omap | 117 | ||||
| -rw-r--r-- | config-arm-tegra | 3 | ||||
| -rw-r--r-- | config-arm-versatile | 23 | ||||
| -rw-r--r-- | config-armv7 | 174 | ||||
| -rw-r--r-- | kernel.spec | 13 |
11 files changed, 508 insertions, 98 deletions
diff --git a/Makefile.config b/Makefile.config index af6dd73f2..ded3bc623 100644 --- a/Makefile.config +++ b/Makefile.config @@ -9,6 +9,7 @@ CONFIGFILES = \ $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-s390x.config \ + $(CFG)-armv7.config \ $(CFG)-armv5tel-kirkwood.config \ $(CFG)-armv7l.config $(CFG)-armv7hl.config \ $(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \ @@ -19,7 +20,7 @@ CONFIGFILES = \ $(CFG)-sparc64.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config -PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64 +PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64 armv7 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) @@ -37,6 +38,9 @@ temp-generic: config-generic temp-debug-generic: config-generic cat config-generic config-debug > temp-debug-generic +temp-armv7: config-armv7 temp-generic + perl merge.pl $^ > $@ + temp-arm-generic: config-arm-generic temp-generic perl merge.pl $^ > $@ @@ -127,6 +131,9 @@ kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic perl merge.pl $^ s390 > $@ +kernel-$(VERSION)-armv7.config: /dev/null temp-armv7 + perl merge.pl $^ armv7 > $@ + kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood perl merge.pl $^ arm > $@ @@ -145,7 +152,7 @@ kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra perl merge.pl $^ arm > $@ -kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7l-versatile +kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 perl merge.pl $^ arm > $@ kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx diff --git a/arm-export-read_current_timer.patch b/arm-export-read_current_timer.patch new file mode 100644 index 000000000..5059d6862 --- /dev/null +++ b/arm-export-read_current_timer.patch @@ -0,0 +1,10 @@ +--- linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c.orig 2012-10-01 00:47:46.000000000 +0100 ++++ linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c 2012-10-24 09:06:46.570452677 +0100 +@@ -50,6 +50,7 @@ + + /* platform dependent support */ + EXPORT_SYMBOL(arm_delay_ops); ++EXPORT_SYMBOL(read_current_timer); + + /* networking */ + EXPORT_SYMBOL(csum_partial); diff --git a/config-arm-generic b/config-arm-generic index e2e6a7714..60c1c6bd5 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -21,28 +21,34 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_CMDLINE="" +# CONFIG_ARM_LPAE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FPE_FASTFPE=y +CONFIG_HIGHPTE=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_UACCESS_WITH_MEMCPY=y # Generic ARM Errata CONFIG_ARM_ERRATA_720789=y CONFIG_ARM_ERRATA_751472=y +CONFIG_ARM_ERRATA_742230=y +CONFIG_ARM_ERRATA_742231=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y + # Generic ARM config options CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_LOCAL_TIMERS=y CONFIG_ATAGS_PROC=y -#CONFIG_XIP_KERNEL is not set - -# DeviceTree -CONFIG_USE_OF=y -# CONFIG_OF_SELFTEST is not set -CONFIG_PROC_DEVICETREE=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_I2C_MUX_PINCTRL=m -CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_PL330_DMA=y +CONFIG_AMBA_PL08X=y +CONFIG_PL330_DMA=y +# CONFIG_XIP_KERNEL is not set +# CONFIG_PID_IN_CONTEXTIDR is not set # Generic options we want for ARM that aren't defualt CONFIG_HIGHMEM=y @@ -66,26 +72,23 @@ CONFIG_SUSPEND=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_CPU_TOPOLOGY=y +# CONFIG_XEN is not set + CONFIG_THERMAL=y +CONFIG_ETHERNET=y + CONFIG_PERF_EVENTS=y CONFIG_PERF_COUNTERS=y CONFIG_CC_STACKPROTECTOR=y -CONFIG_AUTO_ZRELADDR=y - CONFIG_SECCOMP=y CONFIG_STRICT_DEVMEM=y CONFIG_SPARSE_IRQ=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_LSM_MMAP_MIN_ADDR=32768 - # Generic HW for all ARM platforms -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y CONFIG_LEDS_GPIO=m CONFIG_LBDAF=y @@ -93,12 +96,15 @@ CONFIG_LBDAF=y CONFIG_RFKILL_GPIO=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_PINCTRL_SINGLE=m CONFIG_USB_ULPI=y CONFIG_SND_ARM=y CONFIG_SND_ARMAACI=m CONFIG_SND_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SND_SOC_CACHE_LZO is not set CONFIG_SND_SOC_ALL_CODECS=m @@ -111,9 +117,23 @@ CONFIG_DM9000_DEBUGLEVEL=4 CONFIG_SMC911X=m CONFIG_SMSC911X=m +CONFIG_SERIO_AMBAKMI=m +CONFIG_I2C_NOMADIK=m +CONFIG_ARM_SP805_WATCHDOG=m +CONFIG_FB_ARMCLCD=m +CONFIG_MPCORE_WATCHDOG=m + +CONFIG_MMC_ARMMMCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SPI=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW_PCI=m +CONFIG_MMC_DW_EXYNOS=m +# CONFIG_MMC_DW_IDMAC is not set +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m # Generic GPIO options CONFIG_GENERIC_GPIO=y @@ -148,6 +168,7 @@ CONFIG_MTD_ALAUDA=m # CONFIG_MTD_ONENAND is not set CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_IMPA7=m CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set @@ -183,6 +204,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_DEBUG is not set +CONFIG_MG_DISK=m +CONFIG_MG_DISK_RES=0 # CONFIG_SM_FTL is not set @@ -205,17 +228,99 @@ CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set +# HW crypto and rng +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_HW_RANDOM_ATMEL=m +CONFIG_HW_RANDOM_EXYNOS=m + # Device tree CONFIG_OF=y +CONFIG_USE_OF=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set + CONFIG_SERIAL_OF_PLATFORM=y CONFIG_OF_GPIO=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_OF_MDIO=m +CONFIG_MDIO_BUS_MUX_GPIO=m + +CONFIG_BPF_JIT=y + +CONFIG_RCU_FANOUT_LEAF=16 +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_LEGACY_SYSFS=y + +CONFIG_RTC_DRV_88PM80X=m +CONFIG_RTC_DRV_PL030=m +CONFIG_RTC_DRV_PL031=m +CONFIG_RFKILL_REGULATOR=m +CONFIG_INPUT_88PM80X_ONKEY=y +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_SERIAL_AMBA_PL010=m +CONFIG_SERIAL_AMBA_PL011=m +CONFIG_GPIO_PL061=y +CONFIG_GPIO_MCP23S08=m +CONFIG_PL310_ERRATA_753970=y + +CONFIG_MFD_88PM800=m +CONFIG_MFD_88PM805=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_CHARGER_MANAGER=y +CONFIG_EXTCON_GPIO=m + +# CONFIG_VFIO is not set + +# CONFIG_XIP_KERNEL is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_APM_EMULATION is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# CONFIG_SERIAL_8250_EM is not set +# CONFIG_GPIO_EM is not set +# CONFIG_HVC_DCC is not set +# CONFIG_LEDS_RENESAS_TPU is not set + +# Possibly part of Snowball +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set + +# CONFIG_IRQ_DOMAIN_DEBUG is not set +# CONFIG_COMMON_CLK_DEBUG is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set + +# CONFIG_DEBUG_PINCTRL is not set # HW Disabled because it causes issues on ARM platforms # disable TPM on arm at least on the trimslices it causes havoc # CONFIG_TCG_TPM is not set + # CONFIG_IMA is not set # ERROR: "__bswapsi2" [drivers/staging/crystalhd/crystalhd.ko] undefined! diff --git a/config-arm-highbank b/config-arm-highbank index 6b023e02e..952a21ac4 100644 --- a/config-arm-highbank +++ b/config-arm-highbank @@ -26,6 +26,9 @@ CONFIG_ATA_SFF=y CONFIG_NET_CALXEDA_XGMAC=y +CONFIG_EDAC_HIGHBANK_MC=m +CONFIG_EDAC_HIGHBANK_L2=m + CONFIG_GPIO_PL061=y CONFIG_SERIAL_AMBA_PL010=y @@ -38,9 +41,9 @@ CONFIG_RTC_DRV_PL031=y CONFIG_SATA_HIGHBANK=m -# CONFIG_DVB_TDA1004X is not set -# CONFIG_DVB_PLL is not set +CONFIG_OC_ETM=y +# CONFIG_NET_VENDOR_BROADCOM is not set # these were all requested to be disabled on highbank kernels by calxeda # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set diff --git a/config-arm-imx b/config-arm-imx index 88dd42b5f..bddff88ab 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -1,45 +1,62 @@ CONFIG_ARCH_MXC=y CONFIG_ARCH_MX51=y -CONFIG_MACH_MX51_BABBAGE=y -CONFIG_MACH_MX51_3DS=y -CONFIG_MACH_EUKREA_CPUIMX51=y + CONFIG_VFP=y CONFIG_NEON=y - -CONFIG_MACH_EUKREA_CPUIMX51SD=y -CONFIG_MACH_MX51_EFIKAMX=y -CONFIG_MACH_MX51_EFIKASB=y # CONFIG_SWP_EMULATE is not set # CONFIG_THUMB2_KERNEL is not set CONFIG_CPU_FREQ_IMX=y -CONFIG_W1_MASTER_MXC=m -CONFIG_IMX_DMA=y -CONFIG_IMX_SDMA=y + +CONFIG_SOC_IMX6Q=y + +CONFIG_MACH_ARMADILLO5X0=y +CONFIG_MACH_BUG=y +CONFIG_MACH_EUKREA_CPUIMX35=y +CONFIG_MACH_EUKREA_CPUIMX35SD=y +CONFIG_MACH_EUKREA_CPUIMX51=y +CONFIG_MACH_EUKREA_CPUIMX51SD=y +CONFIG_MACH_IMX31_DT=y +CONFIG_MACH_IMX51_DT=y +CONFIG_MACH_IMX53_DT=y +CONFIG_MACH_KZM_ARM11_01=y +CONFIG_MACH_MX31_3DS=y CONFIG_MACH_MX31ADS=y CONFIG_MACH_MX31LILLY=y CONFIG_MACH_MX31LITE=y -CONFIG_MACH_PCM037=y -CONFIG_MACH_MX31_3DS=y CONFIG_MACH_MX31MOBOARD=y -CONFIG_MACH_QONG=y -CONFIG_MACH_ARMADILLO5X0=y -CONFIG_MACH_KZM_ARM11_01=y -CONFIG_MACH_BUG=y -CONFIG_MACH_PCM043=y CONFIG_MACH_MX35_3DS=y -CONFIG_MACH_EUKREA_CPUIMX35=y +CONFIG_MACH_MX51_3DS=y +CONFIG_MACH_MX51_BABBAGE=y +CONFIG_MACH_MX51_EFIKAMX=y +CONFIG_MACH_MX51_EFIKASB=y +CONFIG_MACH_MX53_EVK=y +CONFIG_MACH_MX53_SMD=y +CONFIG_MACH_MX53_LOCO=y +CONFIG_MACH_MX53_ARD=y +CONFIG_MACH_PCM037=y +CONFIG_MACH_PCM037_EET=y +CONFIG_MACH_PCM043=y +CONFIG_MACH_QONG=y CONFIG_MACH_VPR200=y -CONFIG_SOC_IMX6Q=y + +CONFIG_W1_MASTER_MXC=m +CONFIG_DMA_CACHE_RWFO=y +CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y +CONFIG_MXS_DMA=y CONFIG_MXC_IRQ_PRIOR=y CONFIG_MXC_PWM=m CONFIG_MXC_DEBUG_BOARD=y + # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CACHE_L2X0=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_ERRATA_326103=y CONFIG_ARM_ERRATA_411920=y CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y CONFIG_ARM_ERRATA_364296=y + CONFIG_PATA_IMX=m CONFIG_NET_VENDOR_FREESCALE=y CONFIG_FEC=y @@ -50,19 +67,19 @@ CONFIG_I2C_IMX=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MCP23S08=m # CONFIG_GPIO_MC9S08DZ60 is not set -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_PLL=m -CONFIG_SND_IMX_SOC=m +CONFIG_PINCTRL_IMX51=y +CONFIG_PINCTRL_IMX53=y CONFIG_USB_EHCI_MXC=y +CONFIG_USB_MXS_PHY=m # CONFIG_USB_IMX21_HCD is not set CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_MXC=m CONFIG_RTC_MXC=y +CONFIG_RTC_DRV_MXC=m CONFIG_BACKLIGHT_PWM=m CONFIG_LEDS_PWM=m -CONFIG_MACH_PCM037_EET=y # CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set CONFIG_MXC_USE_EPIT=y CONFIG_HAVE_EPIT=y @@ -74,15 +91,19 @@ CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_754322=y CONFIG_CAN_FLEXCAN=m CONFIG_MTD_NAND_MXC=m +CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_INPUT_PWM_BEEPER=m CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_IMX2_WDT=m + +CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_PHYCORE_AC97=m CONFIG_SND_SOC_EUKREA_TLV320=m +CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_PL310_ERRATA_769419=y CONFIG_LEDS_RENESAS_TPU=y -# CONFIG_ARM_LPAE is not set -# CONFIG_INPUT_GP2A is not set -# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_FB_IMX=m + +# CONFIG_NET_VENDOR_BROADCOM is not set diff --git a/config-arm-kirkwood b/config-arm-kirkwood index 7b5d758e4..f03057852 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -3,32 +3,36 @@ CONFIG_ARCH_KIRKWOOD_DT=y # CONFIG_SMP is not set # CONFIG_VFP is not set +CONFIG_MACH_D2NET_V2=y CONFIG_MACH_DB88F6281_BP=y -CONFIG_MACH_RD88F6192_NAS=y -CONFIG_MACH_RD88F6281=y -CONFIG_MACH_MV88F6281GTW_GE=y -CONFIG_MACH_SHEEVAPLUG=y +CONFIG_MACH_DOCKSTAR=y +CONFIG_MACH_DOCKSTAR_DT=y +CONFIG_MACH_DREAMPLUG_DT=y CONFIG_MACH_ESATA_SHEEVAPLUG=y CONFIG_MACH_DLINK_KIRKWOOD_DT=y +CONFIG_MACH_GOFLEXNET_DT=y CONFIG_MACH_GURUPLUG=y -CONFIG_MACH_DREAMPLUG_DT=y -CONFIG_MACH_DOCKSTAR=y CONFIG_MACH_ICONNECT_DT=y CONFIG_MACH_IB62X0_DT=y -CONFIG_MACH_TS219=y -CONFIG_MACH_TS41X=y -CONFIG_MACH_OPENRD_BASE=y -CONFIG_MACH_OPENRD_CLIENT=y -CONFIG_MACH_OPENRD_ULTIMATE=y -CONFIG_MACH_NETSPACE_V2=y CONFIG_MACH_INETSPACE_V2=y +CONFIG_MACH_IOMEGA_IX2_200_DT=y +CONFIG_MACH_KM_KIRKWOOD_DT=y +CONFIG_MACH_LSXL_DT=y +CONFIG_MACH_MV88F6281GTW_GE=y +CONFIG_MACH_NETSPACE_V2=y CONFIG_MACH_NETSPACE_MAX_V2=y -CONFIG_MACH_D2NET_V2=y CONFIG_MACH_NET2BIG_V2=y CONFIG_MACH_NET5BIG_V2=y +CONFIG_MACH_OPENRD_BASE=y +CONFIG_MACH_OPENRD_CLIENT=y +CONFIG_MACH_OPENRD_ULTIMATE=y +CONFIG_MACH_RD88F6192_NAS=y +CONFIG_MACH_RD88F6281=y +CONFIG_MACH_SHEEVAPLUG=y +CONFIG_MACH_TS219=y +CONFIG_MACH_TS219_DT=y +CONFIG_MACH_TS41X=y CONFIG_MACH_T5325=y -# CONFIG_CPU_FEROCEON_OLD_ID is not set - CONFIG_CACHE_FEROCEON_L2=y CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=y @@ -48,7 +52,11 @@ CONFIG_RTC_DRV_MV=y CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m +# CONFIG_CPU_FEROCEON_OLD_ID is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set +# CONFIG_HIGHPTE is not set +# CONFIG_EDAC is not set + CONFIG_FB_XGI=m diff --git a/config-arm-omap b/config-arm-omap index ae328f190..b35ccd1dd 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -1,7 +1,4 @@ CONFIG_ARCH_OMAP=y -# CONFIG_GPIO_PCA953X is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# TI OMAP Common Features CONFIG_ARCH_OMAP_OTG=y # CONFIG_ARCH_OMAP1 is not set CONFIG_ARCH_OMAP2PLUS=y @@ -25,6 +22,7 @@ CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_PM_NONE is not set CONFIG_OMAP_PM_NOOP=y CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_IOMMU_DEBUG is not set CONFIG_OMAP3_EMU=y CONFIG_HWSPINLOCK_OMAP=m CONFIG_DMA_OMAP=y @@ -43,6 +41,7 @@ CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y CONFIG_SOC_AM33XX=y CONFIG_SOC_OMAPTI816X=y +CONFIG_SOC_OMAP5=y CONFIG_OMAP_PACKAGE_CBB=y CONFIG_OMAP_PACKAGE_CBL=y CONFIG_OMAP_PACKAGE_CBS=y @@ -51,34 +50,35 @@ CONFIG_OMAP_PACKAGE_CBS=y # # OMAP Board Type # -CONFIG_MACH_OMAP_GENERIC=y -CONFIG_MACH_OMAP3_BEAGLE=y -CONFIG_MACH_DEVKIT8000=y -CONFIG_MACH_OMAP_LDP=y -CONFIG_MACH_OMAP3530_LV_SOM=y -CONFIG_MACH_OMAP3_TORPEDO=y -CONFIG_MACH_OVERO=y -CONFIG_MACH_OMAP3EVM=y -CONFIG_MACH_OMAP3517EVM=y -CONFIG_MACH_CRANEBOARD=y -CONFIG_MACH_OMAP3_PANDORA=y -CONFIG_MACH_OMAP3_TOUCHBOOK=y -CONFIG_MACH_OMAP_3430SDP=y -CONFIG_MACH_OMAP_ZOOM2=y -CONFIG_MACH_OMAP_ZOOM3=y CONFIG_MACH_CM_T35=y CONFIG_MACH_CM_T3517=y +CONFIG_MACH_CRANEBOARD=y +CONFIG_MACH_DEVKIT8000=y CONFIG_MACH_IGEP0020=y CONFIG_MACH_IGEP0030=y -CONFIG_MACH_SBC3530=y +CONFIG_MACH_OMAP_GENERIC=y +CONFIG_MACH_OMAP_LDP=y +CONFIG_MACH_OMAP_ZOOM2=y +CONFIG_MACH_OMAP_ZOOM3=y +CONFIG_MACH_OMAP_3430SDP=y CONFIG_MACH_OMAP_3630SDP=y CONFIG_MACH_OMAP_4430SDP=y +CONFIG_MACH_OMAP3_BEAGLE=y +CONFIG_MACH_OMAP3_PANDORA=y +CONFIG_MACH_OMAP3_TOUCHBOOK=y +CONFIG_MACH_OMAP3_TORPEDO=y +CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL=y +CONFIG_MACH_OMAP3EVM=y +CONFIG_MACH_OMAP3517EVM=y +CONFIG_MACH_OMAP3530_LV_SOM=y CONFIG_MACH_OMAP4_PANDA=y +CONFIG_MACH_OVERO=y +CONFIG_MACH_SBC3530=y +CONFIG_MACH_TI8148EVM=y CONFIG_MACH_TI8168EVM=y +CONFIG_MACH_TOUCHBOOK=y # CONFIG_MACH_NOKIA_RM680 is not set # CONFIG_MACH_NOKIA_RX51 is not set -# CONFIG_MACH_TI8148EVM is not set -CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set @@ -122,7 +122,6 @@ CONFIG_ARM_GIC=y CONFIG_HAVE_ARM_SCU=y CONFIG_HAVE_ARM_TWD=y CONFIG_HOTPLUG_CPU=y -CONFIG_LOCAL_TIMERS=y CONFIG_HZ=128 # CONFIG_THUMB2_KERNEL is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y @@ -144,12 +143,16 @@ CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y +CONFIG_OMAP4_THERMAL=y +CONFIG_OMAP5_THERMAL=y + # # OMAP Hardware # CONFIG_WL_TI=y CONFIG_WLCORE_SDIO=m CONFIG_TI_ST=m +# CONFIG_TI_CPSW is not set CONFIG_GPIOLIB=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_PREFETCH=y @@ -157,6 +160,8 @@ CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y CONFIG_WL1251_SPI=m CONFIG_WL12XX_SPI=m CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL18XX=m +CONFIG_NFC_WILINK=m CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m CONFIG_INPUT_TWL6040_VIBRA=m @@ -170,40 +175,62 @@ CONFIG_TWL4030_CORE=y CONFIG_TWL4030_MADC=m CONFIG_TWL4030_POWER=y CONFIG_TWL4030_CODEC=y +CONFIG_TWL4030_WATCHDOG=m CONFIG_GPIO_TWL4030=m CONFIG_CHARGER_TWL4030=m CONFIG_TWL6030_PWM=m +CONFIG_TWL6040_CORE=y +CONFIG_SENSORS_TWL4030_MADC=m +CONFIG_TI_DAVINCI_EMAC=m +CONFIG_TI_DAVINCI_MDIO=m +CONFIG_TI_DAVINCI_CPDMA=m +CONFIG_LEDS_PWM=m CONFIG_MTD_ONENAND_OMAP2=y +CONFIG_HDQ_MASTER_OMAP=m CONFIG_I2C_OMAP=y CONFIG_SPI_OMAP24XX=y -CONFIG_MFD_OMAP_USB_HOST=m +CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MFD_WL1273_CORE=m CONFIG_REGULATOR_TWL4030=y +# Enable V4L2 drivers for OMAP2+ +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_VPFE_CAPTURE=m CONFIG_VIDEO_OMAP2_VOUT=m # CONFIG_VIDEO_OMAP3 is not set +# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIVI=m CONFIG_DRM=m CONFIG_DRM_OMAP=m +CONFIG_DRM_OMAP_NUM_CRTCS=2 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set # CONFIG_FB_OMAP_LCD_VGA is not set CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRAM_SIZE=0 CONFIG_OMAP2_VRFB=y -CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_VRAM_SIZE=12 +# CONFIG_FB_OMAP2 is not set + +CONFIG_OMAP2_DSS=m CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set CONFIG_OMAP2_DSS_DPI=y -# CONFIG_OMAP2_DSS_RFBI is not set -ONFIG_OMAP2_DSS_VENC=y +CONFIG_OMAP2_DSS_RFBI=y +CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP4_DSS_HDMI=y -# CONFIG_OMAP2_DSS_SDI is not set -# CONFIG_OMAP2_DSS_DSI is not set +CONFIG_OMAP2_DSS_SDI=y +CONFIG_OMAP2_DSS_DSI=y # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set -CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y -# CONFIG_FB_OMAP2 is not set + +CONFIG_PANEL_TFP410=m +CONFIG_PANEL_PICODLP=m +CONFIG_BACKLIGHT_PANDORA=m # # OMAP2/3 Display Device Drivers @@ -225,6 +252,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y CONFIG_SND_OMAP_SOC_ZOOM2=y CONFIG_SND_OMAP_SOC_IGEP0020=y +CONFIG_SND_OMAP_SOC_OMAP_HDMI=y # Because alsa is modular http://www.spinics.net/lists/linux-omap/msg67307.html # CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m @@ -241,6 +269,9 @@ CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_OHCI_HCD_OMAP3=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_MUSB_DEBUG is not set # @@ -272,5 +303,29 @@ CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5 # CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set # CONFIG_TIDSPBRIDGE_BACKTRACE is not set +CONFIG_OMAP_REMOTEPROC=m +CONFIG_OMAP_BANDGAP=m +CONFIG_OMAP_IOVMM=m + CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m + +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_MTD_NAND_OMAP_BCH is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_REGULATOR_DUMMY is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set + diff --git a/config-arm-tegra b/config-arm-tegra index 015af431d..748edc51c 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -15,7 +15,6 @@ CONFIG_MACH_SEABOARD=y CONFIG_MACH_TEGRA_DT=y CONFIG_MACH_TRIMSLICE=y CONFIG_MACH_WARIO=y -CONFIG_MACH_TEGRA_DT=y CONFIG_MACH_VENTANA=y CONFIG_TEGRA_DEBUG_UARTD=y @@ -61,13 +60,11 @@ CONFIG_ARM_ERRATA_720789=y # CONFIG_ARM_ERRATA_754322 is not set # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set -CONFIG_LOCAL_TIMERS=y # CONFIG_THUMB2_KERNEL is not set # CONFIG_NEON is not set CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_MCP23S08 is not set # CONFIG_KEYBOARD_TEGRA is not set -# CONFIG_MPCORE_WATCHDOG is not set CONFIG_USB_EHCI_TEGRA=y CONFIG_RTC_DRV_TEGRA=y diff --git a/config-arm-versatile b/config-arm-versatile index f65720782..9c379361b 100644 --- a/config-arm-versatile +++ b/config-arm-versatile @@ -71,4 +71,25 @@ CONFIG_PL330_DMA=y CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y -CONFIG_I2C_VERSATILE=y +CONFIG_I2C_VERSATILE=m + +CONFIG_OC_ETM=y + +CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y +CONFIG_ARM_THUMBEE=y +CONFIG_SWP_EMULATE=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CACHE_L2X0=y +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_458693=y +CONFIG_ARM_ERRATA_460075=y +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_ARM_ERRATA_743622=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_PL310_ERRATA_769419=y +CONFIG_NEON=y +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_OF_PLATFORM=m +# CONFIG_NET_VENDOR_BROADCOM is not set + diff --git a/config-armv7 b/config-armv7 new file mode 100644 index 000000000..763c83db8 --- /dev/null +++ b/config-armv7 @@ -0,0 +1,174 @@ +# ARM unified kernel +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MVEBU=y +CONFIG_MACH_ARMADA_370_XP=y +CONFIG_ARCH_HIGHBANK=y +CONFIG_ARCH_PICOXCELL=y +CONFIG_ARCH_SOCFPGA=y +CONFIG_ARCH_VEXPRESS_CA9X4=y +CONFIG_ARCH_VEXPRESS_DT=y + +# generic ARM config options +CONFIG_ARM_ARCH_TIMER=y +CONFIG_AEABI=y +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_VMSPLIT_2G=y +CONFIG_ARM_UNWIND=y +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +CONFIG_ARM_GIC=y +CONFIG_ARM_ASM_UNIFIED=y +CONFIG_ARM_CPU_TOPOLOGY=y +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_SWP_EMULATE=y +CONFIG_CACHE_L2X0=y +CONFIG_HIGHPTE=y + +# Errata - these need proper review +CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y + +# generic that deviates from or should be merged into config-generic +CONFIG_SMP=y +CONFIG_HIGHMEM=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y + +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y + +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 + +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_CPU_IDLE_GOV_MENU=y + +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +CONFIG_SECCOMP=y +CONFIG_STRICT_DEVMEM=y + +CONFIG_PM=y +CONFIG_PM_STD_PARTITION="" +CONFIG_SUSPEND=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARM_CPU_TOPOLOGY=y + +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set + +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y + +CONFIG_MMC=y +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_OF=m +CONFIG_MMC_SPI=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW_PCI=m +CONFIG_MMC_DW_EXYNOS=m + +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_EARLY_PRINTK=y + +CONFIG_LBDAF=y + +# Versatile and highbank +CONFIG_ARM_TIMER_SP804=y + +CONFIG_SERIO_AMBAKMI=m +CONFIG_SERIAL_AMBA_PL010=y +CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y + +CONFIG_RTC_DRV_PL030=y +CONFIG_RTC_DRV_PL031=y + +CONFIG_PL330_DMA=y +CONFIG_AMBA_PL08X=y + +# highbank +CONFIG_EDAC_HIGHBANK_MC=m +CONFIG_EDAC_HIGHBANK_L2=m + +CONFIG_OC_ETM=y + +CONFIG_SATA_HIGHBANK=m + +# versatile +CONFIG_FB_ARMCLCD=m +CONFIG_I2C_VERSATILE=m +CONFIG_OC_ETM=y + +# unknown and needs review +CONFIG_ARM_AMBA=y + +# mvebu +CONFIG_RTC_DRV_88PM80X=m + +# General ARM drivers +# Device tree +CONFIG_OF=y +CONFIG_USE_OF=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_OF_GPIO=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_OF_MDIO=m +CONFIG_MDIO_BUS_MUX_GPIO=m + +# usb +CONFIG_USB_ULPI=y +CONFIG_AX88796=m +CONFIG_AX88796_93CX6=y +CONFIG_SMC91X=m +CONFIG_SMC911X=m +CONFIG_SMSC911X=m +CONFIG_USB_ISP1760_HCD=m + +# HW crypto and rng +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_HW_RANDOM_ATMEL=m +CONFIG_HW_RANDOM_EXYNOS=m + +# Sound +CONFIG_SND_ARM=y +CONFIG_SND_ARMAACI=m +CONFIG_SND_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_SOC_CACHE_LZO=y +CONFIG_SND_SOC_ALL_CODECS=m + +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_LEGACY_SYSFS=y + +# We need to fix these as they should be either generic includes or kconfig fixes +# drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set diff --git a/kernel.spec b/kernel.spec index f32ee956b..79bde35af 100644 --- a/kernel.spec +++ b/kernel.spec @@ -258,10 +258,10 @@ Summary: The Linux kernel # kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp %ifnarch armv7hl armv7l %define with_imx 0 -%define with_highbank 0 %define with_omap 0 %define with_tegra 0 %endif +%define with_highbank 0 # kernel-kirkwood is only built for armv5 %ifnarch armv5tel @@ -589,7 +589,11 @@ Source70: config-s390x Source90: config-sparc64-generic -Source100: config-arm-generic +# Unified ARM kernels +Source100: config-armv7 + +# Legacy ARM kernels +Source105: config-arm-generic Source110: config-arm-omap Source111: config-arm-tegra Source112: config-arm-kirkwood @@ -730,6 +734,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch Patch19001: i82975x-edac-fix.patch # ARM +Patch21000: arm-export-read_current_timer.patch # OMAP @@ -1327,6 +1332,7 @@ ApplyPatch vmbugon-warnon.patch # # ARM # +ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-tegra-sdhci-module-fix.patch @@ -2311,6 +2317,9 @@ fi # ||----w | # || || %changelog +* Fri Oct 26 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- The initial ARM unified kernel support (vexpress, highbank, mvebu to begin). WOO HOO!!! + * Fri Oct 26 2012 Justin M. Forbes <jforbes@redhat.com> - 3.7.0-0.rc2.git4.1 - Linux v3.7-rc2-191-g2ab3f29 |