[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-571-g8b91dd9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-571-g8b91dd9
|
From: Julien B a. A. <ar...@us...> - 2010-07-30 08:52:22
|
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 8b91dd9ad7eb7d07295d907820ae1f731a01928c (commit)
via 699e4863c73481980e79cc7e22657a0515028a4f (commit)
from e8573feeb280196b0b41107f86fba14aad023760 (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 8b91dd9ad7eb7d07295d907820ae1f731a01928c
Merge: 699e4863c73481980e79cc7e22657a0515028a4f e8573feeb280196b0b41107f86fba14aad023760
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 30 10:51:42 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 699e4863c73481980e79cc7e22657a0515028a4f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 30 10:45:11 2010 +0200
[BUILDROOT] Updates apf27_test configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 8 +++++---
buildroot/local/apf27_test/u-boot/apf27.h | 11 ++++++-----
buildroot/local/apf27_test/uclibc-0.9.29.config | 11 ++++++-----
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index e897f72..6b93193 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_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
-# Wed Jun 30 15:23:25 2010
+# Thu Jul 22 23:36:31 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1098,7 +1098,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# Video decoders
#
# CONFIG_VIDEO_OV7670 is not set
-CONFIG_VIDEO_OV96xx=m
# CONFIG_VIDEO_TCM825X is not set
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_SAA717X is not set
@@ -1136,8 +1135,10 @@ CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
-# CONFIG_SOC_CAMERA_OV772X is not set
+# CONFIG_SOC_CAMERA_OV3640 is not set
CONFIG_SOC_CAMERA_OV7670=m
+# CONFIG_SOC_CAMERA_OV772X is not set
+CONFIG_SOC_CAMERA_OV96XX=m
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_VIDEO_MX27=m
# CONFIG_RADIO_ADAPTERS is not set
@@ -1482,6 +1483,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/apf27_test/u-boot/apf27.h b/buildroot/local/apf27_test/u-boot/apf27.h
index a35de4b..82674e6 100644
--- a/buildroot/local/apf27_test/u-boot/apf27.h
+++ b/buildroot/local/apf27_test/u-boot/apf27.h
@@ -32,7 +32,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "1.6"
+#define CONFIG_ENV_VERSION "1.7"
#define CONFIG_IDENT_STRING " apf27 patch 2.1"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
@@ -111,6 +111,7 @@
* Boot options. Setting delay to -1 stops autostart count down.
*/
#define CONFIG_BOOTDELAY 20
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
@@ -129,7 +130,7 @@
"filesize=" MK_STR(CFG_MONITOR_LEN) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nand0,3\0" \
+ "partition=nand0,4\0" \
"uboot_offset=" MK_STR(CFG_MONITOR_OFFSET) "\0" \
"uboot_len=" MK_STR(CFG_MONITOR_LEN) "\0" \
"env_offset=" MK_STR(CFG_ENV_OFFSET) "\0" \
@@ -333,7 +334,7 @@
#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
-#define CONFIG_CLK0_DIV 0 /* Divide CLK0 by 1 */
+#define CONFIG_CLK0_DIV 3 /* Divide CLK0 by 4 */
#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
@@ -670,7 +671,7 @@
#define CFG_CS4A_VAL 0
/* FPGA 16 bit data bus */
-#define CFG_CS5U_VAL 0x00000500
+#define CFG_CS5U_VAL 0x00000600
#define CFG_CS5L_VAL 0x00000D01
#define CFG_CS5A_VAL 0
@@ -678,7 +679,7 @@
/* FPGA specific settings */
/* CLKO */
-#define CFG_CCSR_VAL 0x00000308
+#define CFG_CCSR_VAL 0x00000305
/* drive strength CLKO set to 2*/
#define CFG_DSCR10_VAL 0x00020000
/* drive strength A1..A12 set to 2*/
diff --git a/buildroot/local/apf27_test/uclibc-0.9.29.config b/buildroot/local/apf27_test/uclibc-0.9.29.config
index fb1786a..5f2ca36 100644
--- a/buildroot/local/apf27_test/uclibc-0.9.29.config
+++ b/buildroot/local/apf27_test/uclibc-0.9.29.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 12:39:28 2009
+# Mon Nov 3 21:39:03 2008
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -33,14 +33,15 @@ TARGET_ARCH="arm"
FORCE_OPTIONS_FOR_ARCH=y
# CONFIG_ARM_OABI is not set
CONFIG_ARM_EABI=y
-CONFIG_GENERIC_ARM=y
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
# CONFIG_ARM610 is not set
# CONFIG_ARM710 is not set
# CONFIG_ARM7TDMI is not set
# CONFIG_ARM720T is not set
# CONFIG_ARM920T is not set
# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
+CONFIG_ARM926T=y
# CONFIG_ARM10T is not set
# CONFIG_ARM1136JF_S is not set
# CONFIG_ARM1176JZ_S is not set
@@ -85,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
@@ -97,7 +98,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set
ASSUME_DEVPTS=y
hooks/post-receive
--
armadeus
|
