Restructure ARM configs to minimise duplication and pull all generic options
This commit is contained in:
Peter Robinson
parent
61df2fb662
commit
d07b00d49d
@ -9,12 +9,12 @@ CONFIGFILES = \
|
|||||||
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
|
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
|
||||||
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
|
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
|
||||||
$(CFG)-s390x.config \
|
$(CFG)-s390x.config \
|
||||||
$(CFG)-arm.config $(CFG)-armv5tel.config $(CFG)-armv7hl.config \
|
$(CFG)-arm.config $(CFG)-armv5tel-kirkwood.config \
|
||||||
$(CFG)-armv5tel-kirkwood.config \
|
$(CFG)-armv7l.config $(CFG)-armv7hl.config \
|
||||||
$(CFG)-armv7l-imx.config $(CFG)-armv7l-omap.config \
|
$(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \
|
||||||
$(CFG)-armv7l-tegra.config $(CFG)-armv7l-highbank.config \
|
$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
|
||||||
$(CFG)-armv7hl-imx.config $(CFG)-armv7hl-omap.config \
|
$(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \
|
||||||
$(CFG)-armv7hl-tegra.config $(CFG)-armv7hl-highbank.config \
|
$(CFG)-armv7l-highbank.config $(CFG)-armv7hl-highbank.config \
|
||||||
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
|
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
|
||||||
$(CFG)-sparc64.config \
|
$(CFG)-sparc64.config \
|
||||||
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config
|
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config
|
||||||
@ -40,6 +40,9 @@ temp-debug-generic: config-generic
|
|||||||
temp-arm-generic: config-arm-generic temp-generic
|
temp-arm-generic: config-arm-generic temp-generic
|
||||||
perl merge.pl $^ > $@
|
perl merge.pl $^ > $@
|
||||||
|
|
||||||
|
temp-armv7l-versatile: config-arm-versatile temp-arm-generic
|
||||||
|
perl merge.pl $^ > $@
|
||||||
|
|
||||||
temp-armv7l-omap: config-arm-omap temp-arm-generic
|
temp-armv7l-omap: config-arm-omap temp-arm-generic
|
||||||
perl merge.pl $^ > $@
|
perl merge.pl $^ > $@
|
||||||
|
|
||||||
@ -121,15 +124,12 @@ kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
|
|||||||
kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
|
kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
|
||||||
perl merge.pl $^ arm > $@
|
perl merge.pl $^ arm > $@
|
||||||
|
|
||||||
kernel-$(VERSION)-armv5tel.config: /dev/null temp-arm-generic
|
|
||||||
perl merge.pl $^ arm > $@
|
|
||||||
|
|
||||||
kernel-$(VERSION)-armv7hl.config: /dev/null temp-arm-generic
|
|
||||||
perl merge.pl $^ arm > $@
|
|
||||||
|
|
||||||
kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
|
kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
|
||||||
perl merge.pl $^ arm > $@
|
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
|
kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
|
||||||
perl merge.pl $^ arm > $@
|
perl merge.pl $^ arm > $@
|
||||||
|
|
||||||
@ -142,6 +142,9 @@ kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
|
|||||||
kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
|
kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
|
||||||
perl merge.pl $^ arm > $@
|
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
|
kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
|
||||||
perl merge.pl $^ arm > $@
|
perl merge.pl $^ arm > $@
|
||||||
|
|
||||||
|
|||||||
@ -1,66 +1,90 @@
|
|||||||
|
# Generic ARM config. This is common config options that should be
|
||||||
|
# enabled on all ARM kernels and hence should be added here
|
||||||
|
#
|
||||||
|
# FIXME - we need to add debug/nodebug generic build options
|
||||||
|
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
||||||
|
|
||||||
|
# Generic ARM processor options
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
|
||||||
# CONFIG_SMP is not set
|
|
||||||
|
|
||||||
# CONFIG_CMDLINE_FORCE is not set
|
CONFIG_ARM_THUMB=y
|
||||||
|
CONFIG_AEABI=y
|
||||||
|
CONFIG_OABI_COMPAT=y
|
||||||
|
CONFIG_VFP=y
|
||||||
|
CONFIG_ARM_UNWIND=y
|
||||||
|
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
# CONFIG_FPE_NWFPE is not set
|
||||||
|
CONFIG_FPE_FASTFPE=y
|
||||||
|
|
||||||
CONFIG_ARCH_VERSATILE=y
|
# Generic ARM Errata
|
||||||
CONFIG_ARCH_VERSATILE_PB=y
|
CONFIG_ARM_ERRATA_720789=y
|
||||||
CONFIG_MACH_VERSATILE_AB=y
|
CONFIG_ARM_ERRATA_751472=y
|
||||||
CONFIG_MACH_VERSATILE_DT=y
|
CONFIG_OMAP4_ERRATA_I688=y
|
||||||
|
|
||||||
CONFIG_HIGHMEM=y
|
|
||||||
# CONFIG_HIGHPTE is not set
|
|
||||||
|
|
||||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
|
||||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
|
||||||
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
|
|
||||||
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
|
|
||||||
|
|
||||||
|
# Generic ARM config options
|
||||||
CONFIG_ZBOOT_ROM_TEXT=0
|
CONFIG_ZBOOT_ROM_TEXT=0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0
|
CONFIG_ZBOOT_ROM_BSS=0
|
||||||
|
|
||||||
# CONFIG_XIP_KERNEL is not set
|
|
||||||
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
|
|
||||||
|
# DeviceTree
|
||||||
|
CONFIG_USE_OF=y
|
||||||
|
# CONFIG_OF_SELFTEST is not set
|
||||||
|
CONFIG_PROC_DEVICETREE=y
|
||||||
|
CONFIG_ARM_APPENDED_DTB=y
|
||||||
|
|
||||||
|
# Generic options we want for ARM that aren't defualt
|
||||||
|
CONFIG_HIGHMEM=y
|
||||||
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||||
|
|
||||||
|
CONFIG_SCHED_MC=y
|
||||||
|
CONFIG_SCHED_SMT=y
|
||||||
|
|
||||||
|
CONFIG_RCU_FANOUT=32
|
||||||
|
|
||||||
CONFIG_CPU_IDLE=y
|
CONFIG_CPU_IDLE=y
|
||||||
# CONFIG_CPU_IDLE_GOV_LADDER is not set
|
# CONFIG_CPU_IDLE_GOV_LADDER is not set
|
||||||
ONFIG_CPU_IDLE_GOV_MENU=y
|
CONFIG_CPU_IDLE_GOV_MENU=y
|
||||||
|
|
||||||
CONFIG_NO_HZ=y
|
CONFIG_NO_HZ=y
|
||||||
CONFIG_HIGH_RES_TIMERS=y
|
CONFIG_HIGH_RES_TIMERS=y
|
||||||
|
|
||||||
# CONFIG_FPE_NWFPE is not set
|
|
||||||
CONFIG_FPE_FASTFPE=y
|
|
||||||
CONFIG_VFP=y
|
|
||||||
|
|
||||||
CONFIG_PM=y
|
CONFIG_PM=y
|
||||||
# CONFIG_PM_DEBUG is not set
|
CONFIG_PM_STD_PARTITION=""
|
||||||
# CONFIG_PM_TRACE is not set
|
|
||||||
CONFIG_SUSPEND=y
|
CONFIG_SUSPEND=y
|
||||||
# CONFIG_PM_TEST_SUSPEND is not set
|
CONFIG_ARM_CPU_SUSPEND=y
|
||||||
CONFIG_APM_EMULATION=y
|
CONFIG_ARM_CPU_TOPOLOGY=y
|
||||||
|
|
||||||
CONFIG_ARM_THUMB=y
|
CONFIG_THERMAL=y
|
||||||
|
|
||||||
CONFIG_AEABI=y
|
CONFIG_PERF_EVENTS=y
|
||||||
CONFIG_OABI_COMPAT=y
|
CONFIG_PERF_COUNTERS=y
|
||||||
|
|
||||||
CONFIG_HW_PERF_EVENTS=y
|
CONFIG_CC_STACKPROTECTOR=y
|
||||||
|
|
||||||
# CONFIG_UACCESS_WITH_MEMCPY is not set
|
CONFIG_AUTO_ZRELADDR=y
|
||||||
|
|
||||||
CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
|
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=y
|
||||||
CONFIG_LEDS_CPU=y
|
CONFIG_LEDS_CPU=y
|
||||||
|
CONFIG_LEDS_GPIO=m
|
||||||
|
|
||||||
CONFIG_MTD_AFS_PARTS=y
|
CONFIG_RFKILL_GPIO=m
|
||||||
CONFIG_MTD_ARM_INTEGRATOR=y
|
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||||
CONFIG_MTD_IMPA7=y
|
|
||||||
|
CONFIG_SND_ARM=y
|
||||||
|
CONFIG_SND_ARMAACI=m
|
||||||
|
CONFIG_SND_SOC=m
|
||||||
|
# CONFIG_SND_SOC_CACHE_LZO is not set
|
||||||
|
CONFIG_SND_SOC_ALL_CODECS=m
|
||||||
|
|
||||||
CONFIG_AX88796=m
|
CONFIG_AX88796=m
|
||||||
CONFIG_AX88796_93CX6=y
|
CONFIG_AX88796_93CX6=y
|
||||||
@ -71,103 +95,35 @@ CONFIG_DM9000_DEBUGLEVEL=4
|
|||||||
CONFIG_SMC911X=m
|
CONFIG_SMC911X=m
|
||||||
CONFIG_SMSC911X=m
|
CONFIG_SMSC911X=m
|
||||||
|
|
||||||
CONFIG_SERIO_AMBAKMI=m
|
# Generic MTD options. Platform specific set there
|
||||||
|
CONFIG_MTD=y
|
||||||
CONFIG_SERIAL_AMBA_PL011=y
|
CONFIG_MTD_TESTS=m
|
||||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
CONFIG_MTD_CMDLINE_PARTS=y
|
||||||
|
# CONFIG_MTD_AFS_PARTS is not set
|
||||||
CONFIG_I2C_VERSATILE=y
|
# CONFIG_MTD_AR7_PARTS is not set
|
||||||
|
CONFIG_MTD_CHAR=y
|
||||||
CONFIG_THERMAL=y
|
CONFIG_MTD_BLKDEVS=y
|
||||||
|
CONFIG_MTD_BLOCK=y
|
||||||
# CONFIG_MFD_T7L66XB is not set
|
CONFIG_SM_FTL=m
|
||||||
# CONFIG_MFD_TC6387XB is not set
|
CONFIG_MTD_PHYSMAP=m
|
||||||
|
# CONFIG_MTD_PHYSMAP_COMPAT is not set
|
||||||
CONFIG_FB_ARMCLCD=m
|
# CONFIG_MTD_GPIO_ADDR is not set
|
||||||
|
CONFIG_MTD_PLATRAM=m
|
||||||
CONFIG_SND_ARM=y
|
CONFIG_MTD_AFS_PARTS=y
|
||||||
CONFIG_SND_ARMAACI=m
|
CONFIG_MTD_ARM_INTEGRATOR=y
|
||||||
CONFIG_SND_SOC=m
|
CONFIG_MTD_IMPA7=y
|
||||||
# CONFIG_SND_SOC_CACHE_LZO is not set
|
|
||||||
# CONFIG_SND_SOC_ALL_CODECS is not set
|
|
||||||
|
|
||||||
CONFIG_USB_MUSB_HDRC=y
|
|
||||||
CONFIG_MUSB_PIO_ONLY=y
|
|
||||||
CONFIG_USB_TUSB6010=y
|
|
||||||
# CONFIG_USB_MUSB_DEBUG is not set
|
|
||||||
|
|
||||||
CONFIG_MMC_ARMMMCI=m
|
|
||||||
CONFIG_MMC_DW=m
|
|
||||||
# CONFIG_MMC_DW_IDMAC is not set
|
|
||||||
|
|
||||||
CONFIG_RTC_DRV_PL030=m
|
|
||||||
CONFIG_RTC_DRV_PL031=m
|
|
||||||
|
|
||||||
# CONFIG_SGI_IOC4 is not set
|
|
||||||
|
|
||||||
# CONFIG_DEBUG_USER is not set
|
|
||||||
# CONFIG_DEBUG_ERRORS is not set
|
|
||||||
# CONFIG_DEBUG_LL is not set
|
|
||||||
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
|
||||||
|
|
||||||
CONFIG_ARM_UNWIND=y
|
|
||||||
|
|
||||||
CONFIG_RCU_FANOUT=32
|
|
||||||
|
|
||||||
# CONFIG_USB_ULPI is not set
|
|
||||||
# CONFIG_OC_ETM is not set
|
|
||||||
|
|
||||||
# CONFIG_MTD_PISMO is not set
|
# CONFIG_MTD_PISMO is not set
|
||||||
|
|
||||||
CONFIG_PERF_EVENTS=y
|
|
||||||
CONFIG_PERF_COUNTERS=y
|
|
||||||
|
|
||||||
# CONFIG_MG_DISK is not set
|
|
||||||
# CONFIG_GPIO_PL061 is not set
|
|
||||||
|
|
||||||
CONFIG_CC_STACKPROTECTOR=y
|
|
||||||
|
|
||||||
CONFIG_AUTO_ZRELADDR=y
|
|
||||||
|
|
||||||
# CONFIG_ARM_CHARLCD is not set
|
|
||||||
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
|
|
||||||
|
|
||||||
# CONFIG_ARM_SP805_WATCHDOG is not set
|
|
||||||
|
|
||||||
CONFIG_PM_OPP=y
|
|
||||||
|
|
||||||
CONFIG_SECCOMP=y
|
|
||||||
CONFIG_STRICT_DEVMEM=y
|
|
||||||
|
|
||||||
# CONFIG_AMBA_PL08X is not set
|
|
||||||
|
|
||||||
# CONFIG_HVC_DCC is not set
|
|
||||||
|
|
||||||
CONFIG_SPARSE_IRQ=y
|
|
||||||
|
|
||||||
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
|
|
||||||
|
|
||||||
CONFIG_HWSPINLOCK_OMAP=m
|
|
||||||
|
|
||||||
CONFIG_USE_OF=y
|
|
||||||
CONFIG_PROC_DEVICETREE=y
|
|
||||||
CONFIG_MTD_PHYSMAP_OF=m
|
CONFIG_MTD_PHYSMAP_OF=m
|
||||||
CONFIG_SERIAL_OF_PLATFORM=m
|
|
||||||
CONFIG_MMC_SDHCI_OF=m
|
|
||||||
CONFIG_MMC_SDHCI_PXAV3=m
|
|
||||||
CONFIG_MMC_SDHCI_PXAV2=m
|
|
||||||
|
|
||||||
CONFIG_ARM_APPENDED_DTB=y
|
|
||||||
CONFIG_MTD_OF_PARTS=y
|
CONFIG_MTD_OF_PARTS=y
|
||||||
CONFIG_PL330_DMA=y
|
|
||||||
# CONFIG_ARM_KPROBES_TEST is not set
|
|
||||||
# CONFIG_ARM_ATAG_DTB_COMPAT is not set
|
|
||||||
|
|
||||||
# CONFIG_FTGMAC100 is not set
|
CONFIG_MMC_SDHCI_PLTFM=m
|
||||||
# CONFIG_FTMAC100 is not set
|
|
||||||
#
|
# Generic GPIO options
|
||||||
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
|
CONFIG_GENERIC_GPIO=y
|
||||||
CONFIG_LSM_MMAP_MIN_ADDR=32768
|
|
||||||
|
# We'll enable this here as various platforms will need it
|
||||||
|
CONFIG_DRM=m
|
||||||
|
# HW Disabled because it causes issues on ARM platforms
|
||||||
|
|
||||||
# disable TPM on arm at least on the trimslices it causes havoc
|
# disable TPM on arm at least on the trimslices it causes havoc
|
||||||
# CONFIG_TCG_TPM is not set
|
# CONFIG_TCG_TPM is not set
|
||||||
@ -197,28 +153,9 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
|
|||||||
# CONFIG_TOUCHSCREEN_EGALAX is not set
|
# CONFIG_TOUCHSCREEN_EGALAX is not set
|
||||||
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
|
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
|
||||||
#
|
#
|
||||||
# FIXME: Guesses, need checking
|
|
||||||
# CONFIG_MACH_EUKREA_CPUIMX35SD is not set
|
|
||||||
CONFIG_ARM_ERRATA_720789=y
|
|
||||||
CONFIG_ARM_ERRATA_751472=y
|
|
||||||
CONFIG_OMAP4_ERRATA_I688=y
|
|
||||||
# CONFIG_FB_MX3 is not set
|
# CONFIG_FB_MX3 is not set
|
||||||
# CONFIG_MX3_IPU is not set
|
# CONFIG_MX3_IPU is not set
|
||||||
# CONFIG_MX3_IPU_IRQS is not set
|
# CONFIG_MX3_IPU_IRQS is not set
|
||||||
|
|
||||||
# CONFIG_NET_VENDOR_CIRRUS is not set
|
# CONFIG_NET_VENDOR_CIRRUS is not set
|
||||||
# CONFIG_CS89x0 is not set
|
# CONFIG_CS89x0 is not set
|
||||||
|
|
||||||
# CONFIG_OF_SELFTEST is not set
|
|
||||||
# CONFIG_MACH_IMX51_DT is not set
|
|
||||||
# CONFIG_MACH_IMX53_DT is not set
|
|
||||||
# CONFIG_MACH_MX53_EVK is not set
|
|
||||||
# CONFIG_MACH_MX53_SMD is not set
|
|
||||||
# CONFIG_MACH_MX53_LOCO is not set
|
|
||||||
# CONFIG_MACH_MX53_ARD is not set
|
|
||||||
# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
|
|
||||||
|
|
||||||
CONFIG_OF_GPIO=y
|
|
||||||
|
|
||||||
# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
|
|
||||||
KALLSYMS_EXTRA_PASS=y
|
|
||||||
|
|||||||
@ -39,7 +39,6 @@ CONFIG_ARM_ERRATA_411920=y
|
|||||||
CONFIG_PL310_ERRATA_588369=y
|
CONFIG_PL310_ERRATA_588369=y
|
||||||
CONFIG_PL310_ERRATA_727915=y
|
CONFIG_PL310_ERRATA_727915=y
|
||||||
CONFIG_ARM_ERRATA_364296=y
|
CONFIG_ARM_ERRATA_364296=y
|
||||||
CONFIG_RFKILL_GPIO=m
|
|
||||||
CONFIG_PATA_IMX=m
|
CONFIG_PATA_IMX=m
|
||||||
CONFIG_ETHERNET=y
|
CONFIG_ETHERNET=y
|
||||||
CONFIG_NET_VENDOR_BROADCOM=y
|
CONFIG_NET_VENDOR_BROADCOM=y
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
CONFIG_ARCH_KIRKWOOD=y
|
CONFIG_ARCH_KIRKWOOD=y
|
||||||
|
# CONFIG_SMP is not set
|
||||||
|
# CONFIG_VFP is not set
|
||||||
CONFIG_MACH_DB88F6281_BP=y
|
CONFIG_MACH_DB88F6281_BP=y
|
||||||
CONFIG_MACH_RD88F6192_NAS=y
|
CONFIG_MACH_RD88F6192_NAS=y
|
||||||
CONFIG_MACH_RD88F6281=y
|
CONFIG_MACH_RD88F6281=y
|
||||||
|
|||||||
900
config-arm-omap
900
config-arm-omap
File diff suppressed because it is too large
Load Diff
@ -19,19 +19,11 @@ CONFIG_MACH_TEGRA_DT=y
|
|||||||
CONFIG_MACH_VENTANA=y
|
CONFIG_MACH_VENTANA=y
|
||||||
|
|
||||||
CONFIG_TEGRA_DEBUG_UARTD=y
|
CONFIG_TEGRA_DEBUG_UARTD=y
|
||||||
CONFIG_NO_HZ=y
|
|
||||||
CONFIG_SMP=y
|
|
||||||
CONFIG_NR_CPUS=4
|
CONFIG_NR_CPUS=4
|
||||||
CONFIG_ARM_CPU_TOPOLOGY=y
|
CONFIG_ARM_CPU_TOPOLOGY=y
|
||||||
CONFIG_PREEMPT=y
|
|
||||||
CONFIG_AEABI=y
|
|
||||||
|
|
||||||
CONFIG_I2C_TEGRA=y
|
CONFIG_I2C_TEGRA=y
|
||||||
|
|
||||||
CONFIG_MMC=y
|
|
||||||
CONFIG_MMC_BLOCK=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_PLTFM=y
|
|
||||||
CONFIG_MMC_SDHCI_TEGRA=y
|
CONFIG_MMC_SDHCI_TEGRA=y
|
||||||
|
|
||||||
# CONFIG_RCU_BOOST is not set
|
# CONFIG_RCU_BOOST is not set
|
||||||
@ -60,7 +52,6 @@ CONFIG_SMP_ON_UP=y
|
|||||||
CONFIG_LOCAL_TIMERS=y
|
CONFIG_LOCAL_TIMERS=y
|
||||||
# CONFIG_THUMB2_KERNEL is not set
|
# CONFIG_THUMB2_KERNEL is not set
|
||||||
# CONFIG_NEON is not set
|
# CONFIG_NEON is not set
|
||||||
# CONFIG_RFKILL_GPIO is not set
|
|
||||||
CONFIG_GPIO_GENERIC_PLATFORM=y
|
CONFIG_GPIO_GENERIC_PLATFORM=y
|
||||||
# CONFIG_GPIO_MCP23S08 is not set
|
# CONFIG_GPIO_MCP23S08 is not set
|
||||||
# CONFIG_KEYBOARD_TEGRA is not set
|
# CONFIG_KEYBOARD_TEGRA is not set
|
||||||
@ -73,9 +64,6 @@ CONFIG_SND_SOC_TEGRA_WM8903=m
|
|||||||
CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
|
CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
|
||||||
|
|
||||||
CONFIG_MFD_NVEC=y
|
CONFIG_MFD_NVEC=y
|
||||||
# CONFIG_DEBUG_PREEMPT is not set
|
|
||||||
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
|
|
||||||
# CONFIG_PREEMPT_TRACER is not set
|
|
||||||
CONFIG_KEYBOARD_NVEC=y
|
CONFIG_KEYBOARD_NVEC=y
|
||||||
CONFIG_SERIO_NVEC_PS2=y
|
CONFIG_SERIO_NVEC_PS2=y
|
||||||
CONFIG_NVEC_POWER=y
|
CONFIG_NVEC_POWER=y
|
||||||
@ -83,23 +71,13 @@ CONFIG_POWER_SUPPLY=y
|
|||||||
CONFIG_NVEC_LEDS=y
|
CONFIG_NVEC_LEDS=y
|
||||||
|
|
||||||
CONFIG_CPU_PM=y
|
CONFIG_CPU_PM=y
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
|
||||||
CONFIG_ARM_CPU_SUSPEND=y
|
CONFIG_ARM_CPU_SUSPEND=y
|
||||||
|
|
||||||
CONFIG_CRYSTALHD=m
|
#CONFIG_CRYPTO_DEV_TEGRA_AES=m
|
||||||
|
|
||||||
CONFIG_PL310_ERRATA_753970=y
|
CONFIG_PL310_ERRATA_753970=y
|
||||||
CONFIG_SCHED_MC=y
|
|
||||||
CONFIG_SCHED_SMT=y
|
|
||||||
CONFIG_LEDS_RENESAS_TPU=y
|
CONFIG_LEDS_RENESAS_TPU=y
|
||||||
|
|
||||||
# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
|
|
||||||
# CONFIG_ETHERNET is not set
|
|
||||||
# CONFIG_NET_VENDOR_BROADCOM is not set
|
|
||||||
# CONFIG_INPUT_GP2A is not set
|
|
||||||
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
|
|
||||||
# CONFIG_DVB_TDA1004X is not set
|
|
||||||
# CONFIG_DVB_PLL is not set
|
|
||||||
# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
|
# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
|
||||||
|
|
||||||
CONFIG_PCI=y
|
CONFIG_PCI=y
|
||||||
|
|||||||
75
config-arm-versatile
Normal file
75
config-arm-versatile
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
CONFIG_ARM=y
|
||||||
|
|
||||||
|
CONFIG_ARCH_VEXPRESS=y
|
||||||
|
CONFIG_ARCH_VEXPRESS_CA9X4=y
|
||||||
|
|
||||||
|
CONFIG_PLAT_VERSATILE=y
|
||||||
|
CONFIG_PLAT_VERSATILE_CLCD=y
|
||||||
|
CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
|
||||||
|
|
||||||
|
# Need to verify whether these are generic or vexpress specific
|
||||||
|
CONFIG_ARM_AMBA=y
|
||||||
|
|
||||||
|
CONFIG_USE_GENERIC_SMP_HELPERS=y
|
||||||
|
CONFIG_VFP=y
|
||||||
|
CONFIG_VFPv3=y
|
||||||
|
|
||||||
|
CONFIG_CPUSETS=y
|
||||||
|
CONFIG_CPU_32v6K=y
|
||||||
|
CONFIG_CPU_32v7=y
|
||||||
|
CONFIG_CPU_ABRT_EV7=y
|
||||||
|
CONFIG_CPU_CACHE_V7=y
|
||||||
|
CONFIG_CPU_CACHE_VIPT=y
|
||||||
|
CONFIG_CPU_COPY_V6=y
|
||||||
|
CONFIG_CPU_CP15=y
|
||||||
|
CONFIG_CPU_CP15_MMU=y
|
||||||
|
CONFIG_CPU_HAS_ASID=y
|
||||||
|
CONFIG_CPU_HAS_PMU=y
|
||||||
|
CONFIG_CPU_PABRT_V7=y
|
||||||
|
CONFIG_CPU_RMAP=y
|
||||||
|
CONFIG_CPU_TLB_V7=y
|
||||||
|
CONFIG_CPU_V7=y
|
||||||
|
|
||||||
|
CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
|
||||||
|
CONFIG_THUMB2_KERNEL=y
|
||||||
|
CONFIG_TICK_ONESHOT=y
|
||||||
|
|
||||||
|
CONFIG_ARM_ASM_UNIFIED=y
|
||||||
|
CONFIG_ARM_CPU_TOPOLOGY=y
|
||||||
|
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
|
||||||
|
|
||||||
|
CONFIG_ARM_ERRATA_720789=y
|
||||||
|
CONFIG_ARM_ERRATA_751472=y
|
||||||
|
CONFIG_ARM_ERRATA_753970=y
|
||||||
|
|
||||||
|
CONFIG_ARM_GIC=y
|
||||||
|
CONFIG_ARM_L1_CACHE_SHIFT=5
|
||||||
|
|
||||||
|
CONFIG_ARM_THUMB=y
|
||||||
|
CONFIG_ARM_TIMER_SP804=y
|
||||||
|
CONFIG_ARM_UNWIND=y
|
||||||
|
|
||||||
|
CONFIG_FB=y
|
||||||
|
CONFIG_FB_ARMCLCD=y
|
||||||
|
CONFIG_FB_CFB_COPYAREA=y
|
||||||
|
CONFIG_FB_CFB_FILLRECT=y
|
||||||
|
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||||
|
|
||||||
|
CONFIG_TOUCHSCREEN_ADS7846=m
|
||||||
|
|
||||||
|
CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
|
||||||
|
|
||||||
|
CONFIG_SERIO_AMBAKMI=m
|
||||||
|
CONFIG_SERIAL_AMBA_PL011=y
|
||||||
|
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||||
|
|
||||||
|
CONFIG_FB_ARMCLCD=m
|
||||||
|
|
||||||
|
CONFIG_MMC_ARMMMCI=m
|
||||||
|
CONFIG_MMC_DW=m
|
||||||
|
# CONFIG_MMC_DW_IDMAC is not set
|
||||||
|
|
||||||
|
# CONFIG_ARM_CHARLCD is not set
|
||||||
|
CONFIG_PL330_DMA=y
|
||||||
|
|
||||||
|
CONFIG_I2C_VERSATILE=y
|
||||||
17
kernel.spec
17
kernel.spec
@ -255,18 +255,19 @@ Summary: The Linux kernel
|
|||||||
%define with_pae 0
|
%define with_pae 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# kernel-tegra, omap, imx and highbank are only built on armv7 hard and softfp
|
# kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hard and softfp
|
||||||
%ifnarch armv7hl armv7l
|
%ifnarch armv7hl armv7l
|
||||||
%define with_tegra 0
|
%define with_up 0
|
||||||
%define with_omap 0
|
%define with_omap 0
|
||||||
|
%endif
|
||||||
|
%define with_tegra 0
|
||||||
%define with_imx 0
|
%define with_imx 0
|
||||||
%define with_highbank 0
|
%define with_highbank 0
|
||||||
%endif
|
|
||||||
|
|
||||||
# kernel-kirkwood is only built for armv5
|
# kernel-kirkwood is only built for armv5
|
||||||
%ifnarch armv5tel
|
%ifnarch armv5tel
|
||||||
%define with_kirkwood 0
|
|
||||||
%endif
|
%endif
|
||||||
|
%define with_kirkwood 0
|
||||||
|
|
||||||
# if requested, only build base kernel
|
# if requested, only build base kernel
|
||||||
%if %{with_baseonly}
|
%if %{with_baseonly}
|
||||||
@ -411,10 +412,6 @@ Summary: The Linux kernel
|
|||||||
%define hdrarch arm
|
%define hdrarch arm
|
||||||
%define make_target bzImage
|
%define make_target bzImage
|
||||||
%define kernel_image arch/arm/boot/zImage
|
%define kernel_image arch/arm/boot/zImage
|
||||||
# we build a up kernel on base softfp/hardfp platforms. its used for qemu.
|
|
||||||
%ifnarch armv5tel armv7hl
|
|
||||||
%define with_up 0
|
|
||||||
%endif
|
|
||||||
# we only build headers/perf/tools on the base arm arches
|
# we only build headers/perf/tools on the base arm arches
|
||||||
# just like we used to only build them on i386 for x86
|
# just like we used to only build them on i386 for x86
|
||||||
%ifnarch armv5tel armv7hl
|
%ifnarch armv5tel armv7hl
|
||||||
@ -591,6 +588,7 @@ Source111: config-arm-tegra
|
|||||||
Source112: config-arm-kirkwood
|
Source112: config-arm-kirkwood
|
||||||
Source113: config-arm-imx
|
Source113: config-arm-imx
|
||||||
Source114: config-arm-highbank
|
Source114: config-arm-highbank
|
||||||
|
Source115: config-arm-versatile
|
||||||
|
|
||||||
# This file is intentionally left empty in the stock kernel. Its a nicety
|
# 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.
|
# added for those wanting to do custom rebuilds with altered config opts.
|
||||||
@ -2329,6 +2327,9 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 8 2012 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
|
- Restructure ARM configs to minimise duplication and pull all generic options
|
||||||
|
|
||||||
* Tue May 08 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git1.1
|
* Tue May 08 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git1.1
|
||||||
- Linux v3.4-rc6-20-g789505b
|
- Linux v3.4-rc6-20-g789505b
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user