[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-107-gf73f2ee

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  f73f2ee93f8ea1ca82586dfc0da4f8ec152221a4 (commit)
       via  df5a4542446b3fcd86103e529739a187b5d23cce (commit)
       via  2bbfe7bd56166abd49217b144cba6597c7d83f0c (commit)
       via  f5bc389c8dae72e3b22dcec4db5b2b6048c9fb02 (commit)
      from  77a4e144227f0741950365e739d56751ca957fd1 (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 f73f2ee93f8ea1ca82586dfc0da4f8ec152221a4
Merge: df5a4542446b3fcd86103e529739a187b5d23cce 77a4e144227f0741950365e739d56751ca957fd1
Author: Julien Boibessot <jul...@ar...>
Date:   Tue May 3 11:34:47 2011 +0200

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

commit df5a4542446b3fcd86103e529739a187b5d23cce
Author: Julien Boibessot <jul...@ar...>
Date:   Tue May 3 11:32:57 2011 +0200

    [LINUX] 2.6.38: Add fpgaloader to APF51 default config

commit 2bbfe7bd56166abd49217b144cba6597c7d83f0c
Author: Julien Boibessot <jul...@ar...>
Date:   Mon May 2 15:46:52 2011 +0200

    [DEMOS] Updates demos Makefiles to let them compile on new BR

commit f5bc389c8dae72e3b22dcec4db5b2b6048c9fb02
Author: Julien Boibessot <jul...@ar...>
Date:   Mon May 2 14:54:23 2011 +0200

    [BUILDROOT] Updates menuconfig help of following packages: ad9889ctrl, ch7024ctrl, max5821ctrl, tfp410ctrl

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

Summary of changes:
 buildroot/package/armadeus/ad9889ctrl/Config.in    |    8 +--
 buildroot/package/armadeus/ch7024ctrl/Config.in    |    8 +--
 buildroot/package/armadeus/demos/demos.mk          |    2 +-
 buildroot/package/armadeus/max5821ctrl/Config.in   |    7 +--
 buildroot/package/armadeus/tfp410ctrl/Config.in    |    5 +-
 .../armadeus/apf51/apf51-linux-2.6.38.config       |   45 ++++++++++++++++++-
 target/demos/armanoid/Makefile                     |    6 +-
 target/demos/backlight_control/Makefile            |    6 +-
 target/demos/input_test/Makefile                   |    6 +-
 target/demos/test_lcd/Makefile                     |    6 +-
 10 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/buildroot/package/armadeus/ad9889ctrl/Config.in b/buildroot/package/armadeus/ad9889ctrl/Config.in
index f36a8dc..e00cef6 100644
--- a/buildroot/package/armadeus/ad9889ctrl/Config.in
+++ b/buildroot/package/armadeus/ad9889ctrl/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_AD9889CTRL
-	bool "ad9889ctrl"
+	bool "ad9889 control"
 	depends on BR2_TARGET_ARMADEUS
-	default n
 	help
-	  Build AD9889 control tool. It allows you to configure the HDMI/DVI
-	  output of the DevFull directly from Linux userspace (command ad9889).
-
+	  Build "ad9889" control tool. It allows you to configure the HDMI/DVI
+	  output of the APF27DevFull directly from Linux userspace.
diff --git a/buildroot/package/armadeus/ch7024ctrl/Config.in b/buildroot/package/armadeus/ch7024ctrl/Config.in
index 6d5794b..c1a9c6d 100644
--- a/buildroot/package/armadeus/ch7024ctrl/Config.in
+++ b/buildroot/package/armadeus/ch7024ctrl/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_CH7024CTRL
-	bool "ch7024ctrl"
+	bool "ch7024 control"
 	depends on BR2_TARGET_ARMADEUS
-	default n
 	help
-	  Build CH7024 control tool. It allows you to configure the Svideo
-	  output of the DevFull directly from Linux userspace (command ch7024).
-
+	  Build "ch7024" control tool. It allows you to configure the S-Video
+	  output of the APF9328DevFull directly from Linux userspace.
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index db6f92a..eda3163 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -79,7 +79,7 @@ $(ARMADEUS-DEMOS_DIR)/.compiled: $(ARMADEUS-DEMOS_DIR)/.unpacked
 		echo -e "\n   >>> Compiling $$dir demo <<<" ; \
 		dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
                 if [ -d "$$dir" ]; then \
-                        (cd $$dir && $(MAKE) CC="$(TARGET_CC)" SDL_DIR=$(SDL_DIR) STAGING_DIR=$(STAGING_DIR) ARMADEUS_BOARD_NAME=$(BR2_BOARD_NAME)) || exit 1 ; \
+                        (cd $$dir && $(MAKE) CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR) ARMADEUS_BOARD_NAME=$(BR2_BOARD_NAME)) || exit 1 ; \
                 fi \
         done
 	touch $@
diff --git a/buildroot/package/armadeus/max5821ctrl/Config.in b/buildroot/package/armadeus/max5821ctrl/Config.in
index a1dfacc..370db92 100644
--- a/buildroot/package/armadeus/max5821ctrl/Config.in
+++ b/buildroot/package/armadeus/max5821ctrl/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MAX5821CTRL
-	bool "max5821ctrl"
-	default y
+	bool "max5821 control (setDAC)"
 	help
 	  This tool allows you to configure the MAX5821 I2C DAC directly 
-	  from Linux userspace (setDAC command).
-
+	  from Linux userspace ("setDAC" command) on your APF9328DevFull or
+	  on your APF27DevFull.
diff --git a/buildroot/package/armadeus/tfp410ctrl/Config.in b/buildroot/package/armadeus/tfp410ctrl/Config.in
index 74232e9..c6ecd0f 100644
--- a/buildroot/package/armadeus/tfp410ctrl/Config.in
+++ b/buildroot/package/armadeus/tfp410ctrl/Config.in
@@ -2,6 +2,5 @@ config BR2_PACKAGE_TFP410CTRL
 	bool "tfp410ctrl"
 	depends on BR2_TARGET_ARMADEUS
 	help
-	  Build TFP410 control tool. It allows you to configure the HDMI/DVI
-	  output of the APF51Dev directly from Linux userspace (tfp410ctrl
-	  command).
+	  Build "tfp410ctrl" tool. It allows you to configure the HDMI/DVI
+	  output of the APF51Dev directly from Linux userspace.
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index b14dd1d..7585d77 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38.1 Kernel Configuration
-# Fri Apr 29 14:08:07 2011
+# Tue May  3 11:14:27 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1689,12 +1689,51 @@ CONFIG_USB_ULPI=y
 #
 # Armadeus specific drivers
 #
-# CONFIG_ARMADEUS_DRIVERS is not set
+CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
+# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+# CONFIG_ARMADEUS_AS1531_PLAT is not set
+# CONFIG_ARMADEUS_GPIO_DRIVER is not set
+# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
+# CONFIG_ARMADEUS_MAX1027 is not set
+# CONFIG_ARMADEUS_MAX9768 is not set
+
+#
+# FPGA related
+#
 
 #
 # FPGA Drivers 
 #
-# CONFIG_ARMADEUS_FPGA_DRIVERS is not set
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+
+#
+# Others drivers for the FPGA
+#
+# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
+# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+# CONFIG_POD_DRIVERS is not set
+
+#
+# Handheld related
+#
+# CONFIG_ARMADEUS_PWM_DRIVER is not set
+# CONFIG_IMX_BACKLIGHT is not set
+# CONFIG_HX5116_DISPLAY is not set
+
+#
+# Communication bus related
+#
+# CONFIG_ARMADEUS_ISP1761 is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
diff --git a/target/demos/armanoid/Makefile b/target/demos/armanoid/Makefile
index c459442..34b18ed 100644
--- a/target/demos/armanoid/Makefile
+++ b/target/demos/armanoid/Makefile
@@ -2,16 +2,16 @@
 ARMADEUS_BASE_DIR=../../..
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 
-SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
 STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
 INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
 INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
 
 DEFINES=TARGET
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs)
 
 ifeq ($(TARGET),x86)
 	INSTALL_DIR="/usr/games/"
diff --git a/target/demos/backlight_control/Makefile b/target/demos/backlight_control/Makefile
index 506f817..5977fba 100644
--- a/target/demos/backlight_control/Makefile
+++ b/target/demos/backlight_control/Makefile
@@ -8,9 +8,9 @@ CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
 DEFINES=-DTARGET
 STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs) -lSDL_image
 
 ifeq ($(TARGET),x86)
         INSTALL_DIR:=/usr/local/bin
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index 0513ecb..4ba86e7 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -7,9 +7,9 @@ INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
 INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs)
 DEFINES=-DAPF
 
 ifeq ($(TARGET),x86)
diff --git a/target/demos/test_lcd/Makefile b/target/demos/test_lcd/Makefile
index fed69b9..24cdb37 100644
--- a/target/demos/test_lcd/Makefile
+++ b/target/demos/test_lcd/Makefile
@@ -7,9 +7,9 @@ INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
 STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs)
 
 ifeq ($(TARGET),x86)
         INSTALL_DIR:=/usr/local/bin


hooks/post-receive
-- 
armadeus


