armadeus-commitlog Mailing List for armadeus (Page 102)
Brought to you by:
sszy
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jscheer <js...@us...> - 2010-11-16 14:09:02
|
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 ec24802831d611c30609a2fd232e82c683c2919a (commit)
from 8b512a19e58d3aff7fc4020d84b265ce3f0f0c5d (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 ec24802831d611c30609a2fd232e82c683c2919a
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 16 15:08:28 2010 +0100
[U-BOOT] For PPS boards, correction in U-Boot config files to take UBI file as rootfs instead of UBIFS.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/pps/apf27-u-boot-1.3.4.h | 2 +-
buildroot/target/device/armadeus/pps/apf27.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
index ef2d8bf..3b47270 100644
--- a/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.ubifs\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" \
diff --git a/buildroot/target/device/armadeus/pps/apf27.h b/buildroot/target/device/armadeus/pps/apf27.h
index ef2d8bf..3b47270 100644
--- a/buildroot/target/device/armadeus/pps/apf27.h
+++ b/buildroot/target/device/armadeus/pps/apf27.h
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.ubifs\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" \
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-15 10:01:17
|
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 ef5fcf9dc50c84328c1f69c13a2bc79ad418f57b (commit)
from e068200fd00412794a6641a1c9a4c6fe965d1852 (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 ef5fcf9dc50c84328c1f69c13a2bc79ad418f57b
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Nov 15 11:00:55 2010 +0100
[BUILDROOT] Add target and board APF27 PPS in target/device/armadeus/Config.in and change APF27 target name to APF27 DEV in all Buildroot config files.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 3 ++-
buildroot/configs/apf27_webradio_defconfig | 3 ++-
buildroot/configs/apf51_defconfig | 3 ++-
buildroot/configs/apf9328_defconfig | 4 +++-
buildroot/configs/pps_defconfig | 3 ++-
buildroot/target/device/armadeus/Config.in | 11 +++++++----
buildroot/target/device/armadeus/apf27/Config.in | 20 ++++++++++----------
.../target/device/armadeus/apf27/apf27_defconfig | 3 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 4 +++-
buildroot/target/device/armadeus/pps/Config.in | 20 ++++++++++----------
buildroot/target/device/armadeus/pps/pps_defconfig | 3 ++-
11 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index dae7f48..563f061 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -56,8 +56,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
+BR2_TARGET_ARMADEUS_APF27_DEV=y
# BR2_TARGET_ARMADEUS_APF51 is not set
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 1c55543..1cf4caf 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -56,8 +56,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
+BR2_TARGET_ARMADEUS_APF27_DEV=y
# BR2_TARGET_ARMADEUS_APF51 is not set
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 6521718..1d86404 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -56,8 +56,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-# BR2_TARGET_ARMADEUS_APF27 is not set
+# BR2_TARGET_ARMADEUS_APF27_DEV is not set
BR2_TARGET_ARMADEUS_APF51=y
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf51"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index e09de02..feb77ba 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -56,7 +56,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
BR2_TARGET_ARMADEUS_APF9328=y
-# BR2_TARGET_ARMADEUS_APF27 is not set
+# BR2_TARGET_ARMADEUS_APF27_DEV is not set
+# BR2_TARGET_ARMADEUS_APF51 is not set
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf9328"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index bf97950..8c3fd88 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -56,8 +56,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF27_DEV is not set
# BR2_TARGET_ARMADEUS_APF51 is not set
+BR2_TARGET_ARMADEUS_APF27_PPS=y
BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/target/device/armadeus/Config.in b/buildroot/target/device/armadeus/Config.in
index c5b211e..c23cdc7 100644
--- a/buildroot/target/device/armadeus/Config.in
+++ b/buildroot/target/device/armadeus/Config.in
@@ -16,17 +16,20 @@ choice
config BR2_TARGET_ARMADEUS_APF9328
bool "apf9328"
-config BR2_TARGET_ARMADEUS_APF27
- bool "apf27"
+config BR2_TARGET_ARMADEUS_APF27_DEV
+ bool "apf27 dev"
config BR2_TARGET_ARMADEUS_APF51
bool "apf51"
+config BR2_TARGET_ARMADEUS_APF27_PPS
+ bool "apf27 pps"
endchoice
config BR2_BOARD_NAME
string
default "apf9328" if BR2_TARGET_ARMADEUS_APF9328
- default "apf27" if BR2_TARGET_ARMADEUS_APF27
+ default "apf27" if BR2_TARGET_ARMADEUS_APF27_DEV
default "apf51" if BR2_TARGET_ARMADEUS_APF51
+ default "pps" if BR2_TARGET_ARMADEUS_APF27_PPS
config BR2_BOARD_PATH
string
@@ -35,7 +38,7 @@ config BR2_BOARD_PATH
config BR2_CPU_NAME
string
default "imxl" if BR2_TARGET_ARMADEUS_APF9328
- default "imx27" if BR2_TARGET_ARMADEUS_APF27
+ default "imx27" if BR2_TARGET_ARMADEUS_APF27_DEV || BR2_TARGET_ARMADEUS_APF27_PPS
default "imx51" if BR2_TARGET_ARMADEUS_APF51
source "target/device/armadeus/apf9328/Config.in"
diff --git a/buildroot/target/device/armadeus/apf27/Config.in b/buildroot/target/device/armadeus/apf27/Config.in
index 615b7ef..9ed922d 100644
--- a/buildroot/target/device/armadeus/apf27/Config.in
+++ b/buildroot/target/device/armadeus/apf27/Config.in
@@ -1,37 +1,37 @@
-if BR2_TARGET_ARMADEUS_APF27
+if BR2_TARGET_ARMADEUS_APF27_DEV
choice
prompt "Target DDR SDRAM chip size"
- default BR2_TARGET_ARMADEUS_APF27_SDRAM_64 if BR2_TARGET_ARMADEUS_APF27
- depends on BR2_TARGET_ARMADEUS_APF27
+ default BR2_TARGET_ARMADEUS_APF27_SDRAM_64 if BR2_TARGET_ARMADEUS_APF27_DEV
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
help
Target DDR SDRAM size per chip (Default 64MB).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_16
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "16MB"
help
Target 16MB DDR SDRAM size per chip.
config BR2_TARGET_ARMADEUS_APF27_SDRAM_32
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "32MB"
help
Target 32MB DDR SDRAM size per chip.
config BR2_TARGET_ARMADEUS_APF27_SDRAM_64
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "64MB"
help
Target 64MB DDR SDRAM size per chip (Default).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_128
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "128MB"
help
Target 128MB DDR SDRAM size per chip).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_256
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "256MB"
help
Target 256MB DDR SDRAM size per chip.
@@ -46,12 +46,12 @@ choice
(Default 1 DDR SDRAM)
config BR2_TARGET_ARMADEUS_NR_SDRAM_1
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "1 DDR SDRAM"
help
1 DDR SDRAM on target (Default).
config BR2_TARGET_ARMADEUS_NR_SDRAM_2
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_DEV
bool "2 DDR SDRAMs"
help
2 DDR SDRAMs on target.
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 4e5b744..af3fcf7 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -68,8 +68,9 @@ BR2_BANNER="Welcome to the Armadeus development environment."
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
+BR2_TARGET_ARMADEUS_APF27_DEV=y
# BR2_TARGET_ARMADEUS_APF51 is not set
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 19e08f6..69cca30 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -68,7 +68,9 @@ BR2_BANNER="Welcome to the Armadeus development environment."
#
BR2_TARGET_ARMADEUS=y
BR2_TARGET_ARMADEUS_APF9328=y
-# BR2_TARGET_ARMADEUS_APF27 is not set
+# BR2_TARGET_ARMADEUS_APF27_DEV is not set
+# BR2_TARGET_ARMADEUS_APF51 is not set
+# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf9328"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/target/device/armadeus/pps/Config.in b/buildroot/target/device/armadeus/pps/Config.in
index 615b7ef..e29f4ca 100644
--- a/buildroot/target/device/armadeus/pps/Config.in
+++ b/buildroot/target/device/armadeus/pps/Config.in
@@ -1,37 +1,37 @@
-if BR2_TARGET_ARMADEUS_APF27
+if BR2_TARGET_ARMADEUS_APF27_PPS
choice
prompt "Target DDR SDRAM chip size"
- default BR2_TARGET_ARMADEUS_APF27_SDRAM_64 if BR2_TARGET_ARMADEUS_APF27
- depends on BR2_TARGET_ARMADEUS_APF27
+ default BR2_TARGET_ARMADEUS_APF27_SDRAM_64 if BR2_TARGET_ARMADEUS_APF27_PPS
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
help
Target DDR SDRAM size per chip (Default 64MB).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_16
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "16MB"
help
Target 16MB DDR SDRAM size per chip.
config BR2_TARGET_ARMADEUS_APF27_SDRAM_32
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "32MB"
help
Target 32MB DDR SDRAM size per chip.
config BR2_TARGET_ARMADEUS_APF27_SDRAM_64
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "64MB"
help
Target 64MB DDR SDRAM size per chip (Default).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_128
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "128MB"
help
Target 128MB DDR SDRAM size per chip).
config BR2_TARGET_ARMADEUS_APF27_SDRAM_256
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "256MB"
help
Target 256MB DDR SDRAM size per chip.
@@ -46,12 +46,12 @@ choice
(Default 1 DDR SDRAM)
config BR2_TARGET_ARMADEUS_NR_SDRAM_1
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "1 DDR SDRAM"
help
1 DDR SDRAM on target (Default).
config BR2_TARGET_ARMADEUS_NR_SDRAM_2
- depends on BR2_TARGET_ARMADEUS_APF27
+ depends on BR2_TARGET_ARMADEUS_APF27_PPS
bool "2 DDR SDRAMs"
help
2 DDR SDRAMs on target.
diff --git a/buildroot/target/device/armadeus/pps/pps_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
index db86393..04470d2 100644
--- a/buildroot/target/device/armadeus/pps/pps_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -68,8 +68,9 @@ BR2_BANNER="Welcome to the Armadeus development environment."
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF27_DEV is not set
# BR2_TARGET_ARMADEUS_APF51 is not set
+BR2_TARGET_ARMADEUS_APF27_PPS=y
BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-11-14 16:22:45
|
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 e068200fd00412794a6641a1c9a4c6fe965d1852 (commit)
from a10a05d5f12eecf0a84c36cb844799552110c77f (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 e068200fd00412794a6641a1c9a4c6fe965d1852
Author: nicolas colombain <nic...@ar...>
Date: Sun Nov 14 17:22:05 2010 +0100
[LINUX] add preliminary APF51 linux patches
-----------------------------------------------------------------------
Summary of changes:
.../2.6.36/401-armadeus-fix_clock_tree.patch | 34 ++++
.../2.6.36/402-armadeus-add_nand_device.patch | 167 ++++++++++++++++++++
.../2.6.36/403-armadeus-set-uart2-debug.patch | 15 ++
.../2.6.36/404-armadeus-fix_nand_ecc_oob.patch | 85 ++++++++++
4 files changed, 301 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
new file mode 100644
index 0000000..81697e7
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
@@ -0,0 +1,34 @@
+Index: linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/clock-mx51.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c 2010-11-14 15:36:39.000000000 +0100
+@@ -798,7 +798,7 @@ DEFINE_CLOCK(uart3_ipg_clk, 2, MXC_CCM_C
+
+ /* GPT */
+ DEFINE_CLOCK(gpt_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG9_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &ckil_clk, NULL);
+ DEFINE_CLOCK(gpt_ipg_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG10_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+
+Index: linux-2.6.36/arch/arm/plat-mxc/time.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/time.c 2010-11-14 16:55:16.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/time.c 2010-11-14 16:56:02.000000000 +0100
+@@ -56,6 +56,7 @@
+ /* MX31, MX35, MX25, MXC91231, MX5 */
+ #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
+ #define V2_TCTL_CLK_IPG (1 << 6)
++#define V2_TCTL_CLK_IPG_32k (1 << 8)
+ #define V2_TCTL_FRR (1 << 9)
+ #define V2_IR 0x0c
+ #define V2_TSTAT 0x08
+@@ -308,7 +309,7 @@ void __init mxc_timer_init(struct clk *t
+ __raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */
+
+ if (timer_is_v2())
+- tctl_val = V2_TCTL_CLK_IPG | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN;
++ tctl_val = V2_TCTL_CLK_IPG_32k | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN;
+ else
+ tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN;
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
new file mode 100644
index 0000000..74579c4
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
@@ -0,0 +1,167 @@
+Index: linux-2.6.36/arch/arm/mach-mx5/devices.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/devices.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/devices.h 2010-11-14 12:16:07.000000000 +0100
+@@ -1,3 +1,4 @@
++extern struct platform_device mxc_nand_device;
+ extern struct platform_device mxc_uart_device0;
+ extern struct platform_device mxc_uart_device1;
+ extern struct platform_device mxc_uart_device2;
+Index: linux-2.6.36/arch/arm/mach-mx5/devices.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/devices.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/devices.c 2010-11-14 12:15:57.000000000 +0100
+@@ -17,6 +17,29 @@
+ #include <mach/imx-uart.h>
+ #include <mach/irqs.h>
+
++static struct resource mxc_nand_resources[] = {
++ {
++ .start = MX51_NFC_AXI_BASE_ADDR,
++ .end = MX51_NFC_AXI_BASE_ADDR + 0x1FFF,
++ .flags = IORESOURCE_MEM
++ }, {
++ .start = MX51_NFC_BASE_ADDR,
++ .end = MX51_NFC_BASE_ADDR + 0x37,
++ .flags = IORESOURCE_MEM
++ }, {
++ .start = MX51_MXC_INT_NFC,
++ .end = MX51_MXC_INT_NFC,
++ .flags = IORESOURCE_IRQ
++ },
++};
++
++struct platform_device mxc_nand_device = {
++ .name = "mxc_nand",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(mxc_nand_resources),
++ .resource = mxc_nand_resources,
++};
++
+ static struct resource uart0[] = {
+ {
+ .start = MX51_UART1_BASE_ADDR,
+Index: linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/clock-mx51.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c 2010-11-14 12:16:40.000000000 +0100
+@@ -600,6 +600,84 @@ static int _clk_usboh3_set_parent(struct
+ return 0;
+ }
+
++static unsigned long clk_emi_slow_get_rate(struct clk *clk)
++{
++ u32 reg, div;
++ unsigned long parent_rate;
++
++ parent_rate = clk_get_rate(clk->parent);
++
++ reg = __raw_readl(MXC_CCM_CBCDR);
++ div = ((reg & MXC_CCM_CBCDR_EMI_PODF_MASK) >>
++ MXC_CCM_CBCDR_EMI_PODF_OFFSET) + 1;
++
++ return parent_rate / div;
++}
++
++static int _clk_emi_slow_set_parent(struct clk *clk, struct clk *parent)
++{
++ u32 reg = __raw_readl(MXC_CCM_CBCDR);
++ if (parent == &ahb_clk)
++ reg |= MXC_CCM_CBCDR_EMI_CLK_SEL;
++ else if (parent == &main_bus_clk)
++ reg &= ~MXC_CCM_CBCDR_EMI_CLK_SEL;
++ else
++ return -EINVAL;
++
++ __raw_writel(reg, MXC_CCM_CBCDR);
++
++ return 0;
++}
++
++static int _clk_emi_slow_set_rate(struct clk *clk, unsigned long rate)
++{
++ u32 reg, div;
++ unsigned long parent_rate;
++ int i = 0;
++
++ parent_rate = clk_get_rate(clk->parent);
++
++ div = parent_rate / rate;
++ if (div > 8 || div < 1 || ((parent_rate / div) != rate))
++ return -EINVAL;
++
++ reg = __raw_readl(MXC_CCM_CBCDR);
++ reg &= ~MXC_CCM_CBCDR_EMI_PODF_MASK;
++ reg |= (div - 1) << MXC_CCM_CBCDR_EMI_PODF_OFFSET;
++ __raw_writel(reg, MXC_CCM_CBCDR);
++
++ /* Wait for lock */
++ do {
++ reg = __raw_readl(MXC_CCM_CDHIPR);
++ if (!(reg & MXC_CCM_CDHIPR_EMI_PODF_BUSY))
++ break;
++
++ udelay(1);
++ } while (++i < MAX_DPLL_WAIT_TRIES);
++
++ if (i == MAX_DPLL_WAIT_TRIES) {
++ pr_err("MX5: clk_emi_slow_set_rate failed\n");
++ return -EINVAL;
++ }
++
++ return 0;
++}
++
++
++static unsigned long _clk_nfc_get_rate(struct clk *clk)
++{
++ u32 reg, div;
++ unsigned long parent_rate;
++
++ parent_rate = clk_get_rate(clk->parent);
++
++ reg = __raw_readl(MXC_CCM_CBCDR);
++ div = ((reg & MXC_CCM_CBCDR_NFC_PODF_MASK) >>
++ MXC_CCM_CBCDR_NFC_PODF_OFFSET) + 1;
++ return parent_rate / div;
++}
++
++
+ static unsigned long get_high_reference_clock_rate(struct clk *clk)
+ {
+ return external_high_reference;
+@@ -727,6 +805,14 @@ static struct clk usboh3_clk = {
+ .set_parent = _clk_usboh3_set_parent,
+ };
+
++static struct clk emi_slow_clk = {
++ .parent = &main_bus_clk,
++ .get_rate = clk_emi_slow_get_rate,
++ .set_rate = _clk_emi_slow_set_rate,
++ .set_parent = _clk_emi_slow_set_parent,
++};
++
++
+ static struct clk ahb_max_clk = {
+ .parent = &ahb_clk,
+ .enable_reg = MXC_CCM_CCGR0,
+@@ -812,7 +898,12 @@ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1
+
+ /* FEC */
+ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &emi_slow_clk, NULL);
++
++
++/* NFC */
++DEFINE_CLOCK(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
++ _clk_nfc_get_rate, NULL, &emi_slow_clk, NULL);
+
+ #define _REGISTER_CLOCK(d, n, c) \
+ { \
+@@ -837,6 +928,7 @@ static struct clk_lookup lookups[] = {
+ _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
+ _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
+ _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
++ _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
+ };
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
new file mode 100644
index 0000000..26e4c1c
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
@@ -0,0 +1,15 @@
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/debug-macro.S
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/debug-macro.S 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/debug-macro.S 2010-11-14 13:52:58.000000000 +0100
+@@ -50,8 +50,8 @@
+ #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
+ #endif
+ #include <mach/mx51.h>
+-#define UART_PADDR MX51_UART1_BASE_ADDR
+-#define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART1_BASE_ADDR)
++#define UART_PADDR MX51_UART2_BASE_ADDR
++#define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART2_BASE_ADDR)
+ #endif
+
+ #ifdef CONFIG_ARCH_MXC91231
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
new file mode 100644
index 0000000..52e0789
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
@@ -0,0 +1,85 @@
+Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
+===================================================================
+--- linux-2.6.36.orig/drivers/mtd/nand/mxc_nand.c 2010-11-14 12:33:43.000000000 +0100
++++ linux-2.6.36/drivers/mtd/mxc_nand.c 2010-11-14 12:16:17.000000000 +0100
+@@ -211,6 +211,18 @@ static struct nand_ecclayout nandv2_hw_e
+ }
+ };
+
++/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
++static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
++ .eccbytes = 4 * 8,
++ .eccpos = {
++ 8, 9, 10, 11, 12, 13, 14, 15,
++ 72, 73, 74, 75, 76, 77, 78, 79,
++ 136, 137, 138, 139, 140, 141, 142, 143,
++ 200, 201, 202, 203, 204, 205, 206, 207
++ },
++ .oobfree = { {16, 56}, {80, 56}, {144, 56}, {208, 48} },
++};
++
+ static u_char nand_verify_buf[2048];
+
+ #ifdef CONFIG_MTD_PARTITIONS
+@@ -1013,6 +1025,28 @@ static struct nand_bbt_descr bbt_mirror_
+ .pattern = mirror_pattern,
+ };
+
++/* V3 BBT, use 4bit ECC */
++static struct nand_bbt_descr v3bbt_main_descr = {
++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
++ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
++ .offs = 2,
++ .len = 4,
++ .veroffs = 6,
++ .maxblocks = 4,
++ .pattern = bbt_pattern
++};
++
++/* V3 BBT, use 4bit ECC */
++static struct nand_bbt_descr v3bbt_mirror_descr = {
++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
++ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
++ .offs = 2,
++ .len = 4,
++ .veroffs = 6,
++ .maxblocks = 4,
++ .pattern = bbt_pattern
++};
++
+ static int __init mxcnd_probe(struct platform_device *pdev)
+ {
+ struct nand_chip *this;
+@@ -1029,6 +1063,7 @@ static int __init mxcnd_probe(struct pla
+ if (!host)
+ return -ENOMEM;
+
++
+ host->data_buf = (uint8_t *)(host + 1);
+
+ host->dev = &pdev->dev;
+@@ -1128,7 +1163,7 @@ static int __init mxcnd_probe(struct pla
+ host->get_dev_status = get_dev_status_v3;
+ host->irq_control = irq_control_v3;
+ oob_smallpage = &nandv2_hw_eccoob_smallpage;
+- oob_largepage = &nandv2_hw_eccoob_largepage;
++ oob_largepage = &nandv3_hw_eccoob_largepage;
+ } else
+ BUG();
+
+@@ -1152,8 +1187,13 @@ static int __init mxcnd_probe(struct pla
+ this->options |= NAND_BUSWIDTH_16;
+
+ if (pdata->flash_bbt) {
+- this->bbt_td = &bbt_main_descr;
+- this->bbt_md = &bbt_mirror_descr;
++ if (nfc_is_v3_2()) {
++ this->bbt_td = &v3bbt_main_descr;
++ this->bbt_md = &v3bbt_mirror_descr;
++ } else {
++ this->bbt_td = &bbt_main_descr;
++ this->bbt_md = &bbt_mirror_descr;
++ }
+ /* update flash based bbt */
+ this->options |= NAND_USE_FLASH_BBT;
+ }
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-11-13 19:59:31
|
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 a10a05d5f12eecf0a84c36cb844799552110c77f (commit)
from 2c7653e66b1b3b2dcaf8d34aad23986ff677e22b (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 a10a05d5f12eecf0a84c36cb844799552110c77f
Author: nicolas colombain <nic...@ar...>
Date: Sat Nov 13 20:58:49 2010 +0100
[LINUX] fix apf51 clocks
-----------------------------------------------------------------------
Summary of changes:
.../2.6.36/400-armadeus-add_apf51_module.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
index 58cf4d7..34924b2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
@@ -106,7 +106,7 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+
+static void __init apf51_timer_init(void)
+{
-+// mx51_clocks_init(32768, 0 /*24000000*/, 0 /*22579200*/, 0);
++ mx51_clocks_init(32768, 32768*1024, 0 /*22579200*/, 0);
+}
+
+static struct sys_timer apf51_timer = {
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-11 11:28:09
|
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 2c7653e66b1b3b2dcaf8d34aad23986ff677e22b (commit)
from f62c9cc7716ada745a25cfe5e7d5ebade2763601 (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 2c7653e66b1b3b2dcaf8d34aad23986ff677e22b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 11 12:27:35 2010 +0100
[LINUX] 2.6.36: Add minimum to boot APF51
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.36.config | 31 +++--
.../2.6.36/400-armadeus-add_apf51_module.patch | 148 ++++++++++++++++++++
2 files changed, 168 insertions(+), 11 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
index 14095b8..23dfcd1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Oct 21 13:17:57 2010
+# Wed Nov 3 19:41:42 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -239,19 +239,15 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_MX3 is not set
# CONFIG_ARCH_MXC91231 is not set
CONFIG_ARCH_MX5=y
-# CONFIG_MACH_MX21 is not set
-# CONFIG_MACH_MX27 is not set
-# CONFIG_MACH_APF27_DEV is not set
-# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
-# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
CONFIG_ARCH_MX51=y
#
# MX5 platforms:
#
-CONFIG_MACH_MX51_BABBAGE=y
+# CONFIG_MACH_MX51_BABBAGE is not set
# CONFIG_MACH_MX51_3DS is not set
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
+CONFIG_MACH_ARMADEUS_APF51=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_TZIC=y
# CONFIG_MXC_PWM is not set
@@ -278,7 +274,7 @@ CONFIG_CPU_CP15_MMU=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_THUMBEE=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -365,7 +361,9 @@ CONFIG_CPU_IDLE_GOV_MENU=y
#
# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
-# CONFIG_VFP is not set
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
#
# Userspace binary formats
@@ -1012,6 +1010,7 @@ CONFIG_I2C_HELPER_AUTO=y
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
@@ -1035,6 +1034,7 @@ CONFIG_SPI_IMX=y
# CONFIG_PPS is not set
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
# CONFIG_GPIO_SYSFS is not set
#
@@ -1072,7 +1072,16 @@ CONFIG_GPIOLIB=y
# MODULbus GPIO expanders:
#
# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=m
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1596,7 +1605,7 @@ CONFIG_RTC_MXC=m
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_WM831X is not set
+CONFIG_RTC_DRV_WM831X=m
#
# on-CPU RTC drivers
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
new file mode 100644
index 0000000..58cf4d7
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
@@ -0,0 +1,148 @@
+Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-11-11 11:32:41.000000000 +0100
+@@ -42,4 +42,10 @@
+
+ endchoice
+
++config MACH_ARMADEUS_APF51
++ bool "Support Armadeus APF51"
++ help
++ Include support for Armadeus Systems APF51 System On Module. This
++ includes specific configurations for the board and its peripherals.
++
+ endif
+Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-11-11 11:32:41.000000000 +0100
+@@ -9,3 +9,4 @@
+ obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
+ obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
+ obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
++obj-$(CONFIG_MACH_ARMADEUS_APF51) += board-apf51.o
+Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-11-11 11:32:41.000000000 +0100
+@@ -0,0 +1,97 @@
++/*
++ * Copyright 2010 Armadeus Systems
++ *
++ * Based on code which is:
++ * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include <linux/gpio.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <asm/mach/time.h>
++
++#include <mach/hardware.h>
++#include <mach/common.h>
++#include <mach/iomux-mx51.h>
++#include <mach/imx-uart.h>
++
++#include "devices.h"
++
++
++static struct pad_desc apf51_pads[] = {
++ /* UART2 (Console) */
++ MX51_PAD_UART2_RXD__UART2_RXD,
++ MX51_PAD_UART2_TXD__UART2_TXD,
++
++ /* Debug PINS */
++/* MX51_PAD_GPIO_1_2__GPIO_1_2,
++ MX51_PAD_GPIO_1_3__GPIO_1_3,*/
++};
++
++/* Serial ports */
++#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
++static struct imxuart_platform_data uart_pdata = {
++// .flags = IMXUART_HAVE_RTSCTS,
++};
++
++static inline void apf51_init_imx_uart(void)
++{
++ mxc_register_device(&mxc_uart_device1, &uart_pdata);
++}
++#else /* !SERIAL_IMX */
++static inline void apf51_init_imx_uart(void)
++{
++}
++#endif /* SERIAL_IMX */
++
++
++#define DEBUG1_GPIO (GPIO_PORTA | 2)
++#define DEBUG2_GPIO (GPIO_PORTA | 3)
++/*
++ * Board specific initialization.
++ */
++static void __init apf51_board_init(void)
++{
++ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
++ ARRAY_SIZE(apf51_pads));
++
++ gpio_request(DEBUG1_GPIO, "debug1");
++ gpio_request(DEBUG2_GPIO, "debug2");
++
++ gpio_set_value(DEBUG1_GPIO, 1);
++ gpio_set_value(DEBUG2_GPIO, 1);
++
++ apf51_init_imx_uart();
++#ifdef CONFIG_MACH_ARMADEUS_APF51_BASEBOARD
++ apf51_baseboard_init();
++#endif
++}
++
++static void __init apf51_timer_init(void)
++{
++// mx51_clocks_init(32768, 0 /*24000000*/, 0 /*22579200*/, 0);
++}
++
++static struct sys_timer apf51_timer = {
++ .init = apf51_timer_init,
++};
++
++MACHINE_START(APF51, "Armadeus APF51")
++ /* Maintainer: Armadeus Systems <su...@ar...> */
++ .phys_io = MX51_AIPS1_BASE_ADDR,
++ .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
++ .boot_params = PHYS_OFFSET + 0x100,
++ .map_io = mx51_map_io,
++ .init_irq = mx51_init_irq,
++ .init_machine = apf51_board_init,
++ .timer = &apf51_timer,
++MACHINE_END
++
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:22:51.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:23:44.000000000 +0100
+@@ -63,6 +63,7 @@
+ #define MX3X_UART1_BASE_ADDR 0x43F90000
+ #define MX3X_UART2_BASE_ADDR 0x43F94000
+ #define MX51_UART1_BASE_ADDR 0x73fbc000
++#define MX51_UART2_BASE_ADDR 0x73fc0000
+
+ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
+ {
+@@ -101,6 +102,9 @@
+ case MACH_TYPE_MX51_BABBAGE:
+ uart_base = MX51_UART1_BASE_ADDR;
+ break;
++ case MACH_TYPE_APF51:
++ uart_base = MX51_UART2_BASE_ADDR;
++ break;
+ default:
+ break;
+ }
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-09 17:33:14
|
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 f62c9cc7716ada745a25cfe5e7d5ebade2763601 (commit)
via 1c259bd05f141abc791dc49bf83eeb3d2ab4a89c (commit)
via 6a6de72fcf27e9fbb102881283c034e4ae07453c (commit)
from 7b9dcc33d990f5d45342178a37923c96a5bd2da1 (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 f62c9cc7716ada745a25cfe5e7d5ebade2763601
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 18:32:54 2010 +0100
[LINUX] Updates APF27 default config
commit 1c259bd05f141abc791dc49bf83eeb3d2ab4a89c
Merge: 6a6de72fcf27e9fbb102881283c034e4ae07453c 7b9dcc33d990f5d45342178a37923c96a5bd2da1
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 18:31:02 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6a6de72fcf27e9fbb102881283c034e4ae07453c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 18:30:43 2010 +0100
[BUILDROOT] Generates both UBI and UBIFS images
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 ++-
patches/buildroot/076-ubifs.patch | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 13f114c..a1c2db2 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Sep 9 16:05:02 2010
+# Tue Nov 9 17:21:05 2010
#
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_NONE=y
# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
# CONFIG_MXC_IRQ_PRIOR is not set
diff --git a/patches/buildroot/076-ubifs.patch b/patches/buildroot/076-ubifs.patch
index 6b53383..0c7bec9 100644
--- a/patches/buildroot/076-ubifs.patch
+++ b/patches/buildroot/076-ubifs.patch
@@ -1,5 +1,7 @@
---- buildrootref/target/ubifs/Config.in 2008-11-03 09:15:09.000000000 +0100
-+++ buildroot/target/ubifs/Config.in 2009-10-03 17:07:32.000000000 +0200
+Index: buildroot/target/ubifs/Config.in
+===================================================================
+--- buildroot.orig/target/ubifs/Config.in 2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/ubifs/Config.in 2010-11-09 16:42:27.000000000 +0100
@@ -1,9 +1,15 @@
config BR2_TARGET_ROOTFS_UBIFS
bool "ubifs root filesystem"
@@ -16,7 +18,7 @@
config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
hex "UBI logical erase block size"
depends on BR2_TARGET_ROOTFS_UBIFS
-@@ -16,6 +22,13 @@ config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
+@@ -16,6 +22,13 @@
help
Some comment required here
@@ -30,9 +32,11 @@
config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
int "Maximum LEB count"
depends on BR2_TARGET_ROOTFS_UBIFS
---- buildrootref/target/ubifs/ubifsroot.mk 2009-10-03 17:55:26.000000000 +0200
-+++ buildroot/target/ubifs/ubifsroot.mk 2009-10-03 17:18:09.000000000 +0200
-@@ -76,7 +76,14 @@ else
+Index: buildroot/target/ubifs/ubifsroot.mk
+===================================================================
+--- buildroot.orig/target/ubifs/ubifsroot.mk 2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/ubifs/ubifsroot.mk 2010-11-09 16:53:33.000000000 +0100
+@@ -76,7 +76,14 @@
UBIFS_TARGET := $(UBIFS_BASE)
endif
@@ -48,7 +52,7 @@
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
-@@ -102,11 +109,18 @@ ifneq ($(TARGET_DEVICE_TABLE),)
+@@ -102,11 +109,18 @@
>> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
endif
# Use fakeroot so mkfs.ubifs believes the previous fakery
@@ -62,7 +66,7 @@
+ echo "image=$(UBIFS_BASE)" \
+ >> ./ubinize.cfg
+ $(UBINIZE) -o system_ubi.img $(UBIFS_UBINIZE_OPTS) ubinize.cfg
-+ cp -f system_ubi.img $(UBIFS_BASE)
++ cp -f system_ubi.img $(subst ubifs,ubi,$(UBIFS_BASE))
+ rm system_ubi.img
+ rm ubinize.cfg
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-09 15:46:23
|
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 7b9dcc33d990f5d45342178a37923c96a5bd2da1 (commit)
via aaa9d9dd1885087d99ddaa66e36885c29108bba2 (commit)
from 74a3da157a5e0c5eafaf4ff88144f8c74f00c599 (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 7b9dcc33d990f5d45342178a37923c96a5bd2da1
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:46:00 2010 +0100
[LINUX] Change PPS baseboard prompt message in 500-pps-armadeus-add_pps_baseboard.patch.
commit aaa9d9dd1885087d99ddaa66e36885c29108bba2
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:40:50 2010 +0100
[BUILDROOT] Remove PPS package patch 135-pps-add_test_scripts_package.patch and manually add PPS Buildroot files to Armadeus package.
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/pps/Config.in | 6 ++
buildroot/package/armadeus/pps/pps.mk | 38 +++++++++++
.../500-pps-armadeus-add_pps_baseboard.patch | 4 +-
.../135-pps-add_test_scripts_package.patch | 70 --------------------
.../2010.11/135-pps-add_test_scripts_package.patch | 70 --------------------
6 files changed, 47 insertions(+), 142 deletions(-)
create mode 100644 buildroot/package/armadeus/pps/Config.in
create mode 100644 buildroot/package/armadeus/pps/pps.mk
delete mode 100644 patches/buildroot/135-pps-add_test_scripts_package.patch
delete mode 100644 patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 355644b..d03f031 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -8,6 +8,7 @@ source package/armadeus/fpgaregs/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
+source package/armadeus/pps/Config.in
source package/armadeus/testsuite/Config.in
endmenu
diff --git a/buildroot/package/armadeus/pps/Config.in b/buildroot/package/armadeus/pps/Config.in
new file mode 100644
index 0000000..383785c
--- /dev/null
+++ b/buildroot/package/armadeus/pps/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
+ bool "PPS Test scripts"
+ default n
+ help
+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
new file mode 100644
index 0000000..7df17a4
--- /dev/null
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# PPS Test scripts
+#
+#############################################################
+
+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
+
+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
+
+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
+
+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+
+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
+
+armadeus-pps-testscripts-clean:
+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
+TARGETS+=pps-testscripts
+endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
index 24373c2..525edd1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
@@ -346,11 +346,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
version.
+config MACH_PPS
-+ prompt "Md PPS"
++ prompt "Armadeus Systems APF27 PPS Secured Gateway"
+ bool
+ depends on MACH_APF27
+ help
-+ This selects the PPS as baseboard.
++ This selects the APF27 PPS as baseboard.
+
endchoice
diff --git a/patches/buildroot/135-pps-add_test_scripts_package.patch b/patches/buildroot/135-pps-add_test_scripts_package.patch
deleted file mode 100644
index fa9ea66..0000000
--- a/patches/buildroot/135-pps-add_test_scripts_package.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Add package PPS Test scripts to Buildroot.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/armadeus/Config.in
-===================================================================
---- buildroot.orig/package/armadeus/Config.in 2010-11-05 17:04:08.000000000 +0100
-+++ buildroot/package/armadeus/Config.in 2010-11-05 17:05:06.000000000 +0100
-@@ -8,6 +8,7 @@
- source package/armadeus/imxregs/Config.in
- source package/armadeus/imxssi/Config.in
- source package/armadeus/max5821ctrl/Config.in
-+source package/armadeus/pps/Config.in
- source package/armadeus/testsuite/Config.in
-
- endmenu
-Index: buildroot/package/armadeus/pps/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/Config.in 2010-11-05 17:05:39.000000000 +0100
-@@ -0,0 +1,6 @@
-+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
-+ bool "PPS Test scripts"
-+ default n
-+ help
-+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
-+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
-Index: buildroot/package/armadeus/pps/pps.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:09:58.000000000 +0100
-@@ -0,0 +1,38 @@
-+#############################################################
-+#
-+# PPS Test scripts
-+#
-+#############################################################
-+
-+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
-+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
-+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
-+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
-+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
-+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
-+
-+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
-+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
-+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
-+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
-+
-+armadeus-pps-testscripts-clean:
-+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
-+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
-+TARGETS+=pps-testscripts
-+endif
diff --git a/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch b/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
deleted file mode 100644
index 5f10fc1..0000000
--- a/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Add package PPS Test scripts to Buildroot.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/armadeus/Config.in
-===================================================================
---- buildroot.orig/package/armadeus/Config.in 2010-11-08 10:20:10.000000000 +0100
-+++ buildroot/package/armadeus/Config.in 2010-11-08 14:20:14.000000000 +0100
-@@ -8,6 +8,7 @@
- source package/armadeus/imxregs/Config.in
- source package/armadeus/imxssi/Config.in
- source package/armadeus/max5821ctrl/Config.in
-+source package/armadeus/pps/Config.in
- source package/armadeus/testsuite/Config.in
-
- endmenu
-Index: buildroot/package/armadeus/pps/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/Config.in 2010-11-08 14:20:14.000000000 +0100
-@@ -0,0 +1,6 @@
-+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
-+ bool "PPS Test scripts"
-+ default n
-+ help
-+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
-+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
-Index: buildroot/package/armadeus/pps/pps.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:20:53.000000000 +0100
-@@ -0,0 +1,38 @@
-+#############################################################
-+#
-+# PPS Test scripts
-+#
-+#############################################################
-+
-+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
-+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
-+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
-+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
-+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
-+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
-+
-+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
-+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
-+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
-+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
-+
-+armadeus-pps-testscripts-clean:
-+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
-+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
-+TARGETS+=pps-testscripts
-+endif
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-09 15:05:12
|
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 74a3da157a5e0c5eafaf4ff88144f8c74f00c599 (commit)
via ec9760c4e4c981cdeb5a4e826dc1e66afd71d364 (commit)
from 1140663c16adec1aa4dfc5397cd53c3a5fdc8ba4 (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 74a3da157a5e0c5eafaf4ff88144f8c74f00c599
Merge: ec9760c4e4c981cdeb5a4e826dc1e66afd71d364 1140663c16adec1aa4dfc5397cd53c3a5fdc8ba4
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:03:45 2010 +0100
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ec9760c4e4c981cdeb5a4e826dc1e66afd71d364
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:03:07 2010 +0100
[TEST] GPL licence added on PPS test scripts.
-----------------------------------------------------------------------
Summary of changes:
target/pps/configs/networkConfig | 20 ++++++++++++++++++++
target/pps/scripts/init_boa.sh | 28 ++++++++++++++++------------
target/pps/scripts/init_wpa.sh | 26 +++++++++++++++-----------
target/pps/scripts/install.sh | 20 ++++++++++++++++++++
target/pps/scripts/reset_wi2wi.sh | 26 +++++++++++++++-----------
target/pps/scripts/stop_wpa.sh | 26 +++++++++++++++-----------
target/pps/scripts/test_ether_gadget.sh | 26 +++++++++++++++-----------
target/pps/scripts/test_ether_smsc95xx.sh | 26 +++++++++++++++-----------
target/pps/scripts/test_wifi.sh | 27 +++++++++++++++------------
target/pps/www/index.html | 20 ++++++++++++++++++++
10 files changed, 166 insertions(+), 79 deletions(-)
diff --git a/target/pps/configs/networkConfig b/target/pps/configs/networkConfig
index 4b947fe..a54ca2a 100644
--- a/target/pps/configs/networkConfig
+++ b/target/pps/configs/networkConfig
@@ -1,2 +1,22 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
export SSID=
export PSK=
diff --git a/target/pps/scripts/init_boa.sh b/target/pps/scripts/init_boa.sh
index 3af8abc..9e40a71 100644
--- a/target/pps/scripts/init_boa.sh
+++ b/target/pps/scripts/init_boa.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: HTSC
-#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
-#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Burkhart Frederic,,,
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
# setup /etc/hosts file (hosname id required by "boa")
echo "127.0.0.1 localhost" > /etc/hosts
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index f838353..65fbb81 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: Armadeus
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Jérémie Scheer,,,
-#
if [ -f /etc/wpa_supplicant/networkConfig ]; then
diff --git a/target/pps/scripts/install.sh b/target/pps/scripts/install.sh
index 5526704..6bce6a2 100755
--- a/target/pps/scripts/install.sh
+++ b/target/pps/scripts/install.sh
@@ -1,3 +1,23 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
#!/bin/sh
if [ "$1" == "" ]; then
diff --git a/target/pps/scripts/reset_wi2wi.sh b/target/pps/scripts/reset_wi2wi.sh
index c1f7341..08fed6f 100644
--- a/target/pps/scripts/reset_wi2wi.sh
+++ b/target/pps/scripts/reset_wi2wi.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: Armadeus
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Jérémie Scheer,,,
-#
source /usr/bin/gpio_helpers.sh
diff --git a/target/pps/scripts/stop_wpa.sh b/target/pps/scripts/stop_wpa.sh
index 8e11015..24a406e 100644
--- a/target/pps/scripts/stop_wpa.sh
+++ b/target/pps/scripts/stop_wpa.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: Armadeus
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Jérémie Scheer,,,
-#
ifconfig eth1 down 2>/dev/null
diff --git a/target/pps/scripts/test_ether_gadget.sh b/target/pps/scripts/test_ether_gadget.sh
index 168be97..e2c3a4f 100644
--- a/target/pps/scripts/test_ether_gadget.sh
+++ b/target/pps/scripts/test_ether_gadget.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: HTSC
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Burkhart Frederic,,,
-#
modprobe -r smsc95xx
modprobe -r g_ether
diff --git a/target/pps/scripts/test_ether_smsc95xx.sh b/target/pps/scripts/test_ether_smsc95xx.sh
index 655682b..8745f99 100644
--- a/target/pps/scripts/test_ether_smsc95xx.sh
+++ b/target/pps/scripts/test_ether_smsc95xx.sh
@@ -1,18 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: cryonic medical S.A.
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Burkhart Frederic,,,
-#
modprobe -r g_ether
modprobe -r smsc95xx
diff --git a/target/pps/scripts/test_wifi.sh b/target/pps/scripts/test_wifi.sh
index 1266525..9b9c5c5 100644
--- a/target/pps/scripts/test_wifi.sh
+++ b/target/pps/scripts/test_wifi.sh
@@ -1,19 +1,22 @@
#
-# This software has been developed by ARMADEUS SYSTEMS
+# THE ARMADEUS PROJECT
#
-# Customer Name: HTSC
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
#
-# Project Name: PPS
-#
-# Copyright (C) 2010 :
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# This program is the property of the armadeus systems company or of the
-# final customer as soon as terms & conditions stipulated by the contract
-# between the two parties are full-filled .
-#
-# Written by: Burkhart Frederic,,,
-#
-
modprobe libertas_sdio
diff --git a/target/pps/www/index.html b/target/pps/www/index.html
index b1a5e22..65cf71c 100644
--- a/target/pps/www/index.html
+++ b/target/pps/www/index.html
@@ -1,3 +1,23 @@
+<!--
+ THE ARMADEUS PROJECT
+
+ Copyright (C) year The armadeus systems team [Jérémie Scheer]
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-->
+
<html>
<head>
<title> </title>
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-09 14:27:24
|
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 1140663c16adec1aa4dfc5397cd53c3a5fdc8ba4 (commit)
via 40a81d218694606dbbba43409e3424ea24161880 (commit)
from 0825e81ca6044de8780e497e71922ad5d4067659 (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 1140663c16adec1aa4dfc5397cd53c3a5fdc8ba4
Merge: 40a81d218694606dbbba43409e3424ea24161880 0825e81ca6044de8780e497e71922ad5d4067659
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 15:27:03 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 40a81d218694606dbbba43409e3424ea24161880
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 15:26:33 2010 +0100
[BUILDROOT] Updates APF27 default config
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/apf27/apf27_defconfig | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index de1763b..4e5b744 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
-# Thu Sep 9 16:01:40 2010
+# Tue Nov 9 15:25:06 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -69,6 +69,7 @@ BR2_BANNER="Welcome to the Armadeus development environment."
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF51 is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
@@ -660,6 +661,10 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_QT is not set
#
+# Qwt requires Qt to be installed
+#
+
+#
# X Window System server
#
BR2_PACKAGE_XSERVER_none=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-09 14:01:29
|
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 0825e81ca6044de8780e497e71922ad5d4067659 (commit)
via cc5dfce0e594b460ea104874ec21f201f7047710 (commit)
via 7cb3dbebf24b34792ec2836a398393df701ff989 (commit)
via 4c95d574e63dc564d17c715516be4064ea96fe41 (commit)
from 88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2 (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 0825e81ca6044de8780e497e71922ad5d4067659
Merge: cc5dfce0e594b460ea104874ec21f201f7047710 88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 15:00:43 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit cc5dfce0e594b460ea104874ec21f201f7047710
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 15:00:19 2010 +0100
[BUILDROOT] 2010.11: cleanup 076-ubi-add_ubi_image_support.patch
commit 7cb3dbebf24b34792ec2836a398393df701ff989
Merge: 4c95d574e63dc564d17c715516be4064ea96fe41 54df84e69338318a33141c3402943d16f932abb3
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 13:45:54 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4c95d574e63dc564d17c715516be4064ea96fe41
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 13:43:02 2010 +0100
[BUILDROOT] securetty: be compatible with both ways of naming serial port on i.MX platforms: /dev/ttymxc & /dev/ttySMX
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/rootfs/target_skeleton/etc/securetty | 2 ++
.../2010.11/076-ubi-add_ubi_image_support.patch | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
index 623807c..37b30fc 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
@@ -12,4 +12,6 @@ ttyS2
ttyS3
ttySMX0
ttySMX1
+ttymxc0
+ttymxc1
ttyGS0
diff --git a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
index 4a6b020..b96ea72 100644
--- a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
+++ b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
@@ -6,7 +6,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/fs/ubi/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/Config.in 2010-10-31 21:32:10.000000000 +0100
++++ buildroot/fs/ubi/Config.in 2010-11-01 19:43:55.000000000 +0100
@@ -0,0 +1,22 @@
+config BR2_TARGET_ROOTFS_UBI
+ depends on BR2_TARGET_ROOTFS_UBIFS
@@ -33,8 +33,8 @@ Index: buildroot/fs/ubi/Config.in
Index: buildroot/fs/ubi/ubi.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubi.mk 2010-10-31 21:56:04.000000000 +0100
-@@ -0,0 +1,26 @@
++++ buildroot/fs/ubi/ubi.mk 2010-11-09 14:56:46.000000000 +0100
+@@ -0,0 +1,24 @@
+#############################################################
+#
+# Build the UBI root filesystem image
@@ -50,8 +50,6 @@ Index: buildroot/fs/ubi/ubi.mk
+
+ROOTFS_UBI_DEPENDENCIES = ubifs-root
+
-+# $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
-+
+define ROOTFS_UBI_CMD
+ cp fs/ubi/ubinize.cfg . ;\
+ echo "image=$$@fs" \
@@ -64,7 +62,7 @@ Index: buildroot/fs/ubi/ubi.mk
Index: buildroot/fs/ubi/ubinize.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubinize.cfg 2010-10-31 21:13:58.000000000 +0100
++++ buildroot/fs/ubi/ubinize.cfg 2010-11-01 19:43:55.000000000 +0100
@@ -0,0 +1,7 @@
+[ubifs]
+mode=ubi
@@ -73,3 +71,13 @@ Index: buildroot/fs/ubi/ubinize.cfg
+vol_name=rootfs
+vol_alignment=1
+vol_flags=autoresize
+Index: buildroot/fs/ubifs/Config.in
+===================================================================
+--- buildroot.orig/fs/ubifs/Config.in 2010-11-01 19:39:39.000000000 +0100
++++ buildroot/fs/ubifs/Config.in 2010-11-01 19:43:55.000000000 +0100
+@@ -77,3 +77,5 @@
+
+ endchoice
+
++source "fs/ubi/Config.in"
++
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-09 13:50:28
|
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 88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2 (commit)
via d210a63ee8d7066819b517a06f94e3ee918b3987 (commit)
from bbb379204464e29eba453299174d7d2a1c50791b (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 88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2
Merge: d210a63ee8d7066819b517a06f94e3ee918b3987 bbb379204464e29eba453299174d7d2a1c50791b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 14:49:44 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d210a63ee8d7066819b517a06f94e3ee918b3987
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 14:48:45 2010 +0100
[LINUX] 2.6.36: Makes APF27 + APF27Dev compile and boot with minimum devices: serial port & NAND Flash
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 14 ++-
...7-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref} | 0
.../2.6.36/240-armadeus-mxc_nand-fixes_bbt.patch | 56 ++++++
...llows_multiple_nand_chips_boot_parameters.patch | 13 ++
.../2.6.36/281-apf27-armadeus-add_apf27.c.patch | 189 ++++++++++++--------
...-apf27-armadeus-add_apf27_to_build_system.patch | 17 ++-
6 files changed, 208 insertions(+), 81 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch => 2.6.36/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref} (100%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-armadeus-mxc_nand-fixes_bbt.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240b-armadeus-mxc_nand-allows_multiple_nand_chips_boot_parameters.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index 48bcaf7..c448d08 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Oct 21 08:38:50 2010
+# Sat Nov 6 21:12:40 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,7 +166,7 @@ CONFIG_DEFAULT_IOSCHED="deadline"
# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
+# CONFIG_FREEZER is not set
#
# System Type
@@ -228,6 +228,10 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
+CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y
+CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
#
# Freescale MXC Implementations
@@ -253,6 +257,11 @@ CONFIG_MACH_MX27=y
# CONFIG_MACH_IMX27LITE is not set
# CONFIG_MACH_PCA100 is not set
# CONFIG_MACH_MXT_TD60 is not set
+CONFIG_MACH_APF27=y
+# CONFIG_MACH_APF27_FPGA is not set
+CONFIG_MACH_APF27_DEV=y
+CONFIG_MACH_APF27_DEV_EXT_NONE=y
+# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
# CONFIG_MXC_IRQ_PRIOR is not set
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
@@ -1269,6 +1278,7 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_ARMADEUS_CLUT224=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-armadeus-mxc_nand-fixes_bbt.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-armadeus-mxc_nand-fixes_bbt.patch
new file mode 100644
index 0000000..a018702
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240-armadeus-mxc_nand-fixes_bbt.patch
@@ -0,0 +1,56 @@
+Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
+===================================================================
+--- linux-2.6.36.orig/drivers/mtd/nand/mxc_nand.c 2010-11-08 22:12:19.000000000 +0100
++++ linux-2.6.36/drivers/mtd/nand/mxc_nand.c 2010-11-09 10:29:25.000000000 +0100
+@@ -211,6 +211,8 @@
+ }
+ };
+
++static u_char nand_verify_buf[2048];
++
+ #ifdef CONFIG_MTD_PARTITIONS
+ static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
+ #endif
+@@ -444,6 +446,7 @@
+ {
+ struct nand_chip *this = &host->nand;
+
++ DEBUG(MTD_DEBUG_LEVEL3, "send_read_id \n");
+ /* NANDFC buffer 0 is used for device ID output */
+ writew(0x0, NFC_V1_V2_BUF_ADDR);
+
+@@ -651,7 +654,15 @@
+ static int mxc_nand_verify_buf(struct mtd_info *mtd,
+ const u_char *buf, int len)
+ {
+- return -EFAULT;
++ mxc_nand_read_buf(mtd, (u_char *)&nand_verify_buf[0], len);
++
++ if (!memcmp(buf, &nand_verify_buf[0], len)) {
++ DEBUG(MTD_DEBUG_LEVEL3,"verify_buf: the buffer is OK\n");
++ return 0;
++ } else {
++ DEBUG(MTD_DEBUG_LEVEL0,"verify_buf: the buffer is wrong\n");
++ return -EFAULT;
++ }
+ }
+
+ /* This function is used by upper layer for select and
+@@ -985,7 +996,7 @@
+ static struct nand_bbt_descr bbt_main_descr = {
+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+- .offs = 0,
++ .offs = 12,
+ .len = 4,
+ .veroffs = 4,
+ .maxblocks = 4,
+@@ -995,7 +1006,7 @@
+ static struct nand_bbt_descr bbt_mirror_descr = {
+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+- .offs = 0,
++ .offs = 12,
+ .len = 4,
+ .veroffs = 4,
+ .maxblocks = 4,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240b-armadeus-mxc_nand-allows_multiple_nand_chips_boot_parameters.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240b-armadeus-mxc_nand-allows_multiple_nand_chips_boot_parameters.patch
new file mode 100644
index 0000000..5623baa
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/240b-armadeus-mxc_nand-allows_multiple_nand_chips_boot_parameters.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
+===================================================================
+--- linux-2.6.36.orig/drivers/mtd/nand/mxc_nand.c 2010-11-08 22:56:51.000000000 +0100
++++ linux-2.6.36/drivers/mtd/nand/mxc_nand.c 2010-11-09 09:21:24.000000000 +0100
+@@ -1038,7 +1038,7 @@
+ mtd->priv = this;
+ mtd->owner = THIS_MODULE;
+ mtd->dev.parent = &pdev->dev;
+- mtd->name = DRIVER_NAME;
++ mtd->name = dev_name(&pdev->dev);
+
+ /* 50 us command delay time */
+ this->chip_delay = 5;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
index 46e5706..c435dbe 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
@@ -9,14 +9,14 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-10-21 10:16:28.000000000 +0200
-@@ -0,0 +1,789 @@
++++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-11-09 10:13:43.000000000 +0100
+@@ -0,0 +1,802 @@
+ /*
+ * apf27.c
+ *
+ * Support for the APF27 System On Module
+ *
-+ * Copyright (C) 2008 Armadeus Systems
++ * Copyright (C) 2008 - 2010 Armadeus Systems
+ * Authors: Julien Boibessot <jul...@ar...>
+ * Eric Jarrige <eri...@ar...>
+ *
@@ -38,9 +38,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#define IMX_NEEDS_DEPRECATED_SYMBOLS
++
+#include <linux/platform_device.h>
-+#include <linux/mtd/physmap.h>
-+#include <asm/mach/flash.h>
+#include <linux/i2c.h>
+#include <linux/serial.h>
+#include <linux/delay.h>
@@ -48,6 +48,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
++
++#include <asm/mach/flash.h>
+#include <asm/io.h>
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
@@ -55,9 +57,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+// #include <asm/arch/clock.h>
+#include <mach/common.h>
+#include <mach/hardware.h>
-+#include <mach/iomux-mx1-mx2.h>
++#include <mach/iomux-mx27.h>
+#include <mach/gpio.h>
-+#include <mach/imx_i2c.h>
++//#include <mach/imx_i2c.h>
+#include <mach/imx-uart.h>
+#include <mach/mxc_nand.h>
+#include <mach/mxc_ehci.h>
@@ -67,13 +69,16 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
+#include "cpufreq_imx.h"
+#endif
-+#include <mach/board-apf27.h>
++//#include <mach/board-apf27.h>
+#include <asm/mach/map.h>
+#ifdef CONFIG_MACH_APF27_FPGA
+#include <mach/fpga.h>
+#endif
++
++#include "devices-imx27.h"
+#include "devices.h"
-+#include "crm_regs.h"
++//#include "crm_regs.h"
++
+
+extern void apf27_baseboard_init(void);
+#ifdef CONFIG_PM
@@ -113,9 +118,10 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+
+
+/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
-+static struct mxc_nand_platform_data apf27_nand_board_info = {
++static struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
+ .width = 2,
+ .hw_ecc = 1,
++ .flash_bbt = 1, /* we handle Bad Block Table */
+};
+
+
@@ -138,8 +144,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ return 0;
+}
+
-+static struct imx_i2c_platform_data apf27_i2c_1_data = {
-+ .max_clk = 100000,
++static struct imxi2c_platform_data apf27_i2c_1_data __initconst = {
++ .bitrate = 100000,
+ .init = apf27_i2c_1_init,
+ .exit = apf27_i2c_1_exit,
+};
@@ -242,7 +248,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+}
+#endif /* CONFIG_FEC_OLD */
+
-+
++#if 0
+/* APF27 has an onboard PHY (ISP1504) on OTG USB port */
+static int mxc_usbotg_pins[] = {
+ PE0_PF_USBOTG_NXT,
@@ -423,7 +429,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ .operating_mode = FSL_USB2_DR_DEVICE,
+ .phy_mode = FSL_USB2_PHY_ULPI,
+};
-+
++#endif
+
+/* APF27 frequency scaling stuff */
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
@@ -645,9 +651,11 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ printk("___ %s\n", __func__);
+
+#ifdef CONFIG_USB_EHCI_MXC
-+ isp1504_suspend((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
++// isp1504_suspend((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
+#endif
++#ifdef CONFIG_MACH_APF27_HAS_BASEBOARD
+ apf27_baseboard_suspend();
++#endif
+#ifdef APF27_PM_DEBUG
+ apf27_force_gpios();
+ apf27_dump_clocks();
@@ -663,10 +671,11 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ printk("___ %s\n", __func__);
+
+#ifdef CONFIG_USB_EHCI_MXC
-+ isp1504_resume((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
++// isp1504_resume((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
+#endif
++#ifdef CONFIG_MACH_APF27_HAS_BASEBOARD
+ apf27_baseboard_resume();
-+
++#endif
+ return 0;
+}
+
@@ -718,6 +727,15 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ .name = "ocore_irq_mng",
+ .id = 0,
+};
++
++static struct map_desc apf27_fpga_io_desc[] __initdata = {
++ {
++ .virtual = CS5_BASE_ADDR_VIRT,
++ .pfn = __phys_to_pfn(CS5_BASE_ADDR),
++ .length = CS5_SIZE,
++ .type = MT_DEVICE,
++ },
++};
+#endif /* CONFIG_MACH_APF27_FPGA */
+
+
@@ -726,17 +744,17 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ sysdev_class_register(&apf27_pm_sysclass);
+ sysdev_register(&apf27_pm_sysdev);
+
-+ /* Init apf27 power management related pins */
++ /* Init APF27 power management related pins */
+ apf27_pwr_ctl_active();
+
+#ifdef CONFIG_FEC_OLD
+ gpio_fec_active();
+#endif
+ /* UART1 and UART3 have "on module" transceivers */
-+ mxc_register_device(&mxc_uart_device0, &uart0_pdata); /* console */
-+ mxc_register_device(&mxc_uart_device2, &uart2_pdata);
++ imx27_add_imx_uart0(&uart0_pdata); /* console */
++ imx27_add_imx_uart2(&uart2_pdata);
+
-+ mxc_register_device(&mxc_nand_device, &apf27_nand_board_info);
++ imx27_add_mxc_nand(&apf27_nand_board_info);
+
+#ifdef CONFIG_PWM
+ mxc_register_device(&mxc_pwm_device0, &apf27_pwm_0_data);
@@ -744,13 +762,15 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#ifdef CONFIG_WATCHDOG
+ mxc_register_device(&mxc_wdt, NULL);
+#endif
++#if 0
+ if (otg_mode_host) {
+ mxc_register_device(&mxc_otg_host, &ehci0_pdata);
+ } else {
+ mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);
+ }
++#endif
+#ifdef CONFIG_I2C
-+ mxc_register_device(&imx_i2c_device1, &apf27_i2c_1_data);
++ imx27_add_i2c_imx1(&apf27_i2c_1_data);
+ i2c_register_board_info(1, apf27_i2c_devices_bus1,
+ ARRAY_SIZE(apf27_i2c_devices_bus1));
+#endif
@@ -761,55 +781,48 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#endif
+
+ printk("i.MX27 chip revision: %d\n", mx27_revision() );
-+
++#ifdef CONFIG_MACH_APF27_HAS_BASEBOARD
+ apf27_baseboard_init();
++#endif
+}
+
+static void __init apf27_timer_init(void)
+{
-+ mxc_clocks_init(26000000); /* ext ref even if not used */
-+ mxc_timer_init("gpt_clk.0");
++ mx27_clocks_init(26000000); /* init ext ref, even if not used */
+}
+
+struct sys_timer apf27_timer = {
+ .init = apf27_timer_init,
+};
+
-+static struct map_desc apf27_io_desc[] __initdata = {
-+ {
-+ .virtual = CS5_BASE_ADDR_VIRT,
-+ .pfn = __phys_to_pfn(CS5_BASE_ADDR),
-+ .length = CS5_SIZE,
-+ .type = MT_DEVICE,
-+ },
-+};
-+
+void __init apf27_map_io(void)
+{
-+ mxc_map_io();
-+ iotable_init(apf27_io_desc, ARRAY_SIZE(apf27_io_desc));
++ mx27_map_io();
++#ifdef CONFIG_MACH_APF27_FPGA
++ iotable_init(apf27_fpga_io_desc, ARRAY_SIZE(apf27_fpga_io_desc));
++#endif
+}
+
+MACHINE_START(APF27, "Armadeus APF27")
+ /* Maintainer: Julien Boibessot <jul...@ar...> */
-+ .phys_io = AIPI_BASE_ADDR,
-+ .io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
-+ .boot_params = PHYS_OFFSET + 0x100,
++ .phys_io = MX27_AIPI_BASE_ADDR,
++ .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
++ .boot_params = MX27_PHYS_OFFSET + 0x100,
+ .map_io = apf27_map_io,
-+ .init_irq = mxc_init_irq,
++ .init_irq = mx27_init_irq,
+ .init_machine = apf27_init,
+ .timer = &apf27_timer,
+MACHINE_END
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-10-21 10:16:28.000000000 +0200
-@@ -0,0 +1,1139 @@
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-11-08 16:15:38.000000000 +0100
+@@ -0,0 +1,1155 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
+ *
-+ * Copyright (C) 2009 Armadeus Systems
++ * Copyright (C) 2009-2010 Armadeus Systems
+ * Authors: Julien Boibessot <jul...@ar...>
+ * Nicolas Colombain <nic...@ar...>
+ *
@@ -827,9 +840,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#define IMX_NEEDS_DEPRECATED_SYMBOLS
++
+#include <linux/platform_device.h>
-+#include <linux/mtd/physmap.h>
-+#include <asm/mach/flash.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spidev.h>
+#include <linux/i2c.h>
@@ -839,6 +852,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
++
+#include <asm/io.h>
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
@@ -846,11 +860,11 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+// #include <asm/arch/clock.h>
+#include <mach/common.h>
+#include <mach/hardware.h>
-+#include <mach/iomux-mx1-mx2.h>
++//#include <mach/iomux-mx1-mx2.h>
++#include <mach/iomux-mx27.h>
+#include <mach/gpio.h>
-+#include <mach/imx_i2c.h>
+//#include <mach/imx_spi.h>
-+#include <../mach-imx/include/mach/spi_imx.h>
++//#include <../mach-imx/include/mach/spi_imx.h>
+#include <mach/imx-uart.h>
+#include <mach/mmc.h>
+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
@@ -858,9 +872,10 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#include <mach/imxfb.h>
+#endif
+#include <linux/fb.h>
-+#include <mach/mxc_nand.h>
++//#include <mach/mxc_nand.h>
+#include <mach/mxc_ehci.h>
+#include <mach/ulpi.h>
++#if 0
+#include <linux/spi/max1027.h>
+#include <linux/spi/tsc2102.h>
+#include "../../../drivers/net/can/mcp251x.h"
@@ -868,20 +883,25 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#include <media/ad9889.h>
+#include <mach/imx_dam.h>
+#include <mach/imx_sound.h>
-+#include <mach/imx_ssi.h>
+#include <mach/imx-alsa.h>
+#include <mach/imx_cam.h>
++#endif
++#include <mach/ssi.h>
++
+#include <media/soc_camera.h>
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
+#include "cpufreq_imx.h"
+#endif
-+#include <mach/board-apf27.h>
++//#include <mach/board-apf27.h>
+#include <asm/mach/map.h>
+#ifdef CONFIG_MACH_APF27_FPGA
+#include <mach/fpga.h>
+#endif
++
++#include "devices-imx27.h"
+#include "devices.h"
-+#include "crm_regs.h"
++//#include "crm_regs.h"
++
+
+#ifdef CONFIG_FB_MXC
+extern void apf27_lcd_init(void);
@@ -942,8 +962,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ return 0;
+}
+
-+static struct imx_i2c_platform_data apf27_i2c_0_data = {
-+ .max_clk = 400000,
++static struct imxi2c_platform_data apf27_i2c_0_data __initconst = {
++ .bitrate = 400000,
+ .init = apf27_i2c_0_init,
+ .exit = apf27_i2c_0_exit,
+};
@@ -1307,6 +1327,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#endif /* CONFIG_SPI_MXC_SELECT3 */
+
+
++#if 0 /* TBDJB */
+
+/* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI1) */
+#ifdef CONFIG_ARMADEUS_MAX1027
@@ -1445,6 +1466,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+};
+#endif /* CONFIG_CAN_MCP251X */
+
++#endif /* TBDJB */
+
+/* SPI2 can be used as userspace general SPI bus (CS 2) */
+#ifdef CONFIG_SPI_SPIDEV
@@ -1479,6 +1501,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#endif /* CONFIG_SPI_SPIDEV */
+
+static struct spi_board_info spi_board_info[] __initdata = {
++#if 0 /* TBDJB */
+#ifdef CONFIG_ARMADEUS_MAX1027
+ {
+ .modalias = "max1027",
@@ -1515,6 +1538,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ .platform_data = &apf27_mcp251x_config,
+ },
+#endif /* CONFIG_CAN_MCP251X */
++#endif /* TBDJB */
+#ifdef CONFIG_SPI_SPIDEV
+ {
+ .modalias = "spidev",
@@ -1528,16 +1552,16 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#endif /* CONFIG_SPI_SPIDEV */
+};
+
-+
++#if 0 /* TBDJB */
+/* APF27Dev adds an USB PHY on i.MX27 USB_HOST port 2 */
+#ifdef CONFIG_USB_EHCI_MXC
+static int mxc_usbh1_pins[] = {
+ PB22_PF_USBH1_SUSP,
+ PB23_PF_USB_PWR,
-+ PB24_PF_USB_OC_B,
++ PB24_PF_USB_OC,
+ PB25_PF_USBH1_RCV,
+ PB26_PF_USBH1_FS,
-+ PB27_PF_USBH1_OE_B,
++ PB27_PF_USBH1_OE,
+ PB28_PF_USBH1_TXDM,
+ PB29_PF_USBH1_TXDP,
+ PB30_PF_USBH1_RXDM,
@@ -1582,6 +1606,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ .init = apf27_usbh1_init,
+};
+#endif /* CONFIG_USB_EHCI_MXC */
++#endif /* TBDJB */
+
+
+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
@@ -1623,6 +1648,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ PC23_PF_SSI1_CLK,
+};
+
++/*
+static int gpio_ssi1_active(struct platform_device *pdev)
+{
+ int err;
@@ -1640,15 +1666,17 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ mxc_gpio_release_multiple_pins(mxc_ssi1_pins, ARRAY_SIZE(mxc_ssi1_pins));
+ return 0;
+}
++*/
+
+static struct imx_ssi_platform_data apf27_ssi0_pdata = {
++ .flags = 0, /* TBDJB
+ .init = gpio_ssi1_active,
-+ .exit = gpio_ssi1_inactive
++ .exit = gpio_ssi1_inactive */
+};
+
+static int apf27_late_init(void)
+{
-+ mxc_register_device(&mxc_dam_device, NULL);
++//TBDJB mxc_register_device(&mxc_dam_device, NULL);
+ mxc_register_device(&imx_ssi_device0, &apf27_ssi0_pdata);
+
+ return 0;
@@ -1660,12 +1688,12 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+/* APF27Dev has a microSD connector */
+#ifdef CONFIG_MMC_MXC
+static int mxc_sdhc2_pins[] = {
-+ PB4_PF_SDHC2_D0,
-+ PB5_PF_SDHC2_D1,
-+ PB6_PF_SDHC2_D2,
-+ PB7_PF_SDHC2_D3,
-+ PB8_PF_SDHC2_CMD,
-+ PB9_PF_SDHC2_CLK,
++ PB4_PF_SD2_D0,
++ PB5_PF_SD2_D1,
++ PB6_PF_SD2_D2,
++ PB7_PF_SD2_D3,
++ PB8_PF_SD2_CMD,
++ PB9_PF_SD2_CLK,
+};
+
+static int apf27_sdhc2_init(struct device *dev, irq_handler_t detect_irq, void *data)
@@ -1895,11 +1923,13 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+#ifdef CONFIG_SERIAL_IMX_UART6
+ mxc_register_device(&mxc_uart_device5, &uart5_pdata);
+#endif
++#if 0
+#ifdef CONFIG_USB_EHCI_MXC
+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
+#endif
++#endif
+#ifdef CONFIG_I2C
-+ mxc_register_device(&imx_i2c_device0, &apf27_i2c_0_data);
++ imx27_add_i2c_imx0(&apf27_i2c_0_data);
+ i2c_register_board_info(0, apf27dev_i2c_devices_bus0,
+ ARRAY_SIZE(apf27dev_i2c_devices_bus0));
+ i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
@@ -1915,7 +1945,6 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
+ mxc_register_device(&mxc_spi_device2, &imx_spi2_master_info);
+#endif
+
-+
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
+#ifdef CONFIG_SPI_TSC2102
@@ -1947,8 +1976,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-10-21 10:16:28.000000000 +0200
-@@ -0,0 +1,220 @@
++++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-11-08 16:17:07.000000000 +0100
+@@ -0,0 +1,222 @@
+/*
+ * apf27-lcd.c
+ *
@@ -1973,15 +2002,17 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
+ */
+
+
-+#include <mach/iomux-mx1-mx2.h>
++#include <linux/fb.h>
++#include <linux/delay.h>
++
++#include <mach/iomux-mx27.h>
+#include <mach/gpio.h>
+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
+#include <mach/imx_fb.h>
+#include <mach/imxfb.h>
+#endif
-+#include <linux/fb.h>
-+#include <linux/delay.h>
+#include <mach/common.h>
++
+#include "devices.h"
+
+
@@ -2172,7 +2203,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-10-21 10:16:28.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-11-07 19:07:30.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2364,3 +2395,15 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
+ printk("done\n");
+}
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:21:56.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:22:22.000000000 +0100
+@@ -81,6 +81,7 @@
+ case MACH_TYPE_MX21ADS:
+ case MACH_TYPE_PCA100:
+ case MACH_TYPE_MXT_TD60:
++ case MACH_TYPE_APF27:
+ uart_base = MX2X_UART1_BASE_ADDR;
+ break;
+ case MACH_TYPE_MX31LITE:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
index eb9e7ea..1448737 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,15 +1,19 @@
Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/arm/mach-imx/Kconfig 2010-10-21 10:34:47.000000000 +0200
-@@ -191,4 +191,107 @@
+--- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig 2010-11-08 16:43:19.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/Kconfig 2010-11-08 16:44:46.000000000 +0100
+@@ -191,4 +191,112 @@
Include support for i-MXT (aka td60) platform. This
includes specific configurations for the module and its peripherals.
+config MACH_APF27
+ bool "Armadeus Systems APF27"
+ depends on MACH_MX27
-+ select MXC_ULPI
++ select IMX_HAVE_PLATFORM_IMX_I2C
++ select IMX_HAVE_PLATFORM_IMX_UART
++ select IMX_HAVE_PLATFORM_MXC_NAND
++ select IMX_HAVE_PLATFORM_SPI_IMX
++ select MXC_ULPI if USB_ULPI
+ select SERIAL_IMX_UART1
+ help
+ Include support for APF27 platform. This includes specific
@@ -31,6 +35,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
+ bool
+ depends on MACH_APF27
+ select SERIAL_IMX_UART3
++ select MACH_APF27_HAS_BASEBOARD
+ help
+ This selects the APF27Dev as baseboard. You have to manually
+ activates the devices you want to use if you have the "Full"
@@ -112,8 +117,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
endif
Index: linux-2.6.36/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/arm/mach-imx/Makefile 2010-10-21 10:36:22.000000000 +0200
+--- linux-2.6.36.orig/arch/arm/mach-imx/Makefile 2010-11-08 16:43:19.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/Makefile 2010-11-08 16:43:26.000000000 +0100
@@ -31,3 +31,7 @@
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-09 13:38:17
|
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 bbb379204464e29eba453299174d7d2a1c50791b (commit)
from 54df84e69338318a33141c3402943d16f932abb3 (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 bbb379204464e29eba453299174d7d2a1c50791b
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 14:37:52 2010 +0100
[TEST] Use script gpio_helpers.sh in reset_wi2wi.sh
[TEST] Translate console messages in English for PPS test scripts.
-----------------------------------------------------------------------
Summary of changes:
target/pps/scripts/init_wpa.sh | 12 +++++-----
target/pps/scripts/reset_wi2wi.sh | 34 +----------------------------
target/pps/scripts/test_ether_gadget.sh | 2 +-
target/pps/scripts/test_ether_smsc95xx.sh | 2 +-
target/pps/scripts/test_wifi.sh | 2 +-
5 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index 6997b89..f838353 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -52,13 +52,13 @@ wpa_supplicant -ieth1 -c /etc/wpa_supplicant/wpa_supplicant.conf -Dwext -B dhcli
ifconfig eth1 192.168.0.251
sleep 1
-echo -e "\nPour verifier le port wifi, veuiller tester la commande \"ping 192.168.0.251\" sur le PC hote\n"
-echo -e "\nPour redemarrer le WPA Supplicant, avant de lancer la commande \"sh init_wpa.sh\", ou pour larreter, executer \"sh stop_wpa.sh\"\n"
+echo -e "\nTo check the wifi port (eth1), please enter the command \"ping 192.168.0.251\" on the host PC\n"
+echo -e "\nTo restart the WPA Supplicant, before entering the command \"sh init_wpa.sh\", or to stop it, run \"sh stop_wpa.sh\"\n"
else #[ "$SSID" != "" -a "$PSK" != "" ]; print usage
-echo -e '\nLes variables $SSID et $PSK ne sont pas definies dans /etc/wpa_supplicant/networkConfig.
-Pour executer correctement le WPA Supplicant, vous devez renseigner ces variables de la facon suivante :
+echo -e '\nThe variables $SSID and $PSK are not initialized in /etc/wpa_supplicant/networkConfig.
+To correctly run WPA Supplicant, you must fill these variables in like this:
export SSID=mon_ssid
export PSK=ma_passphrase\n'
@@ -66,8 +66,8 @@ fi
else #[ -f /etc/wpa_supplicant/networkConfig ]; print usage
-echo -e 'Le fichier /etc/wpa_supplicant/networkConfig nexiste pas.
-Pour executer correctement le WPA Supplicant, vous devez creer ce fichier et y definir les variables $SSID et $PSK de la facon suivante :
+echo -e '\nThe file /etc/wpa_supplicant/networkConfig doesnt exist.
+To correctly run WPA Supplicant, you have to create this file and declare the variables $SSID and $PSK like this:
export SSID=mon_ssid
export PSK=ma_passphrase\n'
diff --git a/target/pps/scripts/reset_wi2wi.sh b/target/pps/scripts/reset_wi2wi.sh
index e6a0e01..c1f7341 100644
--- a/target/pps/scripts/reset_wi2wi.sh
+++ b/target/pps/scripts/reset_wi2wi.sh
@@ -14,39 +14,7 @@
# Written by: Jérémie Scheer,,,
#
-GPIO_DEV_DIR=/dev/gpio
-
-setbit()
-{
- PORT=$1
- NB=$2
- VAL=$3
- cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
-}
-
-gpio_set_value()
-{
- GPIO=$1
- VALUE=$2
- if [ "$VALUE" == "1" ]; then
- echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
- else
- echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
- fi
-}
-
-# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
-gpio_mode()
-{
- GPIO=`echo $1 | cut -c 3-4`
- VALUE=$2
- PORT=`echo $1 | cut -c 2`
- PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
- PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
-
- setbit $PORT_MODE $GPIO 1
- setbit $PORT_DIR $GPIO $VALUE
-}
+source /usr/bin/gpio_helpers.sh
gpio_mode PE11 1
gpio_set_value PE11 0
diff --git a/target/pps/scripts/test_ether_gadget.sh b/target/pps/scripts/test_ether_gadget.sh
index 4c4f787..168be97 100644
--- a/target/pps/scripts/test_ether_gadget.sh
+++ b/target/pps/scripts/test_ether_gadget.sh
@@ -26,5 +26,5 @@ ifconfig eth1 down 2>/dev/null
ifconfig usb0 192.168.10.1
-echo -e "\nPour verifier le port usb gadget (usb0) , veuiller browser sur 192.168.10.1\n"
+echo -e "\nTo check the USB Gadget port (usb0), please browse on 192.168.10.1\n"
diff --git a/target/pps/scripts/test_ether_smsc95xx.sh b/target/pps/scripts/test_ether_smsc95xx.sh
index 087d869..655682b 100644
--- a/target/pps/scripts/test_ether_smsc95xx.sh
+++ b/target/pps/scripts/test_ether_smsc95xx.sh
@@ -27,5 +27,5 @@ ifconfig eth1 down 2>/dev/null
ifconfig usb0 192.168.0.251
-echo -e "\nPour verifier le port usb1 , veuiller browser sur 192.168.0.251\n"
+echo -e "\nTo check the port usb1, please browse on 192.168.0.251\n"
diff --git a/target/pps/scripts/test_wifi.sh b/target/pps/scripts/test_wifi.sh
index 43f4222..1266525 100644
--- a/target/pps/scripts/test_wifi.sh
+++ b/target/pps/scripts/test_wifi.sh
@@ -28,4 +28,4 @@ iwconfig eth1 mode managed essid armadeus key restricted 93d7-e853-22e8-8784-0b
ifconfig eth1 192.168.0.251
sleep 1
-echo -e "\nPour verifier le port wifi, veuiller browser sur 192.168.0.251\n"
+echo -e "\nTo check the wifi port, please browse on 192.168.0.251\n"
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-09 09:45:25
|
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 54df84e69338318a33141c3402943d16f932abb3 (commit)
from d831159de65f04053de8ee3fefae87ed3bfdca62 (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 54df84e69338318a33141c3402943d16f932abb3
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 10:44:58 2010 +0100
[BUILDROOT] Add PPS network test scripts package to Armadeus package with patch 135-pps-add_test_scripts_package.patch.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 3 +-
buildroot/target/device/armadeus/pps/pps_defconfig | 3 +-
.../135-pps-add_test_scripts_package.patch | 70 ++++++++++++++++++
.../2010.11/135-pps-add_test_scripts_package.patch | 70 ++++++++++++++++++
target/pps/configs/networkConfig | 2 +
target/pps/scripts/init_boa.sh | 26 +++++++
target/pps/scripts/init_wpa.sh | 75 ++++++++++++++++++++
target/pps/scripts/install.sh | 20 +++++
target/pps/scripts/reset_wi2wi.sh | 53 ++++++++++++++
target/pps/scripts/stop_wpa.sh | 24 ++++++
target/pps/scripts/test_ether_gadget.sh | 30 ++++++++
target/pps/scripts/test_ether_smsc95xx.sh | 31 ++++++++
target/pps/scripts/test_wifi.sh | 31 ++++++++
target/pps/www/index.html | 29 ++++++++
14 files changed, 465 insertions(+), 2 deletions(-)
create mode 100644 patches/buildroot/135-pps-add_test_scripts_package.patch
create mode 100644 patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
create mode 100644 target/pps/configs/networkConfig
create mode 100644 target/pps/scripts/init_boa.sh
create mode 100644 target/pps/scripts/init_wpa.sh
create mode 100755 target/pps/scripts/install.sh
create mode 100644 target/pps/scripts/reset_wi2wi.sh
create mode 100644 target/pps/scripts/stop_wpa.sh
create mode 100644 target/pps/scripts/test_ether_gadget.sh
create mode 100644 target/pps/scripts/test_ether_smsc95xx.sh
create mode 100644 target/pps/scripts/test_wifi.sh
create mode 100644 target/pps/www/index.html
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index cb507a9..bf97950 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Nov 4 14:59:19 2010
+# Fri Nov 5 16:46:21 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -245,6 +245,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
#
diff --git a/buildroot/target/device/armadeus/pps/pps_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
index 97dcc2e..db86393 100644
--- a/buildroot/target/device/armadeus/pps/pps_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Nov 4 14:38:36 2010
+# Fri Nov 5 16:15:18 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -378,6 +378,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
diff --git a/patches/buildroot/135-pps-add_test_scripts_package.patch b/patches/buildroot/135-pps-add_test_scripts_package.patch
new file mode 100644
index 0000000..fa9ea66
--- /dev/null
+++ b/patches/buildroot/135-pps-add_test_scripts_package.patch
@@ -0,0 +1,70 @@
+Add package PPS Test scripts to Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/armadeus/Config.in
+===================================================================
+--- buildroot.orig/package/armadeus/Config.in 2010-11-05 17:04:08.000000000 +0100
++++ buildroot/package/armadeus/Config.in 2010-11-05 17:05:06.000000000 +0100
+@@ -8,6 +8,7 @@
+ source package/armadeus/imxregs/Config.in
+ source package/armadeus/imxssi/Config.in
+ source package/armadeus/max5821ctrl/Config.in
++source package/armadeus/pps/Config.in
+ source package/armadeus/testsuite/Config.in
+
+ endmenu
+Index: buildroot/package/armadeus/pps/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/armadeus/pps/Config.in 2010-11-05 17:05:39.000000000 +0100
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
++ bool "PPS Test scripts"
++ default n
++ help
++ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
++ Test scripts will be installed on the APF in /usr/local/pps/scripts.
+Index: buildroot/package/armadeus/pps/pps.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:09:58.000000000 +0100
+@@ -0,0 +1,38 @@
++#############################################################
++#
++# PPS Test scripts
++#
++#############################################################
++
++ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
++ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
++ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
++ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
++ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
++ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
++
++$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
++ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
++
++$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
++ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
++
++$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
++ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++
++pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
++
++armadeus-pps-testscripts-clean:
++ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
++ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
++ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
++TARGETS+=pps-testscripts
++endif
diff --git a/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch b/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
new file mode 100644
index 0000000..5f10fc1
--- /dev/null
+++ b/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
@@ -0,0 +1,70 @@
+Add package PPS Test scripts to Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/armadeus/Config.in
+===================================================================
+--- buildroot.orig/package/armadeus/Config.in 2010-11-08 10:20:10.000000000 +0100
++++ buildroot/package/armadeus/Config.in 2010-11-08 14:20:14.000000000 +0100
+@@ -8,6 +8,7 @@
+ source package/armadeus/imxregs/Config.in
+ source package/armadeus/imxssi/Config.in
+ source package/armadeus/max5821ctrl/Config.in
++source package/armadeus/pps/Config.in
+ source package/armadeus/testsuite/Config.in
+
+ endmenu
+Index: buildroot/package/armadeus/pps/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/armadeus/pps/Config.in 2010-11-08 14:20:14.000000000 +0100
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
++ bool "PPS Test scripts"
++ default n
++ help
++ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
++ Test scripts will be installed on the APF in /usr/local/pps/scripts.
+Index: buildroot/package/armadeus/pps/pps.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:20:53.000000000 +0100
+@@ -0,0 +1,38 @@
++#############################################################
++#
++# PPS Test scripts
++#
++#############################################################
++
++ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
++ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
++ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
++ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
++ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
++ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
++
++$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
++ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
++
++$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
++ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
++
++$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
++ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++
++pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
++
++armadeus-pps-testscripts-clean:
++ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
++ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
++ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
++TARGETS+=pps-testscripts
++endif
diff --git a/target/pps/configs/networkConfig b/target/pps/configs/networkConfig
new file mode 100644
index 0000000..4b947fe
--- /dev/null
+++ b/target/pps/configs/networkConfig
@@ -0,0 +1,2 @@
+export SSID=
+export PSK=
diff --git a/target/pps/scripts/init_boa.sh b/target/pps/scripts/init_boa.sh
new file mode 100644
index 0000000..3af8abc
--- /dev/null
+++ b/target/pps/scripts/init_boa.sh
@@ -0,0 +1,26 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: HTSC
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Burkhart Frederic,,,
+#
+
+# setup /etc/hosts file (hosname id required by "boa")
+echo "127.0.0.1 localhost" > /etc/hosts
+echo "192.168.0.250 armadeus" >> /etc/hosts
+
+if [ -d "/var/www" ]; then
+ kill -9 `pidof boa` 2> /dev/null
+ mkdir /var/log/boa 2>/dev/null
+ boa
+fi
+
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
new file mode 100644
index 0000000..6997b89
--- /dev/null
+++ b/target/pps/scripts/init_wpa.sh
@@ -0,0 +1,75 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: Armadeus
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Jérémie Scheer,,,
+#
+
+if [ -f /etc/wpa_supplicant/networkConfig ]; then
+
+source /etc/wpa_supplicant/networkConfig
+
+if [ "$SSID" != "" -a "$PSK" != "" ]; then
+
+#create WPA configuration
+mkdir -p /etc/wpa_supplicant/
+echo "ctrl_interface=/var/run/wpa_supplicant
+ctrl_interface_group=wheel
+network={
+ssid=\"$SSID\"
+scan_ssid=1
+proto=WPA
+key_mgmt=WPA-PSK
+pairwise=TKIP
+psk=\"$PSK\"
+}" > /etc/wpa_supplicant/wpa_supplicant.conf
+
+#Hardware reset of wi2wi chip
+sh reset_wi2wi.sh
+
+#Load mmc and libertas modules
+modprobe mxcmmc
+sleep 1
+modprobe libertas_sdio
+
+# shutdown other ports
+ifconfig usb0 down 2>/dev/null
+ifconfig eth0 down 2>/dev/null
+ifconfig usb1 down 2>/dev/null
+
+#Execute Wpa Supplicant
+ifconfig eth1 up
+wpa_supplicant -ieth1 -c /etc/wpa_supplicant/wpa_supplicant.conf -Dwext -B dhclient
+
+ifconfig eth1 192.168.0.251
+sleep 1
+echo -e "\nPour verifier le port wifi, veuiller tester la commande \"ping 192.168.0.251\" sur le PC hote\n"
+echo -e "\nPour redemarrer le WPA Supplicant, avant de lancer la commande \"sh init_wpa.sh\", ou pour larreter, executer \"sh stop_wpa.sh\"\n"
+
+else #[ "$SSID" != "" -a "$PSK" != "" ]; print usage
+
+echo -e '\nLes variables $SSID et $PSK ne sont pas definies dans /etc/wpa_supplicant/networkConfig.
+Pour executer correctement le WPA Supplicant, vous devez renseigner ces variables de la facon suivante :
+export SSID=mon_ssid
+export PSK=ma_passphrase\n'
+
+fi
+
+else #[ -f /etc/wpa_supplicant/networkConfig ]; print usage
+
+echo -e 'Le fichier /etc/wpa_supplicant/networkConfig nexiste pas.
+Pour executer correctement le WPA Supplicant, vous devez creer ce fichier et y definir les variables $SSID et $PSK de la facon suivante :
+export SSID=mon_ssid
+export PSK=ma_passphrase\n'
+
+fi
+
diff --git a/target/pps/scripts/install.sh b/target/pps/scripts/install.sh
new file mode 100755
index 0000000..5526704
--- /dev/null
+++ b/target/pps/scripts/install.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ "$1" == "" ]; then
+ echo "Please provides the directory where to install the PPS Test scripts"
+ echo "$0 dest_dir"
+ exit 1
+fi
+
+THIS_DIR=`dirname $0`
+TESTSCRIPTS_TARGET_DIR="$1"
+echo "Installing PPS Test scripts in $TESTSCRIPTS_TARGET_DIR (from $THIS_DIR)"
+
+mkdir -p $TESTSCRIPTS_TARGET_DIR
+
+install $THIS_DIR/test_*.sh $TESTSCRIPTS_TARGET_DIR/
+install $THIS_DIR/init_*.sh $TESTSCRIPTS_TARGET_DIR/
+install $THIS_DIR/reset_wi2wi.sh $TESTSCRIPTS_TARGET_DIR/
+install $THIS_DIR/stop_wpa.sh $TESTSCRIPTS_TARGET_DIR/
+
+exit 0
diff --git a/target/pps/scripts/reset_wi2wi.sh b/target/pps/scripts/reset_wi2wi.sh
new file mode 100644
index 0000000..e6a0e01
--- /dev/null
+++ b/target/pps/scripts/reset_wi2wi.sh
@@ -0,0 +1,53 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: Armadeus
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Jérémie Scheer,,,
+#
+
+GPIO_DEV_DIR=/dev/gpio
+
+setbit()
+{
+ PORT=$1
+ NB=$2
+ VAL=$3
+ cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
+}
+
+gpio_set_value()
+{
+ GPIO=$1
+ VALUE=$2
+ if [ "$VALUE" == "1" ]; then
+ echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
+ else
+ echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
+ fi
+}
+
+# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
+gpio_mode()
+{
+ GPIO=`echo $1 | cut -c 3-4`
+ VALUE=$2
+ PORT=`echo $1 | cut -c 2`
+ PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
+ PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
+
+ setbit $PORT_MODE $GPIO 1
+ setbit $PORT_DIR $GPIO $VALUE
+}
+
+gpio_mode PE11 1
+gpio_set_value PE11 0
+gpio_set_value PE11 1
diff --git a/target/pps/scripts/stop_wpa.sh b/target/pps/scripts/stop_wpa.sh
new file mode 100644
index 0000000..8e11015
--- /dev/null
+++ b/target/pps/scripts/stop_wpa.sh
@@ -0,0 +1,24 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: Armadeus
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Jérémie Scheer,,,
+#
+
+ifconfig eth1 down 2>/dev/null
+
+#kill WPA Supplicant
+killall wpa_supplicant
+
+#Probe needed modules
+modprobe -r libertas_sdio 2>/dev/null
+modprobe -r mxcmmc
diff --git a/target/pps/scripts/test_ether_gadget.sh b/target/pps/scripts/test_ether_gadget.sh
new file mode 100644
index 0000000..4c4f787
--- /dev/null
+++ b/target/pps/scripts/test_ether_gadget.sh
@@ -0,0 +1,30 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: HTSC
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Burkhart Frederic,,,
+#
+
+modprobe -r smsc95xx
+modprobe -r g_ether
+
+modprobe g_ether
+
+# shutdown other ports
+ifconfig usb0 down 2>/dev/null
+ifconfig eth0 down 2>/dev/null
+ifconfig eth1 down 2>/dev/null
+
+ifconfig usb0 192.168.10.1
+
+echo -e "\nPour verifier le port usb gadget (usb0) , veuiller browser sur 192.168.10.1\n"
+
diff --git a/target/pps/scripts/test_ether_smsc95xx.sh b/target/pps/scripts/test_ether_smsc95xx.sh
new file mode 100644
index 0000000..087d869
--- /dev/null
+++ b/target/pps/scripts/test_ether_smsc95xx.sh
@@ -0,0 +1,31 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: cryonic medical S.A.
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Burkhart Frederic,,,
+#
+
+modprobe -r g_ether
+modprobe -r smsc95xx
+
+modprobe smsc95xx
+
+
+# shutdown other ports
+ifconfig usb0 down 2>/dev/null
+ifconfig eth0 down 2>/dev/null
+ifconfig eth1 down 2>/dev/null
+
+ifconfig usb0 192.168.0.251
+
+echo -e "\nPour verifier le port usb1 , veuiller browser sur 192.168.0.251\n"
+
diff --git a/target/pps/scripts/test_wifi.sh b/target/pps/scripts/test_wifi.sh
new file mode 100644
index 0000000..43f4222
--- /dev/null
+++ b/target/pps/scripts/test_wifi.sh
@@ -0,0 +1,31 @@
+#
+# This software has been developed by ARMADEUS SYSTEMS
+#
+# Customer Name: HTSC
+#
+# Project Name: PPS
+#
+# Copyright (C) 2010 :
+#
+# This program is the property of the armadeus systems company or of the
+# final customer as soon as terms & conditions stipulated by the contract
+# between the two parties are full-filled .
+#
+# Written by: Burkhart Frederic,,,
+#
+
+
+modprobe libertas_sdio
+
+# shutdown other ports
+ifconfig usb0 down 2>/dev/null
+ifconfig eth0 down 2>/dev/null
+ifconfig usb1 down 2>/dev/null
+
+ifconfig eth1 up
+iwconfig eth1 mode managed essid armadeus key restricted 93d7-e853-22e8-8784-0b4a-629c-ab
+
+
+ifconfig eth1 192.168.0.251
+sleep 1
+echo -e "\nPour verifier le port wifi, veuiller browser sur 192.168.0.251\n"
diff --git a/target/pps/www/index.html b/target/pps/www/index.html
new file mode 100644
index 0000000..b1a5e22
--- /dev/null
+++ b/target/pps/www/index.html
@@ -0,0 +1,29 @@
+<html>
+<head>
+<title> </title>
+<style type="text/css">
+<!--
+h1 {text-align:center;
+ font-family:Arial, Helvetica, Sans-Serif;
+ }
+
+p {text-indent:20px;
+ }
+-->
+</style>
+</head>
+<body bgcolor = "#ffffcc" text = "#000000">
+<h1>Hello, World!</h1>
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc dignissim tristique nulla, id gravida quam bibendum vitae. Suspendisse quis viverra dui. Etiam tristique suscipit bibendum. Donec ut dolor mauris. Sed rhoncus elementum est, eget laoreet sapien egestas quis. Integer accumsan odio vel purus laoreet accumsan. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi euismod ligula at sem hendrerit euismod. Nam id lectus vel quam dapibus sagittis et eu tellus. Duis nec gravida mauris. Quisque tempus consectetur mattis. Donec semper vulputate dapibus. Nunc odio lorem, egestas nec cursus id, mattis sed purus. Nullam non viverra purus.</p>
+
+<p>Sed tellus magna, vestibulum at placerat vitae, gravida vitae eros. Quisque at fermentum justo. In lorem felis, adipiscing in consequat ullamcorper, fringilla sed nibh. Aliquam erat volutpat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur fermentum faucibus mattis. Quisque faucibus, ipsum eu tempus laoreet, turpis libero posuere arcu, nec rutrum augue metus non ligula. Donec neque metus, condimentum ac elementum in, semper posuere dolor. Vivamus mattis magna vitae tellus egestas sit amet suscipit tellus sodales. Phasellus sit amet lacus et tellus iaculis imperdiet. Morbi in nunc at sapien lacinia convallis. Morbi non tristique orci. Sed eget urna est, non consequat ante. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris ultrices eros dui. Cras sollicitudin rhoncus enim id lobortis. Nam adipiscing libero a justo consequat a tincidunt lorem cursus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur lobortis lectus a orci sagittis vitae volutpat orci lacinia.</p>
+
+<p>Integer quis purus mi. Proin id dui at erat accumsan mattis ac in risus. Ut nibh purus, ultrices ultrices tempus eget, faucibus vitae nisl. Nulla facilisi. Maecenas id leo orci. Ut vel fermentum magna. Proin et sagittis urna. Donec nisi erat, semper ac vulputate eget, venenatis in magna. Suspendisse potenti. Etiam semper mauris vel sem varius ullamcorper sollicitudin velit consequat.</p>
+
+<p>Nulla facilisi. Morbi a neque sit amet nibh egestas malesuada ultrices a turpis. Integer commodo ipsum non libero porttitor a consequat enim ultrices. Ut et purus urna. Cras quis lacus risus, eget auctor ligula. Maecenas non felis vitae risus porttitor egestas. In non tortor non mi pretium posuere a in odio. Proin purus tellus, sodales dictum aliquet id, mattis quis felis. Fusce augue ipsum, sodales eget gravida id, vehicula a leo. Curabitur vitae ante tellus. Morbi in mauris dui, in accumsan felis. Donec at nisl non eros mattis fringilla a at felis. Nullam volutpat, eros non congue tempor, odio lacus porta dui, et feugiat velit metus sit amet nisi. Duis tristique facilisis rutrum. Sed in mauris magna.</p>
+
+<p>Pellentesque quis ante vitae metus aliquam eleifend id quis arcu. Suspendisse potenti. Nunc a mattis diam. Nunc a pharetra elit. Nullam ultrices porta massa at lacinia. Sed placerat, risus ut aliquet pretium, lacus nibh dignissim quam, eget aliquet orci magna non felis. Vivamus dictum eros quis sem volutpat mollis. Morbi in turpis quis nisi condimentum ultricies. In libero nisi, venenatis eget laoreet sit amet, pretium et dolor. Quisque vehicula libero ac magna tempus non pretium nunc faucibus. Ut elementum mollis elit vel vestibulum. Quisque mollis, odio sit amet tempus aliquam, nunc erat malesuada tellus, at ornare dui purus et ante. Etiam ligula augue, sagittis non bibendum vel, suscipit non magna. Sed non tellus non orci scelerisque egestas. Nunc porttitor varius lacinia. In metus arcu, sollicitudin at dictum et, varius non erat.</p>
+
+</body>
+</html>
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-09 09:23:23
|
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 d831159de65f04053de8ee3fefae87ed3bfdca62 (commit)
via 51560e16cb64c4e7fd35d840641c0002e8f86a2b (commit)
from 011c3d02baed5fc4e0295a8edfed8703c72a7834 (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 d831159de65f04053de8ee3fefae87ed3bfdca62
Merge: 51560e16cb64c4e7fd35d840641c0002e8f86a2b 011c3d02baed5fc4e0295a8edfed8703c72a7834
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 10:22:06 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 51560e16cb64c4e7fd35d840641c0002e8f86a2b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 9 10:21:41 2010 +0100
[BUILDROOT] device table: be compatible with both ways of naming serial port on i.MX platforms: /dev/ttymxc & /dev/ttySMX
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/rootfs/device_table.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/device_table.txt b/buildroot/target/device/armadeus/rootfs/device_table.txt
index a4a745c..c1a2775 100644
--- a/buildroot/target/device/armadeus/rootfs/device_table.txt
+++ b/buildroot/target/device/armadeus/rootfs/device_table.txt
@@ -76,6 +76,7 @@
/dev/ttygserial c 666 0 0 127 0 - - -
/dev/fb c 640 0 5 29 0 0 32 4
/dev/ttySMX c 666 0 0 204 41 0 1 6
+/dev/ttymxc c 666 0 0 207 16 0 1 6
#/dev/ttySA c 666 0 0 204 5 0 1 3
/dev/psaux c 666 0 0 10 1 0 0 -
#/dev/ppp c 666 0 0 108 0 - - -
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-05 09:20:42
|
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 011c3d02baed5fc4e0295a8edfed8703c72a7834 (commit)
from d197a61a73d8770ddee17d25df621db837c63365 (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 011c3d02baed5fc4e0295a8edfed8703c72a7834
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Nov 5 10:20:25 2010 +0100
[LINUX] Symbolic link for new BR PPS' Linux configuration file (pps-linux-2.6.29.6.config)
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/pps/pps-linux-2.6.29.6.config | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
new file mode 120000
index 0000000..aabeec5
--- /dev/null
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
@@ -0,0 +1 @@
+pps-linux-2.6.29.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-04 14:40:34
|
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 d197a61a73d8770ddee17d25df621db837c63365 (commit)
from ef499c7adfda07d0a2c85a93e749d5c8fdb2b178 (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 d197a61a73d8770ddee17d25df621db837c63365
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Nov 4 15:40:00 2010 +0100
[BUILDROOT] Add network packages (OpenSSH, OpenSSL, WPA supplicant, Wifi chipsets) and UBI Rootfs & UBoot Tool Env options to old & new BR.
[LINUX] Add Bluetooth modules to Linux config file and put the new BR's Linux config file as symbolic link to old one.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 39 +-
.../device/armadeus/pps/pps-linux-2.6.29.6.config | 1742 --------------------
.../device/armadeus/pps/pps-linux-2.6.29.config | 26 +-
buildroot/target/device/armadeus/pps/pps_defconfig | 10 +-
4 files changed, 64 insertions(+), 1753 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 3f45829..cb507a9 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,6 +1,7 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 26 15:33:44 2010
+# Thu Nov 4 14:59:19 2010
+#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
BR2_arm=y
@@ -404,7 +405,24 @@ BR2_PACKAGE_PKG_CONFIG=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIRMWARE is not set
+BR2_PACKAGE_FIRMWARE=y
+
+#
+# Video
+#
+
+#
+# WiFi chipsets
+#
+BR2_PACKAGE_FIRMWARE_88W8686=y
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO=y
+# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
+# BR2_PACKAGE_FIRMWARE_88W8686_GSPI is not set
+
+#
+# Others
+#
# BR2_PACKAGE_FIS is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GENEXT2FS is not set
@@ -509,7 +527,9 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_BEECRYPT is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_OPENSSL is not set
+BR2_PACKAGE_OPENSSL=y
+BR2_PACKAGE_OPENSSL_BIN=y
+# BR2_PACKAGE_OPENSSL_ENGINES is not set
#
# Database
@@ -665,7 +685,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
-# BR2_PACKAGE_OPENSSH is not set
+BR2_PACKAGE_OPENSSH=y
# BR2_PACKAGE_OPENVPN is not set
BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_PPPD is not set
@@ -693,7 +713,11 @@ BR2_PACKAGE_PORTMAP=y
# 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_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
#
# Package managers
@@ -759,6 +783,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -788,7 +815,7 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB 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=""
# BR2_TARGET_UBOOT_NETWORK is not set
# BR2_TARGET_AT91BOOTSTRAP is not set
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
deleted file mode 100644
index 48401b4..0000000
--- a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
+++ /dev/null
@@ -1,1742 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29.6
-# Thu Oct 28 15:55:41 2010
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_MMU=y
-# CONFIG_NO_IOPORT is not set
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_USER_SCHED=y
-# CONFIG_CGROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_MARKERS=y
-CONFIG_OPROFILE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_FREEZER=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_W90X900 is not set
-
-#
-# Freescale MXC Implementations
-#
-# CONFIG_ARCH_MX1 is not set
-CONFIG_ARCH_MX2=y
-# CONFIG_ARCH_MX3 is not set
-
-#
-# MX2 family CPU support
-#
-CONFIG_MACH_MX27=y
-
-#
-# MX2 Platforms
-#
-CONFIG_MACH_APF27=y
-CONFIG_MACH_APF27_FPGA=y
-# CONFIG_MACH_MX27ADS is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_PCM970_BASEBOARD is not set
-# CONFIG_MACH_APF27_DEV is not set
-CONFIG_MACH_PPS=y
-# CONFIG_MXC_IRQ_PRIOR is not set
-CONFIG_MXC_ULPI=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_ARM926T=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-# CONFIG_OUTER_CACHE is not set
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT=y
-CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# CPU Power Management
-#
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_FREQ_IMX27 is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_VFP is not set
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
-CONFIG_CAN_PM_TRACE=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_APM_EMULATION is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_COMPAT_NET_DEV_OPS=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=m
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_NL80211=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-
-#
-# Rate control algorithm selection
-#
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ALAUDA is not set
-CONFIG_MTD_NAND_MXC=y
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_93CX6 is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_AX88796 is not set
-# CONFIG_SMC91X is not set
-# CONFIG_DM9000 is not set
-# CONFIG_ENC28J60 is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_DNET is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_B44 is not set
-CONFIG_FEC_OLD=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-
-#
-# Wireless LAN
-#
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_USB is not set
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_DEBUG=y
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-# CONFIG_RT2500USB is not set
-CONFIG_RT73USB=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-# CONFIG_RT2X00_DEBUG is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_DM9601 is not set
-CONFIG_USB_NET_SMSC95XX=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_ISDN is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INPUT_CM109 is not set
-CONFIG_INPUT_UINPUT=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_DEVKMEM=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_IMX_UART1=y
-# CONFIG_SERIAL_IMX_UART1_USE_RTSCTS is not set
-# CONFIG_SERIAL_IMX_UART2 is not set
-CONFIG_SERIAL_IMX_UART3=y
-# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
-# CONFIG_SERIAL_IMX_UART4 is not set
-# CONFIG_SERIAL_IMX_UART5 is not set
-# CONFIG_SERIAL_IMX_UART6 is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_MXC=y
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_SIMTEC is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_IMX is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_STUB is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_DS1682 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_IMX=y
-CONFIG_SPI_MXC_SELECT1=y
-CONFIG_SPI_MXC_SELECT2=y
-# CONFIG_SPI_MXC_SELECT3 is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPI_TSC2102=m
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_VID is not set
-# 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
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_THERMAL is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_IMX_WDT=m
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_PCF50633 is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_DVB_CORE is not set
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMIZE=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_CX25840 is not set
-
-#
-# MPEG video encoders
-#
-# CONFIG_VIDEO_CX2341X is not set
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-CONFIG_VIDEO_AD9889=m
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-CONFIG_SOC_CAMERA=m
-# CONFIG_SOC_CAMERA_MT9M001 is not set
-# CONFIG_SOC_CAMERA_MT9M111 is not set
-# CONFIG_SOC_CAMERA_MT9T031 is not set
-# CONFIG_SOC_CAMERA_MT9V022 is not set
-# CONFIG_SOC_CAMERA_TW9910 is not set
-# CONFIG_SOC_CAMERA_PLATFORM is not set
-# CONFIG_SOC_CAMERA_OV3640 is not set
-# CONFIG_SOC_CAMERA_OV7670 is not set
-# CONFIG_SOC_CAMERA_OV772X is not set
-# CONFIG_SOC_CAMERA_OV96XX is not set
-# CONFIG_V4L_USB_DRIVERS is not set
-CONFIG_VIDEO_MX27=m
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_DAB is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-CONFIG_SND_IMX2_PCM=m
-CONFIG_SND_IMX_TSC2102=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_HID_SUPPORT is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_MON=y
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-CONFIG_USB_EHCI_MXC=y
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
-#
-
-#
-# see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_VST is not set
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-CONFIG_USB_GADGET_FSL_USB2=y
-CONFIG_USB_FSL_USB2=m
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-
-#
-# OTG and related infrastructure
-#
-# CONFIG_USB_GPIO_VBUS is not set
-
-#
-# Armadeus specific drivers
-#
-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 is not set
-# CONFIG_ARMADEUS_MAX9768 is not set
-
-#
-# FPGA related
-#
-
-#
-# FPGA Drivers
-#
-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=m
-# CONFIG_HX5116_DISPLAY is not set
-
-#
-# Communication bus related
-#
-# CONFIG_ARMADEUS_ISP1761 is not set
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_SDHCI is not set
-CONFIG_MMC_MXC=m
-# CONFIG_MMC_SPI is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_NEW_LEDS is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS1307 is not set
-CONFIG_RTC_DRV_DS1374=y
-# CONFIG_RTC_DRV_DS1374_LEGACY is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_DMADEVICES is not set
-
-#
-# MXC support drivers
-#
-
-#
-# MXC VPU(Video Processing Unit) support
-#
-# CONFIG_MXC_VPU is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_UIO is not set
-# CONFIG_STAGING is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4_FS is not set
-CONFIG_FS_XIP=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_XFS_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_XATTR is not set
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=y
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_DLM is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_RING_BUFFER=y
-CONFIG_TRACING=y
-
-#
-# Tracers
-#
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_DEBUG_USER is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-# CONFIG_CRYPTO_FIPS is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=m
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 48401b4..a2aa565 100644
--- a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Oct 28 15:55:41 2010
+# Thu Nov 4 14:57:42 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -397,7 +397,29 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_PHONET is not set
CONFIG_WIRELESS=y
diff --git a/buildroot/target/device/armadeus/pps/pps_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
index 5d6dd9f..97dcc2e 100644
--- a/buildroot/target/device/armadeus/pps/pps_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -1,6 +1,7 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 26 15:33:44 2010
+# Thu Nov 4 14:38:36 2010
+#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
# BR2_alpha is not set
@@ -442,7 +443,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
-# BR2_PACKAGE_OPENSSH is not set
+BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENSSL=y
BR2_PACKAGE_OPENSSL_BIN=y
# BR2_PACKAGE_OPENSSL_ENGINES is not set
@@ -782,6 +783,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
BR2_TARGET_ROOTFS_UBIFS_COPYTO=""
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -808,7 +812,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=""
#
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-04 13:21:20
|
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 ef499c7adfda07d0a2c85a93e749d5c8fdb2b178 (commit)
from ab5fbb38192bcf232530c529860e8c60ab4248b9 (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 ef499c7adfda07d0a2c85a93e749d5c8fdb2b178
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Nov 4 14:20:56 2010 +0100
[LINUX] Last commit correction : leave PPS's Linux original configuration file for old Buildroot.
-----------------------------------------------------------------------
Summary of changes:
...nux-2.6.29.6.config => pps-linux-2.6.29.config} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/pps/{pps-linux-2.6.29.6.config => pps-linux-2.6.29.config} (100%)
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
similarity index 100%
copy from buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
copy to buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-04 13:14:59
|
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 ab5fbb38192bcf232530c529860e8c60ab4248b9 (commit)
via 232e9e9033db2159a71bfc7fb6c2f4c9fa347c88 (commit)
from cf54e4f5f31c10228de6abaeb61d57a5d41d4431 (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 ab5fbb38192bcf232530c529860e8c60ab4248b9
Merge: 232e9e9033db2159a71bfc7fb6c2f4c9fa347c88 cf54e4f5f31c10228de6abaeb61d57a5d41d4431
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Nov 4 14:14:31 2010 +0100
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 232e9e9033db2159a71bfc7fb6c2f4c9fa347c88
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Nov 4 14:13:42 2010 +0100
[LINUX] Rename the PPS' Linux configuration file.
-----------------------------------------------------------------------
Summary of changes:
...nux-2.6.29.config => pps-linux-2.6.29.6.config} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/pps/{pps-linux-2.6.29.config => pps-linux-2.6.29.6.config} (100%)
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
rename to buildroot/target/device/armadeus/pps/pps-linux-2.6.29.6.config
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-11-04 10:36:12
|
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 cf54e4f5f31c10228de6abaeb61d57a5d41d4431 (commit)
from 038a3161e18a65036366f93227250cd457ff3bec (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 cf54e4f5f31c10228de6abaeb61d57a5d41d4431
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 4 11:35:29 2010 +0100
[SOFTWARE] Add warning comment in u-boot recover
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27_recover.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index e23d084..d96b252 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -356,8 +356,9 @@ if __name__ == "__main__":
SPEED = 115200
print "\nAPF27 Bootstrap Tool\n"
- print "!!! Do not forget to put the bootstrap jumper and to reset your board !!!"
+ print "/!\\ Do not forget to put the bootstrap jumper and to reset your board /!\\"
print "(be sure to have a u-boot.bin file in current dir too)\n"
+ print("/!\\ U-Boot recover eat lot of CPU, be sure that no process trust your CPU\n")
port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows): ')
try:
ser = serial.Serial(port, SPEED, timeout=3)
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-03 13:23:44
|
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 038a3161e18a65036366f93227250cd457ff3bec (commit)
via 463f1696a826e0108fb546553d61cdce87cd20a0 (commit)
from 4de40f3390aa73f124b2a9c251d70ca237381ed3 (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 038a3161e18a65036366f93227250cd457ff3bec
Merge: 463f1696a826e0108fb546553d61cdce87cd20a0 4de40f3390aa73f124b2a9c251d70ca237381ed3
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Nov 3 14:22:34 2010 +0100
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 463f1696a826e0108fb546553d61cdce87cd20a0
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Nov 3 14:21:40 2010 +0100
[BUILD] Add PPS board configs : Linux, Buildroot, UBoot & uClibc config files and PPS baseboard kernel patch.
-----------------------------------------------------------------------
Summary of changes:
.../configs/{apf27_defconfig => pps_defconfig} | 64 +---
.../500-pps-armadeus-add_pps_baseboard.patch | 369 ++++++++++++++++++++
.../device/armadeus/{apf27 => pps}/Config.in | 0
.../device/armadeus/{apf27 => pps}/Makefile.in | 0
.../{apf27/apf27.h => pps/apf27-u-boot-1.3.4.h} | 9 +-
.../target/device/armadeus/{apf27 => pps}/apf27.h | 9 +-
.../pps-linux-2.6.29.config} | 264 +++------------
.../{apf27/apf27_defconfig => pps/pps_defconfig} | 75 +++--
.../{apf51 => pps}/uClibc-0.9.30.config.arm | 5 +-
.../armadeus/{apf27 => pps}/uClibc.config.arm | 0
10 files changed, 482 insertions(+), 313 deletions(-)
copy buildroot/configs/{apf27_defconfig => pps_defconfig} (92%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
copy buildroot/target/device/armadeus/{apf27 => pps}/Config.in (100%)
copy buildroot/target/device/armadeus/{apf27 => pps}/Makefile.in (100%)
copy buildroot/target/device/armadeus/{apf27/apf27.h => pps/apf27-u-boot-1.3.4.h} (99%)
copy buildroot/target/device/armadeus/{apf27 => pps}/apf27.h (99%)
copy buildroot/target/device/armadeus/{apf27/apf27-linux-2.6.29.config => pps/pps-linux-2.6.29.config} (86%)
copy buildroot/target/device/armadeus/{apf27/apf27_defconfig => pps/pps_defconfig} (95%)
copy buildroot/target/device/armadeus/{apf51 => pps}/uClibc-0.9.30.config.arm (98%)
copy buildroot/target/device/armadeus/{apf27 => pps}/uClibc.config.arm (100%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/pps_defconfig
similarity index 92%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/pps_defconfig
index dae7f48..3f45829 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Nov 1 17:03:11 2010
-#
+# Tue Oct 26 15:33:44 2010
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
BR2_arm=y
@@ -58,7 +57,7 @@ BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
# BR2_TARGET_ARMADEUS_APF51 is not set
-BR2_BOARD_NAME="apf27"
+BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
@@ -250,41 +249,7 @@ BR2_PACKAGE_MAX5821CTRL=y
#
# Audio and video libraries and applications
#
-BR2_PACKAGE_ALSA_LIB=y
-
-#
-# ALSA lib selection
-#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
-BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_ARECORD=y
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_AUMIX is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FLITE is not set
@@ -354,7 +319,7 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
+BR2_PACKAGE_PKG_CONFIG=y
#
# Games
@@ -589,7 +554,7 @@ BR2_PACKAGE_ZLIB=y
#
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
-BR2_PACKAGE_TSLIB=y
+# BR2_PACKAGE_TSLIB is not set
# BR2_PACKAGE_LIBUSB is not set
#
@@ -628,9 +593,9 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_ICU is not set
# BR2_PACKAGE_LIBICONV is not set
BR2_PACKAGE_NCURSES=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
+# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
+# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
+# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_POPT is not set
@@ -669,7 +634,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
+BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IPERF is not set
@@ -771,7 +736,7 @@ BR2_TARGET_ROOTFS_JFFS2=y
# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set
BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
-# BR2_TARGET_ROOTFS_JFFS2_FLASH_128 is not set
+BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x800
@@ -794,9 +759,6 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -813,8 +775,8 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
#
# BR2_TARGET_BAREBOX is not set
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
+BR2_TARGET_UBOOT_BOARDNAME="apf27"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2010_06 is not set
# BR2_TARGET_UBOOT_2010_03 is not set
@@ -826,7 +788,7 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-BR2_TARGET_UBOOT_TOOL_ENV=y
+# BR2_TARGET_UBOOT_TOOL_ENV is not set
BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_NETWORK is not set
# BR2_TARGET_AT91BOOTSTRAP is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
new file mode 100644
index 0000000..24373c2
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
@@ -0,0 +1,369 @@
+
+Adds support for APF27's PPS baseboard.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-mx2/pps.c 2010-10-28 15:25:13.000000000 +0200
+@@ -0,0 +1,329 @@
++ /*
++ * pps.c
++ * Support of PPS baseboard
++ *
++ * Copyright (C) 2009 Armadeus Systems
++ * Authors: Julien Boibessot <jul...@ar...>
++ * Nicolas Colombain <nic...@ar...>
++ * Fabien Marteau <fab...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/i2c.h>
++#include <linux/serial.h>
++#include <linux/delay.h>
++#include <linux/irq.h>
++#include <linux/clk.h>
++#include <linux/dma-mapping.h>
++#include <asm/io.h>
++#include <asm/mach/arch.h>
++#include <asm/mach-types.h>
++#include <asm/mach/time.h>
++#include <mach/common.h>
++#include <mach/hardware.h>
++#include <mach/iomux-mx1-mx2.h>
++#include <mach/gpio.h>
++#include <mach/imx_i2c.h>
++#include <../mach-imx/include/mach/spi_imx.h>
++#include <mach/imx-uart.h>
++#include <mach/board-apf27.h>
++#include <asm/mach/map.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
++#include <mach/mmc.h>
++
++#include "devices.h"
++#include "crm_regs.h"
++
++/*********/
++/* Wi2Wi */
++/*********/
++
++#define BT_RESETn (GPIO_PORTE | 11) /* UART3_RTS */
++#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
++
++static int bt_wifi_pins[] = {
++ (BT_RESETn | GPIO_OUT | GPIO_GPIO),
++ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
++};
++
++/* SDHC2 is used for WiFi */
++static int mxc_sdhc2_pins[] = {
++ PB4_PF_SDHC2_D0,
++ PB5_PF_SDHC2_D1,
++ PB6_PF_SDHC2_D2,
++ PB7_PF_SDHC2_D3,
++ PB8_PF_SDHC2_CMD,
++ PB9_PF_SDHC2_CLK,
++};
++
++static int sdhc2_init(struct device *dev, irq_handler_t handler, void *data)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_sdhc2_pins,
++ ARRAY_SIZE(mxc_sdhc2_pins),
++ "SDHC2");
++}
++
++static void sdhc2_exit(struct device *pdev, void *data)
++{
++ mxc_gpio_release_multiple_pins(mxc_sdhc2_pins, ARRAY_SIZE(mxc_sdhc2_pins));
++}
++
++static struct imxmmc_platform_data sdhc2_pdata = {
++ .init = sdhc2_init,
++ .exit = sdhc2_exit,
++};
++
++static int bt_wifi_init(void)
++{
++ int res=0;
++
++ res = mxc_gpio_setup_multiple_pins(bt_wifi_pins,
++ ARRAY_SIZE(bt_wifi_pins), "BT_WIFI");
++ if(!res){
++ mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata);
++ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
++ gpio_set_value(BT_RESETn, 1); /* Bluetooth on */
++ }
++
++ mxc_gpio_release_multiple_pins(bt_wifi_pins, ARRAY_SIZE(bt_wifi_pins));
++
++ return res;
++}
++
++/***********/
++/* USBH1 */
++/***********/
++
++/* Adds an USB PHY ISP1105 on i.MX27 USB_HOST port 2 (pps schematic page 2) */
++static int mxc_usbh1_pins[] = {
++ PB22_PF_USBH1_SUSP,
++ PB23_PF_USB_PWR,
++ PB24_PF_USB_OC_B,
++ PB25_PF_USBH1_RCV,
++ PB26_PF_USBH1_FS,
++ PB27_PF_USBH1_OE_B,
++ PB28_PF_USBH1_TXDM,
++ PB29_PF_USBH1_TXDP,
++ PB30_PF_USBH1_RXDM,
++ PB31_PF_USBH1_RXDP
++};
++
++static int apf27_usbh1_init(struct platform_device *pdev)
++{
++ int ret;
++ uint32_t temp;
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh1_pins,
++ ARRAY_SIZE(mxc_usbh1_pins), "usbh1");
++ if (ret)
++ return ret;
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
++ pr_debug("USB_CTRL before: 0x%08x\n", temp);
++ temp &= ~( (3 << 13) | (1 << 8) | 1 );
++ temp |= (1 << 4) | (1 << 11) ;
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
++ pr_debug("USB_CTRL after: 0x%08x\n", temp);
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++ pr_debug("PORTSC1 before: 0x%08x\n", temp);
++ temp &= ~(3 << 30);
++ temp |= 3 << 30;
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++ pr_debug("PORTSC1 after: 0x%08x\n", temp);
++ mdelay(10);
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
++ temp |= 0x02; /* reset controller */
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
++ pr_debug("reset controller: 0x%08x\n", temp);
++ mdelay(10);
++
++ return ret;
++}
++
++struct mxc_usb2_platform_data ehci1_pdata = {
++ .init = apf27_usbh1_init,
++};
++
++/***********/
++/* USBH2 */
++/***********/
++/* define USB registers XXX */
++#define USB_CTRL (IO_ADDRESS(OTG_BASE_ADDR) + 0x600)
++#define UOG_PORTSC1 (IO_ADDRESS(OTG_BASE_ADDR) + 0x184)
++#define UOG_USBCMD (IO_ADDRESS(OTG_BASE_ADDR) + 0x140)
++#define UOG_ULPIVIEW (IO_ADDRESS(OTG_BASE_ADDR) + 0x170)
++#define UH2_PORTSC1 (IO_ADDRESS(OTG_BASE_ADDR) + 0x584)
++#define UH2_USBCMD (IO_ADDRESS(OTG_BASE_ADDR) + 0x540)
++#define UH2_ULPIVIEW (IO_ADDRESS(OTG_BASE_ADDR) + 0x570)
++
++#define USBH2_RST_n_GPIO (GPIO_PORTB | 10)
++#define USBH2_RST_n (USBH2_RST_n_GPIO | GPIO_GPIO | GPIO_OUT)
++
++static int mxc_usbh2_reset_pin[] = {
++ USBH2_RST_n,
++};
++
++/* CONFIG EHCI2 USBH2 */
++static int mxc_usbh2_pins[] = {
++ PA0_PF_USBH2_CLK,
++ PA1_PF_USBH2_DIR,
++ PA3_PF_USBH2_NXT,
++ PA4_PF_USBH2_STP,
++ PD22_AF_USBH2_DATA0,
++ PD24_AF_USBH2_DATA1,
++ PD23_AF_USBH2_DATA2,
++ PD20_AF_USBH2_DATA3,
++ PD19_AF_USBH2_DATA4,
++ PD26_AF_USBH2_DATA5,
++ PD21_AF_USBH2_DATA6,
++ PA2_PF_USBH2_DATA7,
++
++};
++
++static int usb3315_set_vbus_power(void __iomem *view, int on)
++{
++ int vid, pid, ret = 0;
++
++ vid = (ulpi_read(USB3315_VID_HIGH, view) << 8) |
++ ulpi_read(USB3315_VID_LOW, view);
++ pid = (ulpi_read(USB3315_PID_HIGH, view) << 8) |
++ ulpi_read(USB3315_PID_LOW, view);
++
++ pr_info("ULPI h2 Vendor ID 0x%x Product ID 0x%x\n", vid, pid);
++ if (vid != 0x424 || pid != 0x6) { //XXX
++ pr_err("No USB3315 found\n");
++ return -1;
++ }
++
++ if (on) {
++ /* force disconnection of the DM/DP signals. This
++ avoid powering the connected device through these lines */
++ ulpi_set(RESET, USB3315_FCNCTL, view);
++ mdelay(10); /*wait until the supply is really down*/
++ ulpi_clear(RESET, USB3315_FCNCTL, view);
++ mdelay(1);
++
++ ret = ulpi_set(DRV_VBUS_EXT | /* enable external Vbus */
++ DRV_VBUS | /* enable internal Vbus */
++ USE_EXT_VBUS_IND | /* use external indicator */
++ CHRG_VBUS, /* charge Vbus */
++ USB3315_OTGCTL, view);
++ } else {
++ ret = ulpi_clear(DRV_VBUS_EXT | /* disable external Vbus */
++ DRV_VBUS, /* disable internal Vbus */
++ USB3315_OTGCTL, view);
++
++ ret |= ulpi_set(USE_EXT_VBUS_IND | /* use external indicator */
++ DISCHRG_VBUS, /* discharge Vbus */
++ USB3315_OTGCTL, view);
++ }
++
++ return ret;
++}
++
++static void usb3315_suspend(void __iomem *view)
++{
++ /* usb3315_set_vbus_power(view, 0); needed ? */
++ ulpi_clear(SUSPENDM, USB3315_FCNCTL, view);
++}
++
++static int apf27_usbh2_init(struct platform_device *pdev)
++{
++ int ret;
++ uint32_t temp;
++
++ gpio_set_value(USBH2_RST_n_GPIO, 1); /* reset off */
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh2_reset_pin,
++ ARRAY_SIZE(mxc_usbh2_reset_pin), "USBH2_RESET");
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh2_pins,
++ ARRAY_SIZE(mxc_usbh2_pins), "USBH2");
++ if (ret)
++ return ret;
++
++ temp = readl(USB_CTRL);
++
++ pr_debug("USB_CTRL before: 0x%08x\n", temp);
++ /* H2SIC = 3 */
++ temp &= ~( (3 << 21) | 1 );
++ /* H2PM=1, H2WIE=1, H2UIE=1 */
++ temp |= (1 << 16) | (1 << 19) | (1 << 20);
++ writel(temp, USB_CTRL);
++ pr_debug("USB_CTRL after: 0x%08x\n", temp);
++
++ temp = readl(UH2_PORTSC1);
++ pr_debug("PORTSC1 before: 0x%08x\n", temp);
++ /* XXX: ? */
++ temp &= ~(3 << 30);
++ temp |= 2 << 30;
++ writel(temp, UH2_PORTSC1);
++ pr_debug("PORTSC1 after: 0x%08x\n", temp);
++
++ mdelay(10);
++
++ temp = readl(UH2_USBCMD);
++ temp |= 0x02; /* reset controller */
++ writel(temp, UH2_USBCMD);
++ pr_debug("reset controller: 0x%08x\n", temp);
++ mdelay(50);
++
++ if (ret)
++ mxc_gpio_release_multiple_pins(mxc_usbh2_pins,
++ ARRAY_SIZE(mxc_usbh2_pins));
++
++ ret = usb3315_set_vbus_power(
++ (void __iomem *)UH2_ULPIVIEW, 1);
++
++ return ret;
++}
++
++struct mxc_usb2_platform_data ehci2_pdata = {
++ .init = apf27_usbh2_init,
++};
++
++/******************/
++/* Baseboard init */
++/******************/
++void apf27_baseboard_resume(void)
++{
++ /* TO BE DONE */
++}
++
++void apf27_baseboard_suspend(void)
++{
++ /* TO BE DONE */
++}
++
++void __init apf27_baseboard_init(void)
++{
++ printk("\n** Registering PPS ressources: **\n");
++
++ /* Init USB */
++ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
++ mxc_register_device(&mxc_ehci2, &ehci2_pdata);
++
++ /* init Wi2Wi */
++ bt_wifi_init();
++
++ printk("done\n");
++}
++
+Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2010-10-28 15:15:50.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2010-10-28 15:15:53.000000000 +0200
+@@ -63,6 +63,13 @@
+ activates the devices you want to use if you have the "Full"
+ version.
+
++config MACH_PPS
++ prompt "Md PPS"
++ bool
++ depends on MACH_APF27
++ help
++ This selects the PPS as baseboard.
++
+ endchoice
+
+ config MACH_APF27_DEV_EXT
+Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2010-10-28 15:15:51.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2010-10-28 15:15:53.000000000 +0200
+@@ -15,6 +15,7 @@
+ obj-$(CONFIG_MACH_APF27_DEV) += apf27-dev.o
+ obj-$(CONFIG_MACH_APF27_DEV) += apf27-lcd.o
+ obj-$(CONFIG_MACH_APF27_DEV_EXT_WIRELESS) += apf27-dev-ext-apw.o
++obj-$(CONFIG_MACH_PPS) += pps.o
+ obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
+ obj-$(CONFIG_MACH_PCM038) += pcm038.o
+ obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/buildroot/target/device/armadeus/apf27/Config.in b/buildroot/target/device/armadeus/pps/Config.in
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/Config.in
copy to buildroot/target/device/armadeus/pps/Config.in
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/pps/Makefile.in
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/Makefile.in
copy to buildroot/target/device/armadeus/pps/Makefile.in
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27.h
copy to buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
index 816d3e1..ef2d8bf 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
@@ -110,13 +110,13 @@
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
-#define CONFIG_BOOTDELAY 20
+#define CONFIG_BOOTDELAY 1
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
#define CONFIG_MTDMAP "mxc_nand.0"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
@@ -223,7 +223,7 @@
#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
+#define CONFIG_BOARD_NAME "pps"
#define CONFIG_HOSTNAME "apf27"
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
@@ -762,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 0xFCFFCCF8
+#define CFG_GIUS_E_VAL 0xFFFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
@@ -912,4 +912,3 @@
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
-
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/pps/apf27.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27.h
copy to buildroot/target/device/armadeus/pps/apf27.h
index 816d3e1..ef2d8bf 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/pps/apf27.h
@@ -110,13 +110,13 @@
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
-#define CONFIG_BOOTDELAY 20
+#define CONFIG_BOOTDELAY 1
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
#define CONFIG_MTDMAP "mxc_nand.0"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
@@ -223,7 +223,7 @@
#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
+#define CONFIG_BOARD_NAME "pps"
#define CONFIG_HOSTNAME "apf27"
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
@@ -762,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 0xFCFFCCF8
+#define CFG_GIUS_E_VAL 0xFFFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
@@ -912,4 +912,3 @@
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
-
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
similarity index 86%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
copy to buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 13f114c..48401b4 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Sep 9 16:05:02 2010
+# Thu Oct 28 15:55:41 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -190,9 +190,8 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_MX27ADS is not set
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
-CONFIG_MACH_APF27_DEV=y
-CONFIG_MACH_APF27_DEV_EXT_NONE=y
-# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
+# CONFIG_MACH_APF27_DEV is not set
+CONFIG_MACH_PPS=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -309,8 +308,6 @@ CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
-# CONFIG_USE_APF27DEV_IMX_LED_FOR_PM is not set
-# CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -400,29 +397,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_PHONET is not set
CONFIG_WIRELESS=y
@@ -639,7 +614,7 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_PHYLIB is not set
CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -667,7 +642,7 @@ CONFIG_WLAN_80211=y
CONFIG_LIBERTAS=m
# CONFIG_LIBERTAS_USB is not set
CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_DEBUG=y
# CONFIG_LIBERTAS_THINFIRM is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_USB_NET_RNDIS_WLAN is not set
@@ -700,7 +675,24 @@ CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+CONFIG_USB_NET_SMSC95XX=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
# CONFIG_WAN is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
@@ -719,57 +711,19 @@ CONFIG_INPUT=y
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_MXC=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_GPIO is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-CONFIG_TOUCHSCREEN_TSC2102=m
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -810,9 +764,11 @@ CONFIG_DEVKMEM=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART1_USE_RTSCTS is not set
# CONFIG_SERIAL_IMX_UART2 is not set
CONFIG_SERIAL_IMX_UART3=y
# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
+# CONFIG_SERIAL_IMX_UART4 is not set
# CONFIG_SERIAL_IMX_UART5 is not set
# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
@@ -1049,7 +1005,6 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1109,7 +1064,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
@@ -1120,9 +1075,9 @@ CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_TW9910 is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
# CONFIG_SOC_CAMERA_OV3640 is not set
-CONFIG_SOC_CAMERA_OV7670=m
+# CONFIG_SOC_CAMERA_OV7670 is not set
# CONFIG_SOC_CAMERA_OV772X is not set
-CONFIG_SOC_CAMERA_OV96XX=m
+# CONFIG_SOC_CAMERA_OV96XX is not set
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_VIDEO_MX27=m
# CONFIG_RADIO_ADAPTERS is not set
@@ -1133,58 +1088,8 @@ CONFIG_VIDEO_MX27=m
#
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_IMX is not set
-# 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_MOTOROLA_A910_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_MXC=y
-
-#
-# MXC framebuffer options
-#
-CONFIG_FB_MXC_SYNC_PANEL=y
-# CONFIG_FB_MXC_OVERLAY is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
@@ -1196,25 +1101,6 @@ CONFIG_BACKLIGHT_GENERIC=m
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_ARMADEUS_CLUT224 is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
@@ -1245,43 +1131,7 @@ CONFIG_SND_USB=y
# CONFIG_SND_USB_CAIAQ is not set
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HIDRAW is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# Special HID drivers
-#
-CONFIG_HID_COMPAT=y
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_HID_SUPPORT is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1385,15 +1235,15 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_VST is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
CONFIG_USB_GADGET_FSL_USB2=y
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_FSL_USB2=m
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_PXA25X is not set
@@ -1411,9 +1261,9 @@ CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
+# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
-CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
@@ -1435,7 +1285,7 @@ CONFIG_ARMADEUS_DRIVERS=y
# CONFIG_ARMADEUS_AS1531_PLAT is not set
CONFIG_ARMADEUS_GPIO_DRIVER=m
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
-CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX1027 is not set
# CONFIG_ARMADEUS_MAX9768 is not set
#
@@ -1464,21 +1314,20 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
# Handheld related
#
CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_IMX_BACKLIGHT=m
# CONFIG_HX5116_DISPLAY is not set
#
# Communication bus related
#
# CONFIG_ARMADEUS_ISP1761 is not set
-CONFIG_MMC=y
+CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD/SDIO Card Drivers
#
-CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1487,7 +1336,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# MMC/SD/SDIO Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
-CONFIG_MMC_MXC=y
+CONFIG_MMC_MXC=m
# CONFIG_MMC_SPI is not set
# CONFIG_MEMSTICK is not set
# CONFIG_ACCESSIBILITY is not set
@@ -1563,8 +1412,7 @@ CONFIG_RTC_DRV_DS1374=y
#
# MXC VPU(Video Processing Unit) support
#
-CONFIG_MXC_VPU=y
-CONFIG_MXC_VPU_DEBUG=y
+# CONFIG_MXC_VPU is not set
# CONFIG_REGULATOR is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
@@ -1638,21 +1486,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_CMODE_NONE=y
-# CONFIG_JFFS2_CMODE_PRIORITY is not set
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_FS is not set
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_XATTR is not set
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27_defconfig
copy to buildroot/target/device/armadeus/pps/pps_defconfig
index de1763b..5d6dd9f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Sep 9 16:01:40 2010
-#
+# Tue Oct 26 15:33:44 2010
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
# BR2_alpha is not set
@@ -59,7 +58,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
# Project Options
#
-BR2_PROJECT="apf27"
+BR2_PROJECT="pps"
BR2_HOSTNAME="armadeus"
BR2_BANNER="Welcome to the Armadeus development environment."
@@ -69,7 +68,8 @@ BR2_BANNER="Welcome to the Armadeus development environment."
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
-BR2_BOARD_NAME="apf27"
+# BR2_TARGET_ARMADEUS_APF51 is not set
+BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
@@ -391,7 +391,7 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BOA is not set
+BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BLUEZ_LIBS is not set
@@ -401,7 +401,7 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
+BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IRDA_UTILS is not set
@@ -443,7 +443,9 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENSSL is not set
+BR2_PACKAGE_OPENSSL=y
+BR2_PACKAGE_OPENSSL_BIN=y
+# BR2_PACKAGE_OPENSSL_ENGINES is not set
# BR2_PACKAGE_OPENVPN is not set
# BR2_PACKAGE_OPENSWAN is not set
BR2_PACKAGE_PORTMAP=y
@@ -481,7 +483,11 @@ BR2_PACKAGE_PORTMAP=y
# 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_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_CWIID is not set
@@ -494,7 +500,24 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIRMWARE is not set
+BR2_PACKAGE_FIRMWARE=y
+
+#
+# Video
+#
+
+#
+# WiFi chipsets
+#
+BR2_PACKAGE_FIRMWARE_88W8686=y
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO=y
+# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
+# BR2_PACKAGE_FIRMWARE_88W8686_GSPI is not set
+
+#
+# Others
+#
# BR2_PACKAGE_FIS is not set
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
@@ -504,8 +527,9 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_PICKIT2 is not set
# 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
@@ -564,26 +588,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
-BR2_PACKAGE_ALSA_LIB=y
-BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_ARECORD=y
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_ALSA_LIB is not set
#
# asterisk - disabled (required openssl and mpg123)
@@ -599,7 +604,6 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# BR2_PACKAGE_MADPLAY is not set
# BR2_PACKAGE_MPG123 is not set
-BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
# BR2_PACKAGE_FLITE is not set
@@ -660,6 +664,10 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_QT is not set
#
+# Qwt requires Qt to be installed
+#
+
+#
# X Window System server
#
BR2_PACKAGE_XSERVER_none=y
@@ -729,7 +737,6 @@ BR2_PACKAGE_ZLIB=y
# BR2_XML_SUPPORT is not set
# BR2_JAVA_SUPPORT is not set
# BR2_GAMES is not set
-# BR2_PACKAGE_JOYSTICKTEST is not set
#
# Target filesystem options
@@ -791,8 +798,8 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
# bootloader for target device
#
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_UBOOT_BOARDNAME="apf27"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27.h"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
BR2_TARGET_UBOOT_SERVERIP=""
BR2_TARGET_UBOOT_IPADDR=""
diff --git a/buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm b/buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
similarity index 98%
copy from buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
copy to buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
index 0ef197a..88985ed 100644
--- a/buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
+++ b/buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.30.2
-# Mon Feb 1 14:24:52 2010
+# Mon Nov 3 21:39:03 2008
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -93,7 +92,7 @@ UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# 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_SYSLOG=y
UCLIBC_HAS_LFS=y
diff --git a/buildroot/target/device/armadeus/apf27/uClibc.config.arm b/buildroot/target/device/armadeus/pps/uClibc.config.arm
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/uClibc.config.arm
copy to buildroot/target/device/armadeus/pps/uClibc.config.arm
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-01 16:17:56
|
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 4de40f3390aa73f124b2a9c251d70ca237381ed3 (commit)
via fe73fcd50948b19f0bb30c2271f244d5f3cb0973 (commit)
from 0072a175cd67516b4c86b74f79433c4a45c61fb8 (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 4de40f3390aa73f124b2a9c251d70ca237381ed3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 1 17:16:53 2010 +0100
[BUILDROOT] [2010.11] Add UBI image generation support
commit fe73fcd50948b19f0bb30c2271f244d5f3cb0973
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 1 16:47:07 2010 +0100
[BUILDROOT] [2010.11] remove add_packages_config_entry.pl
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 ++-
buildroot/configs/apf27_webradio_defconfig | 6 ++-
buildroot/configs/apf51_defconfig | 5 +-
.../2010.11/076-ubi-add_ubi_image_support.patch | 75 ++++++++++++++++++++
patches/buildroot/2010.11/076-ubifs.tofix | 66 -----------------
.../buildroot/2010.11/add_packages_config_entry.pl | 1 -
patches/buildroot/2010.11/cleanup_buildroot.sh | 1 +
7 files changed, 90 insertions(+), 70 deletions(-)
create mode 100644 patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
delete mode 100644 patches/buildroot/2010.11/076-ubifs.tofix
delete mode 120000 patches/buildroot/2010.11/add_packages_config_entry.pl
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 2865fa3..dae7f48 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -57,6 +57,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF51 is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
@@ -793,6 +794,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index bf93631..1c55543 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Mon Nov 1 17:07:31 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -57,6 +57,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF51 is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
@@ -860,6 +861,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 8269e48..6521718 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Oct 21 14:12:52 2010
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -792,6 +792,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
new file mode 100644
index 0000000..4a6b020
--- /dev/null
+++ b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
@@ -0,0 +1,75 @@
+Add support to generate UBI images from UBIFS one.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/fs/ubi/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/Config.in 2010-10-31 21:32:10.000000000 +0100
+@@ -0,0 +1,22 @@
++config BR2_TARGET_ROOTFS_UBI
++ depends on BR2_TARGET_ROOTFS_UBIFS
++ bool "UBI image"
++ help
++ Build a UBI image of the UBIFS root filesystem.
++
++config BR2_TARGET_ROOTFS_UBI_PEBSIZE
++ hex "UBI physical erase block size"
++ depends on BR2_TARGET_ROOTFS_UBI
++ default 0x20000
++ help
++ Tells ubinize that physical eraseblock size of the flash chip the UBI
++ image is created for is 0x20000 (by default).
++
++config BR2_TARGET_ROOTFS_UBI_SUBSIZE
++ int "UBI sub-page size"
++ depends on BR2_TARGET_ROOTFS_UBI
++ default 512
++ help
++ Tells ubinize that the flash supports sub-pages and sub-page size is
++ 512 bytes (by default).
++
+Index: buildroot/fs/ubi/ubi.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/ubi.mk 2010-10-31 21:56:04.000000000 +0100
+@@ -0,0 +1,26 @@
++#############################################################
++#
++# Build the UBI root filesystem image
++#
++#############################################################
++
++UBI_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
++UBI_UBINIZE_OPTS += -p $(BR2_TARGET_ROOTFS_UBI_PEBSIZE)
++ifneq ($(BR2_TARGET_ROOTFS_UBI_SUBSIZE),0)
++UBI_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBI_SUBSIZE)
++endif
++
++
++ROOTFS_UBI_DEPENDENCIES = ubifs-root
++
++# $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
++
++define ROOTFS_UBI_CMD
++ cp fs/ubi/ubinize.cfg . ;\
++ echo "image=$$@fs" \
++ >> ./ubinize.cfg ;\
++ $(HOST_DIR)/usr/sbin/ubinize -o $$@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
++ rm ubinize.cfg
++endef
++
++$(eval $(call ROOTFS_TARGET,ubi))
+Index: buildroot/fs/ubi/ubinize.cfg
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/ubinize.cfg 2010-10-31 21:13:58.000000000 +0100
+@@ -0,0 +1,7 @@
++[ubifs]
++mode=ubi
++vol_id=0
++vol_type=dynamic
++vol_name=rootfs
++vol_alignment=1
++vol_flags=autoresize
diff --git a/patches/buildroot/2010.11/076-ubifs.tofix b/patches/buildroot/2010.11/076-ubifs.tofix
deleted file mode 100644
index bbd70f9..0000000
--- a/patches/buildroot/2010.11/076-ubifs.tofix
+++ /dev/null
@@ -1,66 +0,0 @@
---- buildrootref/fs/ubifs/Config.in 2008-11-03 09:15:09.000000000 +0100
-+++ buildroot/fs/ubifs/Config.in 2009-10-03 17:07:32.000000000 +0200
-@@ -1,6 +1,11 @@
- help
- Build a ubifs root filesystem
-
-+config BR2_TARGET_ROOTFS_UBIFS_PEBSIZE
-+ hex "UBI physical erase block size"
-+ depends on BR2_TARGET_ROOTFS_UBIFS
-+ default 0x20000
-+
- config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
- hex "UBI logical erase block size"
- depends on BR2_TARGET_ROOTFS_UBIFS
-@@ -17,6 +23,13 @@ config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
- help
- Some comment required here
-
-+config BR2_TARGET_ROOTFS_UBIFS_SUBSIZE
-+ int "UBI sub-page size"
-+ depends on BR2_TARGET_ROOTFS_UBIFS
-+ default 512
-+ help
-+ Some comment required here
-+
- config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
- int "Maximum LEB count"
- depends on BR2_TARGET_ROOTFS_UBIFS
---- buildrootref/fs/ubifs/ubifs.mk 2009-10-03 17:55:26.000000000 +0200
-+++ buildroot/fs/ubifs/ubifs.mk 2009-10-03 17:18:09.000000000 +0200
-@@ -75,7 +75,14 @@ else
- UBIFS_TARGET := $(UBIFS_BASE)
- endif
-
--$(UBIFS_BASE): host-fakeroot makedevs mkfs.ubifs
-+UBIFS_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) -p $(BR2_TARGET_ROOTFS_UBIFS_PEBSIZE)
-+
-+ifneq ($(BR2_TARGET_ROOTFS_UBIFS_SUBSIZE),0)
-+UBIFS_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBIFS_SUBSIZE)
-+endif
-+
-+
-+$(UBIFS_BASE): host-fakeroot makedevs
- # Use fakeroot to pretend all target binaries are owned by root
- rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- touch $(BUILD_DIR)/.fakeroot.00000
-@@ -80,11 +87,18 @@ ifneq ($(TARGET_DEVICE_TABLE),)
- >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- endif
- # Use fakeroot so mkfs.ubifs believes the previous fakery
-- echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \
-+ echo "$(MKFS_UBIFS) -d $(TARGET_DIR) " \
- "$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
-+ cp target/ubifs/ubinize.cfg .
-+ echo "image=$(UBIFS_BASE)" \
-+ >> ./ubinize.cfg
-+ $(UBINIZE) -o system_ubi.img $(UBIFS_UBINIZE_OPTS) ubinize.cfg
-+ cp -f system_ubi.img $(UBIFS_BASE)
-+ rm system_ubi.img
-+ rm ubinize.cfg
-
- ifneq ($(UBIFS_ROOTFS_COMPRESSOR),)
- $(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ) $(UBIFS_BASE)
diff --git a/patches/buildroot/2010.11/add_packages_config_entry.pl b/patches/buildroot/2010.11/add_packages_config_entry.pl
deleted file mode 120000
index cba56cc..0000000
--- a/patches/buildroot/2010.11/add_packages_config_entry.pl
+++ /dev/null
@@ -1 +0,0 @@
-../add_packages_config_entry.pl
\ No newline at end of file
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index e3f2cfe..14fe7f9 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/ipsec-tools/
rm -rf buildroot/package/lbreakout2/
rm -rf buildroot/package/ltris/
rm -rf buildroot/package/qwt/
+rm -rf buildroot/fs/ubi/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-10-28 17:07:13
|
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 0072a175cd67516b4c86b74f79433c4a45c61fb8 (commit)
from 4680fb7d7311aa707eaeb18b0f00cfe9bb79d230 (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 0072a175cd67516b4c86b74f79433c4a45c61fb8
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 28 19:06:36 2010 +0200
[BUILDROOT] Don't dereference symlinked Linux configs when copying them
-----------------------------------------------------------------------
Summary of changes:
...nux-dont_deference_symlinked_config_files.patch | 24 ++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/134-linux-dont_deference_symlinked_config_files.patch
diff --git a/patches/buildroot/134-linux-dont_deference_symlinked_config_files.patch b/patches/buildroot/134-linux-dont_deference_symlinked_config_files.patch
new file mode 100644
index 0000000..2fd832c
--- /dev/null
+++ b/patches/buildroot/134-linux-dont_deference_symlinked_config_files.patch
@@ -0,0 +1,24 @@
+Otherwise Linux configs which are symlinks are copied as symlinks and prevent
+build from going further afterwards.
+
+Signed-off-by: Julien Boibessot <jul...@fr...>
+
+Index: buildroot/target/linux/Makefile.in.advanced
+===================================================================
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-10-28 16:51:17.000000000 +0200
++++ buildroot/target/linux/Makefile.in.advanced 2010-10-28 16:55:09.000000000 +0200
+@@ -315,12 +315,12 @@
+ ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
+ # Try user defined config
+ if [ -f "$(LINUX26_KCONFIG)" ] ; then \
+- cp -dpf $(LINUX26_KCONFIG) $@ ; \
++ cp -pf $(LINUX26_KCONFIG) $@ ; \
+ fi
+ # Try to get a config for this linux version in the board directory
+ if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
+ if [ -f "$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config" ] ; then \
+- cp -dpf $(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config $@ ; \
++ cp -pf $(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config $@ ; \
+ fi ; \
+ fi
+ # Try to get a config for latest linux version in the board directory
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-10-27 16:08:20
|
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 4680fb7d7311aa707eaeb18b0f00cfe9bb79d230 (commit)
from 2df873e3d500907b9ebfe3550ea2fd8f42ba6356 (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 4680fb7d7311aa707eaeb18b0f00cfe9bb79d230
Author: Fabien Marteau <fab...@ar...>
Date: Wed Oct 27 17:57:58 2010 +0200
[as_devices] Change helpers name
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/Makefile | 2 +-
target/packages/as_devices/c/as_gpio.c | 3 +--
.../as_devices/c/{helpers.c => as_helpers.c} | 2 +-
.../as_devices/c/{helpers.h => as_helpers.h} | 0
target/packages/as_devices/c/as_pwm.c | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
rename target/packages/as_devices/c/{helpers.c => as_helpers.c} (98%)
rename target/packages/as_devices/c/{helpers.h => as_helpers.h} (100%)
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 1164cc2..159646f 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -20,7 +20,7 @@ OBJ += as_93lcxx.o
OBJ += as_spi.o
OBJ += as_max1027.o
OBJ += as_max5821.o
-OBJ += helpers.o
+OBJ += as_helpers.o
LIBRARY=as_devices
LIB_VERS=1
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 7959313..637990f 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -28,8 +28,7 @@
#include <sys/ioctl.h>
#include <linux/ppdev.h>
-/*#define DEBUG*/
-#include "helpers.h"
+#include "as_helpers.h"
#include "as_gpio.h"
diff --git a/target/packages/as_devices/c/helpers.c b/target/packages/as_devices/c/as_helpers.c
similarity index 98%
rename from target/packages/as_devices/c/helpers.c
rename to target/packages/as_devices/c/as_helpers.c
index 702a88d..5b43416 100644
--- a/target/packages/as_devices/c/helpers.c
+++ b/target/packages/as_devices/c/as_helpers.c
@@ -26,7 +26,7 @@
#include <unistd.h> /* for write() */
/* #define DEBUG */
-#include "helpers.h"
+#include "as_helpers.h"
#define SIZE_OF_BUFF 50
diff --git a/target/packages/as_devices/c/helpers.h b/target/packages/as_devices/c/as_helpers.h
similarity index 100%
rename from target/packages/as_devices/c/helpers.h
rename to target/packages/as_devices/c/as_helpers.h
diff --git a/target/packages/as_devices/c/as_pwm.c b/target/packages/as_devices/c/as_pwm.c
index f4c8b19..787021c 100644
--- a/target/packages/as_devices/c/as_pwm.c
+++ b/target/packages/as_devices/c/as_pwm.c
@@ -26,7 +26,7 @@
#include <unistd.h> /* for write() */
/* #define DEBUG */
-#include "helpers.h"
+#include "as_helpers.h"
#include "as_pwm.h"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-10-21 15:25:14
|
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 2df873e3d500907b9ebfe3550ea2fd8f42ba6356 (commit)
from 56052e376fd68ab28370fca519f332ad27a68da2 (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 2df873e3d500907b9ebfe3550ea2fd8f42ba6356
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 21 17:24:51 2010 +0200
[LINUX] Makes OV3640 starts in YUV mode by default
-----------------------------------------------------------------------
Summary of changes:
...adeus-soc_camera-add_ov3640_sensor_driver.patch | 24 ++++++++++---------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
index 2f7aa7c..fa988b4 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-09-27 15:45:46.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-09-27 15:45:46.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-10-14 11:18:31.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-10-14 11:18:31.000000000 +0200
@@ -783,6 +783,12 @@
help
This is a generic SoC camera platform driver, useful for testing
@@ -17,8 +17,8 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
depends on SOC_CAMERA && I2C
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-09-27 15:45:46.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-09-27 15:45:46.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-10-14 11:18:31.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-10-14 11:18:31.000000000 +0200
@@ -144,6 +144,7 @@
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
@@ -30,8 +30,8 @@ Index: linux-2.6.29.6/drivers/media/video/Makefile
Index: linux-2.6.29.6/drivers/media/video/ov3640.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov3640.c 2010-09-30 18:46:25.000000000 +0200
-@@ -0,0 +1,2115 @@
++++ linux-2.6.29.6/drivers/media/video/ov3640.c 2010-10-14 13:21:59.000000000 +0200
+@@ -0,0 +1,2117 @@
+/*
+ * OV3640 driver (soc_camera)
+ *
@@ -663,8 +663,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
+ {OV3640_SC_CTRL0, 0x02, 0, 0},
+ {OV3640_DSP_CTRL_1, 0x10, 0x30, 0},
+ {OV3640_DSP_CTRL_4, 0x00, 0x03, 0},
-+ {OV3640_FMT_MUX_CTRL0, 0x01, 0, 0}, /* ISP RGB */
-+ {OV3640_FMT_CTRL00, 0x11, 0, 0}, /* RGB565 */
++// {OV3640_FMT_MUX_CTRL0, 0x01, 0, 0}, /* ISP RGB */
++// {OV3640_FMT_CTRL00, 0x11, 0, 0}, /* RGB565 */
++ {OV3640_FMT_MUX_CTRL0, 0x10, 0, 0}, /* ISP YUV */
++ {OV3640_FMT_CTRL00, 0x00, 0, 0}, /* YUV422 */
+
+ {0x304c, 0x84, 0, 0},
+ {OV3640_CLK, 00, 0, 0},// ;15fps
@@ -2150,7 +2152,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov3640_regs.h 2010-09-27 15:45:46.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/ov3640_regs.h 2010-10-14 11:18:31.000000000 +0200
@@ -0,0 +1,602 @@
+/*
+ * drivers/media/video/ov3640_regs.h
@@ -2756,8 +2758,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
+#endif /* ifndef OV3640_REGS_H */
Index: linux-2.6.29.6/include/media/v4l2-chip-ident.h
===================================================================
---- linux-2.6.29.6.orig/include/media/v4l2-chip-ident.h 2010-09-27 15:44:27.000000000 +0200
-+++ linux-2.6.29.6/include/media/v4l2-chip-ident.h 2010-09-27 15:45:46.000000000 +0200
+--- linux-2.6.29.6.orig/include/media/v4l2-chip-ident.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/include/media/v4l2-chip-ident.h 2010-10-14 11:18:31.000000000 +0200
@@ -62,6 +62,7 @@
V4L2_IDENT_OV7670 = 250,
V4L2_IDENT_OV7720 = 251,
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-10-21 13:26:19
|
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 56052e376fd68ab28370fca519f332ad27a68da2 (commit)
from ae646357f536c8f5b643999cfadd61693c792c29 (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 56052e376fd68ab28370fca519f332ad27a68da2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 21 15:13:35 2010 +0200
[BUILDROOT] [2010.11] Add minimum infrastructure to compile for APF51
-----------------------------------------------------------------------
Summary of changes:
Makefile | 5 +-
.../configs/{apf27_defconfig => apf51_defconfig} | 43 +++++------
buildroot/target/device/armadeus/Config.in | 5 +
buildroot/target/device/armadeus/apf51/Config.in | 54 ++++++++++++++
.../device/armadeus/{apf27 => apf51}/Makefile.in | 2 +-
.../apf51-linux-2.6.36.config} | 78 ++++++++++++--------
.../{apf27 => apf51}/uClibc-0.9.30.config.arm | 0
...15-armadeus-logo-add_armadeus-project_tux.patch | 20 ++++-
8 files changed, 147 insertions(+), 60 deletions(-)
copy buildroot/configs/{apf27_defconfig => apf51_defconfig} (96%)
create mode 100644 buildroot/target/device/armadeus/apf51/Config.in
copy buildroot/target/device/armadeus/{apf27 => apf51}/Makefile.in (71%)
copy buildroot/target/device/armadeus/{apf27/apf27-linux-2.6.36.config => apf51/apf51-linux-2.6.36.config} (97%)
copy buildroot/target/device/armadeus/{apf27 => apf51}/uClibc-0.9.30.config.arm (100%)
diff --git a/Makefile b/Makefile
index 3978e93..e50b29f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,8 +71,9 @@ default: all
help:
@echo 'First, choose the platform:'
- @echo ' apf9328_defconfig - must be launch before using apf9328 card'
- @echo ' apf27_defconfig - must be launch before using apf27 card'
+ @echo ' apf9328_defconfig - get default config for an APF9328 board'
+ @echo ' apf27_defconfig - get default config for an APF27 board'
+ @echo ' apf51_defconfig - get default config for an APF51 board'
@echo ''
@echo 'Cleaning:'
@echo ' buildroot-clean - delete all non-source files in buildroot'
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf51_defconfig
similarity index 96%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/apf51_defconfig
index 2865fa3..8269e48 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Thu Oct 21 14:12:52 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -23,7 +23,7 @@ BR2_arm=y
# BR2_arm720t is not set
# BR2_arm920t is not set
# BR2_arm922t is not set
-BR2_arm926t=y
+# BR2_arm926t is not set
# BR2_arm10t is not set
# BR2_arm1136jf_s is not set
# BR2_arm1176jz_s is not set
@@ -32,19 +32,19 @@ BR2_arm926t=y
#
# cortex-A8/A9 needs gcc >= 4.4.x
#
-# BR2_cortex_a8 is not set
+BR2_cortex_a8=y
# BR2_cortex_a9 is not set
# BR2_sa110 is not set
# BR2_sa1100 is not set
# BR2_xscale is not set
# BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM926T"
+BR2_ARM_TYPE="ARM_CORTEXA8"
BR2_ARM_EABI=y
# BR2_ARM_OABI is not set
BR2_ARCH="arm"
BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="arm926ej-s"
-BR2_GCC_TARGET_ARCH="armv5te"
+BR2_GCC_TARGET_TUNE="cortex-a8"
+BR2_GCC_TARGET_ARCH="armv7-a"
BR2_GCC_TARGET_ABI="aapcs-linux"
#
@@ -56,19 +56,18 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
-BR2_TARGET_ARMADEUS_APF27=y
-BR2_BOARD_NAME="apf27"
+# BR2_TARGET_ARMADEUS_APF27 is not set
+BR2_TARGET_ARMADEUS_APF51=y
+BR2_BOARD_NAME="apf51"
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
-# BR2_TARGET_ARMADEUS_APF27_SDRAM_128 is not set
-# BR2_TARGET_ARMADEUS_APF27_SDRAM_256 is not set
-BR2_TARGET_ARMADEUS_NR_SDRAM_1=y
-# BR2_TARGET_ARMADEUS_NR_SDRAM_2 is not set
+BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_NR_SDRAM="1"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="64"
+BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1=y
+# BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_2 is not set
+# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_32 is not set
+# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_64 is not set
+BR2_TARGET_ARMADEUS_APF51_DDR2RAM_128=y
+# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_256 is not set
# BR2_TARGET_ARMLTD is not set
# BR2_TARGET_ATMEL is not set
# BR2_TARGET_KWIKBYTE is not set
@@ -811,13 +810,13 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
-BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_1_3_4 is not set
# BR2_TARGET_UBOOT_2010_06 is not set
-# BR2_TARGET_UBOOT_2010_03 is not set
+BR2_TARGET_UBOOT_2010_03=y
# BR2_TARGET_UBOOT_2009_11 is not set
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
-BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_VERSION="2010.03"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
@@ -836,8 +835,8 @@ BR2_LINUX_KERNEL=y
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_VERSION="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
+BR2_LINUX_KERNEL_VERSION="2.6.36"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/buildroot/target/device/armadeus/Config.in b/buildroot/target/device/armadeus/Config.in
index 773e32a..c5b211e 100644
--- a/buildroot/target/device/armadeus/Config.in
+++ b/buildroot/target/device/armadeus/Config.in
@@ -18,12 +18,15 @@ config BR2_TARGET_ARMADEUS_APF9328
bool "apf9328"
config BR2_TARGET_ARMADEUS_APF27
bool "apf27"
+config BR2_TARGET_ARMADEUS_APF51
+ bool "apf51"
endchoice
config BR2_BOARD_NAME
string
default "apf9328" if BR2_TARGET_ARMADEUS_APF9328
default "apf27" if BR2_TARGET_ARMADEUS_APF27
+ default "apf51" if BR2_TARGET_ARMADEUS_APF51
config BR2_BOARD_PATH
string
@@ -33,9 +36,11 @@ config BR2_CPU_NAME
string
default "imxl" if BR2_TARGET_ARMADEUS_APF9328
default "imx27" if BR2_TARGET_ARMADEUS_APF27
+ default "imx51" if BR2_TARGET_ARMADEUS_APF51
source "target/device/armadeus/apf9328/Config.in"
source "target/device/armadeus/apf27/Config.in"
+source "target/device/armadeus/apf51/Config.in"
config BR2_TARGET_ARMADEUS_SDRAM_SIZE
string
diff --git a/buildroot/target/device/armadeus/apf51/Config.in b/buildroot/target/device/armadeus/apf51/Config.in
new file mode 100644
index 0000000..5cd455e
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/Config.in
@@ -0,0 +1,54 @@
+if BR2_TARGET_ARMADEUS_APF51
+choice
+ prompt "Number of DDR2 RAM chips on your APF"
+ default BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1
+ help
+ Number of DDR2 RAM chips mounted on your APF51
+ (Default: 1)
+
+config BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1
+ bool "1x DDR2 RAM"
+ help
+ 1 DDR2 RAM chip (Default).
+
+config BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_2
+ bool "2x DDR2 RAMs"
+ help
+ 2 DDR2 RAM chips.
+
+endchoice
+
+config BR2_TARGET_ARMADEUS_NR_SDRAM
+ string
+ default 1 if BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1
+ default 2 if BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_2
+
+choice
+ prompt "Single size of your DDR2 RAM chip(s)"
+ default BR2_TARGET_ARMADEUS_APF51_DDR2RAM_128
+ help
+ DDR2 RAM size per chip (Default 128MB).
+
+config BR2_TARGET_ARMADEUS_APF51_DDR2RAM_32
+ bool "32MB"
+ help
+ 32MB size per DDR2 RAM chip.
+
+config BR2_TARGET_ARMADEUS_APF51_DDR2RAM_64
+ bool "64MB"
+ help
+ 64MB size per DDR2 RAM chip.
+
+config BR2_TARGET_ARMADEUS_APF51_DDR2RAM_128
+ bool "128MB"
+ help
+ 128MB size per DDR2 RAM chip.
+
+config BR2_TARGET_ARMADEUS_APF51_DDR2RAM_256
+ bool "256MB"
+ help
+ 256MB size per DDR2 RAM chip.
+
+endchoice
+
+endif
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/apf51/Makefile.in
similarity index 71%
copy from buildroot/target/device/armadeus/apf27/Makefile.in
copy to buildroot/target/device/armadeus/apf51/Makefile.in
index 8e48415..026601b 100644
--- a/buildroot/target/device/armadeus/apf27/Makefile.in
+++ b/buildroot/target/device/armadeus/apf51/Makefile.in
@@ -1,5 +1,5 @@
ifeq ($(BR2_VERSION),"0.10.0-svn")
-U_BOOT_BINLOC=u-boot-nand.bin
+error APF51 is not supported on old Buildroot
else
U_BOOT_BIN=u-boot-nand.bin
U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
similarity index 97%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
index 48bcaf7..14095b8 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Oct 21 08:38:50 2010
+# Thu Oct 21 13:17:57 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y
@@ -233,42 +234,43 @@ CONFIG_ARCH_MXC=y
# Freescale MXC Implementations
#
# CONFIG_ARCH_MX1 is not set
-CONFIG_ARCH_MX2=y
+# CONFIG_ARCH_MX2 is not set
# CONFIG_ARCH_MX25 is not set
# CONFIG_ARCH_MX3 is not set
# CONFIG_ARCH_MXC91231 is not set
-# CONFIG_ARCH_MX5 is not set
-CONFIG_IMX_HAVE_DMA_V1=y
-CONFIG_SOC_IMX27=y
+CONFIG_ARCH_MX5=y
# CONFIG_MACH_MX21 is not set
-CONFIG_MACH_MX27=y
+# CONFIG_MACH_MX27 is not set
+# CONFIG_MACH_APF27_DEV is not set
+# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
+# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
+CONFIG_ARCH_MX51=y
#
-# MX27 platforms:
+# MX5 platforms:
#
-# CONFIG_MACH_MX27ADS is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_CPUIMX27 is not set
-# CONFIG_MACH_MX27_3DS is not set
-# CONFIG_MACH_IMX27LITE is not set
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_MXT_TD60 is not set
+CONFIG_MACH_MX51_BABBAGE=y
+# CONFIG_MACH_MX51_3DS is not set
+# CONFIG_MACH_EUKREA_CPUIMX51 is not set
# CONFIG_MXC_IRQ_PRIOR is not set
+CONFIG_MXC_TZIC=y
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
-CONFIG_IMX_HAVE_IOMUX_V1=y
-CONFIG_ARCH_MXC_AUDMUX_V1=y
+CONFIG_ARCH_MXC_IOMUX_V3=y
#
# Processor Type
#
-CONFIG_CPU_ARM926T=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
@@ -276,11 +278,17 @@ CONFIG_CPU_CP15_MMU=y
# Processor Features
#
CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_CPU_HAS_PMU=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
CONFIG_COMMON_CLKDEV=y
#
@@ -305,11 +313,13 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_HZ=100
+# CONFIG_THUMB2_KERNEL is not set
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
+CONFIG_HW_PERF_EVENTS=y
# CONFIG_SPARSE_IRQ is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -317,7 +327,7 @@ CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
@@ -914,6 +924,7 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_WM831X_ON is not set
# CONFIG_INPUT_ADXL34X is not set
#
@@ -1039,6 +1050,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_WM831X is not set
# CONFIG_GPIO_ADP5588 is not set
#
@@ -1138,6 +1150,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_WM831X is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_THERMAL is not set
@@ -1148,6 +1161,7 @@ CONFIG_WATCHDOG=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_WM831X_WATCHDOG is not set
# CONFIG_MAX63XX_WATCHDOG is not set
CONFIG_IMX2_WDT=m
@@ -1162,7 +1176,7 @@ CONFIG_SSB_POSSIBLE=y
#
# CONFIG_SSB is not set
CONFIG_MFD_SUPPORT=y
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=y
# CONFIG_MFD_88PM860X is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -1183,7 +1197,7 @@ CONFIG_MFD_SUPPORT=y
# CONFIG_MFD_MAX8925 is not set
# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
+CONFIG_MFD_WM831X=y
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set
# CONFIG_MFD_PCF50633 is not set
@@ -1223,8 +1237,8 @@ CONFIG_FB=y
#
# Frame buffer hardware drivers
#
-# CONFIG_FB_IMX is not set
# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_TMIO is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
@@ -1240,6 +1254,7 @@ CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_S6E63M0 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_WM831X is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
#
@@ -1269,6 +1284,7 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_ARMADEUS_CLUT224=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1580,6 +1596,7 @@ CONFIG_RTC_MXC=m
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_WM831X is not set
#
# on-CPU RTC drivers
@@ -1948,4 +1965,3 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
diff --git a/buildroot/target/device/armadeus/apf27/uClibc-0.9.30.config.arm b/buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/uClibc-0.9.30.config.arm
copy to buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch
index b5797be..84b8982 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.36/drivers/video/logo/Kconfig
===================================================================
--- linux-2.6.36.orig/drivers/video/logo/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/video/logo/Kconfig 2010-10-21 10:16:28.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/Kconfig 2010-10-21 14:29:22.000000000 +0200
@@ -82,4 +82,11 @@
depends on M32R
default y
@@ -17,7 +17,7 @@ Index: linux-2.6.36/drivers/video/logo/Kconfig
Index: linux-2.6.36/drivers/video/logo/logo.c
===================================================================
--- linux-2.6.36.orig/drivers/video/logo/logo.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/video/logo/logo.c 2010-10-21 10:16:28.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/logo.c 2010-10-21 14:29:22.000000000 +0200
@@ -100,6 +100,10 @@
/* M32R Linux logo */
logo = &logo_m32r_clut224;
@@ -29,10 +29,22 @@ Index: linux-2.6.36/drivers/video/logo/logo.c
}
return logo;
}
+Index: linux-2.6.36/include/linux/linux_logo.h
+===================================================================
+--- linux-2.6.36.orig/include/linux/linux_logo.h 2010-10-21 14:42:43.000000000 +0200
++++ linux-2.6.36/include/linux/linux_logo.h 2010-10-21 14:45:46.000000000 +0200
+@@ -35,6 +35,7 @@
+ extern const struct linux_logo logo_linux_mono;
+ extern const struct linux_logo logo_linux_vga16;
+ extern const struct linux_logo logo_linux_clut224;
++extern const struct linux_logo logo_armadeus_clut224;
+ extern const struct linux_logo logo_blackfin_vga16;
+ extern const struct linux_logo logo_blackfin_clut224;
+ extern const struct linux_logo logo_dec_clut224;
Index: linux-2.6.36/drivers/video/logo/Makefile
===================================================================
--- linux-2.6.36.orig/drivers/video/logo/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/video/logo/Makefile 2010-10-21 10:16:28.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/Makefile 2010-10-21 14:29:22.000000000 +0200
@@ -15,6 +15,7 @@
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
@@ -44,7 +56,7 @@ Index: linux-2.6.36/drivers/video/logo/Makefile
Index: linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm 2010-10-21 10:16:28.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm 2010-10-21 14:29:22.000000000 +0200
@@ -0,0 +1,19205 @@
+P3
+# CREATOR: The GIMP's PNM Filter Version 1.0
hooks/post-receive
--
armadeus
|