[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-525-g7fe300f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-525-g7fe300f
|
From: Fabien M <fa...@us...> - 2010-07-12 16:56:17
|
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 7fe300fab41477e4463d4a079b3bc938a404d179 (commit)
via 1308c361e5809715b034d72bcd2b28253541abd4 (commit)
via a036707b7dad75f66eb0323729f23fac87ec875a (commit)
via 4d5aff8026b88f83b551ef75dbb7de362c800512 (commit)
via b6ff58a50cf8c11fdb9b22a3b2572a5b8cc05bbe (commit)
from 1ca7190c2790f2d45f2a12e51646e8f8d0c50656 (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 7fe300fab41477e4463d4a079b3bc938a404d179
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:55:37 2010 +0200
[buildroot] Fix joysticktest package bug
commit 1308c361e5809715b034d72bcd2b28253541abd4
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:53:37 2010 +0200
[buildroot] Fix pickit2 package bugs
commit a036707b7dad75f66eb0323729f23fac87ec875a
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:15:01 2010 +0200
[buildroot] Add pickit2 programer command line program
commit 4d5aff8026b88f83b551ef75dbb7de362c800512
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 17:45:09 2010 +0200
[buildroot] adding joysticktest package in cleanup script
commit b6ff58a50cf8c11fdb9b22a3b2572a5b8cc05bbe
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 8 10:44:40 2010 +0200
[linux][as5011] Do not try to free tabular pointer
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 11 +-
...est-add_joystick_testing_programs_package.patch | 2 +-
...ickit2-add_pickit2_programer_command_line.patch | 115 ++++++++++++++++++++
patches/buildroot/cleanup_buildroot.sh | 2 +
4 files changed, 123 insertions(+), 7 deletions(-)
create mode 100644 patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 24292bf..63da72c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-01 14:26:46.000000000 +0200
-@@ -0,0 +1,429 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-08 10:43:14.000000000 +0200
+@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -388,7 +388,6 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+i2c_protocol_error:
+ destroy_workqueue(plat_dat->workqueue);
+workqueue_create_error:
-+ kfree(plat_dat->workqueue_name);
+workqueue_name_error:
+ return retval;
+}
@@ -439,7 +438,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-06-28 09:20:47.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-07-08 10:11:38.000000000 +0200
@@ -254,6 +254,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -459,7 +458,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
Index: linux-2.6.29.6/drivers/input/joystick/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-06-28 09:20:47.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-07-08 10:11:38.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -471,7 +470,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
Index: linux-2.6.29.6/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-07-01 11:11:11.000000000 +0200
++++ linux-2.6.29.6/include/linux/as5011.h 2010-07-08 10:11:38.000000000 +0200
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index eed2817..e6b0a19 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -284,6 +284,6 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+#
+############################################################
+ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
-+ARGETS+=joysticktest
++TARGETS+=joysticktest
+endif
+
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
new file mode 100644
index 0000000..359c4f9
--- /dev/null
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -0,0 +1,115 @@
+Index: buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch 2010-07-12 18:17:35.000000000 +0200
+@@ -0,0 +1,29 @@
++Index: pk2cmdv1.20LinuxMacSource/Makefile
++===================================================================
++--- pk2cmdv1.20LinuxMacSource.orig/Makefile 2010-07-12 17:33:48.000000000 +0200
+++++ pk2cmdv1.20LinuxMacSource/Makefile 2010-07-12 17:33:56.000000000 +0200
++@@ -12,9 +12,13 @@
++ # or
++ # make mac
++ #
+++ifeq ($(ARMADEUS_BASE_DIR),)
+++ ARMADEUS_BASE_DIR=../../../
+++endif
+++include $(ARMADEUS_BASE_DIR)/Makefile.in
++
++ APP=pk2cmd
++-CC=g++
+++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
++ # Uncomment this for debugging with gdb
++ #DBG=-ggdb -O0
++ # Uncomment this for no debugging (default)
++@@ -24,7 +28,8 @@
++
++ # Grab the version of libusb in /usr/local if possible:
++ LIBUSB=/usr/local
++-LDFLAGS=-L$(LIBUSB)/lib -lusb
+++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/ -lusb
+++#LDFLAGS=-L$(LIBUSB)/lib -lusb
++
++ # CHOOSE A TARGET BEFORE COMPILING
++ #
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-12 17:59:53.000000000 +0200
++++ buildroot/package/Config.in 2010-07-12 18:17:35.000000000 +0200
+@@ -268,6 +268,7 @@
+ source "package/i2c-tools/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
++source "package/pickit2/Config.in"
+ source "package/lcd4linux/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
+Index: buildroot/package/pickit2/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/Config.in 2010-07-12 18:17:35.000000000 +0200
+@@ -0,0 +1,5 @@
++config BR2_PACKAGE_PICKIT2
++ bool "pickit2"
++ select BR2_PACKAGE_LIBUSB
++ help
++ Use microchip programmer adapt PICkit 2
+Index: buildroot/package/pickit2/pickit2.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/pickit2.mk 2010-07-12 18:48:52.000000000 +0200
+@@ -0,0 +1,54 @@
++#############################################################
++#
++# PICkit2
++#
++#############################################################
++PICKIT2_VERSION:=1.20
++PICKIT2_BINARY:=pk2cmd
++PICKIT2_SOURCE:=$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource.tar.gz
++PICKIT2_SITE =http://ww1.microchip.com/downloads/en/DeviceDoc/
++PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)
++PICKIT2_TARGET_BINARY:=usr/bin/pk2cmd
++
++$(DL_DIR)/$(PICKIT2_SOURCE):
++ $(call DOWNLOAD,$(PICKIT2_SITE),$(PICKIT2_SOURCE))
++
++$(PICKIT2_DIR)/.source: $(DL_DIR)/$(PICKIT2_SOURCE)
++ $(ZCAT) $(DL_DIR)/$(PICKIT2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
++ mv $(BUILD_DIR)/$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource $(PICKIT2_DIR)
++ touch $@
++
++$(PICKIT2_DIR)/.configured: $(PICKIT2_DIR)/.source
++ touch $@
++
++$(PICKIT2_DIR)/$(PICKIT2_BINARY): $(PICKIT2_DIR)/.configured
++ $(MAKE) -C $(PICKIT2_DIR) linux
++
++$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
++ install -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++ install -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
++ chmod 755 $(TARGET_DIR)/usr/bin/pk2cmd
++ chmod 755 $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++ rm -Rf $(TARGET_DIR)/usr/man
++
++pickit2: uclibc libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
++
++pickit2-source: $(DL_DIR)/$(PICKIT2_SOURCE)
++
++pickit2-clean:
++ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PICKIT2_DIR) uninstall
++ -$(MAKE) -C $(PICKIT2_DIR) clean
++
++pickit2-dirclean:
++ rm -rf $(PICKIT2_DIR)
++
++############################################################
++#
++# Toplevel Makefile options
++#
++############################################################
++ifeq ($(BR2_PACKAGE_PICKIT2),y)
++TARGETS+=pickit2
++endif
++
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 75d5faa..556f19a 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -45,3 +45,5 @@ rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
rm -rf buildroot/package/urg/
+rm -rf buildroot/package/joysticktest/
+rm -rf buildroot/package/pickit2/
hooks/post-receive
--
armadeus
|
