[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-317-ge143aad
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-317-ge143aad
|
From: Julien B a. A. <ar...@us...> - 2010-04-23 15:09:58
|
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 e143aade66c48447ed5669e195483bfd924e0b73 (commit)
via a119cee0f76e8d668e501b9c126abfd1ccc2fd19 (commit)
from 3822de7a6df167852d0f11ecbd8a325533a39599 (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 e143aade66c48447ed5669e195483bfd924e0b73
Author: Julien Boibessot <jul...@ar...>
Date: Fri Apr 23 16:49:23 2010 +0200
[BUILDROOT] Add a new (hidden) BR2_CPU_NAME config variable and updates imxregs accordingly
commit a119cee0f76e8d668e501b9c126abfd1ccc2fd19
Author: Julien Boibessot <jul...@ar...>
Date: Fri Apr 23 15:45:31 2010 +0200
[BUILDROOT] Bluez: remove no more needed serial port speed patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 3 +-
buildroot/configs/apf9328_defconfig | 3 +-
buildroot/local/apf27_test/apf27_test.config | 3 +-
buildroot/local/apf9328_test/apf9328_test.config | 3 +-
buildroot/package/armadeus/imxregs/Config.in | 1 -
buildroot/package/armadeus/imxregs/imxregs.mk | 5 ++-
...ttach-removes-uclibc-not-supported-speeds.patch | 25 --------------------
buildroot/target/device/.gitignore | 2 +-
buildroot/target/device/armadeus/Config.in | 5 ++++
.../target/device/armadeus/apf27/apf27_defconfig | 3 +-
.../device/armadeus/apf9328/apf9328_defconfig | 3 +-
11 files changed, 21 insertions(+), 35 deletions(-)
delete mode 100644 buildroot/package/bluez/bluez-utils-hciattach-removes-uclibc-not-supported-speeds.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 791ebfc..a8f0d64 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Feb 23 09:17:23 2010
+# Fri Apr 23 16:15:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02-rc1"
@@ -64,6 +64,7 @@ BR2_TARGET_ARMADEUS=y
BR2_TARGET_ARMADEUS_APF27=y
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
# BR2_TARGET_ARMADEUS_APF27_SDRAM_32 is not set
BR2_TARGET_ARMADEUS_APF27_SDRAM_64=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index ca426bd..82418da 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Mar 29 22:02:48 2010
+# Fri Apr 23 16:43:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02"
@@ -64,6 +64,7 @@ BR2_TARGET_ARMADEUS_APF9328=y
# BR2_TARGET_ARMADEUS_APF27 is not set
BR2_BOARD_NAME="apf9328"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imxl"
# BR2_TARGET_ARMADEUS_SDRAM_8 is not set
BR2_TARGET_ARMADEUS_SDRAM_16=y
# BR2_TARGET_ARMADEUS_SDRAM_32 is not set
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 6ccb600..dfb67f0 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 8 17:28:51 2009
+# Fri Apr 23 16:15:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -70,6 +70,7 @@ BR2_TARGET_ARMADEUS=y
BR2_TARGET_ARMADEUS_APF27=y
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
# BR2_TARGET_ARMADEUS_APF27_SDRAM_32 is not set
BR2_TARGET_ARMADEUS_APF27_SDRAM_64=y
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index cb827a1..4cd8c46 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
-# Tue Dec 8 17:28:51 2009
+# Fri Apr 23 16:43:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -70,6 +70,7 @@ BR2_TARGET_ARMADEUS_APF9328=y
# BR2_TARGET_ARMADEUS_APF27 is not set
BR2_BOARD_NAME="apf9328"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imxl"
# BR2_TARGET_ARMADEUS_SDRAM_8 is not set
BR2_TARGET_ARMADEUS_SDRAM_16=y
# BR2_TARGET_ARMADEUS_SDRAM_32 is not set
diff --git a/buildroot/package/armadeus/imxregs/Config.in b/buildroot/package/armadeus/imxregs/Config.in
index d25aaaa..f355521 100644
--- a/buildroot/package/armadeus/imxregs/Config.in
+++ b/buildroot/package/armadeus/imxregs/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_IMXREGS
bool "imxregs"
- default n
help
This debug tool allows you to access the i.MX internal registers
directly from Linux userspace. (If operation was allowed in U-Boot).
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index e1da229..82a84af 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -8,10 +8,11 @@ IMXREGS_VER:=1.0
IMXREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/imxregs/
IMXREGS_DIR:=$(BUILD_DIR)/imxregs-$(IMXREGS_VER)
IMXREGS_CAT:=zcat
-ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
+CPU_NAME=$(call qstrip,$(BR2_CPU_NAME))
+ifeq ($(CPU_NAME),imx27)
IMXREGS_BINARY:=imx27regs
else
- ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
+ ifeq ($(CPU_NAME),imxl)
IMXREGS_BINARY:=imxregs
else
IMXREGS_BINARY:=unknown_arch
diff --git a/buildroot/package/bluez/bluez-utils-hciattach-removes-uclibc-not-supported-speeds.patch b/buildroot/package/bluez/bluez-utils-hciattach-removes-uclibc-not-supported-speeds.patch
deleted file mode 100644
index b9a2557..0000000
--- a/buildroot/package/bluez/bluez-utils-hciattach-removes-uclibc-not-supported-speeds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: bluez-utils-3.20/tools/hciattach.c
-===================================================================
---- bluez-utils-3.20.orig/tools/hciattach.c 2009-07-01 16:06:54.000000000 +0200
-+++ bluez-utils-3.20/tools/hciattach.c 2009-07-01 16:07:40.000000000 +0200
-@@ -104,7 +104,7 @@
- return B57600;
- case 115200:
- return B115200;
-- case 230400:
-+/* case 230400:
- return B230400;
- case 460800:
- return B460800;
-@@ -119,9 +119,9 @@
- case 1152000:
- return B1152000;
- case 1500000:
-- return B1500000;
-+ return B1500000;*/
- default:
-- return B57600;
-+ return B115200;
- }
- }
-
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
index b3132da..9a1d08a 100644
--- a/buildroot/target/device/.gitignore
+++ b/buildroot/target/device/.gitignore
@@ -2,7 +2,7 @@ AMD/
ARM/
ARMLTD/
Atmel/
-Config.*
+/Config.*
Hitachi/
jp/
KwikByte/
diff --git a/buildroot/target/device/armadeus/Config.in b/buildroot/target/device/armadeus/Config.in
index 7d4a16a..773e32a 100644
--- a/buildroot/target/device/armadeus/Config.in
+++ b/buildroot/target/device/armadeus/Config.in
@@ -29,6 +29,11 @@ config BR2_BOARD_PATH
string
default "target/device/armadeus/$(BR2_BOARD_NAME)"
+config BR2_CPU_NAME
+ string
+ default "imxl" if BR2_TARGET_ARMADEUS_APF9328
+ default "imx27" if BR2_TARGET_ARMADEUS_APF27
+
source "target/device/armadeus/apf9328/Config.in"
source "target/device/armadeus/apf27/Config.in"
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 02805ee..6b4c011 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sun Jan 31 18:25:35 2010
+# Fri Apr 23 16:15:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -70,6 +70,7 @@ BR2_TARGET_ARMADEUS=y
BR2_TARGET_ARMADEUS_APF27=y
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
# BR2_TARGET_ARMADEUS_APF27_SDRAM_32 is not set
BR2_TARGET_ARMADEUS_APF27_SDRAM_64=y
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index bf02601..07716a1 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 8 17:26:00 2009
+# Fri Apr 23 16:43:36 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -70,6 +70,7 @@ BR2_TARGET_ARMADEUS_APF9328=y
# BR2_TARGET_ARMADEUS_APF27 is not set
BR2_BOARD_NAME="apf9328"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
+BR2_CPU_NAME="imxl"
# BR2_TARGET_ARMADEUS_SDRAM_8 is not set
BR2_TARGET_ARMADEUS_SDRAM_16=y
# BR2_TARGET_ARMADEUS_SDRAM_32 is not set
hooks/post-receive
--
armadeus
|
