[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-560-g43d21da
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-560-g43d21da
|
From: Julien B a. A. <ar...@us...> - 2010-07-29 08:58:11
|
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 43d21daef0b92cb9fc69982d479ee69b3d346a76 (commit)
from 1794d9a4a59d0fa566494ca4dced70bf6e176cd1 (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 43d21daef0b92cb9fc69982d479ee69b3d346a76
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 10:57:20 2010 +0200
[BUILDROOT] Updates apf9328_test configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf9328_test/apf9328_test.config | 85 ++++++++++---------
buildroot/local/apf9328_test/linux-2.6.29.4.config | 14 ++-
buildroot/local/apf9328_test/u-boot/apf9328.h | 36 ++-------
buildroot/local/apf9328_test/uclibc-0.9.29.config | 4 +-
4 files changed, 63 insertions(+), 76 deletions(-)
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index f9a38a4..197586f 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 24 16:15:39 2010
+# Thu Jul 29 10:40:19 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -326,40 +326,6 @@ BR2_READLINE=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_MESALIB is not set
-BR2_PACKAGE_FBTEST=y
-# BR2_PACKAGE_IMXSSI is not set
-# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_SNES9X is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-
-#
-# Armadeus specific tools/utilities
-#
-BR2_PACKAGE_ARMADEUS_DEMOS=y
-
-#
-# Choose the demos to install
-#
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -398,7 +364,33 @@ BR2_PACKAGE_LTRACE=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
+
+#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+BR2_PACKAGE_CH7024CTRL=y
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+# BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE is not set
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -414,6 +406,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
@@ -492,15 +489,15 @@ BR2_PACKAGE_SOCKETCAN=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
BR2_BLOCKDEV_SUPPORT=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
-# BR2_PACKAGE_AD9889CTRL is not set
-BR2_PACKAGE_CH7024CTRL=y
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -517,12 +514,15 @@ BR2_PACKAGE_FPGAREGS=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_PICKIT2 is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
@@ -580,6 +580,7 @@ BR2_PACKAGE_SETSERIAL=y
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
BR2_PACKAGE_ALSA_LIB=y
@@ -622,6 +623,7 @@ BR2_PACKAGE_MADPLAY_ALSA=y
BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_FLITE is not set
BR2_GRAPHIC_SUPPORT=y
#
@@ -651,7 +653,9 @@ BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
BR2_PACKAGE_LIBPNG=y
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PIXMAN is not set
+# BR2_PACKAGE_PYGAME is not set
BR2_PACKAGE_SDL=y
#
@@ -698,6 +702,7 @@ BR2_PACKAGE_SDL_WATER=y
#
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_FBSET is not set
+BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBGRAB=y
#
@@ -867,7 +872,7 @@ BR2_TARGET_UBOOT_NETMASK=""
BR2_TARGET_UBOOT_ETHADDR=""
# BR2_TARGET_UBOOT_SILENT is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-# BR2_TARGET_UBOOT_TOOL_ENV is not set
+BR2_TARGET_UBOOT_TOOL_ENV=y
BR2_TARGET_UBOOT_COPYTO=""
#
diff --git a/buildroot/local/apf9328_test/linux-2.6.29.4.config b/buildroot/local/apf9328_test/linux-2.6.29.4.config
index e05c77d..add5513 100644
--- a/buildroot/local/apf9328_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf9328_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Sun Sep 27 11:02:36 2009
+# Thu Jul 29 09:57:54 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -895,13 +895,15 @@ CONFIG_FB_MODE_HELPERS=y
# Frame buffer hardware drivers
#
CONFIG_FB_IMX=y
-CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
-# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
-# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
-# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
+CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
+# CONFIG_FB_IMX_CUSTOM_LCD is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
@@ -1192,6 +1194,7 @@ CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
@@ -1223,6 +1226,7 @@ CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
#
CONFIG_ARMADEUS_PWM_DRIVER=m
CONFIG_IMX_BACKLIGHT=m
+# CONFIG_HX5116_DISPLAY is not set
#
# Communication bus related
diff --git a/buildroot/local/apf9328_test/u-boot/apf9328.h b/buildroot/local/apf9328_test/u-boot/apf9328.h
index 4876403..158c59c 100644
--- a/buildroot/local/apf9328_test/u-boot/apf9328.h
+++ b/buildroot/local/apf9328_test/u-boot/apf9328.h
@@ -32,8 +32,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "3.5"
-#define CONFIG_IDENT_STRING " apf9328 patch 3.8"
+#define CONFIG_ENV_VERSION "3.6"
+#define CONFIG_IDENT_STRING " apf9328 patch 3.9"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
@@ -118,7 +118,7 @@
#define CONFIG_MTDMAP "physmap-flash.0"
#define MTDIDS_DEFAULT "nor0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
- "128k(U-boot_env),256k(firmware),2048k(kernel),-(root)"
+ "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
@@ -146,6 +146,8 @@
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addjffsargs=setenv bootargs ${bootargs} " \
"root=/dev/mtdblock4 rootfstype=jffs2\0" \
+ "addubifsargs=setenv bootargs ${bootargs} " \
+ "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
"root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
"addipargs=setenv bootargs ${bootargs} " \
@@ -154,6 +156,8 @@
"run addnfsargs addipargs; bootm ${kernel_addr}\0" \
"jffsboot=setenv bootargs ${console} ${mtdparts};" \
"run addjffsargs addipargs; bootm ${kernel_addr}\0" \
+ "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addubifsargs addipargs; bootm ${kernel_addr}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; bootm ${kernel_addr}\0" \
"firmware_autoload=0\0" \
@@ -1003,29 +1007,3 @@
|(((((CFG_CS5_OE_ASSERT_DLY*2)+CFG_HCLK_LGTH-1)/CFG_HCLK_LGTH)&0x0F)<<28))
#endif /* __CONFIG_H */
-
-/* Add a wrapper around the values Buildroot sets. */
-#ifndef __BR2_ADDED_CONFIG_H
-#define __BR2_ADDED_CONFIG_H
-#ifdef CONFIG_HOSTNAME
-#undef CONFIG_HOSTNAME
-#endif
-#define CONFIG_HOSTNAME "apf9328_test"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf9328
-#endif /* __BR2_ADDED_CONFIG_H */
-
-/* Add a wrapper around the values Buildroot sets. */
-#ifndef __BR2_ADDED_CONFIG_H
-#define __BR2_ADDED_CONFIG_H
-#ifdef CONFIG_HOSTNAME
-#undef CONFIG_HOSTNAME
-#endif
-#define CONFIG_HOSTNAME "apf9328_test"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf9328
-#endif /* __BR2_ADDED_CONFIG_H */
diff --git a/buildroot/local/apf9328_test/uclibc-0.9.29.config b/buildroot/local/apf9328_test/uclibc-0.9.29.config
index 9a613de..cb71de0 100644
--- a/buildroot/local/apf9328_test/uclibc-0.9.29.config
+++ b/buildroot/local/apf9328_test/uclibc-0.9.29.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 17:35:00 2009
+# Mon Nov 3 21:39:03 2008
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -86,7 +86,7 @@ LDSO_BASE_FILENAME="ld.so"
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
LINUXTHREADS_OLD=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
hooks/post-receive
--
armadeus
|
