[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2581-g8355118

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  8355118821ddb1a6e75d97ec418bc89a255280be (commit)
       via  922d507100f9838e6e7bc370160c5ae16ba1db69 (commit)
       via  8db3a53a962fa35a7eeba6594dae50dd12b3a7e8 (commit)
      from  21efbba05c85cf7189f7aee2d5510dca20ce502f (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 8355118821ddb1a6e75d97ec418bc89a255280be
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 15 11:18:53 2011 +0100

    [LINUX] Add SCC & IIM registration for APF51. Updates Armadeus systems name while we are at it.

commit 922d507100f9838e6e7bc370160c5ae16ba1db69
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 15 11:17:09 2011 +0100

    [LINUX] Don't make apf51proto the default baseboard for apf51

commit 8db3a53a962fa35a7eeba6594dae50dd12b3a7e8
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 15 11:16:04 2011 +0100

    [LINUX] Add gpiolib support to gpio_helpers.sh

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

Summary of changes:
 .../2.6.38/400-armadeus-add_apf51_module.patch     |   18 ++++++++-----
 .../408-armadeus-add_apf51-dev_baseboard.patch     |    6 ++--
 .../408b-armadeus-add_apf51-proto_baseboard.patch  |   11 +--------
 target/linux/modules/gpio/gpio_helpers.sh          |   25 +++++++++++++++++++-
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
index fbb0ab5..23bda11 100644
--- a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,8 +1,8 @@
 Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig	2011-10-21 12:19:07.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig	2011-10-21 14:30:28.000000000 +0200
-@@ -162,4 +162,16 @@
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig	2011-08-26 10:45:02.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig	2011-10-20 16:47:37.000000000 +0200
+@@ -162,4 +162,17 @@
  	  Include support for MX50 reference design platform (RDP) board. This
  	  includes specific configurations for the board and its peripherals.
  
@@ -13,9 +13,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
 +	select IMX_HAVE_PLATFORM_IMX_I2C
 +	select IMX_HAVE_PLATFORM_MXC_NAND
 +	select IMX_HAVE_PLATFORM_IMX2_WDT
++	select IMX_HAVE_PLATFORM_MXC_IIM
 +	select MXC_ULPI
 +	help
-+	  Include support for Armadeus Systems APF51 System On Module. This
++	  Include support for Armadeus systems APF51 System On Module. This
 +	  includes specific configurations for the board and its peripherals.
 +
  endif
@@ -35,10 +36,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c	2011-10-21 14:32:58.000000000 +0200
-@@ -0,0 +1,505 @@
+@@ -0,0 +1,508 @@
 +/*
 + * Support for APF51 System On Module
-+ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
++ * Copyright (C) 2010-2011 Armadeus systems <su...@ar...>
 + *
 + * Based on code which is:
 + * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -517,6 +518,9 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
 +#endif
 +
 +	imx51_add_imx2_wdt(0, NULL);
++	imx51_add_iim(NULL);
++
++	mxc_register_device(&mxc_scc_device, NULL);
 +
 +#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
 +	apf51_baseboard_init();
@@ -533,7 +537,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
 +};
 +
 +MACHINE_START(APF51, "Armadeus APF51")
-+	/* Maintainer: Armadeus Systems <su...@ar...> */
++	/* Maintainer: Armadeus systems <su...@ar...> */
 +	.boot_params = MX51_PHYS_OFFSET + 0x100,
 +	.map_io = mx51_map_io,
 +	.init_irq = mx51_init_irq,
diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 6a88c49..eabb69a 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -7,7 +7,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
 --- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig	2011-07-07 16:43:36.000000000 +0200
 +++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig	2011-07-07 17:02:20.000000000 +0200
 @@ -174,4 +174,27 @@
- 	  Include support for Armadeus Systems APF51 System On Module. This
+ 	  Include support for Armadeus systems APF51 System On Module. This
  	  includes specific configurations for the board and its peripherals.
  
 +config MACH_APF51_HAS_BASEBOARD
@@ -19,7 +19,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
 +	default MACH_APF51_DEV
 +
 +config MACH_APF51_DEV
-+	prompt "Armadeus Systems APF51Dev development board"
++	prompt "Armadeus systems APF51Dev development board"
 +	bool
 +	select MACH_APF51_HAS_BASEBOARD
 +	select IMX_HAVE_PLATFORM_IMX_IPUV3
@@ -54,7 +54,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
 + /*
 + * Support for APF51's official development baseboard (APF51Dev)
 + *
-+ * Copyright (C) 2011 Armadeus Systems <su...@ar...>
++ * Copyright (C) 2011 Armadeus systems <su...@ar...>
 + *
 + * Based on code which is:
 + * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
diff --git a/patches/linux/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch b/patches/linux/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
index eef915a..3cc6e2e 100644
--- a/patches/linux/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
+++ b/patches/linux/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
@@ -220,22 +220,13 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
 ===================================================================
 --- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig	2011-02-10 18:29:43.000000000 +0100
 +++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig	2011-02-11 15:15:57.000000000 +0100
-@@ -179,7 +179,7 @@
- choice
- 	prompt "Baseboard"
- 	depends on MACH_APF51
--	default MACH_APF51_DEV
-+	default MACH_APF51_PROTO
- 
- config MACH_APF51_DEV
- 	prompt "Armadeus Systems APF51Dev development board"
 @@ -192,6 +192,17 @@
  	help
  	  This selects the APF51Dev as baseboard and adds board's specific
  	  devices.
 +
 +config MACH_APF51_PROTO
-+	prompt "Armadeus Systems APF51Proto development board"
++	prompt "Armadeus systems APF51Proto development board"
 +	bool
 +	select MACH_APF51_HAS_BASEBOARD
 +	select IMX_HAVE_PLATFORM_IMX_IPUV3
diff --git a/target/linux/modules/gpio/gpio_helpers.sh b/target/linux/modules/gpio/gpio_helpers.sh
index 06cf193..894a7ad 100755
--- a/target/linux/modules/gpio/gpio_helpers.sh
+++ b/target/linux/modules/gpio/gpio_helpers.sh
@@ -22,7 +22,7 @@ setbit()
 	cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
 }
 
-gpio_set_value()
+gpio_set_value_old()
 {
 	GPIO=$1
 	VALUE=$2
@@ -50,3 +50,26 @@ gpio_mode()
         setbit $PORT_DIR $GPIO $VALUE
 }
 
+#
+# For gpiolib:
+#
+gpio_direction_output()
+{
+	if [ "$1" != "" ]; then
+		echo $1 > /sys/class/gpio/export
+		echo out > /sys/class/gpio/gpio$1/direction
+		if [ "$2" != "" ]; then
+			echo $2 > /sys/class/gpio/gpio$1/value
+		fi
+	fi
+}
+
+gpio_set_value()
+{
+	BOARD=`cat /etc/machine`
+	if [ "$BOARD" == "APF9328" ]; then
+		gpio_set_value_old $1 $2
+	else
+		echo $2 > /sys/class/gpio/gpio$1/value
+	fi
+}


hooks/post-receive
-- 
armadeus


