From: Michael Tremer Date: Thu, 11 Jul 2013 15:05:44 +0000 (+0000) Subject: kernel: ARM configuration changes. X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=a18df16eed7ca1e60bb9422bd6b4e4e8686ba60c kernel: ARM configuration changes. CONFIG_DEBUG_LL is now enabled for all ARM kernels and CONFIG_EARLY_PRINTK is enabled for all kernels. This patch also fixes some warnings about inconsistencies with the media stack configuration. --- diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 506dd53cb..6baebb4be 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -14,7 +14,6 @@ CONFIG_BROKEN_ON_SMP=y # IRQ subsystem # CONFIG_HARDIRQS_SW_RESEND=y -# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set CONFIG_KTIME_SCALAR=y # @@ -453,9 +452,6 @@ CONFIG_LEDS_PWM=m # iptables trigger is under Netfilter config (LED target) # # CONFIG_EDAC is not set -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # # on-CPU RTC drivers @@ -501,7 +497,10 @@ CONFIG_VERSATILE_FPGA_IRQ_NR=4 CONFIG_ARM_UNWIND=y CONFIG_OLD_MCOUNT=y # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_LL_UART_NONE=y +# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_DEBUG_SEMIHOSTING is not set CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_OC_ETM is not set @@ -557,4 +556,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_AUDIT_GENERIC=y CONFIG_GENERIC_ATOMIC64=y -# CONFIG_VIRTUALIZATION is not set diff --git a/kernel/config-armv5tel-kirkwood b/kernel/config-armv5tel-kirkwood index eb407a1bc..9f6492fce 100644 --- a/kernel/config-armv5tel-kirkwood +++ b/kernel/config-armv5tel-kirkwood @@ -72,7 +72,7 @@ CONFIG_CPU_TLB_FEROCEON=y # CONFIG_OUTER_CACHE=y CONFIG_CACHE_FEROCEON_L2=y -CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=y +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set # # Boot options @@ -173,20 +173,6 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set -# -# Graphics support -# -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y - -# -# I2C encoder or helper chips -# -# CONFIG_DRM_TILCDC is not set -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y - # # Frame buffer hardware drivers # diff --git a/kernel/config-armv7hl-default b/kernel/config-armv7hl-default index 01998265f..1e08cc1b5 100644 --- a/kernel/config-armv7hl-default +++ b/kernel/config-armv7hl-default @@ -287,7 +287,7 @@ CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y -# CONFIG_ARM_PSCI is not set +CONFIG_ARM_PSCI=y CONFIG_LOCAL_TIMERS=y CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y @@ -674,6 +674,21 @@ CONFIG_VIDEO_CODA=m # CONFIG_VIDEO_IR_I2C=y +# +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=y +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_MC44S803=y + # # I2C encoder or helper chips # @@ -890,7 +905,26 @@ CONFIG_DCACHE_WORD_ACCESS=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_DEBUG_ZYNQ_UART0=y +# CONFIG_DEBUG_ZYNQ_UART1 is not set +# CONFIG_DEBUG_HIGHBANK_UART is not set +# CONFIG_DEBUG_IMX31_UART is not set +# CONFIG_DEBUG_IMX35_UART is not set +# CONFIG_DEBUG_IMX51_UART is not set +# CONFIG_DEBUG_IMX53_UART is not set +# CONFIG_DEBUG_IMX6Q_UART is not set +# CONFIG_DEBUG_MVEBU_UART is not set +# CONFIG_DEBUG_OMAP2PLUS_UART is not set +# CONFIG_DEBUG_PICOXCELL_UART is not set +# CONFIG_DEBUG_SOCFPGA_UART is not set +# CONFIG_DEBUG_SUNXI_UART0 is not set +# CONFIG_DEBUG_SUNXI_UART1 is not set +# CONFIG_DEBUG_VEXPRESS_UART0_DETECT is not set +# CONFIG_DEBUG_VEXPRESS_UART0_CA9 is not set +# CONFIG_DEBUG_VEXPRESS_UART0_RS1 is not set +# CONFIG_DEBUG_VT8500_UART0 is not set CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="debug/zynq.S" CONFIG_OC_ETM=y # CONFIG_PID_IN_CONTEXTIDR is not set diff --git a/kernel/config-armv7hl-exynos b/kernel/config-armv7hl-exynos index fa2406060..ea5de5962 100644 --- a/kernel/config-armv7hl-exynos +++ b/kernel/config-armv7hl-exynos @@ -122,11 +122,11 @@ CONFIG_ARM_ERRATA_742231=y CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_751472=y CONFIG_PL310_ERRATA_753970=y -CONFIG_ARM_ERRATA_754327=y # # Kernel Features # +# CONFIG_ARM_PSCI is not set CONFIG_ARCH_NR_GPIO=0 CONFIG_HZ=200 # CONFIG_THUMB2_KERNEL is not set @@ -304,15 +304,12 @@ CONFIG_GIC_NON_BANKED=y # RCU Debugging # CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y CONFIG_DEBUG_S3C_UART0=y # CONFIG_DEBUG_S3C_UART1 is not set # CONFIG_DEBUG_S3C_UART2 is not set # CONFIG_DEBUG_S3C_UART3 is not set # CONFIG_DEBUG_LL_UART_NONE is not set -# CONFIG_DEBUG_ICEDCC is not set -# CONFIG_DEBUG_SEMIHOSTING is not set -CONFIG_EARLY_PRINTK=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # # Non-executable pages diff --git a/kernel/config-generic b/kernel/config-generic index 4c8e2b0d1..9ffe2bff0 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -2412,7 +2412,7 @@ CONFIG_MEDIA_SUPPORT=y # Multimedia core support # CONFIG_MEDIA_CAMERA_SUPPORT=y -# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set CONFIG_MEDIA_RC_SUPPORT=y @@ -2529,6 +2529,15 @@ CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m # CONFIG_USB_SN9C102 is not set +# +# Analog TV USB devices +# +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_HDPVR is not set +# CONFIG_VIDEO_TLG2300 is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_VIDEO_STK1160 is not set + # # Analog/digital TV USB devices # @@ -2605,6 +2614,14 @@ CONFIG_MEDIA_PCI_SUPPORT=y # Media capture support # +# +# Media capture/analog TV support +# +# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_MXB is not set + # # Media capture/analog/hybrid TV support # @@ -2758,11 +2775,13 @@ CONFIG_SOC_CAMERA_OV9740=m CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA827X=m CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m CONFIG_MEDIA_TUNER_MT2266=m @@ -3576,6 +3595,9 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m # CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -4255,6 +4277,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_TEST_KSTRTOX is not set CONFIG_STRICT_DEVMEM=y +CONFIG_EARLY_PRINTK=y # # Security options @@ -4312,6 +4335,7 @@ CONFIG_PAX_USERCOPY=y # Memory Protections # CONFIG_GRKERNSEC_KMEM=y +# CONFIG_GRKERNSEC_PERF_HARDEN is not set CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -4538,6 +4562,7 @@ CONFIG_ASYMMETRIC_KEY_TYPE=m CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_VIRTUALIZATION=y CONFIG_BINARY_PRINTF=y # diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 201113a96..cad967316 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -29,7 +29,6 @@ CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -571,6 +570,11 @@ CONFIG_IR_WINBOND_CIR=m # CONFIG_VIDEO_MEYE=m +# +# Media capture/analog TV support +# +# CONFIG_VIDEO_ZORAN is not set + # # Media digital TV PCI Adapters # @@ -863,7 +867,6 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # CONFIG_MMIOTRACE is not set # CONFIG_X86_VERBOSE_BOOTUP is not set -CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_X86_PTDUMP is not set @@ -964,7 +967,6 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y -CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 3d20985eb..5f27c08b9 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 3.9.5 -release = 0.2 +release = 0.3 thisapp = linux-%{version} maintainer = Arne Fitzenreiter