From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bd25a4232ba04720920d4a80d9b2f0682a7acc61 Date: Thu, 11 Jul 2013 17:20:03 +0200 Message-ID: <20130711152003.9B0B6202C1@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7752882077111647977==" List-Id: --===============7752882077111647977== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Thu Jul 11 15:18:31 2013 +0000 u-boot: Update to 2013.07rc2. =20 Add u-boot.kwb for Dreamplug and support for Wandboard Solo and Wandboard Dual. commit a18df16eed7ca1e60bb9422bd6b4e4e8686ba60c Author: Michael Tremer Date: Thu Jul 11 15:05:44 2013 +0000 kernel: ARM configuration changes. =20 CONFIG_DEBUG_LL is now enabled for all ARM kernels and CONFIG_EARLY_PRINTK is enabled for all kernels. =20 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=3Dy # IRQ subsystem # CONFIG_HARDIRQS_SW_RESEND=3Dy -# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set CONFIG_KTIME_SCALAR=3Dy =20 # @@ -453,9 +452,6 @@ CONFIG_LEDS_PWM=3Dm # iptables trigger is under Netfilter config (LED target) # # CONFIG_EDAC is not set -CONFIG_RTC_HCTOSYS=3Dy -CONFIG_RTC_SYSTOHC=3Dy -CONFIG_RTC_HCTOSYS_DEVICE=3D"rtc0" =20 # # on-CPU RTC drivers @@ -501,7 +497,10 @@ CONFIG_VERSATILE_FPGA_IRQ_NR=3D4 CONFIG_ARM_UNWIND=3Dy CONFIG_OLD_MCOUNT=3Dy # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=3Dy +CONFIG_DEBUG_LL_UART_NONE=3Dy +# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_DEBUG_SEMIHOSTING is not set CONFIG_DEBUG_LL_INCLUDE=3D"mach/debug-macro.S" # CONFIG_OC_ETM is not set =20 @@ -557,4 +556,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=3Dy # CONFIG_AUDIT_GENERIC=3Dy CONFIG_GENERIC_ATOMIC64=3Dy -# 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=3Dy # CONFIG_OUTER_CACHE=3Dy CONFIG_CACHE_FEROCEON_L2=3Dy -CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=3Dy +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set =20 # # Boot options @@ -174,20 +174,6 @@ CONFIG_REGULATOR_LP8755=3Dm # CONFIG_REGULATOR_TPS6507X is not set =20 # -# Graphics support -# -CONFIG_DRM_GEM_CMA_HELPER=3Dy -CONFIG_DRM_KMS_CMA_HELPER=3Dy - -# -# I2C encoder or helper chips -# -# CONFIG_DRM_TILCDC is not set -CONFIG_FB_SYS_FILLRECT=3Dy -CONFIG_FB_SYS_COPYAREA=3Dy -CONFIG_FB_SYS_IMAGEBLIT=3Dy - -# # 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=3Dy CONFIG_SCHED_SMT=3Dy CONFIG_NR_CPUS=3D8 CONFIG_HOTPLUG_CPU=3Dy -# CONFIG_ARM_PSCI is not set +CONFIG_ARM_PSCI=3Dy CONFIG_LOCAL_TIMERS=3Dy CONFIG_ARCH_NR_GPIO=3D512 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=3Dy @@ -675,6 +675,21 @@ CONFIG_VIDEO_CODA=3Dm CONFIG_VIDEO_IR_I2C=3Dy =20 # +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=3Dy +CONFIG_MEDIA_TUNER_SIMPLE=3Dy +CONFIG_MEDIA_TUNER_TDA8290=3Dy +CONFIG_MEDIA_TUNER_TDA827X=3Dy +CONFIG_MEDIA_TUNER_TDA18271=3Dy +CONFIG_MEDIA_TUNER_TDA9887=3Dy +CONFIG_MEDIA_TUNER_MT20XX=3Dy +CONFIG_MEDIA_TUNER_XC2028=3Dy +CONFIG_MEDIA_TUNER_XC5000=3Dy +CONFIG_MEDIA_TUNER_XC4000=3Dy +CONFIG_MEDIA_TUNER_MC44S803=3Dy + +# # I2C encoder or helper chips # # CONFIG_DRM_EXYNOS is not set @@ -890,7 +905,26 @@ CONFIG_DCACHE_WORD_ACCESS=3Dy CONFIG_RCU_CPU_STALL_TIMEOUT=3D60 # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_DEBUG_ZYNQ_UART0=3Dy +# 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=3D1 +CONFIG_DEBUG_LL_INCLUDE=3D"debug/zynq.S" CONFIG_OC_ETM=3Dy # CONFIG_PID_IN_CONTEXTIDR is not set =20 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=3Dy CONFIG_ARM_ERRATA_743622=3Dy CONFIG_ARM_ERRATA_751472=3Dy CONFIG_PL310_ERRATA_753970=3Dy -CONFIG_ARM_ERRATA_754327=3Dy =20 # # Kernel Features # +# CONFIG_ARM_PSCI is not set CONFIG_ARCH_NR_GPIO=3D0 CONFIG_HZ=3D200 # CONFIG_THUMB2_KERNEL is not set @@ -304,15 +304,12 @@ CONFIG_GIC_NON_BANKED=3Dy # RCU Debugging # CONFIG_DEBUG_USER=3Dy -CONFIG_DEBUG_LL=3Dy CONFIG_DEBUG_S3C_UART0=3Dy # 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=3Dy +CONFIG_DEBUG_LL_INCLUDE=3D"mach/debug-macro.S" =20 # # 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=3Dy # Multimedia core support # CONFIG_MEDIA_CAMERA_SUPPORT=3Dy -# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set +CONFIG_MEDIA_ANALOG_TV_SUPPORT=3Dy CONFIG_MEDIA_DIGITAL_TV_SUPPORT=3Dy # CONFIG_MEDIA_RADIO_SUPPORT is not set CONFIG_MEDIA_RC_SUPPORT=3Dy @@ -2530,6 +2530,15 @@ CONFIG_USB_S2255=3Dm # CONFIG_USB_SN9C102 is not set =20 # +# 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=3Dm @@ -2606,6 +2615,14 @@ CONFIG_MEDIA_PCI_SUPPORT=3Dy # =20 # +# 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=3Dm @@ -2758,11 +2775,13 @@ CONFIG_SOC_CAMERA_OV9740=3Dm CONFIG_SOC_CAMERA_RJ54N1=3Dm CONFIG_SOC_CAMERA_TW9910=3Dm CONFIG_MEDIA_ATTACH=3Dy +CONFIG_MEDIA_TUNER=3Dm CONFIG_MEDIA_TUNER_SIMPLE=3Dm CONFIG_MEDIA_TUNER_TDA8290=3Dm CONFIG_MEDIA_TUNER_TDA827X=3Dm CONFIG_MEDIA_TUNER_TDA18271=3Dm CONFIG_MEDIA_TUNER_TDA9887=3Dm +CONFIG_MEDIA_TUNER_MT20XX=3Dm CONFIG_MEDIA_TUNER_MT2060=3Dm CONFIG_MEDIA_TUNER_MT2063=3Dm CONFIG_MEDIA_TUNER_MT2266=3Dm @@ -3576,6 +3595,9 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=3Dm # CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=3Dy CONFIG_RTC_CLASS=3Dy +CONFIG_RTC_HCTOSYS=3Dy +CONFIG_RTC_SYSTOHC=3Dy +CONFIG_RTC_HCTOSYS_DEVICE=3D"rtc0" # CONFIG_RTC_DEBUG is not set =20 # @@ -4255,6 +4277,7 @@ CONFIG_HAVE_ARCH_KGDB=3Dy # CONFIG_KGDB is not set # CONFIG_TEST_KSTRTOX is not set CONFIG_STRICT_DEVMEM=3Dy +CONFIG_EARLY_PRINTK=3Dy =20 # # Security options @@ -4312,6 +4335,7 @@ CONFIG_PAX_USERCOPY=3Dy # Memory Protections # CONFIG_GRKERNSEC_KMEM=3Dy +# CONFIG_GRKERNSEC_PERF_HARDEN is not set CONFIG_GRKERNSEC_PROC_MEMMAP=3Dy CONFIG_GRKERNSEC_BRUTE=3Dy CONFIG_GRKERNSEC_MODHARDEN=3Dy @@ -4538,6 +4562,7 @@ CONFIG_ASYMMETRIC_KEY_TYPE=3Dm CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=3Dm CONFIG_PUBLIC_KEY_ALGO_RSA=3Dm CONFIG_X509_CERTIFICATE_PARSER=3Dm +CONFIG_VIRTUALIZATION=3Dy CONFIG_BINARY_PRINTF=3Dy =20 # 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=3Dy CONFIG_IRQ_FORCED_THREADING=3Dy CONFIG_SPARSE_IRQ=3Dy CONFIG_CLOCKSOURCE_WATCHDOG=3Dy -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=3Dy CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=3Dy CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=3Dy CONFIG_GENERIC_CMOS_UPDATE=3Dy @@ -572,6 +571,11 @@ CONFIG_IR_WINBOND_CIR=3Dm CONFIG_VIDEO_MEYE=3Dm =20 # +# Media capture/analog TV support +# +# CONFIG_VIDEO_ZORAN is not set + +# # Media digital TV PCI Adapters # CONFIG_VIDEO_VIA_CAMERA=3Dm @@ -863,7 +867,6 @@ CONFIG_FTRACE_SYSCALLS=3Dy CONFIG_DYNAMIC_FTRACE_WITH_REGS=3Dy # CONFIG_MMIOTRACE is not set # CONFIG_X86_VERBOSE_BOOTUP is not set -CONFIG_EARLY_PRINTK=3Dy # CONFIG_EARLY_PRINTK_DBGP is not set CONFIG_DEBUG_STACKOVERFLOW=3Dy # CONFIG_X86_PTDUMP is not set @@ -964,7 +967,6 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=3Dm CONFIG_KVM_APIC_ARCHITECTURE=3Dy CONFIG_KVM_MMIO=3Dy CONFIG_KVM_ASYNC_PF=3Dy -CONFIG_VIRTUALIZATION=3Dy CONFIG_KVM=3Dm CONFIG_KVM_INTEL=3Dm CONFIG_KVM_AMD=3Dm 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 @@ =20 name =3D kernel version =3D 3.9.5 -release =3D 0.2 +release =3D 0.3 thisapp =3D linux-%{version} =20 maintainer =3D Arne Fitzenreiter 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 @@ ############################################################################= ### =20 name =3D u-boot -version =3D 2013.04 +version =3D 2013.07 rc =3D 2 release =3D 0.1.rc%{rc} thisapp =3D %{name}-%{version}-rc%{rc} @@ -33,42 +33,37 @@ build # Skip all other architectures. [ "${arch}" =3D "%{DISTRO_ARCH}" ] || continue =20 - builddir=3D"$(pwd)/build-${platform}" - mkdir -p ${builddir} + make CROSS_COMPILE=3D"" ${platform}_config + make HOSTCC=3D"gcc %{CFLAGS}" CROSS_COMPILE=3D"" all ${targets} =20 - make CROSS_COMPILE=3D"" O=3D${builddir} ${platform}_config - make HOSTCC=3D"gcc %{CFLAGS}" CROSS_COMPILE=3D"" O=3D${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=3D"gcc %{CFLAGS}" HOSTSTRIP=3D"/bin/true" CROSS_COMPILE= =3D"" - make env HOSTCC=3D"gcc %{CFLAGS}" HOSTSTRIP=3D"/bin/true" - end - - install - while read arch platform targets; do - # Skip all other architectures. - [ "${arch}" =3D "%{DISTRO_ARCH}" ] || continue - - builddir=3D"build-${platform}" + # install installdir=3D"%{BUILDROOT}/usr/lib/%{name}/${platform}" mkdir -pv ${installdir} =20 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 =20 + # Build tools. + # Need to create a config because the tools won't build without. + make sheevaplug_config + + make tools HOSTCC=3D"gcc %{CFLAGS}" HOSTSTRIP=3D"/bin/true" CROSS_COMPILE= =3D"" + make env HOSTCC=3D"gcc %{CFLAGS}" HOSTSTRIP=3D"/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 --===============7752882077111647977==--