[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-380-gbca6bda

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  bca6bda9f2a410cea4f4aad94c51025ec7137525 (commit)
       via  c8c9ef281369f0a4ceb421c4b1f00d21443e77f8 (commit)
      from  6a94351baab3869bd983400ae740e10342b25640 (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 bca6bda9f2a410cea4f4aad94c51025ec7137525
Merge: c8c9ef2 6a94351
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jun 14 11:48:54 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit c8c9ef281369f0a4ceb421c4b1f00d21443e77f8
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jun 14 11:48:17 2012 +0200

    [LINUX] Move APF28 experimental mainline support to 3.4.2

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf28/apf28-linux-3.3.5.config |    1 -
 .../device/armadeus/apf28/apf28-linux-3.4.2.config |    1 +
 ...f28-linux-3.3.config => apf28-linux-3.4.config} |   12 ++-------
 patches/linux/3.3.5                                |    1 -
 patches/linux/3.4.2                                |    1 +
 .../450-armadeus-add_apf28_module_support.patch    |   24 --------------------
 ...1-armadeus-add_apf28dev_baseboard_support.patch |    0
 7 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config
 create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.3.config => apf28-linux-3.4.config} (96%)
 delete mode 120000 patches/linux/3.3.5
 create mode 120000 patches/linux/3.4.2
 rename patches/linux/{3.3 => 3.4}/450-armadeus-add_apf28_module_support.patch (81%)
 rename patches/linux/{3.3 => 3.4}/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
deleted file mode 120000
index e18fadf..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.5.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.3.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
new file mode 120000
index 0000000..ba0c3a3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
@@ -0,0 +1 @@
+apf28-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
similarity index 96%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
index 460fc5e..3ac10f1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.3.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
@@ -12,6 +12,8 @@ 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_MXS=y
 CONFIG_MACH_MX28EVK=y
@@ -44,8 +46,6 @@ CONFIG_CAN_BCM=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_FLEXCAN=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -67,7 +67,6 @@ CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 CONFIG_SCSI=y
@@ -80,9 +79,6 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
 CONFIG_RTL8187=m
 CONFIG_RT2X00=m
 CONFIG_RT73USB=m
@@ -155,7 +151,7 @@ CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_MXS=y
@@ -187,8 +183,6 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
diff --git a/patches/linux/3.3.5 b/patches/linux/3.3.5
deleted file mode 120000
index f30101c..0000000
--- a/patches/linux/3.3.5
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file
diff --git a/patches/linux/3.4.2 b/patches/linux/3.4.2
new file mode 120000
index 0000000..af1817b
--- /dev/null
+++ b/patches/linux/3.4.2
@@ -0,0 +1 @@
+3.4
\ No newline at end of file
diff --git a/patches/linux/3.3/450-armadeus-add_apf28_module_support.patch b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
similarity index 81%
rename from patches/linux/3.3/450-armadeus-add_apf28_module_support.patch
rename to patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
index 5c50cfb..42e147c 100644
--- a/patches/linux/3.3/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
@@ -142,27 +142,3 @@ Index: linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c
 +	.init_machine	= apf28_init,
 +	.timer		= &apf28_timer,
 +MACHINE_END
-Index: linux-3.3.5/arch/arm/mach-mxs/include/mach/mxs.h
-===================================================================
---- 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.3/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
similarity index 100%
rename from patches/linux/3.3/451-armadeus-add_apf28dev_baseboard_support.patch
rename to patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch


hooks/post-receive
-- 
armadeus


