Merge 3.7 ARM kernel including unified kernel, Drop separate IMX and highbank kernels, Disable ARM PL310 errata that crash highbank
This commit is contained in:
Peter Robinson
parent
202608877d
commit
0f008535c8
|
|
@ -11,15 +11,13 @@ CONFIGFILES = \
|
|||
$(CFG)-s390x.config \
|
||||
$(CFG)-armv5tel-kirkwood.config \
|
||||
$(CFG)-armv7l.config $(CFG)-armv7hl.config \
|
||||
$(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \
|
||||
$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
|
||||
$(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \
|
||||
$(CFG)-armv7l-highbank.config $(CFG)-armv7hl-highbank.config \
|
||||
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
|
||||
$(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 arm
|
||||
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
|
||||
|
||||
configs: $(CONFIGFILES)
|
||||
|
|
@ -37,10 +35,10 @@ temp-generic: config-generic
|
|||
temp-debug-generic: config-generic
|
||||
cat config-generic config-debug > temp-debug-generic
|
||||
|
||||
temp-arm-generic: config-arm-generic temp-generic
|
||||
perl merge.pl $^ > $@
|
||||
temp-armv7: config-armv7 temp-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
temp-armv7l-versatile: config-arm-versatile temp-arm-generic
|
||||
temp-arm-generic: config-arm-generic temp-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
temp-armv7l-omap: config-arm-omap temp-arm-generic
|
||||
|
|
@ -52,12 +50,6 @@ temp-armv7l-tegra: config-arm-tegra temp-arm-generic
|
|||
temp-armv5tel-kirkwood: config-arm-kirkwood temp-arm-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
temp-armv7l-imx: config-arm-imx temp-arm-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
temp-armv7l-highbank: config-arm-highbank temp-arm-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
temp-x86-32: config-x86-32-generic config-x86-generic
|
||||
perl merge.pl $^ > $@
|
||||
|
||||
|
|
@ -130,13 +122,7 @@ kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
|
|||
kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7l-versatile
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7l-highbank.config: /dev/null temp-armv7l-highbank
|
||||
kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
|
||||
|
|
@ -145,13 +131,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
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7hl-highbank.config: /dev/null temp-armv7l-highbank
|
||||
kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7
|
||||
perl merge.pl $^ arm > $@
|
||||
|
||||
kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap
|
||||
|
|
|
|||
|
|
@ -251,6 +251,7 @@ CONFIG_HW_RANDOM_EXYNOS=m
|
|||
# Device tree
|
||||
CONFIG_OF=y
|
||||
CONFIG_USE_OF=y
|
||||
CONFIG_OF_DEVICE=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
CONFIG_ARCH_HIGHBANK=y
|
||||
# CONFIG_ARM_LPAE is not set
|
||||
# CONFIG_ARM_THUMBEE is not set
|
||||
CONFIG_SWP_EMULATE=y
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
# CONFIG_ARM_ERRATA_430973 is not set
|
||||
# CONFIG_ARM_ERRATA_458693 is not set
|
||||
# CONFIG_ARM_ERRATA_460075 is not set
|
||||
# CONFIG_PL310_ERRATA_588369 is not set
|
||||
# CONFIG_PL310_ERRATA_727915 is not set
|
||||
# CONFIG_ARM_ERRATA_743622 is not set
|
||||
# CONFIG_PL310_ERRATA_753970 is not set
|
||||
# CONFIG_ARM_ERRATA_754322 is not set
|
||||
# CONFIG_PL310_ERRATA_769419 is not set
|
||||
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
|
||||
CONFIG_ARM_TIMER_SP804=y
|
||||
|
||||
CONFIG_VFP=y
|
||||
CONFIG_VFPv3=y
|
||||
CONFIG_NEON=y
|
||||
|
||||
CONFIG_SATA_AHCI_PLATFORM=y
|
||||
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
|
||||
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_SATA_HIGHBANK=m
|
||||
|
||||
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
|
||||
# CONFIG_WIMAX is not set
|
||||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_CAIF is not set
|
||||
# CONFIG_NFC is not set
|
||||
# CONFIG_MTD is not set
|
||||
# CONFIG_PARPORT is not set
|
||||
# CONFIG_ATM_DRIVERS is not set
|
||||
# CONFIG_WAN is not set
|
||||
# CONFIG_ISDN is not set
|
||||
# CONFIG_MEDIA_SUPPORT is not set
|
||||
# CONFIG_DRM is not set
|
||||
# CONFIG_SND is not set
|
||||
# CONFIG_ARCH_MULTI_V4 is not set
|
||||
# CONFIG_ARCH_MULTI_V4T is not set
|
||||
# CONFIG_ARCH_MULTI_V6 is not set
|
||||
# end of list of requested disabled options
|
||||
119
config-arm-imx
119
config-arm-imx
|
|
@ -1,119 +0,0 @@
|
|||
CONFIG_ARCH_MXC=y
|
||||
CONFIG_ARCH_MX51=y
|
||||
|
||||
CONFIG_VFP=y
|
||||
CONFIG_NEON=y
|
||||
# CONFIG_SWP_EMULATE is not set
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
CONFIG_CPU_FREQ_IMX=y
|
||||
|
||||
CONFIG_SOC_IMX53=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_MX31MOBOARD=y
|
||||
CONFIG_MACH_MX35_3DS=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_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
|
||||
CONFIG_KEYBOARD_IMX=m
|
||||
CONFIG_SERIAL_IMX=y
|
||||
CONFIG_HW_RANDOM_MXC_RNGA=m
|
||||
CONFIG_I2C_IMX=m
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=y
|
||||
CONFIG_GPIO_MCP23S08=m
|
||||
# CONFIG_GPIO_MC9S08DZ60 is not set
|
||||
CONFIG_PINCTRL_IMX35=y
|
||||
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_DRM_IMX=m
|
||||
CONFIG_DRM_IMX_FB_HELPER=m
|
||||
CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
|
||||
CONFIG_DRM_IMX_IPUV3_CORE=m
|
||||
CONFIG_DRM_IMX_IPUV3=m
|
||||
CONFIG_VIDEO_CODA=m
|
||||
CONFIG_BACKLIGHT_PWM=m
|
||||
CONFIG_LEDS_PWM=m
|
||||
|
||||
# CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set
|
||||
CONFIG_MXC_USE_EPIT=y
|
||||
CONFIG_HAVE_EPIT=y
|
||||
CONFIG_ARM_THUMBEE=y
|
||||
CONFIG_ARM_ERRATA_430973=y
|
||||
CONFIG_ARM_ERRATA_458693=y
|
||||
CONFIG_ARM_ERRATA_460075=y
|
||||
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_MFD_MAX8907=m
|
||||
|
||||
CONFIG_FB_IMX=m
|
||||
|
||||
# CONFIG_NET_VENDOR_BROADCOM is not set
|
||||
|
|
@ -0,0 +1,353 @@
|
|||
# ARM unified arch kernel
|
||||
CONFIG_CPU_V7=y
|
||||
# CONFIG_ARCH_MULTI_V4 is not set
|
||||
# CONFIG_ARCH_MULTI_V4T is not set
|
||||
# CONFIG_ARCH_MULTI_V6 is not set
|
||||
CONFIG_ARCH_MULTI_V6_V7=y
|
||||
CONFIG_ARCH_MULTI_V7=y
|
||||
CONFIG_ARCH_MVEBU=y
|
||||
CONFIG_ARCH_HIGHBANK=y
|
||||
CONFIG_ARCH_PICOXCELL=y
|
||||
CONFIG_ARCH_SOCFPGA=y
|
||||
CONFIG_ARCH_VEXPRESS_CA9X4=y
|
||||
CONFIG_ARCH_VEXPRESS_DT=y
|
||||
|
||||
CONFIG_MACH_ARMADA_370_XP=y
|
||||
CONFIG_MACH_ARMADA_370=y
|
||||
CONFIG_MACH_ARMADA_XP=y
|
||||
|
||||
# generic ARM config options
|
||||
CONFIG_CMDLINE=""
|
||||
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_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_CPU_BPREDICT_DISABLE=y
|
||||
CONFIG_CACHE_L2X0=y
|
||||
CONFIG_HIGHPTE=y
|
||||
# CONFIG_OABI_COMPAT is not set
|
||||
# CONFIG_ATAGS is not set
|
||||
# CONFIG_ATAGS_PROC is not set
|
||||
# CONFIG_FPE_NWFPE is not set
|
||||
# CONFIG_FPE_FASTFPE is not set
|
||||
# CONFIG_APM_EMULATION is not set
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
||||
# CONFIG_DMA_CACHE_RWFO is not set
|
||||
# CONFIG_ARM_LPAE is not set
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_HVC_DCC=y
|
||||
|
||||
# CONFIG_ARM_VIRT_EXT is not set
|
||||
|
||||
# errata
|
||||
# v5/v6
|
||||
# CONFIG_ARM_ERRATA_326103 is not set
|
||||
# CONFIG_ARM_ERRATA_411920 is not set
|
||||
# Cortex-A8
|
||||
# CONFIG_ARM_ERRATA_430973 is not set
|
||||
# CONFIG_ARM_ERRATA_458693 is not set
|
||||
# CONFIG_ARM_ERRATA_460075 is not set
|
||||
# Cortex-A9
|
||||
CONFIG_ARM_ERRATA_742230=y
|
||||
CONFIG_ARM_ERRATA_742231=y
|
||||
CONFIG_ARM_ERRATA_743622=y
|
||||
CONFIG_ARM_ERRATA_754322=y
|
||||
CONFIG_ARM_ERRATA_754327=y
|
||||
CONFIG_ARM_ERRATA_764369=y
|
||||
CONFIG_ARM_ERRATA_775420=y
|
||||
# Disabled due to causing highbank to crash
|
||||
# CONFIG_PL310_ERRATA_588369 is not set
|
||||
# CONFIG_PL310_ERRATA_727915 is not set
|
||||
CONFIG_PL310_ERRATA_769419=y
|
||||
|
||||
# generic that deviates from or should be merged into config-generic
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_SMP_ON_UP=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_DEFAULT_MMAP_MIN_ADDR=32768
|
||||
CONFIG_LSM_MMAP_MIN_ADDR=32768
|
||||
|
||||
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_LOCAL_TIMERS=y
|
||||
CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
CONFIG_CC_STACKPROTECTOR=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_PINCTRL=y
|
||||
CONFIG_PINCONF=y
|
||||
|
||||
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
|
||||
|
||||
CONFIG_COMMON_CLK=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
|
||||
CONFIG_ARM_SP805_WATCHDOG=m
|
||||
|
||||
# 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
|
||||
CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
|
||||
|
||||
# unknown and needs review
|
||||
CONFIG_ARM_AMBA=y
|
||||
|
||||
# mvebu
|
||||
CONFIG_MV_XOR=y
|
||||
CONFIG_RTC_DRV_88PM80X=m
|
||||
CONFIG_CRYPTO_DEV_MV_CESA=m
|
||||
CONFIG_MV643XX_ETH=m
|
||||
CONFIG_I2C_MV64XXX=m
|
||||
CONFIG_PINCTRL_MVEBU=y
|
||||
|
||||
# exynos
|
||||
# CONFIG_DRM_EXYNOS is not set
|
||||
|
||||
# picoxcell
|
||||
CONFIG_CRYPTO_DEV_PICOXCELL=m
|
||||
|
||||
# ST Ericsson
|
||||
# CONFIG_I2C_NOMADIK is not set
|
||||
|
||||
# General ARM drivers
|
||||
# Device tree
|
||||
CONFIG_OF=y
|
||||
CONFIG_USE_OF=y
|
||||
CONFIG_OF_DEVICE=y
|
||||
CONFIG_OF_IRQ=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_GPIOLIB=y
|
||||
|
||||
# MMC/SD
|
||||
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 is not set
|
||||
# CONFIG_MMC_DW_IDMAC is not set
|
||||
CONFIG_MMC_TMIO=m
|
||||
CONFIG_MMC_SDHCI_PXAV3=m
|
||||
CONFIG_MMC_SDHCI_PXAV2=m
|
||||
CONFIG_MMC_MVSDIO=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
|
||||
|
||||
# Watchdog
|
||||
CONFIG_MPCORE_WATCHDOG=m
|
||||
|
||||
# Multi function devices
|
||||
CONFIG_MFD_T7L66XB=y
|
||||
CONFIG_MFD_TC6387XB=y
|
||||
CONFIG_MFD_SYSCON=y
|
||||
CONFIG_MFD_MAX8907=m
|
||||
# CONFIG_MFD_DA9055 is not set
|
||||
# CONFIG_MFD_SMSC is not set
|
||||
|
||||
# RTC
|
||||
CONFIG_RTC_DRV_SNVS=m
|
||||
|
||||
# Pin stuff
|
||||
CONFIG_PINMUX=y
|
||||
CONFIG_PINCONF=y
|
||||
CONFIG_PINCTRL_SINGLE=m
|
||||
# CONFIG_PINCTRL_SAMSUNG is not set
|
||||
# CONFIG_PINCTRL_EXYNOS4 is not set
|
||||
|
||||
# GPIO
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
CONFIG_GPIO_EM=m
|
||||
CONFIG_GPIO_ADNP=m
|
||||
CONFIG_GPIO_MCP23S08=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_SERIAL_8250_EM=m
|
||||
CONFIG_INPUT_GP2A=m
|
||||
CONFIG_INPUT_GPIO_TILT_POLLED=m
|
||||
CONFIG_MDIO_BUS_MUX_MMIOREG=m
|
||||
|
||||
# MTD
|
||||
CONFIG_MTD_OF_PARTS=y
|
||||
# CONFIG_MG_DISK is not set
|
||||
|
||||
# Regulator drivers
|
||||
CONFIG_REGULATOR_FAN53555=m
|
||||
# Needs work/investigation
|
||||
|
||||
# CONFIG_ARM_CHARLCD is not set
|
||||
# CONFIG_MTD_AFS_PARTS is not set
|
||||
# CONFIG_IP_PNP_RARP is not set
|
||||
# CONFIG_BPF_JIT is not set
|
||||
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
|
||||
# CONFIG_PID_IN_CONTEXTIDR is not set
|
||||
# CONFIG_DEPRECATED_PARAM_STRUCT 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_DEBUG_PINCTRL is not set
|
||||
|
||||
# CONFIG_CS89x0 is not set
|
||||
# CONFIG_DM9000 is not set
|
||||
|
||||
# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
|
||||
# CONFIG_ARM_KPROBES_TEST is not set
|
||||
# CONFIG_LEDS_RENESAS_TPU is not set
|
||||
|
||||
CONFIG_ETHERNET=y
|
||||
# CONFIG_NET_VENDOR_BROADCOM is not set
|
||||
# CONFIG_NET_VENDOR_CIRRUS is not set
|
||||
CONFIG_THERMAL=y
|
||||
# CONFIG_PATA_PLATFORM is not set
|
||||
CONFIG_PERF_EVENTS=y
|
||||
|
||||
# Defined config options we don't use yet
|
||||
# CONFIG_PINCTRL_IMX35 is not set
|
||||
# CONFIG_DRM_IMX_FB_HELPER is not set
|
||||
# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
|
||||
# CONFIG_DRM_IMX_IPUV3_CORE is not set
|
||||
# CONFIG_DRM_IMX_IPUV3 is not set
|
||||
# CONFIG_REGULATOR_ANATOP is not set
|
||||
|
||||
# CONFIG_GPIO_TWL6040 is not set
|
||||
# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
|
||||
# CONFIG_VIDEO_DM6446_CCDC is not set
|
||||
# CONFIG_PANEL_TAAL is not set
|
||||
# CONFIG_IR_RX51 is not set
|
||||
|
||||
# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
|
||||
# CONFIG_GPIO_TWL6040 is not set
|
||||
# CONFIG_MFD_SMSC is not set
|
||||
# CONFIG_MFD_DA9055 is not set
|
||||
# CONFIG_MFD_LP8788 is not set
|
||||
# CONFIG_MFD_MAX8907 is not set
|
||||
# CONFIG_REGULATOR_FAN53555 is not set
|
||||
# CONFIG_REGULATOR_ANATOP is not set
|
||||
# CONFIG_IR_RX51 is not set
|
||||
# CONFIG_VIDEO_DM6446_CCDC is not set
|
||||
# CONFIG_PANEL_TAAL is not set
|
||||
# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
|
||||
|
||||
# CONFIG_DVB_USB_PCTV452E is not set
|
||||
# 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
|
||||
63
kernel.spec
63
kernel.spec
|
|
@ -138,10 +138,6 @@ Summary: The Linux kernel
|
|||
%define with_tegra %{?_without_tegra: 0} %{?!_without_tegra: 1}
|
||||
# kernel-kirkwood (only valid for arm)
|
||||
%define with_kirkwood %{?_without_kirkwood: 0} %{?!_without_kirkwood: 1}
|
||||
# kernel-imx (only valid for arm)
|
||||
%define with_imx %{?_without_imx: 0} %{?!_without_imx: 1}
|
||||
# kernel-highbank (only valid for arm)
|
||||
%define with_highbank %{?_without_highbank: 0} %{?!_without_highbank: 1}
|
||||
#
|
||||
# Additional options for user-friendly one-off kernel building:
|
||||
#
|
||||
|
|
@ -258,10 +254,8 @@ Summary: The Linux kernel
|
|||
%define with_pae 0
|
||||
%endif
|
||||
|
||||
# kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp
|
||||
# kernel up (versatile express), tegra and omap 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
|
||||
|
|
@ -534,6 +528,11 @@ ExclusiveOS: Linux
|
|||
|
||||
%kernel_reqprovconf
|
||||
|
||||
%ifarch %{arm}
|
||||
Obsoletes: kernel-highbank
|
||||
Obsoletes: kernel-imx
|
||||
%endif
|
||||
|
||||
#
|
||||
# List the packages used during the kernel build
|
||||
#
|
||||
|
|
@ -599,13 +598,14 @@ 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
|
||||
Source113: config-arm-imx
|
||||
Source114: config-arm-highbank
|
||||
Source115: config-arm-versatile
|
||||
|
||||
# This file is intentionally left empty in the stock kernel. Its a nicety
|
||||
# added for those wanting to do custom rebuilds with altered config opts.
|
||||
|
|
@ -752,12 +752,6 @@ Patch21004: arm-tegra-nvec-kconfig.patch
|
|||
Patch21005: arm-tegra-usb-no-reset-linux33.patch
|
||||
Patch21006: arm-tegra-sdhci-module-fix.patch
|
||||
|
||||
# ARM highbank patches
|
||||
|
||||
# ARM exynos4
|
||||
Patch21020: arm-smdk310-regulator-fix.patch
|
||||
Patch21021: arm-origen-regulator-fix.patch
|
||||
|
||||
#rhbz 754518
|
||||
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
|
||||
|
||||
|
|
@ -1074,18 +1068,6 @@ on kernel bugs, as some of these options impact performance noticably.
|
|||
This package includes a version of the Linux kernel with support for
|
||||
marvell kirkwood based systems, i.e., guruplug, sheevaplug
|
||||
|
||||
%define variant_summary The Linux kernel compiled for freescale boards
|
||||
%kernel_variant_package imx
|
||||
%description imx
|
||||
This package includes a version of the Linux kernel with support for
|
||||
freescale based systems, i.e., efika smartbook.
|
||||
|
||||
%define variant_summary The Linux kernel compiled for Calxeda boards
|
||||
%kernel_variant_package highbank
|
||||
%description highbank
|
||||
This package includes a version of the Linux kernel with support for
|
||||
Calxeda based systems, i.e., HP arm servers.
|
||||
|
||||
%define variant_summary The Linux kernel compiled for TI-OMAP boards
|
||||
%kernel_variant_package omap
|
||||
%description omap
|
||||
|
|
@ -1368,8 +1350,6 @@ ApplyPatch arm-tegra-nvec-kconfig.patch
|
|||
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
|
||||
ApplyPatch arm-tegra-sdhci-module-fix.patch
|
||||
ApplyPatch arm-alignment-faults.patch
|
||||
ApplyPatch arm-smdk310-regulator-fix.patch
|
||||
ApplyPatch arm-origen-regulator-fix.patch
|
||||
|
||||
#
|
||||
# bugfixes to drivers and filesystems
|
||||
|
|
@ -1871,14 +1851,6 @@ BuildKernel %make_target %kernel_image PAE
|
|||
BuildKernel %make_target %kernel_image kirkwood
|
||||
%endif
|
||||
|
||||
%if %{with_imx}
|
||||
BuildKernel %make_target %kernel_image imx
|
||||
%endif
|
||||
|
||||
%if %{with_highbank}
|
||||
BuildKernel %make_target %kernel_image highbank
|
||||
%endif
|
||||
|
||||
%if %{with_omap}
|
||||
BuildKernel %make_target %kernel_image omap
|
||||
%endif
|
||||
|
|
@ -2218,12 +2190,6 @@ fi}\
|
|||
%kernel_variant_preun kirkwood
|
||||
%kernel_variant_post -v kirkwood
|
||||
|
||||
%kernel_variant_preun imx
|
||||
%kernel_variant_post -v imx
|
||||
|
||||
%kernel_variant_preun highbank
|
||||
%kernel_variant_post -v highbank
|
||||
|
||||
%kernel_variant_preun omap
|
||||
%kernel_variant_post -v omap
|
||||
|
||||
|
|
@ -2371,8 +2337,6 @@ fi
|
|||
%kernel_variant_files %{with_pae} PAE
|
||||
%kernel_variant_files %{with_pae_debug} PAEdebug
|
||||
%kernel_variant_files %{with_kirkwood} kirkwood
|
||||
%kernel_variant_files %{with_imx} imx
|
||||
%kernel_variant_files %{with_highbank} highbank
|
||||
%kernel_variant_files %{with_omap} omap
|
||||
%kernel_variant_files %{with_tegra} tegra
|
||||
|
||||
|
|
@ -2389,6 +2353,11 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Thu Jan 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Merge 3.7 ARM kernel including unified kernel
|
||||
- Drop separate IMX and highbank kernels
|
||||
- Disable ARM PL310 errata that crash highbank
|
||||
|
||||
* Wed Jan 16 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Fix power management sysfs on non-secure boot machines (rhbz 896243)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue