[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-502-gce4b06c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-502-gce4b06c
|
From: jorasse <jo...@us...> - 2013-11-11 18:19:55
|
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 "armadeus".
The branch, master has been updated
via ce4b06c2ecc647a62f0cc412d5195d85ca04f1f1 (commit)
via 9febdb870eea8e99a99df3c912bdd90364fa8a76 (commit)
via 464588e64ff2f959cccbc4a2c5dc298ac8106b08 (commit)
from 065e155264768af6f303d3117062dfaa63bfe24a (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 ce4b06c2ecc647a62f0cc412d5195d85ca04f1f1
Author: Philippe Reynes <tr...@ya...>
Date: Mon Nov 11 17:50:46 2013 +0100
[LINUX] 3.12: move to 3.12
commit 9febdb870eea8e99a99df3c912bdd90364fa8a76
Author: Philippe Reynes <tr...@ya...>
Date: Fri Nov 8 17:30:59 2013 +0100
[LINUX] 3.11: move to 3.11.7
Signed-off-by: Philippe Reynes <tr...@ya...>
commit 464588e64ff2f959cccbc4a2c5dc298ac8106b08
Author: Philippe Reynes <tr...@ya...>
Date: Thu Nov 7 20:55:55 2013 +0100
[LINUX] 3.10: move to 3.10.18
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.17.config => apf27-linux-3.10.18.config} | 0
...nux-3.11.6.config => apf27-linux-3.11.7.config} | 0
...7-linux-3.10.config => apf27-linux-3.12.config} | 0
...x-3.10.17.config => apf28-linux-3.10.18.config} | 0
...nux-3.11.6.config => apf28-linux-3.11.7.config} | 0
.../armadeus/apf28/apf28-linux-3.12-rc1.config | 183 --------------------
...x-3.10.17.config => apf51-linux-3.10.18.config} | 0
...nux-3.11.6.config => apf51-linux-3.11.7.config} | 0
...1-linux-3.11.config => apf51-linux-3.12.config} | 0
patches/linux/{3.10.17 => 3.10.18} | 0
patches/linux/{3.11.6 => 3.11.7} | 0
patches/linux/3.12-rc1 | 1 -
.../0212-armadeus-imx27-fix_cspi_per_clk_id.patch | 26 ---
...us-imx51-dts-add-pin-definition-for-uart1.patch | 43 +++--
14 files changed, 26 insertions(+), 227 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.17.config => apf27-linux-3.10.18.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.11.6.config => apf27-linux-3.11.7.config} (100%)
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.config => apf27-linux-3.12.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.17.config => apf28-linux-3.10.18.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.11.6.config => apf28-linux-3.11.7.config} (100%)
delete mode 100644 buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.17.config => apf51-linux-3.10.18.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.11.6.config => apf51-linux-3.11.7.config} (100%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.11.config => apf51-linux-3.12.config} (100%)
rename patches/linux/{3.10.17 => 3.10.18} (100%)
rename patches/linux/{3.11.6 => 3.11.7} (100%)
delete mode 120000 patches/linux/3.12-rc1
delete mode 100644 patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.17.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.17.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.18.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.11.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.11.7.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.17.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.17.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.18.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.11.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.11.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
deleted file mode 100644
index cb875e4..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
+++ /dev/null
@@ -1,183 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ARCH_MULTI_V7 is not set
-CONFIG_ARCH_MXS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_IDLE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-CONFIG_RTL8187=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_MXS_AUART=y
-CONFIG_TTY_PRINTK=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MXS=y
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_MXS=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_HWMON=m
-CONFIG_WATCHDOG=y
-CONFIG_STMP3XXX_RTC_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_FB=y
-CONFIG_FB_MXS=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_MON=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=m
-CONFIG_MMC=y
-CONFIG_MMC_MXS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STMP=y
-CONFIG_DMADEVICES=y
-CONFIG_MXS_DMA=y
-CONFIG_STAGING=y
-CONFIG_MXS_LRADC=y
-CONFIG_IIO=y
-CONFIG_PWM=y
-CONFIG_PWM_MXS=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.17.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.18.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.11.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.11.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.config
diff --git a/patches/linux/3.10.17 b/patches/linux/3.10.18
similarity index 100%
rename from patches/linux/3.10.17
rename to patches/linux/3.10.18
diff --git a/patches/linux/3.11.6 b/patches/linux/3.11.7
similarity index 100%
rename from patches/linux/3.11.6
rename to patches/linux/3.11.7
diff --git a/patches/linux/3.12-rc1 b/patches/linux/3.12-rc1
deleted file mode 120000
index fdcfcfd..0000000
--- a/patches/linux/3.12-rc1
+++ /dev/null
@@ -1 +0,0 @@
-3.12
\ No newline at end of file
diff --git a/patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch b/patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
deleted file mode 100644
index f440607..0000000
--- a/patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-CSPI PER clock is per2clk (id per2_gate/60) instead of cspiX_ipg_gate.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-Index: linux-3.11-rc4/arch/arm/boot/dts/imx27.dtsi
-===================================================================
---- linux-3.11-rc4.orig/arch/arm/boot/dts/imx27.dtsi
-+++ linux-3.11-rc4/arch/arm/boot/dts/imx27.dtsi
-@@ -159,7 +159,7 @@
- compatible = "fsl,imx27-cspi";
- reg = <0x1000e000 0x1000>;
- interrupts = <16>;
-- clocks = <&clks 53>, <&clks 53>;
-+ clocks = <&clks 53>, <&clks 60>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -170,7 +170,7 @@
- compatible = "fsl,imx27-cspi";
- reg = <0x1000f000 0x1000>;
- interrupts = <15>;
-- clocks = <&clks 52>, <&clks 52>;
-+ clocks = <&clks 52>, <&clks 60>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
diff --git a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
index ace24a4..da3703a 100644
--- a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
+++ b/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
@@ -1,21 +1,30 @@
-To use UART1 without CTS/RTS.
+From 8298da1db865a3789c8a786c95b5def6003e53d1 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Mon, 11 Nov 2013 10:09:41 +0100
+Subject: [PATCH] To use UART1 without CTS/RTS.
Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ arch/arm/boot/dts/imx51.dtsi | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
-Index: linux-3.11.1/arch/arm/boot/dts/imx51.dtsi
-===================================================================
---- linux-3.11.1.orig/arch/arm/boot/dts/imx51.dtsi 2013-10-23 11:06:16.201044459 +0200
-+++ linux-3.11.1/arch/arm/boot/dts/imx51.dtsi 2013-10-28 12:19:52.758294405 +0100
-@@ -535,6 +535,12 @@
- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
- >;
- };
-+ pinctrl_uart1_2: uart1grp-2 {
-+ fsl,pins = <
-+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-+ >;
-+ };
- };
+diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
+index 524ac61..c863f6c 100644
+--- a/arch/arm/boot/dts/imx51.dtsi
++++ b/arch/arm/boot/dts/imx51.dtsi
+@@ -760,6 +760,12 @@
+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+ >;
+ };
++ pinctrl_uart1_2: uart1grp-2 {
++ fsl,pins = <
++ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
++ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
++ >;
++ };
+ };
- uart2 {
+ uart2 {
+--
+1.7.4.4
+
hooks/post-receive
--
armadeus
|
