diff --git a/Makefile.config b/Makefile.config index 5a15ee6bd..69b12baa4 100644 --- a/Makefile.config +++ b/Makefile.config @@ -41,10 +41,7 @@ temp-armv7: config-armv7 temp-armv7-generic temp-armv7-lpae: config-armv7-lpae temp-armv7-generic perl merge.pl $^ > $@ -temp-arm-generic: config-arm-generic temp-generic - perl merge.pl $^ > $@ - -temp-armv7l-tegra: config-arm-tegra temp-arm-generic +temp-armv7-tegra: config-armv7-tegra temp-armv7-generic perl merge.pl $^ > $@ temp-x86-32: config-x86-32-generic config-x86-generic @@ -116,7 +113,7 @@ kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae perl merge.pl $^ arm > $@ -kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra +kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7-tegra perl merge.pl $^ arm > $@ kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic diff --git a/config-arm-generic b/config-arm-generic deleted file mode 100644 index 6c070483a..000000000 --- a/config-arm-generic +++ /dev/null @@ -1,524 +0,0 @@ -# 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_THUMB=y -CONFIG_AEABI=y -CONFIG_VFP=y -CONFIG_ARM_UNWIND=y -# CONFIG_ARCH_MULTI_V7 is not set -# CONFIG_OABI_COMPAT is not set - -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_SMP_ON_UP=y - -CONFIG_HAVE_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 -# CONFIG_GENERIC_CPUFREQ_CPU0 is not set - -# 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 -CONFIG_ARM_ERRATA_775420=y -CONFIG_PL310_ERRATA_753970=y - -# Generic ARM config options -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_LOCAL_TIMERS=y - -CONFIG_ATAGS=y -CONFIG_ATAGS_PROC=y - -CONFIG_PL330_DMA=m -CONFIG_AMBA_PL08X=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_EARLY_PRINTK=y - -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_MULTIPLE_DRIVERS is not set -# CONFIG_CPU_IDLE_GOV_LADDER is not set -CONFIG_CPU_IDLE_GOV_MENU=y - -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -CONFIG_PM=y -CONFIG_PM_STD_PARTITION="" -CONFIG_SUSPEND=y -CONFIG_ARM_CPU_SUSPEND=y -CONFIG_ARM_CPU_TOPOLOGY=y - -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_LSM_MMAP_MIN_ADDR=32768 - -# CONFIG_XEN is not set - -CONFIG_PINCTRL=y -CONFIG_PINCONF=y - -CONFIG_COMMON_CLK=y - -CONFIG_THERMAL=y - -CONFIG_ETHERNET=y - -CONFIG_PERF_EVENTS=y -CONFIG_PERF_COUNTERS=y - -CONFIG_CC_STACKPROTECTOR=y - -CONFIG_SECCOMP=y -CONFIG_STRICT_DEVMEM=y - -CONFIG_SPARSE_IRQ=y - -# Generic HW for all ARM platforms -CONFIG_LEDS_GPIO=m - -CONFIG_LBDAF=y - -CONFIG_GPIOLIB=y -CONFIG_RFKILL_GPIO=m -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_PINCTRL_SINGLE=m -CONFIG_POWER_RESET_GPIO=y -CONFIG_POWER_RESET_RESTART=y - -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 -CONFIG_SND_SPI=y - -CONFIG_AX88796=m -CONFIG_AX88796_93CX6=y -CONFIG_SMC91X=m -CONFIG_DM9000=m -CONFIG_DM9000_DEBUGLEVEL=4 -# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set -CONFIG_SMC911X=m -CONFIG_SMSC911X=m - -CONFIG_SERIO_AMBAKMI=m -CONFIG_I2C_NOMADIK=m -CONFIG_ARM_SP805_WATCHDOG=m -CONFIG_FB_ARMCLCD=m -CONFIG_FB_SSD1307=m -CONFIG_MPCORE_WATCHDOG=m -CONFIG_BACKLIGHT_PWM=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 is not set -# CONFIG_MMC_DW_IDMAC is not set -CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDHCI_PXAV2=m - -# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set - -CONFIG_SPI=y -# Generic GPIO options -CONFIG_GENERIC_GPIO=y - -CONFIG_MTD=m -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_OF_PARTS=y -CONFIG_MTD_PHYSMAP_OF=y -# CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_MTD_AR7_PARTS is not set -CONFIG_MTD_CFI=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_NOSWAP=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_CFI_UTIL=y -CONFIG_MTD_DOC2000=m -CONFIG_MTD_DOC2001=m -CONFIG_MTD_DOC2001PLUS=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -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 -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_PHYSMAP=m -# CONFIG_MTD_PHYSMAP_COMPAT is not set -CONFIG_MTD_M25P80=m -CONFIG_M25PXX_USE_FAST_READ=y -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_ECC=m -CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_CAFE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_DENALI is not set -# CONFIG_MTD_NAND_DOCG4 is not set -CONFIG_MTD_NAND_GPIO=m -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_NAND_NANDSIM is not set -CONFIG_MTD_NAND_ORION=m -# CONFIG_MTD_NAND_RICOH is not set -# CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_OTP is not set -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_PLATRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_SLRAM is not set -CONFIG_MTD_DATAFLASH=m -CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y -CONFIG_MTD_DATAFLASH_OTP=y -CONFIG_MTD_SST25L=m -CONFIG_MTD_UBI=m -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 - -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set - -CONFIG_UBIFS_FS=m -CONFIG_UBIFS_FS_XATTR=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -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_DTC=y -CONFIG_OF=y -CONFIG_USE_OF=y -CONFIG_OF_DEVICE=y -CONFIG_OF_IRQ=y -CONFIG_OF_GPIO=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_MDIO_BUS_MUX_MMIOREG=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_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_PCF2123=m -CONFIG_RTC_DRV_PL030=m -CONFIG_RTC_DRV_PL031=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_RX4581=m -CONFIG_RTC_DRV_SNVS=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_INPUT_ARIZONA_HAPTICS=m -CONFIG_INPUT_MC13783_PWRBUTTON=m - -CONFIG_SERIAL_AMBA_PL010=m -CONFIG_SERIAL_AMBA_PL011=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX310X=y -CONFIG_SERIAL_IFX6X60=m - -CONFIG_GPIO_74X164=m -CONFIG_GPIO_ADNP=m -CONFIG_GPIO_ARIZONA=m -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MC33880=m -CONFIG_GPIO_MCP23S08=m -CONFIG_GPIO_PL061=y - -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_DW_MMIO=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m -CONFIG_SPI_PL022=m -CONFIG_SPI_SC18IS602=m -CONFIG_SPI_XCOMM=m -CONFIG_SPI_XILINX=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m -CONFIG_BMP085_SPI=m -CONFIG_BMP085_SPI=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_93XX46=m -CONFIG_KS8851=m -CONFIG_MICREL_KS8995MA=m -CONFIG_LIBERTAS_SPI=m -CONFIG_P54_SPI=m -CONFIG_P54_SPI_DEFAULT_EEPROM=y - -CONFIG_MFD_CORE=m -CONFIG_MFD_88PM800=m -CONFIG_MFD_88PM805=m -CONFIG_MFD_ARIZONA_SPI=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_SYSCON=y -# CONFIG_MFD_WM5102 is not set -# CONFIG_MFD_WM5110 is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_DA9052_SPI is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_TPS80031 is not set -# CONFIG_MFD_AS3711 is not set -# CONFIG_MFD_SMSC is not set -# CONFIG_MFD_DA9055 is not set -# CONFIG_MFD_MAX8907 is not set - -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -# CONFIG_REGULATOR_DUMMY is not set -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_ARIZONA=m -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_MAX8973=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6524X=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_CHARGER_MANAGER=y -CONFIG_EXTCON_GPIO=m - -CONFIG_SENSORS_AD7314=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MC13783_ADC=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_LIS3_SPI=m - -CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_MRF24J40=m - -# CONFIG_ARM_VIRT_EXT is not set -# CONFIG_PINCTRL_EXYNOS4 is not set -# CONFIG_PINCTRL_EXYNOS5440 is not set - -CONFIG_AUTO_ZRELADDR=y -# CONFIG_ASYMMETRIC_KEY_TYPE is not set - -# CONFIG_VFIO 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 -# CONFIG_LEDS_PWM is not set -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_MC13783=m - -# CONFIG_VIRTIO_CONSOLE 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! -# CONFIG_CRYSTALHD is not set - -# these modules all fail with missing __bad_udelay -# http://www.spinics.net/lists/arm/msg15615.html provides some background -# CONFIG_SUNGEM is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_RADEON is not set -# CONFIG_ATM_HE is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SFC is not set - -# these all currently fail due to missing symbols __bad_udelay or -# error: implicit declaration of function ‘iowrite32be’ -# CONFIG_SND_ALI5451 is not set -# CONFIG_MLX4_EN is not set - -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_MC13783=m - -# 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 - -# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set -# CONFIG_PANEL_ACX565AKM is not set -# CONFIG_PANEL_N8X0 is not set - -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -# 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_FB_MX3 is not set -# CONFIG_MX3_IPU is not set -# CONFIG_MX3_IPU_IRQS is not set -# CONFIG_SND_ATMEL_SOC is not set - -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_CS89x0 is not set -# CONFIG_DVB_USB_PCTV452E is not set -# CONFIG_PINCTRL_EXYNOS is not set -# CONFIG_VIRTUALIZATION is not set - -CONFIG_XZ_DEC_ARM=y - -# CONFIG_EZX_PCAP is not set - -# CONFIG_EXTCON_ARIZONA is not set - -# CONFIG_VIRTUALIZATION is not set -# CONFIG_VIRTIO_PCI is not set -# VIRTIO_MMIO is not set -# REMOTEPROC is not set -# RPMSG is not set - -# CONFIG_LATTICE_ECP3_CONFIG is not set -# CONFIG_DRM_TILCDC is not set -CONFIG_OF_DISPLAY_TIMING=y -CONFIG_OF_VIDEOMODE=y diff --git a/config-arm-omap b/config-arm-omap index 49f68235b..877f7c16b 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -40,55 +40,12 @@ CONFIG_MACH_TOUCHBOOK=y # System MMU -CONFIG_CPU_32v6K=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y -CONFIG_ARM_THUMBEE=y CONFIG_SWP_EMULATE=y # CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_ERRATA_430973=y -# CONFIG_ARM_ERRATA_458693 is not set -# CONFIG_ARM_ERRATA_460075 is not set -# CONFIG_ARM_ERRATA_742230 is not set -# CONFIG_ARM_ERRATA_742231 is not set -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_ARM_ERRATA_720789=y -# CONFIG_ARM_ERRATA_743622 is not set -# CONFIG_ARM_ERRATA_751472 is not set -# CONFIG_ARM_ERRATA_753970 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_ARM_ERRATA_754327 is not set -# CONFIG_ARM_ERRATA_764369 is not set -CONFIG_ARM_GIC=y -CONFIG_HAVE_ARM_SCU=y -CONFIG_HAVE_ARM_TWD=y -CONFIG_HOTPLUG_CPU=y -CONFIG_HZ=128 # CONFIG_THUMB2_KERNEL is not set -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_KSM is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" -# CONFIG_AUTO_ZRELADDR is not set -CONFIG_VFPv3=y -CONFIG_NEON=y CONFIG_BINFMT_MISC=m -CONFIG_PM_DEBUG=y -# CONFIG_PM_ADVANCED_DEBUG is not set -# CONFIG_PM_VERBOSE is not set CONFIG_CAN_PM_TRACE=y CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y @@ -101,13 +58,9 @@ CONFIG_PM_OPP=y CONFIG_LEDS_PWM=m CONFIG_LEDS_LP8788=m CONFIG_MTD_ONENAND_OMAP2=y -CONFIG_HDQ_MASTER_OMAP=m -CONFIG_I2C_OMAP=m -CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MFD_LP8788=y CONFIG_MFD_TPS65910=y CONFIG_GPIO_TPS65910=y -CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_LP8788=y CONFIG_REGULATOR_TPS65217=y CONFIG_REGULATOR_TPS65910=y @@ -119,16 +72,8 @@ CONFIG_BACKLIGHT_LP8788=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_PANDORA=m -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 -# # CONFIG_USB_GADGET_OMAP is not set # CONFIG_ISP1301_OMAP is not set diff --git a/config-armv7 b/config-armv7 index 7d3c9c8c8..749406051 100644 --- a/config-armv7 +++ b/config-armv7 @@ -71,6 +71,7 @@ CONFIG_GPIO_MVEBU=y CONFIG_MVEBU_CLK_CORE=y CONFIG_MVEBU_CLK_GATING=y CONFIG_MMC_MVSDIO=m +CONFIG_SPI_ORION=m # omap CONFIG_ARCH_OMAP2PLUS_TYPICAL=y @@ -171,7 +172,7 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m -CONFIG_RTC_DRV_TWL92330=m +# CONFIG_RTC_DRV_TWL92330 is not set CONFIG_RTC_DRV_TWL4030=m CONFIG_RTC_DRV_OMAP=m # Note needs to be compiled in until we build MMC modular @@ -259,6 +260,9 @@ CONFIG_PANEL_PICODLP=m CONFIG_PANEL_TAAL=m CONFIG_PANEL_NEC_NL8048HL11_01B=m CONFIG_PANEL_TPO_TD043MTEA1=m +CONFIG_PANEL_LGPHILIPS_LB035Q02=m +CONFIG_PANEL_ACX565AKM=m +# CONFIG_PANEL_N8X0 is not set # Enable V4L2 drivers for OMAP2+ CONFIG_MEDIA_CONTROLLER=y @@ -421,7 +425,9 @@ CONFIG_REGULATOR_LP3972=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6524X=m CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_MAX8907=m CONFIG_REGULATOR_LP872X=y CONFIG_REGULATOR_LP8755=m @@ -431,7 +437,6 @@ CONFIG_REGULATOR_LP8755=m # 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 diff --git a/config-armv7-generic b/config-armv7-generic index c10b1ae4f..057ea50d8 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -1,5 +1,7 @@ # arm configs for sharing between armv7 and armv7-lpae -# generic ARM config options +# Generic ARM config options +CONFIG_ARM=y + CONFIG_CMDLINE="" CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y @@ -17,23 +19,26 @@ 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_CACHE_PL310=y CONFIG_HIGHPTE=y CONFIG_AUTO_ZRELADDR=y +CONFIG_EARLY_PRINTK=y +CONFIG_ATAGS=y +CONFIG_ATAGS_PROC=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_CPU_BPREDICT_DISABLE is not set # CONFIG_DMA_CACHE_RWFO is not set # CONFIG_THUMB2_KERNEL is not set # CONFIG_HVC_DCC is not set # CONFIG_XIP_KERNEL is not set +# CONFIG_ARM_VIRT_EXT is not set # errata # v5/v6 @@ -61,7 +66,7 @@ CONFIG_PL310_ERRATA_769419=y # generic that deviates from or should be merged into config-generic CONFIG_SMP=y -CONFIG_NR_CPUS=4 +CONFIG_NR_CPUS=8 CONFIG_SMP_ON_UP=y CONFIG_HIGHMEM=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -100,22 +105,17 @@ 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_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -CONFIG_PINCTRL=y -CONFIG_PINCONF=y - +# Root as NFS, different from mainline 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 @@ -137,14 +137,10 @@ CONFIG_OF_PCI_IRQ=y CONFIG_OF_GPIO=y CONFIG_I2C_MUX_PINCTRL=m CONFIG_OF_MDIO=m -CONFIG_MFD_SYSCON=y CONFIG_OF_DISPLAY_TIMING=y CONFIG_OF_VIDEOMODE=y -CONFIG_MDIO_BUS_MUX_GPIO=m -CONFIG_GPIOLIB=y - # General vexpress ARM drivers CONFIG_ARM_AMBA=y CONFIG_ARM_TIMER_SP804=y @@ -179,24 +175,58 @@ CONFIG_SMC911X=m CONFIG_SMSC911X=m CONFIG_USB_ISP1760_HCD=m +# Multifunction Devices +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TPS65912_SPI=y +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_MC13XXX_SPI is not set + # Pin stuff CONFIG_PINMUX=y CONFIG_PINCONF=y +CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=m # CONFIG_PINCTRL_SAMSUNG is not set # CONFIG_PINCTRL_EXYNOS4 is not set # GPIO CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_EXTCON_GPIO=m +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIO_EM is not set CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m CONFIG_POWER_RESET_GPIO=y CONFIG_RFKILL_GPIO=m CONFIG_SERIAL_8250_EM=m -CONFIG_INPUT_GP2A=m CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +CONFIG_LEDS_GPIO=m +CONFIG_GPIOLIB=y +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_74X164=m +CONFIG_GPIO_TPS65912=m + +CONFIG_SPI=y +CONFIG_SPI_GPIO=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_PL022=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_S3C64XX=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_TLE62X0=m # HW crypto and rng CONFIG_CRYPTO_SHA1_ARM=m @@ -217,16 +247,23 @@ CONFIG_POWER_RESET_RESTART=y # MTD CONFIG_MTD_OF_PARTS=y # CONFIG_MG_DISK is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_M25P80=m +CONFIG_MTD_SST25L=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_93XX46=m # 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_SPI_DW_MMIO=m # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_IDMAC is not set @@ -234,6 +271,7 @@ CONFIG_MMC_DW_PCI=m CONFIG_SND_ARM=y CONFIG_SND_ARMAACI=m CONFIG_SND_SOC=m +CONFIG_SND_SPI=y CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SOC_CACHE_LZO=y @@ -243,17 +281,123 @@ CONFIG_SND_SOC_ALL_CODECS=m # Displays CONFIG_FB_SSD1307=m -CONFIG_ARM_KPROBES_TEST=m - # PWM CONFIG_PWM=y CONFIG_BACKLIGHT_PWM=m + +# RTC +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_RX4581=m + +# Regulators +CONFIG_REGULATOR=y +CONFIG_RFKILL_REGULATOR=m +CONFIG_CHARGER_MANAGER=y +# CONFIG_REGULATOR_DUMMY is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX8973=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_TPS51632=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS6524X=m +CONFIG_REGULATOR_TPS65912=m + +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_LIS3_SPI=m + +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m + CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_MC13783_PWRBUTTON=m + + +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_TSC2005=m + +CONFIG_LEDS_DAC124S085=m +CONFIG_BMP085_SPI=m + +# Ethernet +CONFIG_KS8851=m +CONFIG_ENC28J60=m +CONFIG_LIBERTAS_SPI=m +CONFIG_P54_SPI=m +CONFIG_P54_SPI_DEFAULT_EEPROM=n +CONFIG_MICREL_KS8995MA=m +CONFIG_IEEE802154_AT86RF230=m +CONFIG_IEEE802154_MRF24J40=m + +CONFIG_ARM_KPROBES_TEST=m + +# jffs2 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y + +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set # Should be in generic CONFIG_ETHERNET=y +CONFIG_BPF_JIT=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set + # CONFIG_PATA_PLATFORM is not set CONFIG_PERF_EVENTS=y @@ -271,15 +415,21 @@ CONFIG_PERF_EVENTS=y # CONFIG_LEDS_RENESAS_TPU is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_EZX_PCAP is not set # 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_LATTICE_ECP3_CONFIG is not set +# CONFIG_M25PXX_USE_FAST_READ is not set +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_IFX6X60 is not set # these modules all fail with missing __bad_udelay # http://www.spinics.net/lists/arm/msg15615.html provides some background diff --git a/config-arm-tegra b/config-armv7-tegra similarity index 84% rename from config-arm-tegra rename to config-armv7-tegra index 53c415312..12235bae7 100644 --- a/config-arm-tegra +++ b/config-armv7-tegra @@ -3,10 +3,13 @@ CONFIG_ARCH_TEGRA=y CONFIG_ARCH_TEGRA_2x_SOC=y # CONFIG_ARCH_TEGRA_3x_SOC is not set # CONFIG_ARCH_TEGRA_114_SOC is not set -# CONFIG_ARM_LPAE is not set -CONFIG_VFP=y -CONFIG_VFPv3=y +# These are supported in the LPAE kernel +# CONFIG_ARM_LPAE is not set +# CONFIG_XEN is not set +# CONFIG_VIRTIO_CONSOLE is not set +# CONFIG_ARM_VIRT_EXT is not set +# CONFIG_VIRTUALIZATION is not set # CONFIG_MACH_HARMONY is not set CONFIG_MACH_KAEN=y @@ -24,7 +27,7 @@ CONFIG_TEGRA_PCI=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y -CONFIG_I2C_TEGRA=m +# CONFIG_I2C_TEGRA is not set # This block is temporary until we work out why the MMC modules don't work as modules CONFIG_MMC=y @@ -32,8 +35,6 @@ CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SPI=y - CONFIG_MMC_SDHCI_TEGRA=y # CONFIG_RCU_BOOST is not set @@ -41,12 +42,10 @@ CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_TEGRA_AHB=y CONFIG_TEGRA20_APB_DMA=y -CONFIG_SPI_TEGRA20_SFLASH=m -CONFIG_SPI_TEGRA20_SLINK=m +CONFIG_SPI_TEGRA20_SFLASH=y +CONFIG_SPI_TEGRA20_SLINK=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 is not set # CONFIG_ARM_ERRATA_460075 is not set @@ -69,6 +68,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_KEYBOARD_TEGRA is not set CONFIG_PINCTRL_TEGRA=y CONFIG_PINCTRL_TEGRA20=y +CONFIG_PINCTRL_TEGRA30=y CONFIG_USB_EHCI_TEGRA=y CONFIG_RTC_DRV_TEGRA=y @@ -82,7 +82,7 @@ CONFIG_SND_SOC_TEGRA30_AHUB=m CONFIG_SND_SOC_TEGRA30_I2S=m # AC100 (PAZ00) -# CONFIG_MFD_NVEC is not set +CONFIG_MFD_NVEC=y CONFIG_MFD_TPS80031=y CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y @@ -96,7 +96,7 @@ CONFIG_NVEC_PAZ00=y CONFIG_PWM_TEGRA=m -CONFIG_DRM_TEGRA=m +# CONFIG_DRM_TEGRA is not set CONFIG_CPU_PM=y CONFIG_ARM_CPU_SUSPEND=y @@ -119,3 +119,7 @@ CONFIG_OF_PCI_IRQ=y # CONFIG_SPI_TOPCLIFF_PCH is not set # CONFIG_SPI_DW_PCI is not set # CONFIG_SPI_PXA2XX is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_PINCTRL_EXYNOS is not set +# CONFIG_PINCTRL_EXYNOS5440 is not set diff --git a/kernel.spec b/kernel.spec index 3b92c23e9..01d55243f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -251,9 +251,9 @@ Summary: The Linux kernel # kernel up (unified kernel target), unified LPAE, tegra are only built on armv7 hfp %ifnarch armv7hl -%define with_lpae 0 -%endif %define with_tegra 0 +%endif +%define with_lpae 0 # if requested, only build base kernel %if %{with_baseonly} @@ -387,10 +387,7 @@ Summary: The Linux kernel %define kernel_image arch/arm/boot/zImage # we only build headers/perf/tools on the base arm arches # just like we used to only build them on i386 for x86 -%ifarch armv5tel -%define with_up 0 -%endif -%ifnarch armv5tel armv7hl +%ifnarch armv7hl %define with_headers 0 %define with_perf 0 %define with_tools 0 @@ -578,11 +575,7 @@ Source70: config-s390x Source100: config-armv7-generic Source101: config-armv7 Source102: config-armv7-lpae - -# Legacy ARM kernels -Source105: config-arm-generic -Source110: config-arm-omap -Source111: config-arm-tegra +Source103: config-armv7-tegra # 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. @@ -2299,6 +2292,12 @@ fi # ||----w | # || || %changelog +* Sun Mar 31 2013 Peter Robinson +- Make tegra inherit armv7-generic, fix and re-enable tegra +- Enable SPI on ARM +- Drop config-arm-generic +- ARM config updates + * Thu Mar 28 2013 Peter Robinson - Update ARM unified config for OMAP