scm-commits March 2013

scm-commits@lists.fedoraproject.org

488 participants
20545 discussions

[OpenImageIO] Add upstream patch to fix FTBFS on ARM (RHBZ 924932)
by Peter Robinson 31 Mar '13

31 Mar '13

commit 3a130363bd9b0e93480c0071788a965c0b6c8efa Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Mon Apr 1 00:59:02 2013 +0100 Add upstream patch to fix FTBFS on ARM (RHBZ 924932) OpenImageIO.spec | 8 +++++++- oiio-arm.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) --- diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 9d6a5a6..f7c5398 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -4,7 +4,7 @@ Name: OpenImageIO Version: 1.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library for reading and writing images Group: Development/Libraries @@ -21,6 +21,8 @@ Patch0: OpenImageIO-1.1.2-use_external_tbb.patch Patch2: OpenImageIO-ppc.patch # https://github.com/OpenImageIO/oiio/issues/473 Patch3: OpenImageIO-1.1.3-SHA1_undef_ref.patch +# https://github.com/The11ers/oiio/commit/010754d2a9b4b41f658a7752046c9217aba… +Patch4: oiio-arm.patch BuildRequires: cmake txt2man BuildRequires: qt4-devel @@ -92,6 +94,7 @@ Development files for package %{name} %patch2 -p1 -b .ppc %endif %patch3 -p1 -b .sha1 +%patch4 -p1 -b .arm # Install FindTBB.cmake install %{SOURCE101} src/cmake/modules/ @@ -172,6 +175,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Sun Mar 31 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.1.3-7 +- Add upstream patch to fix FTBFS on ARM (RHBZ 924932) + * Sun Mar 10 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1.1.3-6 - rebuild (OpenEXR) diff --git a/oiio-arm.patch b/oiio-arm.patch new file mode 100644 index 0000000..0c9f732 --- /dev/null +++ b/oiio-arm.patch @@ -0,0 +1,26 @@ +--- oiio-Release-1.1.3/src/include/thread.h.orig 2013-04-01 00:27:21.337292586 +0100 ++++ oiio-Release-1.1.3/src/include/thread.h 2013-04-01 00:30:08.910886481 +0100 +@@ -326,7 +326,11 @@ + __TBB_Pause(delay); + #elif defined(__GNUC__) + for (int i = 0; i < delay; ++i) { ++#if defined __arm__ ++ __asm__ __volatile__("NOP;"); ++#else + __asm__ __volatile__("pause;"); ++#endif + } + #elif defined(_MSC_VER) + for (int i = 0; i < delay; ++i) { +@@ -441,7 +445,11 @@ + + // Disallow copy construction by making private and unimplemented. + atomic (atomic const &); ++#if defined __arm__ ++} __attribute__((aligned(8))); ++#else + }; ++#endif + + + #endif /* ! USE_TBB */

1 0

[kernel/f19] fix arm merge
by Peter Robinson 31 Mar '13

31 Mar '13

commit 1e37df09d47ff7c03bd0985afa862824286ccc9b Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Mon Apr 1 00:45:08 2013 +0100 fix arm merge Makefile.config | 15 +- config-arm-generic | 524 -------------------------------- config-arm-omap | 323 -------------------- config-armv7 | 32 ++- config-armv7-generic | 195 +++++++++++-- config-armv7-lpae | 6 +- config-arm-tegra => config-armv7-tegra | 28 +- kernel.spec | 21 +- 8 files changed, 237 insertions(+), 907 deletions(-) --- diff --git a/Makefile.config b/Makefile.config index 140172d..69b12ba 100644 --- a/Makefile.config +++ b/Makefile.config @@ -10,7 +10,7 @@ CONFIGFILES = \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-s390x.config \ $(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config\ - $(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \ + $(CFG)-armv7hl-tegra.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config @@ -41,13 +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-omap: config-arm-omap temp-arm-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 @@ -119,10 +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-omap.config: /dev/null temp-armv7l-omap - 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-omap b/config-arm-omap index 4d64f90..877f7c1 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -1,70 +1,6 @@ -CONFIG_ARCH_OMAP=y -CONFIG_ARCH_OMAP_OTG=y -# CONFIG_ARCH_OMAP1 is not set -# 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_OMAP2PLUS=y -# CONFIG_ARCH_MVEBU is not set -# CONFIG_ARCH_BCM is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set -# CONFIG_ARCH_VEXPRESS_CA9X4 is not set -# CONFIG_ARCH_VIRT is not set -# CONFIG_ARCH_WM8850 is not set -# CONFIG_ARCH_ZYNQ is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_WM8505 is not set -# CONFIG_ARM_CHARLCD is not set -# CONFIG_PATA_PLATFORM is not set -# CONFIG_I2C_VERSATILE is not set -# CONFIG_SENSORS_VEXPRESS is not set -# CONFIG_REGULATOR_VEXPRESS is not set -# CONFIG_RTC_DRV_LP8788 is not set - -# -# OMAP Feature Selections -# -CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_OMAP_MUX=y -# CONFIG_OMAP_MUX_DEBUG is not set -CONFIG_OMAP_MUX_WARNINGS=y -CONFIG_OMAP_MCBSP=y -CONFIG_OMAP_MBOX_FWK=m -CONFIG_OMAP_MBOX_KFIFO_SIZE=256 -CONFIG_OMAP_32K_TIMER=y -# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set -CONFIG_OMAP_32K_TIMER_HZ=128 -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 -# CONFIG_DMADEVICES_VDEBUG is not set - -# -# TI OMAP2/3/4 Specific Features -# -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y -# CONFIG_ARCH_OMAP2 is not set -CONFIG_ARCH_OMAP3=y -CONFIG_ARCH_OMAP4=y -CONFIG_SOC_OMAP3430=y -CONFIG_SOC_TI81XX=y -CONFIG_SOC_AM33XX=y -CONFIG_SOC_OMAPTI816X=y -# CONFIG_SOC_OMAP5 is not set CONFIG_OMAP_PACKAGE_CBB=y CONFIG_OMAP_PACKAGE_CBL=y CONFIG_OMAP_PACKAGE_CBS=y -# CONFIG_OMAP4_ERRATA_I688 is not set # # OMAP Board Type @@ -104,299 +40,40 @@ 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_CACHE_L2X0=y -CONFIG_CACHE_PL310=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 CONFIG_PM_OPP=y -# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES -CONFIG_OMAP_BANDGAP=y -CONFIG_OMAP4_THERMAL=y -CONFIG_OMAP5_THERMAL=y - -# OMAP3 thermal/power -CONFIG_POWER_AVS=y -CONFIG_POWER_AVS_OMAP=y -CONFIG_POWER_AVS_OMAP_CLASS3=y - -CONFIG_ARM_OMAP2PLUS_CPUFREQ=y - # # OMAP Hardware # -CONFIG_WL_TI=y -CONFIG_WLCORE_SDIO=m -CONFIG_WLCORE_SPI=m -CONFIG_TI_ST=m -CONFIG_TI_DAC7512=m -# CONFIG_TI_CPSW is not set -CONFIG_MTD_NAND_OMAP2=y -CONFIG_MTD_NAND_OMAP_PREFETCH=y -CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y -CONFIG_WL1251_SPI=m -CONFIG_WL12XX_SPI=m -CONFIG_WL12XX_SDIO_TEST=m -CONFIG_WL18XX=m -CONFIG_SPI_DAVINCI=m -CONFIG_SPI_OMAP24XX=y -CONFIG_MFD_TI_SSP=m -CONFIG_SPI_TI_SSP=m -CONFIG_NFC_WILINK=m -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_KEYBOARD_OMAP4=m -CONFIG_KEYBOARD_TWL4030=m -CONFIG_TOUCHSCREEN_TI_TSCADC=m -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_CLK_TWL6040=m -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_GPIO_TWL6040=m -CONFIG_CHARGER_TWL4030=m -CONFIG_TWL6030_PWM=m -CONFIG_TWL6040_CORE=y -CONFIG_SENSORS_TWL4030_MADC=m -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_TI_DAVINCI_EMAC=m -CONFIG_TI_DAVINCI_MDIO=m -CONFIG_TI_DAVINCI_CPDMA=m 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_WL1273_CORE=m 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 -# Enable V4L2 drivers for OMAP2+ -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_OMAP2_VOUT=m -CONFIG_VIDEO_OMAP3=m -CONFIG_VIDEO_VPFE_CAPTURE=m -# The ones below are for TI Davinci -# CONFIG_VIDEO_VPSS_SYSTEM is not set -# CONFIG_VIDEO_DM6446_CCDC is not set -# CONFIG_VIDEO_DM644X_VPBE is not set -# CONFIG_VIDEO_DM355_CCDC is not set -# CONFIG_VIDEO_ISIF 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_DRM_EXYNOS is not set -# CONFIG_DRM_IMX is not set -# 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_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=y -CONFIG_OMAP2_DSS_VENC=y -CONFIG_OMAP4_DSS_HDMI=y -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=0 -CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y -CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y - -CONFIG_FB_DA8XX=m -CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=5 CONFIG_LCD_CLASS_DEVICE=m -CONFIG_PANEL_GENERIC_DPI=m -CONFIG_PANEL_TFP410=m -CONFIG_PANEL_TAAL=m -CONFIG_PANEL_PICODLP=m -CONFIG_PANEL_SHARP_LS037V7DW01=m -CONFIG_PANEL_NEC_NL8048HL11_01B=m -CONFIG_PANEL_TPO_TD043MTEA1=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_LP8788=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_PANDORA=m - -CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_DMIC=m -CONFIG_SND_OMAP_SOC_MCBSP=m -CONFIG_SND_OMAP_SOC_MCPDM=m -CONFIG_SND_OMAP_SOC_OVERO=m -CONFIG_SND_OMAP_SOC_OMAP3EVM=m -CONFIG_SND_OMAP_SOC_AM3517EVM=m -CONFIG_SND_OMAP_SOC_SDP3430=m -CONFIG_SND_OMAP_SOC_SDP4430=m -CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m -CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m -CONFIG_SND_OMAP_SOC_ZOOM2=m -CONFIG_SND_OMAP_SOC_IGEP0020=m -CONFIG_SND_OMAP_SOC_OMAP_HDMI=m -CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m -CONFIG_SND_SOC_I2C_AND_SPI=y -# CONFIG_SND_OMAP_SOC_RX51 is not set -# CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC3X=m -CONFIG_SND_SOC_TWL4030=m -CONFIG_SND_SOC_TWL6040=m -CONFIG_RADIO_WL128X=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 - -# This block is temporary until we work out why the MMC modules don't work as modules -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SPI=y - -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y -CONFIG_TWL4030_USB=y -CONFIG_TWL6030_USB=y -CONFIG_RTC_DRV_OMAP=m -CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_TPS65910=m - -CONFIG_PWM_TIECAP=m -CONFIG_PWM_TIEHRPWM=m -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m - -# CONFIG_IR_RX51 is not set -# CONFIG_BATTERY_RX51 is not set - -# CONFIG_TIDSPBRIDGE is not set -# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 -# CONFIG_TIDSPBRIDGE_DEBUG is not set -# CONFIG_TIDSPBRIDGE_RECOVERY=y -# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set -# CONFIG_TIDSPBRIDGE_WDT3=y -# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5 -# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set -# CONFIG_TIDSPBRIDGE_BACKTRACE is not set - -# CONFIG_OMAP_REMOTEPROC is not set -# CONFIG_OMAP_IOVMM is not set - -CONFIG_CRYPTO_DEV_OMAP_SHAM=m -CONFIG_CRYPTO_DEV_OMAP_AES=m -CONFIG_HW_RANDOM_OMAP=m - -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_MTD_NAND_OMAP_BCH 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_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set - -# CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_OMAP2_DSS_DEBUGFS is not set -# CONFIG_ARM_PSCI is not set -# CONFIG_WILINK_PLATFORM_DATA is not set - -# VIRTIO_PCI is not set -# VIRTIO_MMIO is not set -# REMOTEPROC is not set -# RPMSG is not set diff --git a/config-armv7 b/config-armv7 index b4cb3eb..7494060 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 @@ -141,6 +142,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m +CONFIG_I2C_OMAP=m CONFIG_CHARGER_TWL4030=m CONFIG_OMAP_WATCHDOG=m CONFIG_TWL4030_CORE=y @@ -154,19 +156,25 @@ CONFIG_TWL6030_PWM=m CONFIG_TWL6040_CORE=y CONFIG_CLK_TWL6040=m CONFIG_MFD_OMAP_USB_HOST=y +CONFIG_MTD_ONENAND_OMAP2=m +CONFIG_HDQ_MASTER_OMAP=m CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_OHCI_HCD_OMAP3=y CONFIG_USB_MUSB_AM35X=m +CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_MUSB_HDRC=y +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_MUSB_DEBUG is not set CONFIG_OMAP_CONTROL_USB=m CONFIG_NOP_USB_XCEIV=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m -CONFIG_RTC_DRV_TWL92330=y -CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_OMAP=y +# 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 CONFIG_DMA_OMAP=y CONFIG_OMAP_IOVMM=m @@ -252,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 @@ -299,6 +310,18 @@ CONFIG_SND_SOC_TWL4030=m CONFIG_SND_SOC_TWL6040=m CONFIG_RADIO_WL128X=m +# CONFIG_OMAP_REMOTEPROC is not set + +# CONFIG_TIDSPBRIDGE is not set +# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 +# CONFIG_TIDSPBRIDGE_DEBUG is not set +# CONFIG_TIDSPBRIDGE_RECOVERY=y +# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set +# CONFIG_TIDSPBRIDGE_WDT3=y +# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5 +# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set +# CONFIG_TIDSPBRIDGE_BACKTRACE is not set + # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP_IOMMU_DEBUG is not set # CONFIG_OMAP_MUX_DEBUG is not set @@ -402,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 @@ -412,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 924b023..057ea50 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -1,7 +1,10 @@ # 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 CONFIG_AEABI=y CONFIG_VFP=y CONFIG_VFPv3=y @@ -16,22 +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 @@ -59,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 @@ -98,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 @@ -135,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 @@ -166,6 +164,9 @@ CONFIG_FB_ARMCLCD=m CONFIG_REGULATOR_VEXPRESS=m # usb +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_ULPI=y CONFIG_AX88796=m CONFIG_AX88796_93CX6=y @@ -174,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 @@ -212,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 @@ -229,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 @@ -238,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 @@ -266,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-armv7-lpae b/config-armv7-lpae index 324a31e..7263d76 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -61,6 +61,7 @@ CONFIG_SND_SOC_SAMSUNG=m CONFIG_USB_EHCI_S5P=y CONFIG_USB_OHCI_EXYNOS=y CONFIG_MMC_SDHCI_S3C=m +CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_RTC_DRV_S3C=m CONFIG_PWM_SAMSUNG=m CONFIG_S3C_BOOT_WATCHDOG=y @@ -73,4 +74,7 @@ CONFIG_FB_S3C_DEBUG_REGWRITE=y CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_USB_EHCI_S5P=y CONFIG_SAMSUNG_USBPHY=y -CONFIG_MMC_SDHCI_S3C_DMA=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_PLTFM=y +CONFIG_MMC_DW_PCI=y +CONFIG_MMC_DW_EXYNOS=y diff --git a/config-arm-tegra b/config-armv7-tegra similarity index 84% rename from config-arm-tegra rename to config-armv7-tegra index 53c4153..12235ba 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 20a5853..9816597 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. @@ -2300,6 +2293,12 @@ fi # and build. %changelog +* Sun Mar 31 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> +- 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 <pbrobinson(a)fedoraproject.org> - Update ARM unified config for OMAP

1 0

[openstack-packstack] (6 commits) ...Merge branch 'el6-grizzly'
by Derek Higgins 31 Mar '13

31 Mar '13

Summary of changes: 592c058... Updated to version 2012.2.3dev454 (*) 412a319... Updated to version 2012.2.3dev475 (*) bd9f8f8... Udated to grizzly (packstack-2013.1.1dev502.tar.gz) (*) 2a17b7c... Removing unit test (*) 01f9e71... Update to packstack-2013.1.1dev527.tar.gz (*) f7d7226... Merge branch 'el6-grizzly' (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[openstack-packstack/f19] (7 commits) ...Merge branch 'el6-grizzly'
by Derek Higgins 31 Mar '13

31 Mar '13

Summary of changes: 592c058... Updated to version 2012.2.3dev454 (*) 412a319... Updated to version 2012.2.3dev475 (*) 46d8b9d... Updated to version 2012.2.3dev475 (*) bd9f8f8... Udated to grizzly (packstack-2013.1.1dev502.tar.gz) (*) 2a17b7c... Removing unit test (*) 01f9e71... Update to packstack-2013.1.1dev527.tar.gz (*) f7d7226... Merge branch 'el6-grizzly' (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[openstack-packstack/el6-grizzly: 3/3] Merge branch 'el6-grizzly'
by Derek Higgins 31 Mar '13

31 Mar '13

commit f7d72269b4f498e732cdb4ca7c340a9f3371ca44 Merge: 46d8b9d 01f9e71 Author: Derek Higgins <derekh(a)redhat.com> Date: Mon Apr 1 00:41:18 2013 +0100 Merge branch 'el6-grizzly' Conflicts: .gitignore openstack-packstack.spec sources .gitignore | 11 ++--------- openstack-packstack.spec | 33 ++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) ---

1 0

[openstack-packstack/el6-grizzly] (3 commits) ...Merge branch 'el6-grizzly'
by Derek Higgins 31 Mar '13

31 Mar '13

Summary of changes: 2f3f342... Updated to version 2012.2.3dev454 (*) 46d8b9d... Updated to version 2012.2.3dev475 (*) f7d7226... Merge branch 'el6-grizzly' (*) This commit already existed in another branch; no separate mail sent

1 0

[kernel] - Make tegra inherit armv7-generic, fix and re-enable tegra - Enable SPI on ARM - Drop config-arm-ge
by Peter Robinson 31 Mar '13

31 Mar '13

commit a940693b1080f6e7d04ffda879075f85fb372e40 Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Mon Apr 1 00:45:08 2013 +0100 - Make tegra inherit armv7-generic, fix and re-enable tegra - Enable SPI on ARM - Drop config-arm-generic - ARM config updates Makefile.config | 7 +- config-arm-generic | 524 -------------------------------- config-arm-omap | 55 ---- config-armv7 | 9 +- config-armv7-generic | 190 +++++++++++-- config-arm-tegra => config-armv7-tegra | 28 +- kernel.spec | 21 +- 7 files changed, 205 insertions(+), 629 deletions(-) --- diff --git a/Makefile.config b/Makefile.config index 5a15ee6..69b12ba 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-omap b/config-arm-omap index 49f6823..877f7c1 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 7d3c9c8..7494060 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 c10b1ae..057ea50 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 53c4153..12235ba 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 3b92c23..01d5524 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 <pbrobinson(a)fedoraproject.org> +- 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 <pbrobinson(a)fedoraproject.org> - Update ARM unified config for OMAP

1 0

File node-v0.10.2.tar.gz uploaded to lookaside cache by patches
by T.C. Hollingsworth 31 Mar '13

31 Mar '13

A file has been added to the lookaside cache for nodejs: d447905b919faacd8a5d74127702bec2 node-v0.10.2.tar.gz

1 0

File kdenetwork-4.10.2.tar.xz uploaded to lookaside cache by rdieter
by Rex Dieter 31 Mar '13

31 Mar '13

A file has been added to the lookaside cache for kdenetwork: 4b8ea088ec26a21f2328056977e23d67 kdenetwork-4.10.2.tar.xz

1 0

[kdegraphics-thumbnailers] 4.10.2
by Rex Dieter 31 Mar '13

31 Mar '13

commit 07a174672f8e0a2bfbc71cc47e6f10731b10c395 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Sun Mar 31 18:33:34 2013 -0500 4.10.2 .gitignore | 1 + kdegraphics-thumbnailers.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index e09e593..9913d01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kdegraphics-thumbnailers-4.10.1.tar.xz +/kdegraphics-thumbnailers-4.10.2.tar.xz diff --git a/kdegraphics-thumbnailers.spec b/kdegraphics-thumbnailers.spec index 1262aa1..1206eec 100644 --- a/kdegraphics-thumbnailers.spec +++ b/kdegraphics-thumbnailers.spec @@ -1,6 +1,6 @@ Name: kdegraphics-thumbnailers Summary: Thumbnailers for various graphic types -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} # most sources GPLv2+, dscparse.* GPL, gscreator.* LGPLv2+, @@ -53,6 +53,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Mar 31 2013 Rex Dieter <rdieter(a)fedoraproject.org> - 4.10.2-1 +- 4.10.2 + * Sat Mar 02 2013 Rex Dieter <rdieter(a)fedoraproject.org> - 4.10.1-1 - 4.10.1 diff --git a/sources b/sources index bccebdf..257132e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd3d211796c9401ba47f80b5ecf1035d kdegraphics-thumbnailers-4.10.1.tar.xz +05d146f16c7f36234850e61143b8e2dc kdegraphics-thumbnailers-4.10.2.tar.xz

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits March 2013