[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-382-gc50294e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-382-gc50294e
|
From: Julien B a. A. <ar...@us...> - 2011-02-28 14:47: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 c50294ed94cf9669efa04cf52186f74e35252fb1 (commit)
via e57aaf7f68c100d2772973320b1d0b04f9699ea5 (commit)
via d019f30a16ea0822a62a7cfcf966ba8f748ed0eb (commit)
from bb2a90c3bd6e3a74e33148d02f067b8c0658fba8 (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 c50294ed94cf9669efa04cf52186f74e35252fb1
Merge: e57aaf7f68c100d2772973320b1d0b04f9699ea5 bb2a90c3bd6e3a74e33148d02f067b8c0658fba8
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 28 15:46:30 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e57aaf7f68c100d2772973320b1d0b04f9699ea5
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 28 15:45:56 2011 +0100
[TEST] Updates apf27_test default configs
commit d019f30a16ea0822a62a7cfcf966ba8f748ed0eb
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 28 14:43:21 2011 +0100
[U-BOOT] Revert part of commit 20c2ca77f88a91a04afd5f3e539b9ebbb31c630d. Otherwise FPGA loading on APF27 without SP_VISION is KO.
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 25 +++++----------------
buildroot/local/apf27_test/u-boot/apf27.h | 26 ++++++----------------
buildroot/local/apf27_test/uclibc-0.9.29.config | 2 +-
buildroot/target/device/armadeus/apf27/apf27.h | 3 +-
4 files changed, 15 insertions(+), 41 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 a1b9e57..9a3d2a1 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
-# Fri Jul 30 14:21:48 2010
+# Mon Feb 28 14:24:40 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,7 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
CONFIG_MACH_APF27_DEV=y
+# CONFIG_MACH_PPS is not set
CONFIG_MACH_APF27_DEV_EXT=y
# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
CONFIG_MACH_APF27_DEV_EXT_WIRELESS=y
@@ -570,21 +571,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
#
# UBI debugging options
#
-CONFIG_MTD_UBI_DEBUG=y
-CONFIG_MTD_UBI_DEBUG_MSG=y
-CONFIG_MTD_UBI_DEBUG_PARANOID=y
-# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-
-#
-# Additional UBI debugging messages
-#
-CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
+# CONFIG_MTD_UBI_DEBUG is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -946,6 +933,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
@@ -1457,6 +1445,7 @@ CONFIG_ARMADEUS_DRIVERS=y
# Misc.
#
# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+# CONFIG_ARMADEUS_AS1531_PLAT is not set
CONFIG_ARMADEUS_GPIO_DRIVER=m
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
CONFIG_ARMADEUS_MAX1027=m
@@ -1685,9 +1674,7 @@ CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_DEBUG=y
-CONFIG_UBIFS_FS_DEBUG_MSG_LVL=3
-# CONFIG_UBIFS_FS_DEBUG_CHKS is not set
+# CONFIG_UBIFS_FS_DEBUG is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
diff --git a/buildroot/local/apf27_test/u-boot/apf27.h b/buildroot/local/apf27_test/u-boot/apf27.h
index 82674e6..6ef742f 100644
--- a/buildroot/local/apf27_test/u-boot/apf27.h
+++ b/buildroot/local/apf27_test/u-boot/apf27.h
@@ -32,8 +32,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "1.7"
-#define CONFIG_IDENT_STRING " apf27 patch 2.1"
+#define CONFIG_ENV_VERSION "2.0"
+#define CONFIG_IDENT_STRING " apf27 patch 2.2"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_IMX27 1 /* in a Freescale i.MX27 Chip */
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
+ " ${serverpath}${board_name}-rootfs.arm.ubi\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
@@ -211,8 +211,9 @@
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-#define CONFIG_BOOTCOMMAND "run jffsboot"
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CFG_AUTOLOAD "no"
+#define CFG_DIRECT_FLASH_TFTP
#define CONFIG_MACH_TYPE MACH_TYPE_APF27
#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
@@ -731,7 +732,7 @@
#define CFG_ICFB1_C_VAL 0xFFFFFFFF
#define CFG_ICFB2_C_VAL 0xFFFFFFFF
#define CFG_DR_C_VAL 0x00000000
-#define CFG_GIUS_C_VAL 0xFFFFFFFF
+#define CFG_GIUS_C_VAL 0xFFFFC07F
#define CFG_ICR1_C_VAL 0x00000000
#define CFG_ICR2_C_VAL 0x00000000
#define CFG_IMR_C_VAL 0x00000000
@@ -761,7 +762,7 @@
#define CFG_ICFB1_E_VAL 0xFFFFFFFF
#define CFG_ICFB2_E_VAL 0xFFFFFFFF
#define CFG_DR_E_VAL 0x00000000
-#define CFG_GIUS_E_VAL 0xFFFFCCF8
+#define CFG_GIUS_E_VAL 0xFCFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
@@ -912,16 +913,3 @@
#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 "apf27_test"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf27
-#endif /* __BR2_ADDED_CONFIG_H */
-
diff --git a/buildroot/local/apf27_test/uclibc-0.9.29.config b/buildroot/local/apf27_test/uclibc-0.9.29.config
index 5f2ca36..f33a6be 100644
--- a/buildroot/local/apf27_test/uclibc-0.9.29.config
+++ b/buildroot/local/apf27_test/uclibc-0.9.29.config
@@ -95,7 +95,7 @@ MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y
# COMPAT_ATEXIT is not set
-# UCLIBC_SUSV3_LEGACY is not set
+UCLIBC_SUSV3_LEGACY=y
# UCLIBC_SUSV3_LEGACY_MACROS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 3b3cc13..6ef742f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -581,10 +581,9 @@
* FPGA stuff
*/
#define CONFIG_FPGA
-#define CONFIG_FPGA_COUNT 2
+#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_FPGA_SPARTAN6
#define CFG_FPGA_WAIT 20000 /* 20 ms */
#define CFG_FPGA_PROG_FEEDBACK
#define CFG_FPGA_CHECK_CTRLC
hooks/post-receive
--
armadeus
|
