[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-297-g1b45ccd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-297-g1b45ccd
|
From: Julien B a. A. <ar...@us...> - 2012-05-08 17:35:53
|
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 1b45ccd796d1b3f5f9a661a672c03129dfbecde8 (commit)
via d5ca6ae35730dd8de1b14c5110a5bfa53c849847 (commit)
from 35b82458979f3f0550f00c9e39827ca718292566 (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 1b45ccd796d1b3f5f9a661a672c03129dfbecde8
Merge: d5ca6ae 35b8245
Author: Julien Boibessot <jul...@ar...>
Date: Tue May 8 19:35:26 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d5ca6ae35730dd8de1b14c5110a5bfa53c849847
Author: Julien Boibessot <jul...@ar...>
Date: Tue May 8 19:34:45 2012 +0200
[LINUX] Updates APF28 vanilla kernel (experimental) support from 3.1 to 3.3.5
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-linux-3.3.5.config | 1 +
...f28-linux-3.1.config => apf28-linux-3.3.config} | 3 +-
patches/linux/3.3.5 | 1 +
.../450-armadeus-add_apf28_module_support.patch | 57 ++++++++++++-------
...1-armadeus-add_apf28dev_baseboard_support.patch | 0
5 files changed, 40 insertions(+), 22 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.1.config => apf28-linux-3.3.config} (98%)
create mode 120000 patches/linux/3.3.5
rename patches/linux/{3.1 => 3.3}/450-armadeus-add_apf28_module_support.patch (70%)
rename patches/linux/{3.1 => 3.3}/451-armadeus-add_apf28dev_baseboard_support.patch (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config
new file mode 120000
index 0000000..e18fadf
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config
@@ -0,0 +1 @@
+apf28-linux-3.3.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config
similarity index 98%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config
index 4e50d65..460fc5e 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.1.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config
@@ -93,8 +93,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_MXS_AUART=y
-CONFIG_SERIAL_MXS_AUART_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
diff --git a/patches/linux/3.3.5 b/patches/linux/3.3.5
new file mode 120000
index 0000000..f30101c
--- /dev/null
+++ b/patches/linux/3.3.5
@@ -0,0 +1 @@
+3.3
\ No newline at end of file
diff --git a/patches/linux/3.1/450-armadeus-add_apf28_module_support.patch b/patches/linux/3.3/450-armadeus-add_apf28_module_support.patch
similarity index 70%
rename from patches/linux/3.1/450-armadeus-add_apf28_module_support.patch
rename to patches/linux/3.3/450-armadeus-add_apf28_module_support.patch
index 4f0bcd1..5c50cfb 100644
--- a/patches/linux/3.1/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/3.3/450-armadeus-add_apf28_module_support.patch
@@ -2,13 +2,13 @@ Add Armadeus systems APF28 SOM support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.1/arch/arm/mach-mxs/Kconfig
+Index: linux-3.3.5/arch/arm/mach-mxs/Kconfig
===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Kconfig 2011-11-08 17:02:08.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Kconfig 2011-11-09 15:52:13.000000000 +0100
-@@ -68,4 +68,13 @@
- bool "Ka-Ro TX28 module"
- select MODULE_TX28
+--- linux-3.3.5.orig/arch/arm/mach-mxs/Kconfig 2012-05-07 17:55:30.000000000 +0200
++++ linux-3.3.5/arch/arm/mach-mxs/Kconfig 2012-05-08 14:59:27.000000000 +0200
+@@ -91,4 +91,13 @@
+ bool "Support DENX M28EVK Platform"
+ select MODULE_M28
+config MACH_APF28
+ bool "Armadeus APF28 module"
@@ -20,21 +20,21 @@ Index: linux-3.1/arch/arm/mach-mxs/Kconfig
+ specific configurations for the module and its peripherals.
+
endif
-Index: linux-3.1/arch/arm/mach-mxs/Makefile
+Index: linux-3.3.5/arch/arm/mach-mxs/Makefile
===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Makefile 2011-11-08 17:09:03.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Makefile 2011-11-09 15:52:13.000000000 +0100
-@@ -12,5 +12,6 @@
- obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
+--- linux-3.3.5.orig/arch/arm/mach-mxs/Makefile 2012-05-07 17:55:30.000000000 +0200
++++ linux-3.3.5/arch/arm/mach-mxs/Makefile 2012-05-08 14:59:27.000000000 +0200
+@@ -13,5 +13,6 @@
+ obj-$(CONFIG_MACH_M28EVK) += mach-m28evk.o
obj-$(CONFIG_MODULE_TX28) += module-tx28.o
obj-$(CONFIG_MACH_TX28) += mach-tx28.o
+obj-$(CONFIG_MACH_APF28) += mach-apf28.o
obj-y += devices/
-Index: linux-3.1/arch/arm/mach-mxs/mach-apf28.c
+Index: linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/mach-mxs/mach-apf28.c 2011-11-09 15:53:02.000000000 +0100
++++ linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c 2012-05-08 14:59:27.000000000 +0200
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2011 Armadeus systems.
@@ -142,12 +142,27 @@ Index: linux-3.1/arch/arm/mach-mxs/mach-apf28.c
+ .init_machine = apf28_init,
+ .timer = &apf28_timer,
+MACHINE_END
-Index: linux-3.1/arch/arm/tools/mach-types
+Index: linux-3.3.5/arch/arm/mach-mxs/include/mach/mxs.h
===================================================================
---- linux-3.1.orig/arch/arm/tools/mach-types 2011-11-09 11:01:00.000000000 +0100
-+++ linux-3.1/arch/arm/tools/mach-types 2011-11-09 11:02:38.000000000 +0100
-@@ -1113,3 +1113,4 @@
- thales_adc MACH_THALES_ADC THALES_ADC 3492
- ubisys_p9d_evp MACH_UBISYS_P9D_EVP UBISYS_P9D_EVP 3493
- atdgp318 MACH_ATDGP318 ATDGP318 3494
-+apf28 MACH_APF28 APF28 3845
+--- linux-3.3.5.orig/arch/arm/mach-mxs/include/mach/mxs.h 2012-05-08 14:59:50.000000000 +0200
++++ linux-3.3.5/arch/arm/mach-mxs/include/mach/mxs.h 2012-05-08 15:00:14.000000000 +0200
+@@ -36,6 +36,7 @@
+ machine_is_mx28evk() || \
+ machine_is_m28evk() || \
+ machine_is_tx28() || \
++ machine_is_apf28() || \
+ 0)
+
+ /*
+Index: linux-3.3.5/arch/arm/mach-mxs/include/mach/uncompress.h
+===================================================================
+--- linux-3.3.5.orig/arch/arm/mach-mxs/include/mach/uncompress.h 2012-05-08 15:00:38.000000000 +0200
++++ linux-3.3.5/arch/arm/mach-mxs/include/mach/uncompress.h 2012-05-08 15:01:01.000000000 +0200
+@@ -65,6 +65,7 @@
+ case MACH_TYPE_MX28EVK:
+ case MACH_TYPE_M28EVK:
+ case MACH_TYPE_TX28:
++ case MACH_TYPE_APF28:
+ mxs_duart_base = MX28_DUART_BASE_ADDR;
+ break;
+ default:
diff --git a/patches/linux/3.1/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.3/451-armadeus-add_apf28dev_baseboard_support.patch
similarity index 100%
rename from patches/linux/3.1/451-armadeus-add_apf28dev_baseboard_support.patch
rename to patches/linux/3.3/451-armadeus-add_apf28dev_baseboard_support.patch
hooks/post-receive
--
armadeus
|
