From 1cbcbe6c389c712d7368ba171bd0b00fe8e32819 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 23 Dec 2011 10:28:07 -0600 Subject: [PATCH] pull in the arm config changes from f15 --- config-arm-generic | 24 +++++++--------- config-arm-highbank | 13 +++++++++ config-arm-imx | 20 +++++++++++++ config-arm-kirkwood | 2 +- config-arm-omap-generic | 63 ++++------------------------------------- config-arm-tegra | 5 +--- 6 files changed, 51 insertions(+), 76 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index 1a89e6384..3141e66a5 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -44,8 +44,6 @@ CONFIG_OABI_COMPAT=y # CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" CONFIG_NO_HZ=y @@ -55,12 +53,10 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_LEDS=y CONFIG_LEDS_CPU=y -# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_MTD_AFS_PARTS=y CONFIG_MTD_ARM_INTEGRATOR=y CONFIG_MTD_IMPA7=y -CONFIG_MTD_OF_PARTS=y CONFIG_AX88796=m CONFIG_AX88796_93CX6=y @@ -146,9 +142,6 @@ CONFIG_SPARSE_IRQ=y # CONFIG_ARM_PATCH_PHYS_VIRT is not set -CONFIG_NET_VENDOR_FARADAY=y -CONFIG_FTMAC100=m - CONFIG_HWSPINLOCK_OMAP=m CONFIG_USE_OF=y @@ -159,7 +152,12 @@ CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MMC_SDHCI_PXAV2=m -CONFIG_FTGMAC100=m + +# CONFIG_FTGMAC100 is not set +# CONFIG_FTMAC100 is not set +# +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +CONFIG_LSM_MMAP_MIN_ADDR=32768 # disable TPM on arm at least on the trimslices it causes havoc # CONFIG_TCG_TPM is not set @@ -176,9 +174,9 @@ CONFIG_FTGMAC100=m # CONFIG_DRM_RADEON is not set # CONFIG_ATM_HE is not set # CONFIG_SCSI_ACARD is not set -# CONFIG_ARM_KPROBES_TEST is not set -# CONFIG_PL330_DMA is not set -# CONFIG_VIDEO_S5K6AA is not set -CONFIG_PL310_ERRATA_753970=y -CONFIG_PL310_ERRATA_769419=y +# these all currently fail due to missing symbols __bad_udelay or +# error: implicit declaration of function ‘iowrite32be’ +# CONFIG_SND_ALI5451 is not set +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_MLX4_EN is not set diff --git a/config-arm-highbank b/config-arm-highbank index 18fc0c4cc..d4aca8222 100644 --- a/config-arm-highbank +++ b/config-arm-highbank @@ -1,3 +1,16 @@ ONFIG_ARCH_HIGHBANK=y CONFIG_VFP=y CONFIG_NEON=y + +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEBUG=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y diff --git a/config-arm-imx b/config-arm-imx index a491b8cab..5ed7ae2ed 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -6,6 +6,14 @@ CONFIG_MACH_EUKREA_CPUIMX51=y CONFIG_VFP=y CONFIG_NEON=y +CONFIG_MACH_EUKREA_CPUIMX51SD=y +CONFIG_MACH_MX51_EFIKAMX=y +CONFIG_MACH_MX51_EFIKASB=y +# CONFIG_SWP_EMULATE is not set +# CONFIG_THUMB2_KERNEL is not set +CONFIG_CPU_FREQ_IMX=y +CONFIG_W1_MASTER_MXC=m +CONFIG_IMX_SDMA=y CONFIG_MACH_MX31ADS=y CONFIG_MACH_MX31LILLY=y CONFIG_MACH_MX31LITE=y @@ -73,3 +81,15 @@ CONFIG_IMX2_WDT=m CONFIG_SND_SOC_PHYCORE_AC97=m CONFIG_SND_SOC_EUKREA_TLV320=m +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEBUG=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y diff --git a/config-arm-kirkwood b/config-arm-kirkwood index 6aa045cd9..415e822dc 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -40,4 +40,4 @@ CONFIG_RTC_DRV_MV=m CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m - +# CONFIG_TOUCHSCREEN_EETI is not set diff --git a/config-arm-omap-generic b/config-arm-omap-generic index 746195e6a..03913d36d 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -51,7 +51,6 @@ 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 is not set # # TI OMAP2/3/4 Specific Features @@ -94,7 +93,6 @@ CONFIG_MACH_OMAP_3630SDP=y CONFIG_MACH_OMAP_4430SDP=y CONFIG_MACH_OMAP4_PANDA=y CONFIG_MACH_TI8168EVM=y -CONFIG_MACH_OMAP_GENERIC=y CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set # System MMU @@ -123,6 +121,7 @@ CONFIG_ARM_ERRATA_430973=y # 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 @@ -135,9 +134,6 @@ CONFIG_ARM_GIC=y # CONFIG_PCCARD is not set CONFIG_SMP=y CONFIG_SMP_ON_UP=y -CONFIG_ARM_CPU_TOPOLOGY=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y CONFIG_HAVE_ARM_SCU=y CONFIG_HAVE_ARM_TWD=y CONFIG_NR_CPUS=2 @@ -152,7 +148,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_HW_PERF_EVENTS=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_KSM is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_CC_STACKPROTECTOR is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 @@ -187,10 +182,6 @@ CONFIG_PM_SLEEP_SMP=y # CONFIG_APM_EMULATION is not set CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set # CONFIG_ARPD is not set @@ -295,9 +286,6 @@ CONFIG_EEPROM_93XX46=m CONFIG_DM_MULTIPATH=y # CONFIG_TARGET_CORE is not set # CONFIG_MACVTAP is not set -CONFIG_ETHERNET=y -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_NET_VENDOR_MICROCHIP=y CONFIG_MII=y # CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -330,13 +318,14 @@ CONFIG_SMSC911X=y # CONFIG_DNET is not set # CONFIG_B44 is not set CONFIG_KS8851=m +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # CONFIG_ATH9K_HTC is not set # CONFIG_AR9170_USB is not set # CONFIG_B43_SDIO is not set # CONFIG_B43_PHY_N is not set # CONFIG_HOSTAP is not set # CONFIG_IWM is not set -# CONFIG_BRCMDBG is not set CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_MESH is not set CONFIG_P54_SPI=m @@ -418,7 +407,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y # CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_R3964 is not set @@ -454,7 +442,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y -# CONFIG_GPIO_GENERIC_PLATFORM is not set # # Memory mapped GPIO expanders: @@ -496,7 +483,6 @@ CONFIG_GPIO_TWL4030=y # CONFIG_CHARGER_TWL4030 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADCXX is not set @@ -631,13 +617,6 @@ CONFIG_REGULATOR_TWL4030=y # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set # CONFIG_REGULATOR_TPS6524X is not set -# CONFIG_REGULATOR_GPIO is not set -CONFIG_MEDIA_SUPPORT=y -CONFIG_RC_CORE=y -CONFIG_LIRC=y -CONFIG_IR_RC5_SZ_DECODER=y -CONFIG_IR_LIRC_CODEC=y -# CONFIG_RC_LOOPBACK is not set CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_V4L2_MEM2MEM_DEV=m # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -690,8 +669,6 @@ CONFIG_VIDEO_OMAP2_VOUT=m # CONFIG_VIDEO_AU0828 is not set # CONFIG_VIDEO_SR030PC30 is not set # CONFIG_VIDEO_OMAP3 is not set -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set # CONFIG_SOC_CAMERA is not set CONFIG_USB_ET61X251=m CONFIG_USB_SN9C102=m @@ -746,8 +723,6 @@ CONFIG_PANEL_GENERIC_DPI=y CONFIG_PANEL_SHARP_LS037V7DW01=y CONFIG_PANEL_NEC_NL8048HL11_01B=y CONFIG_PANEL_TPO_TD043MTEA1=y -# CONFIG_PANEL_DVI is not set -# CONFIG_PANEL_PICODLP is not set # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set @@ -818,25 +793,6 @@ CONFIG_SND_SOC_TLV320AIC3X=y CONFIG_SND_SOC_TWL4030=y CONFIG_SND_SOC_TWL6040=y # CONFIG_SOUND_PRIME is not set -CONFIG_HID=y -CONFIG_HID_3M_PCT=m -CONFIG_HID_A4TECH=m -# CONFIG_HID_ACRUX is not set -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_EZKEY=m -CONFIG_HID_KYE=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MOSART=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_NTRIG=m -CONFIG_HID_QUANTA=m -CONFIG_HID_STANTUM=m # CONFIG_HID_TIVO_SLIDE is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # CONFIG_USB_DEVICEFS is not set @@ -899,7 +855,6 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_R8A66597 is not set @@ -907,7 +862,6 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_RENESAS_USBHS is not set # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set CONFIG_USB_ETH=y @@ -915,7 +869,6 @@ CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_EEM=y # CONFIG_USB_G_NCM is not set # CONFIG_USB_GADGETFS is not set -# CONFIG_USB_DWC3 is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_MASS_STORAGE is not set @@ -1006,11 +959,6 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=m -CONFIG_ISO9660_FS=m -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_DEBUG is not set # CONFIG_NTFS_RW is not set # CONFIG_JFFS2_SUMMARY is not set @@ -1078,9 +1026,6 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_ICEDCC is not set CONFIG_OC_ETM=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 # CONFIG_IMA is not set CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_RNG=m @@ -1114,3 +1059,5 @@ CONFIG_LIBCRC32C=y # CONFIG_USB_HSO is not set CONFIG_CRYSTALHD=m + +CONFIG_GPIO_GENERIC_PLATFORM=y diff --git a/config-arm-tegra b/config-arm-tegra index 0f9d0f0ff..b131978d2 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -5,7 +5,6 @@ CONFIG_MACH_PAZ00=y CONFIG_MACH_TRIMSLICE=y CONFIG_MACH_WARIO=y CONFIG_MACH_TEGRA_DT=y -CONFIG_MACH_VENTANA=y CONFIG_TEGRA_DEBUG_UARTD=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -35,6 +34,7 @@ CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_742230=y # CONFIG_ARM_ERRATA_742231 is not set CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_769419=y CONFIG_ARM_ERRATA_720789=y # CONFIG_PL310_ERRATA_727915 is not set # CONFIG_ARM_ERRATA_743622 is not set @@ -44,9 +44,6 @@ CONFIG_ARM_ERRATA_720789=y # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set CONFIG_SMP_ON_UP=y -CONFIG_ARM_CPU_TOPOLOGY=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y CONFIG_LOCAL_TIMERS=y # CONFIG_THUMB2_KERNEL is not set CONFIG_HW_PERF_EVENTS=y