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 2.x development tree branch, next, updated.
36c92ab00dd7d5a778199217bffe4c52c94d77ec
Date: Tue, 04 Mar 2014 07:32:42 +0100
Message-ID: <20140304063257.6AC6520505@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1535288646738432172=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============1535288646738432172==
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 2.x development tree".
The branch, next has been updated
via 36c92ab00dd7d5a778199217bffe4c52c94d77ec (commit)
from c39413f2d59c04f2d6051d737abbb2c89e203ec1 (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 36c92ab00dd7d5a778199217bffe4c52c94d77ec
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Mar 4 07:07:31 2014 +0100
kernel: arm-multi: add marvel and allwinner support.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.armv5tel-ipfire-multi | 46 ++++++++++++++++++++-=
--
config/rootfiles/common/armv5tel/linux-multi | 19 +++++++++-
2 files changed, 58 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne=
l/kernel.config.armv5tel-ipfire-multi
index dfc746d..dcd3b08 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -333,7 +333,14 @@ CONFIG_ARCH_MULTIPLATFORM=3Dy
CONFIG_ARCH_MULTI_V7=3Dy
CONFIG_ARCH_MULTI_V6_V7=3Dy
# CONFIG_ARCH_MULTI_CPU_AUTO is not set
-# CONFIG_ARCH_MVEBU is not set
+CONFIG_ARCH_MVEBU=3Dy
+
+#
+# Marvell SOC with device tree
+#
+CONFIG_MACH_ARMADA_370_XP=3Dy
+CONFIG_MACH_ARMADA_370=3Dy
+CONFIG_MACH_ARMADA_XP=3Dy
# CONFIG_ARCH_BCM is not set
# CONFIG_GPIO_PCA953X is not set
CONFIG_KEYBOARD_GPIO_POLLED=3Dm
@@ -443,7 +450,7 @@ CONFIG_MACH_OMAP4_PANDA=3Dy
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=3Dy
# CONFIG_ARCH_SIRF is not set
# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_U8500 is not set
@@ -460,12 +467,14 @@ CONFIG_ARCH_VIRT=3Dy
CONFIG_ARCH_VT8500=3Dy
CONFIG_ARCH_WM8850=3Dy
CONFIG_ARCH_ZYNQ=3Dy
+CONFIG_PLAT_ORION=3Dy
CONFIG_PLAT_VERSATILE=3Dy
CONFIG_ARM_TIMER_SP804=3Dy
=20
#
# Processor Type
#
+CONFIG_CPU_PJ4B=3Dy
CONFIG_CPU_V7=3Dy
CONFIG_CPU_32v6K=3Dy
CONFIG_CPU_32v7=3Dy
@@ -502,6 +511,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=3D6
CONFIG_ARM_DMA_MEM_BUFFERABLE=3Dy
CONFIG_ARM_NR_BANKS=3D8
CONFIG_MULTI_IRQ_HANDLER=3Dy
+CONFIG_PJ4B_ERRATA_4742=3Dy
CONFIG_ARM_ERRATA_430973=3Dy
CONFIG_PL310_ERRATA_588369=3Dy
CONFIG_ARM_ERRATA_643719=3Dy
@@ -1314,6 +1324,7 @@ CONFIG_CMA_AREAS=3D7
#
# Bus devices
#
+CONFIG_MVEBU_MBUS=3Dy
CONFIG_OMAP_OCP2SCP=3Dy
CONFIG_OMAP_INTERCONNECT=3Dy
CONFIG_CONNECTOR=3Dy
@@ -1402,6 +1413,7 @@ CONFIG_MTD_NAND_IDS=3Dy
CONFIG_MTD_NAND_GPMI_NAND=3Dm
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_ORION=3Dy
CONFIG_MTD_NAND_MXC=3Dm
# CONFIG_MTD_ONENAND is not set
=20
@@ -1945,7 +1957,9 @@ CONFIG_NET_VENDOR_I825XX=3Dy
CONFIG_IP1000=3Dm
CONFIG_JME=3Dm
CONFIG_NET_VENDOR_MARVELL=3Dy
+CONFIG_MV643XX_ETH=3Dm
CONFIG_MVMDIO=3Dm
+CONFIG_MVNETA=3Dm
CONFIG_SKGE=3Dm
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=3Dy
@@ -2542,8 +2556,10 @@ CONFIG_SERIAL_8250_RSA=3Dy
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_AMBA_PL010=3Dm
-CONFIG_SERIAL_AMBA_PL011=3Dm
+CONFIG_SERIAL_AMBA_PL010=3Dy
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=3Dy
+CONFIG_SERIAL_AMBA_PL011=3Dy
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=3Dy
# CONFIG_SERIAL_MFD_HSU is not set
CONFIG_SERIAL_IMX=3Dy
CONFIG_SERIAL_IMX_CONSOLE=3Dy
@@ -2627,6 +2643,7 @@ CONFIG_I2C_CBUS_GPIO=3Dm
CONFIG_I2C_GPIO=3Dm
CONFIG_I2C_IMX=3Dm
# CONFIG_I2C_INTEL_MID is not set
+CONFIG_I2C_MV64XXX=3Dy
CONFIG_I2C_NOMADIK=3Dy
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=3Dy
@@ -2708,8 +2725,12 @@ CONFIG_PINCTRL_IMX51=3Dy
CONFIG_PINCTRL_IMX53=3Dy
CONFIG_PINCTRL_IMX6Q=3Dy
CONFIG_PINCTRL_SINGLE=3Dy
+CONFIG_PINCTRL_SUNXI=3Dy
# CONFIG_PINCTRL_EXYNOS is not set
# CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_MVEBU=3Dy
+CONFIG_PINCTRL_ARMADA_370=3Dy
+CONFIG_PINCTRL_ARMADA_XP=3Dy
CONFIG_PINCTRL_WMT=3Dy
CONFIG_PINCTRL_WM8850=3Dy
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=3Dy
@@ -2727,6 +2748,7 @@ CONFIG_GPIO_GENERIC=3Dy
#
CONFIG_GPIO_GENERIC_PLATFORM=3Dy
# CONFIG_GPIO_EM is not set
+CONFIG_GPIO_MVEBU=3Dy
CONFIG_GPIO_MXC=3Dy
CONFIG_GPIO_PL061=3Dy
# CONFIG_GPIO_RCAR is not set
@@ -2828,6 +2850,7 @@ CONFIG_CHARGER_TWL4030=3Dy
# CONFIG_BATTERY_GOLDFISH is not set
CONFIG_POWER_RESET=3Dy
CONFIG_POWER_RESET_GPIO=3Dy
+CONFIG_POWER_RESET_QNAP=3Dy
CONFIG_POWER_RESET_RESTART=3Dy
CONFIG_POWER_RESET_VEXPRESS=3Dy
CONFIG_POWER_AVS=3Dy
@@ -2964,6 +2987,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=3Dy
CONFIG_CPU_THERMAL=3Dy
CONFIG_THERMAL_EMULATION=3Dy
CONFIG_IMX_THERMAL=3Dm
+CONFIG_ARMADA_THERMAL=3Dm
CONFIG_WATCHDOG=3Dy
CONFIG_WATCHDOG_CORE=3Dy
CONFIG_WATCHDOG_NOWAYOUT=3Dy
@@ -4147,6 +4171,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=3Dy
CONFIG_USB_EHCI_PCI=3Dy
CONFIG_USB_EHCI_MXC=3Dm
CONFIG_USB_EHCI_HCD_OMAP=3Dy
+CONFIG_USB_EHCI_HCD_ORION=3Dy
CONFIG_USB_EHCI_HCD_PLATFORM=3Dy
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
@@ -4345,6 +4370,7 @@ CONFIG_MMC_OMAP=3Dy
CONFIG_MMC_OMAP_HS=3Dy
CONFIG_MMC_MXC=3Dm
# CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_MVSDIO=3Dy
# CONFIG_MMC_CB710 is not set
# CONFIG_MMC_VIA_SDMMC is not set
CONFIG_MMC_DW=3Dm
@@ -4495,6 +4521,7 @@ CONFIG_RTC_DRV_OMAP=3Dy
CONFIG_RTC_DRV_PL030=3Dm
CONFIG_RTC_DRV_PL031=3Dm
CONFIG_RTC_DRV_VT8500=3Dm
+CONFIG_RTC_DRV_MV=3Dm
CONFIG_RTC_DRV_MXC=3Dm
CONFIG_RTC_DRV_SNVS=3Dm
=20
@@ -4508,8 +4535,10 @@ CONFIG_DMADEVICES=3Dy
#
# DMA Devices
#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=3Dy
CONFIG_AMBA_PL08X=3Dy
# CONFIG_DW_DMAC is not set
+CONFIG_MV_XOR=3Dy
CONFIG_MX3_IPU=3Dy
CONFIG_MX3_IPU_IRQS=3D4
CONFIG_TIMB_DMA=3Dm
@@ -4687,6 +4716,9 @@ CONFIG_COMMON_CLK=3Dy
CONFIG_COMMON_CLK_VERSATILE=3Dy
CONFIG_COMMON_CLK_SI5351=3Dm
CONFIG_COMMON_CLK_AXI_CLKGEN=3Dm
+CONFIG_MVEBU_CLK_CORE=3Dy
+CONFIG_MVEBU_CLK_CPU=3Dy
+CONFIG_MVEBU_CLK_GATING=3Dy
CONFIG_HWSPINLOCK=3Dy
=20
#
@@ -4695,6 +4727,8 @@ CONFIG_HWSPINLOCK=3Dy
CONFIG_HWSPINLOCK_OMAP=3Dy
CONFIG_CLKSRC_OF=3Dy
CONFIG_CLKSRC_MMIO=3Dy
+CONFIG_ARMADA_370_XP_TIMER=3Dy
+CONFIG_SUN4I_TIMER=3Dy
CONFIG_VT8500_TIMER=3Dy
CONFIG_CADENCE_TTC_TIMER=3Dy
CONFIG_ARM_ARCH_TIMER=3Dy
@@ -5457,7 +5491,9 @@ CONFIG_CRYPTO_USER_API=3Dy
CONFIG_CRYPTO_USER_API_HASH=3Dy
CONFIG_CRYPTO_USER_API_SKCIPHER=3Dy
CONFIG_CRYPTO_HW=3Dy
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_CRYPTO_DEV_MV_CESA=3Dm
+CONFIG_CRYPTO_DEV_HIFN_795X=3Dm
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=3Dy
CONFIG_CRYPTO_DEV_OMAP_SHAM=3Dy
CONFIG_CRYPTO_DEV_OMAP_AES=3Dy
CONFIG_ASYMMETRIC_KEY_TYPE=3Dm
diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/=
common/armv5tel/linux-multi
index 30c4d55..89107a3 100644
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -5,6 +5,12 @@ boot/dtb-KVER-ipfire-multi
#boot/dtb-KVER-ipfire-multi/am335x-bone.dtb
#boot/dtb-KVER-ipfire-multi/am335x-evm.dtb
#boot/dtb-KVER-ipfire-multi/am335x-evmsk.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-db.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-mirabox.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-rd.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-db.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-gp.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-openblocks-ax3-4.dtb
#boot/dtb-KVER-ipfire-multi/imx25-karo-tx25.dtb
#boot/dtb-KVER-ipfire-multi/imx25-pdk.dtb
#boot/dtb-KVER-ipfire-multi/imx27-apf27.dtb
@@ -45,6 +51,10 @@ boot/dtb-KVER-ipfire-multi
#boot/dtb-KVER-ipfire-multi/omap4-sdp.dtb
#boot/dtb-KVER-ipfire-multi/omap4-var-som.dtb
#boot/dtb-KVER-ipfire-multi/omap5-evm.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-cubieboard.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-hackberry.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-mini-xplus.dtb
+#boot/dtb-KVER-ipfire-multi/sun5i-a13-olinuxino.dtb
#boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15-tc1.dtb
#boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15_a7.dtb
#boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca5s.dtb
@@ -181,6 +191,9 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/clk/clk-si5351.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq
#lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq/imx6q-cpufreq.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/hifn_795x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/mv_cesa.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/dma
#lib/modules/KVER-ipfire-multi/kernel/drivers/dma/timb_dma.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/firewire
@@ -1135,7 +1148,9 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe=
.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/jme.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mv643xx_e=
th.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvmdio.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvneta.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/skge.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/sky2.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/mellanox
@@ -1448,6 +1463,7 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-m48t59.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-max6900.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-msm6242.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mv.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mxc.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8523.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8563.ko
@@ -1579,14 +1595,13 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/usbip-host.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/vhci-hcd.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/thermal
+#lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/armada_thermal.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/imx_thermal.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_gsm.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_hdlc.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_r3964.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/amba-pl010.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/amba-pl011.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/arc_uart.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/sccnxp.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/uio
hooks/post-receive
--
IPFire 2.x development tree
--===============1535288646738432172==--