[git.ipfire.org] IPFire 3.x development tree branch, master, updated. bd25a4232ba04720920d4a80d9b2f0682a7acc61 - IPFire-SCM

11 Jul 2013

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  bd25a4232ba04720920d4a80d9b2f0682a7acc61 (commit)
       via  a18df16eed7ca1e60bb9422bd6b4e4e8686ba60c (commit)
      from  85662fb5be1705406d51b95d74c33b8f147ed7c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bd25a4232ba04720920d4a80d9b2f0682a7acc61
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jul 11 15:18:31 2013 +0000
u-boot: Update to 2013.07rc2.
Add u-boot.kwb for Dreamplug and support for
    Wandboard Solo and Wandboard Dual.
commit a18df16eed7ca1e60bb9422bd6b4e4e8686ba60c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jul 11 15:05:44 2013 +0000
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.
-----------------------------------------------------------------------
Summary of changes:
 kernel/config-arm-generic       | 10 ++++-----
 kernel/config-armv5tel-kirkwood | 16 +--------------
 kernel/config-armv7hl-default   | 36 ++++++++++++++++++++++++++++++++-
 kernel/config-armv7hl-exynos    |  7 ++-----
 kernel/config-generic           | 27 ++++++++++++++++++++++++-
 kernel/config-x86-generic       |  8 +++++---
 kernel/kernel.nm                |  2 +-
 u-boot/targets                  |  4 +++-
 u-boot/u-boot.nm                | 45 ++++++++++++++++++-----------------------
 9 files changed, 97 insertions(+), 58 deletions(-)
Difference in files:

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 506dd53..6baebb4 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 eb407a1..9f6492f 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
@@ -174,20 +174,6 @@ CONFIG_REGULATOR_LP8755=m
 # 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
 #
 # CONFIG_BACKLIGHT_PWM is not set
diff --git a/kernel/config-armv7hl-default b/kernel/config-armv7hl-default
index 0199826..1e08cc1 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
@@ -675,6 +675,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
 #
 # CONFIG_DRM_EXYNOS is not set
@@ -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 fa24060..ea5de59 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 4c8e2b0..9ffe2bf 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
@@ -2530,6 +2530,15 @@ 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
 #
 CONFIG_VIDEO_AU0828=m
@@ -2606,6 +2615,14 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
#
+# 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
 #
 CONFIG_VIDEO_CX18=m
@@ -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 201113a..cad9673 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
@@ -572,6 +571,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
 #
 CONFIG_VIDEO_VIA_CAMERA=m
@@ -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 3d20985..5f27c08 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 arne.fitzenreiter@ipfire.org
diff --git a/u-boot/targets b/u-boot/targets
index 8f2c601..18cf5b1 100644
--- a/u-boot/targets
+++ b/u-boot/targets
@@ -1,4 +1,6 @@
 # HOST_ARCH		platform	targets
 # --------------------------------------------
-armv5tel		dreamplug	u-boot.bin
+armv5tel		dreamplug	u-boot.bin u-boot.kwb
 armv7hl			omap4_panda	u-boot.bin u-boot.img
+armv7hl			wandboard_solo	u-boot.imx
+armv7hl			wandboard_dl	u-boot.imx
diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm
index 4099778..517c262 100644
--- a/u-boot/u-boot.nm
+++ b/u-boot/u-boot.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = u-boot
-version    = 2013.04
+version    = 2013.07
 rc         = 2
 release    = 0.1.rc%{rc}
 thisapp    = %{name}-%{version}-rc%{rc}
@@ -33,42 +33,37 @@ build
    		# Skip all other architectures.
    		[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
-			builddir="$(pwd)/build-${platform}"
-			mkdir -p ${builddir}
+			make CROSS_COMPILE="" ${platform}_config
+			make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" all ${targets}
-			make CROSS_COMPILE="" O=${builddir} ${platform}_config
-			make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" O=${builddir}
-		done < %{DIR_SOURCE}/targets
-
-		# Build tools.
-		# Need to create a config because the tools won't build without.
-		make sheevaplug_config
-
-		make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE=""
-		make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true"
-	end
-
-	install
-		while read arch platform targets; do
-			# Skip all other architectures.
-			[ "${arch}" = "%{DISTRO_ARCH}" ] || continue
-
-			builddir="build-${platform}"
+			# install
    		installdir="%{BUILDROOT}/usr/lib/%{name}/${platform}"
    		mkdir -pv ${installdir}
for target in ${targets}; do
-				install -D -m 644 ${builddir}/${target} ${installdir}
+				install -D -m 644 ${target} ${installdir}
    		done
-			if [ -e "${builddir}/MLO" ]; then
-				install -D -m 644 ${builddir}/MLO ${installdir}
+			if [ -e "MLO" ]; then
+				install -D -m 644 MLO ${installdir}
    		fi
-			for f in ${builddir}/spl/*.bin; do
+			for f in spl/*.bin; do
    			[ -e "${f}" ] || continue
    			install -D -m 644 ${f} ${installdir}
    		done
+
+			# Clean out the build environment.
+			make distclean
    	done < %{DIR_SOURCE}/targets
+		# Build tools.
+		# Need to create a config because the tools won't build without.
+		make sheevaplug_config
+
+		make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE=""
+		make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true"
+	end
+
+	install
    	# Install tools.
    	mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1
    	install -p -m 0755 tools/mkimage %{BUILDROOT}/usr/bin
hooks/post-receive
--
IPFire 3.x development tree

    