[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-8-gc3f1103
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-8-gc3f1103
|
From: Sébastien S. <ss...@us...> - 2013-11-22 10:34:54
|
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 c3f1103cca2915947048a4781215964ed45c7e34 (commit)
via 6c7fc8605bd1fdabf5a53d7f5016986ca5ebefcf (commit)
from 157dbc21373bb426a3e157e42e263bf4a3cba3d3 (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 c3f1103cca2915947048a4781215964ed45c7e34
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 22 11:33:56 2013 +0100
[BUILDROOT] APF51: 3.12.1 is now the default kernel for apf51mainline_defconfig.
commit 6c7fc8605bd1fdabf5a53d7f5016986ca5ebefcf
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 22 10:26:22 2013 +0100
[LINUX] 3.12: APF51: add parallel display support.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51mainline_defconfig | 4 +-
.../armadeus/apf51/apf51-linux-3.12.1.config | 1 +
patches/linux/3.12.1 | 1 +
.../0401-armadeus-add_apf51dev_baseboard.patch | 37 +++++++++++++++++---
4 files changed, 36 insertions(+), 7 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
create mode 120000 patches/linux/3.12.1
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 572f2a7..a585ab2 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -5,7 +5,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.8"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_23_2=y
BR2_PACKAGE_HOST_GDB=y
@@ -96,7 +96,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
new file mode 120000
index 0000000..f5f41cd
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
@@ -0,0 +1 @@
+apf51-linux-3.12.config
\ No newline at end of file
diff --git a/patches/linux/3.12.1 b/patches/linux/3.12.1
new file mode 120000
index 0000000..fdcfcfd
--- /dev/null
+++ b/patches/linux/3.12.1
@@ -0,0 +1 @@
+3.12
\ No newline at end of file
diff --git a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
index 6619f2e..21454bc 100644
--- a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
@@ -7,7 +7,7 @@ Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- linux-3.12.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -34,6 +34,12 @@
+@@ -34,6 +34,40 @@
gpios = <&gpio1 2 0>;
linux,default-trigger = "heartbeat";
};
@@ -17,10 +17,38 @@ Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
+ gpios = <&gpio3 4 0>;
+ default-state = "on";
+ };
++ };
++
++ /* Copied fom Gwenhael Goavec-Merou's patch */
++ display@di1 {
++ compatible = "fsl,imx-parallel-display";
++ crtcs = <&ipu 0>;
++ interface-pix-fmt = "bgr666";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu_disp1_1>;
++
++ display-timings {
++ lw700 {
++ native-mode;
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ hsync-active = <1>;
++ vsync-active = <1>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
++ };
};
};
-@@ -51,6 +57,14 @@
+@@ -51,6 +85,14 @@
fsl,spi-num-chipselects = <2>;
cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
status = "okay";
@@ -35,7 +63,7 @@ Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
};
&esdhc1 {
-@@ -65,6 +79,7 @@
+@@ -65,6 +107,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc2_1>;
bus-width = <4>;
@@ -43,11 +71,10 @@ Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
non-removable;
status = "okay";
};
-@@ -91,6 +106,8 @@
+@@ -91,6 +134,7 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
-+ MX51_PAD_DI1_PIN12__GPIO3_1 0x80000000
+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
>;
};
hooks/post-receive
--
armadeus
|
