armadeus-commitlog Mailing List for armadeus (Page 91)
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: Julien B a. A. <ar...@us...> - 2011-06-28 19:02: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 480409f8f527428b2930771767cc7d532a72cd4a (commit)
via dee7ddac47e38b462c774b3e5581f1cf6cab9d12 (commit)
via 16c9814b4aced081f6353f96b9afa59d0ad7b887 (commit)
via 8535874fba5565cd6a000804cd96dfc60de18c47 (commit)
via d1edab5dc914221c01999cc7d7b547b85af1c2a6 (commit)
via 84201795aa09d7e7a8b214d8bd752705e4706b58 (commit)
from b76a0b17039754fcb3f7cf6dd8300158f786dc71 (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 480409f8f527428b2930771767cc7d532a72cd4a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:58:49 2011 +0200
[BUILDROOT] Cleanup demos Config.in
commit dee7ddac47e38b462c774b3e5581f1cf6cab9d12
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:55:58 2011 +0200
[BUILDROOT] Updates apf51test_defconfig apf51_defconfig
commit 16c9814b4aced081f6353f96b9afa59d0ad7b887
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:18:37 2011 +0200
[DEMOS] Add screen resolution auto-detection to input_test
commit 8535874fba5565cd6a000804cd96dfc60de18c47
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 19:41:38 2011 +0200
[AS_DEVICES] Fixes compilation errors for cpp wrapper
commit d1edab5dc914221c01999cc7d7b547b85af1c2a6
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 17:56:40 2011 +0200
[LINUX] Makes gpio_keys a module to let user choose to use it or not (APF51 USER button)
commit 84201795aa09d7e7a8b214d8bd752705e4706b58
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 17:46:42 2011 +0200
[DEBUG] Add PWM 1&2 registers def in imxregs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 37 ++++++++++++++++---
buildroot/configs/apf51test_defconfig | 39 ++++++++++++++++----
buildroot/package/armadeus/demos/Config.in | 9 +++--
.../armadeus/apf51/apf51-linux-2.6.38.config | 4 +-
target/demos/input_test/README | 1 +
target/demos/input_test/main.c | 33 ++++++++++++++---
target/linux/debug/imxregs/imx51regs.h | 14 +++++++
target/packages/as_devices/cpp/as_gpio.cpp | 2 +-
target/packages/as_devices/test_cpp.h | 34 ++++++-----------
9 files changed, 125 insertions(+), 48 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index f0f10da..90f9a18 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00241-g76c7fa1-dirty
-# Mon Jun 27 15:30:22 2011
+# Buildroot version: 2010.11
+# Tue Jun 28 17:40:48 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,6 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
+BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
@@ -250,19 +251,37 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ANYBUSD is not set
# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
BR2_PACKAGE_FPGAREGS=y
+# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
# BR2_PACKAGE_MAX5821CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# straton requires as_devices to be installed
+#
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
+
+#
+# APF27 specific:
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# APF51 specific:
+#
BR2_PACKAGE_TFP410CTRL=y
#
+# APF9328 specific:
+#
+# BR2_PACKAGE_CH7024CTRL is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
@@ -631,6 +650,11 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBUSB is not set
#
+# Java
+#
+# BR2_PACKAGE_CLASSPATH is not set
+
+#
# Networking
#
# BR2_PACKAGE_LIBCGI is not set
@@ -728,9 +752,10 @@ BR2_PACKAGE_IPROUTE2=y
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
+# BR2_PACKAGE_NTP_NTPD is not set
+# BR2_PACKAGE_NTP_NTPDATE is not set
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 91fd40d..d2ff72b 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Buildroot version: 2010.11
-# Fri Jun 24 10:57:47 2011
+# Tue Jun 28 20:45:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,6 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
+BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
@@ -250,12 +251,11 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ANYBUSD is not set
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-# BR2_PACKAGE_CH7024CTRL is not set
BR2_PACKAGE_ARMADEUS_DEMOS=y
#
@@ -271,19 +271,37 @@ BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+# BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020 is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
#
-# DEMOS_MCP25020 requires package iproute2
+# Choose the firmware to install
#
-BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
# BR2_PACKAGE_MAX5821CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+# BR2_PACKAGE_STRATON is not set
BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+
+#
+# APF27 specific:
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# APF51 specific:
+#
BR2_PACKAGE_TFP410CTRL=y
#
+# APF9328 specific:
+#
+# BR2_PACKAGE_CH7024CTRL is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
@@ -676,6 +694,11 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBUSB is not set
#
+# Java
+#
+# BR2_PACKAGE_CLASSPATH is not set
+
+#
# Networking
#
# BR2_PACKAGE_LIBCGI is not set
@@ -806,7 +829,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
+BR2_PACKAGE_UUCP=y
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
@@ -873,7 +896,7 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800
BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
BR2_TARGET_ROOTFS_UBIFS_RT_LZO=y
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index f4d4d2f..8e7db54 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -32,6 +32,7 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
bool "Input test"
select BR2_PACKAGE_SDL
help
+ Shows how to use user inputs (mouse, keyboard, touch) in SDL.
config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
bool "Music player"
@@ -45,7 +46,7 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE
bool "Camera capture"
select BR2_PACKAGE_SDL
help
- capture and print camera video stream.
+ Capture and display camera (V4L) video stream.
config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
bool "Oscilloscope"
@@ -65,13 +66,13 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
Test for LCD dead pixels. Needs SDL.
config BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020
- bool "DEMOS_MCP25020"
+ bool "MCP25020 demo"
depends on BR2_PACKAGE_IPROUTE2
help
- Test for CAN bus communication with MCP25020.
+ Test for CAN bus communication with MCP25020 (demo board).
Requires package iproute2.
-comment "DEMOS_MCP25020 requires package iproute2"
+comment "MCP25020 demo requires package iproute2"
depends on !BR2_PACKAGE_IPROUTE2
endmenu
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 5c05c37..aebaa75 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38.1 Kernel Configuration
-# Mon Jun 20 17:28:57 2011
+# Tue Jun 28 17:50:21 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -981,7 +981,7 @@ CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO=m
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_LM8323 is not set
diff --git a/target/demos/input_test/README b/target/demos/input_test/README
index 6376899..429b8d0 100644
--- a/target/demos/input_test/README
+++ b/target/demos/input_test/README
@@ -1,3 +1,4 @@
+This demo *requires* SDL.
* ARM compiling:
$ make clean; make install
diff --git a/target/demos/input_test/main.c b/target/demos/input_test/main.c
index 0c97268..37cebe8 100644
--- a/target/demos/input_test/main.c
+++ b/target/demos/input_test/main.c
@@ -194,15 +194,14 @@ void process_events()
#else /* SDL_DOUBLEBUF crashes on APF */
#define SDL_VIDEO_FLAGS (SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_ANYFORMAT)
#endif
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 240
int main(int argc, char * argv[])
{
SDL_Surface * screen;
SDL_Surface * sprite, * tmp;
int nbjoysticks;
- int i;
+ int i, height, width;
+ SDL_Rect **modes;
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
fprintf(stderr, "Error during SDL init: %s\n",
@@ -213,12 +212,36 @@ int main(int argc, char * argv[])
/* Call SDL_Quit() before exiting */
atexit(SDL_Quit);
- screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 16, SDL_VIDEO_FLAGS);
+ /* Get available fullscreen/hardware modes */
+ modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
+
+ /* Check is there are any modes available */
+ if (modes == (SDL_Rect **)0) {
+ printf("No modes available!\n");
+ exit(-1);
+ }
+
+ /* Check if our resolution is restricted */
+ if (modes == (SDL_Rect **)-1) {
+ printf("All resolutions available.\n");
+ } else {
+ /* Print valid modes */
+ printf("Available Modes\n");
+ for (i=0; modes[i]; ++i) {
+ printf(" %d x %d\n", modes[i]->w, modes[i]->h);
+ }
+ }
+ width = modes[0]->w;
+ height = modes[0]->h;
+ printf("Taking greatest one: %d x %d\n\n", width, height);
+
+ screen = SDL_SetVideoMode(width, height, 16, SDL_VIDEO_FLAGS);
if (screen) {
printf("Video mode: %dx%dx%d\n", screen->w, screen->h,
screen->format->BitsPerPixel);
} else {
- printf("Unable to set %dx%d video mode: %s\n", SCREEN_WIDTH, SCREEN_HEIGHT, SDL_GetError());
+ printf("Unable to set %dx%d video mode: %s\n", width, height,
+ SDL_GetError());
return 1;
}
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx51regs.h
index 3555d70..497b6c7 100644
--- a/target/linux/debug/imxregs/imx51regs.h
+++ b/target/linux/debug/imxregs/imx51regs.h
@@ -72,6 +72,20 @@ static struct reg_info regs[] =
{ "GPTICR1_1", 0x73fa001c, 0, 0xffffffff, 'x', "GPT1 Input capture Register 1" },
{ "GPTICR2_1", 0x73fa0020, 0, 0xffffffff, 'x', "GPT1 Input capture Register 2" },
{ "GPTCNT_1", 0x73fa0024, 0, 0xffffffff, 'x', "GPT1 Counter Register" },
+/* PWM1 */
+{ "PWMCR_1", 0x73fb4000, 0, 0xffffffff, 'x', "PWM1 Control Register" },
+{ "PWMSR_1", 0x73fb4004, 0, 0xffffffff, 'x', "PWM1 Status Register" },
+{ "PWMIR_1", 0x73fb4008, 0, 0xffffffff, 'x', "PWM1 Interrupt Register" },
+{ "PWMSAR_1", 0x73fb400c, 0, 0xffffffff, 'x', "PWM1 Sample Register" },
+{ "PWMPR_1", 0x73fb4010, 0, 0xffffffff, 'x', "PWM1 Period Register" },
+{ "PWMCNR_1", 0x73fb4014, 0, 0xffffffff, 'x', "PWM1 Counter Register" },
+/* PWM2 */
+{ "PWMCR_2", 0x73fb8000, 0, 0xffffffff, 'x', "PWM2 Control Register" },
+{ "PWMSR_2", 0x73fb8004, 0, 0xffffffff, 'x', "PWM2 Status Register" },
+{ "PWMIR_2", 0x73fb8008, 0, 0xffffffff, 'x', "PWM2 Interrupt Register" },
+{ "PWMSAR_2", 0x73fb800c, 0, 0xffffffff, 'x', "PWM2 Sample Register" },
+{ "PWMPR_2", 0x73fb8010, 0, 0xffffffff, 'x', "PWM2 Period Register" },
+{ "PWMCNR_2", 0x73fb8014, 0, 0xffffffff, 'x', "PWM2 Counter Register" },
/* I2C1 */
{ "IADR_1", 0x83fc8000, 0, 0xffffffff, 'x', "I2C1 Address Register" },
{ "IFDR_1", 0x83fc8004, 0, 0xffffffff, 'x', "I2C1 Frequency Divider Register" },
diff --git a/target/packages/as_devices/cpp/as_gpio.cpp b/target/packages/as_devices/cpp/as_gpio.cpp
index a4a7034..385d1cd 100644
--- a/target/packages/as_devices/cpp/as_gpio.cpp
+++ b/target/packages/as_devices/cpp/as_gpio.cpp
@@ -174,7 +174,7 @@ const char* AsGpio::getIrqMode() const
else
{
std::cerr<<"AsGpio device structure not allocated"<<std::endl;
- return '?';
+ return "?";
}
}
diff --git a/target/packages/as_devices/test_cpp.h b/target/packages/as_devices/test_cpp.h
index f39944e..1814075 100644
--- a/target/packages/as_devices/test_cpp.h
+++ b/target/packages/as_devices/test_cpp.h
@@ -121,15 +121,14 @@ void test_gpio()
AsGpio *gpio_dev = NULL;
int32_t ret;
int32_t value;
- char port_letter = 'F';
- int pin_num = 13;
+ int pin_num = (5 *32) + 13;
int port_direction = 0;
int port_value = 1;
- gpio_dev = new AsGpio(port_letter, pin_num);
+ gpio_dev = new AsGpio(pin_num);
if (gpio_dev == NULL)
{
- printf("Error can't open gpio %c\nHave you run loadgpio.sh ?\n", port_letter);
+ printf("Error can't open gpio %d\nHave you run loadgpio.sh ?\n", pin_num);
pressEnterToContinue();
return ;
}
@@ -141,17 +140,16 @@ void test_gpio()
}
port_value = ret;
-
while(buffer[0] != 'q')
{
system("clear");
printf("**************************\n");
- printf(" Testing GPIO Port%c%d \n", gpio_dev->getPortLetter(), gpio_dev->getPinNum());
+ printf(" Testing GPIO %d \n", (int)gpio_dev->getPinNum());
printf("**************************\n");
printf("Choose ('q' to quit):\n");
- printf(" 1) Change gpio (P%c%d)\n", gpio_dev->getPortLetter(), gpio_dev->getPinNum());
+ printf(" 1) Change GPIO number (%d)\n", (int)gpio_dev->getPinNum());
printf(" 2) Change direction (%s)\n", gpio_dev->getPinDirection());
- printf(" 3) Change value (%d)\n", gpio_dev->getPinValue());
+ printf(" 3) Change value (%d)\n", (int)gpio_dev->getPinValue());
printf(" 4) Read pin value\n");
printf(" 5) Set irq mode (%s)\n", gpio_dev->getIrqMode());
printf(" a) blocking read\n");
@@ -159,27 +157,19 @@ void test_gpio()
printf("> ");
scanf("%s",buffer);
- switch(buffer[0])
+ switch (buffer[0])
{
- case '1' : printf("Give letter of port in upper case : ");
- scanf("%s", buffer);
- if (buffer[0] != port_letter)
- {
- delete gpio_dev;
- }
- port_letter = buffer[0];
-
- printf("Give pin number : ");
+ case '1' :
+ printf("Give GPIO number (port index (A==0) x 32 + pin index): ");
scanf("%d", &pin_num);
-
- gpio_dev = new AsGpio(port_letter, pin_num);
+ gpio_dev = new AsGpio(pin_num);
if(gpio_dev == NULL)
{
- printf("Error, can't open P%c%d\n", port_letter, pin_num);
+ printf("Error, can't open %d\n", pin_num);
pressEnterToContinue();
break;
}
- printf("Ok P%c%d is open\n", port_letter, pin_num);
+ printf("Ok %d is open\n", pin_num);
pressEnterToContinue();
break;
case '2' : printf("Give direction (in / out) : ");
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 15:15: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 b76a0b17039754fcb3f7cf6dd8300158f786dc71 (commit)
from ebfd36cd64bd1737680c0667b8c795ec948ea040 (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 b76a0b17039754fcb3f7cf6dd8300158f786dc71
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 17:14:32 2011 +0200
[LINUX] Removes warning et debug stuff in wb_irq_mngr driver
-----------------------------------------------------------------------
Summary of changes:
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 2 +-
.../fpga/wishbone_example/wb_irq_mngr/main.c | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
index 9a679ba..039f190 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
@@ -79,9 +79,9 @@ static int fpga_pins[] = {
static int __init board_irq_mng_init(void)
{
+#ifdef CONFIG_MACH_APF27
int ret;
-#ifdef CONFIG_MACH_APF27
ret = mxc_gpio_setup_multiple_pins(fpga_pins, ARRAY_SIZE(fpga_pins), "FPGA");
if (ret)
return -EINVAL;
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
index 13cf633..6ea5244 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
@@ -252,7 +252,6 @@ static int __devinit ocore_irq_mng_probe(struct platform_device *pdev)
writew(0, mng->membase + FPGA_IMR);
for (irq = IRQ_FPGA(0); irq < IRQ_FPGA(NB_IT); irq++) {
- printk("IRQ %d\n", irq);
set_irq_chip_data(irq, mng);
set_irq_chip_and_handler(irq, &imx_fpga_chip, handle_edge_irq);
set_irq_flags(irq, IRQF_VALID);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 14:12:04
|
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 ebfd36cd64bd1737680c0667b8c795ec948ea040 (commit)
via 11ad535807725e41268de885ba6c2133dbfa4a6c (commit)
via cf6230f42468dac0179791d51ec6fa8d274f6f04 (commit)
from 6ab1789742ee14ab40071ba5413e9bc1536ceec8 (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 ebfd36cd64bd1737680c0667b8c795ec948ea040
Merge: 11ad535807725e41268de885ba6c2133dbfa4a6c 6ab1789742ee14ab40071ba5413e9bc1536ceec8
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:10:35 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 11ad535807725e41268de885ba6c2133dbfa4a6c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:09:38 2011 +0200
[STRATON] Change as_devices related comment in Config.in
commit cf6230f42468dac0179791d51ec6fa8d274f6f04
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:06:51 2011 +0200
[PPS] Updates Buildroot and Linux 2.6.29 default configs; mostly to get download & gpiolib fixes from APF27
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 14 +++++++++-----
buildroot/package/armadeus/straton/Config.in | 2 +-
.../device/armadeus/pps/pps-linux-2.6.29.config | 5 ++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 32eadd0..c218cdc 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00354-g97b1b34-dirty
-# Mon Feb 21 17:54:45 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -99,7 +99,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -115,7 +115,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
@@ -457,6 +457,7 @@ BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_KBD is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
@@ -508,6 +509,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SQUASHFS is not set
@@ -579,6 +581,7 @@ BR2_PACKAGE_OPENSSL_BIN=y
# BR2_PACKAGE_FREETYPE is not set
# BR2_PACKAGE_JPEG is not set
# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBSVGTINY is not set
# BR2_PACKAGE_LIBUNGIF is not set
@@ -706,6 +709,7 @@ BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
# BR2_PACKAGE_NTP_SNTP is not set
@@ -713,6 +717,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
@@ -728,7 +733,6 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOCKETCAN is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
# BR2_PACKAGE_TCPDUMP is not set
diff --git a/buildroot/package/armadeus/straton/Config.in b/buildroot/package/armadeus/straton/Config.in
index 41eda04..073d42e 100644
--- a/buildroot/package/armadeus/straton/Config.in
+++ b/buildroot/package/armadeus/straton/Config.in
@@ -1,4 +1,4 @@
-comment "Select as_devices package to use straton"
+comment "straton requires as_devices to be installed"
depends on !(BR2_PACKAGE_AS_DEVICES)
config BR2_PACKAGE_STRATON
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 333371b..92bbaef 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
-# Wed Mar 2 14:25:41 2011
+# Tue Jun 21 18:13:55 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -186,7 +186,6 @@ 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
@@ -987,7 +986,7 @@ CONFIG_SPI_MXC_SELECT2=y
CONFIG_SPI_TSC2102=m
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-28 13:25: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 6ab1789742ee14ab40071ba5413e9bc1536ceec8 (commit)
via f80d3a10724cfb46ed7f3fc49888239c84b41a65 (commit)
via 4009f1dd20ee86e89734c81342d79de062fe077b (commit)
via 9ce9be947006bf4d2013ae47b2fb1613dfab3d26 (commit)
via 1f9383ff4259181a7cc2169bd6189fd40c9d2407 (commit)
from fb171838bb8d3160d1e1dea4ee32f33e4ea58b60 (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 6ab1789742ee14ab40071ba5413e9bc1536ceec8
Merge: f80d3a10724cfb46ed7f3fc49888239c84b41a65 fb171838bb8d3160d1e1dea4ee32f33e4ea58b60
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 28 15:25:13 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit f80d3a10724cfb46ed7f3fc49888239c84b41a65
Merge: 4009f1dd20ee86e89734c81342d79de062fe077b 044fd59f56b8510b6074c264d088403a574d7b09
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 28 10:45:48 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4009f1dd20ee86e89734c81342d79de062fe077b
Merge: 9ce9be947006bf4d2013ae47b2fb1613dfab3d26 ee8eb7655cb49b082c0c601e590a389bbeb153e9
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 28 10:15:14 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9ce9be947006bf4d2013ae47b2fb1613dfab3d26
Merge: 1f9383ff4259181a7cc2169bd6189fd40c9d2407 f39412fe7cbbd63aa6fb64c0a60b854e78f88d20
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 27 19:09:26 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1f9383ff4259181a7cc2169bd6189fd40c9d2407
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 24 18:14:00 2011 +0200
[buildroot][package][straton] Packaging completed (with demo version)
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/straton/Config.in | 11 +-------
buildroot/package/armadeus/straton/straton.mk | 33 ++++++++++++++++++-------
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/buildroot/package/armadeus/straton/Config.in b/buildroot/package/armadeus/straton/Config.in
index ad50b2e..41eda04 100644
--- a/buildroot/package/armadeus/straton/Config.in
+++ b/buildroot/package/armadeus/straton/Config.in
@@ -24,11 +24,10 @@ config BR2_PACKAGE_STRATON_BIN
help
Straton runtime binary. This runtime is not free
ask ARMadeus Systems to obtain it. If you have
- the tar.gz select this option then give the full
- path name in "straton runtime path" field
+ the tar.gz, copy it under your downloads/ directory
config BR2_PACKAGE_STRATON_DEMO
- bool "straton_demo (TODO)"
+ bool "straton_demo"
help
Straton demo runtime. This runtime will be stopped
after 10 minutes running. It can be relaunched each
@@ -43,10 +42,4 @@ config BR2_PACKAGE_STRATON_DEV_DIR
help
Straton runtime development code directory
-config BR2_PACKAGE_STRATON_BIN_DIR
- string "straton runtime path"
- depends on BR2_PACKAGE_STRATON_BIN
- default "/straton_dir/straton-armadeus-0.1.tar.gz"
- help
- straton runtime full path
endif
diff --git a/buildroot/package/armadeus/straton/straton.mk b/buildroot/package/armadeus/straton/straton.mk
index aa00e21..8b499e5 100644
--- a/buildroot/package/armadeus/straton/straton.mk
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -7,18 +7,10 @@ STRATON_VERSION = 0.1
STRATON_DEPENDENCIES = straton_ios
STRATON_BIN_NAME = straton
+# STRATON DEV
ifeq ($(BR2_PACKAGE_STRATON_DEV),y)
STRATON_SITE=$(BR2_PACKAGE_STRATON_DEV_DIR)
STRATON_SITE_METHOD=copy
-endif
-ifeq ($(BR2_PACKAGE_STRATON_BIN),y)
-STRATON_SITE=$(BR2_PACKAGE_STRATON_BIN_DIR)
-STRATON_SITE_METHOD=copy
-endif
-ifeq ($(BR2_PACKAGE_STRATON_DEMO),y)
-STRATON_SITE=http://TODO
-STRATON_SITE_METHOD=wget
-endif
define STRATON_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
@@ -28,5 +20,28 @@ endef
define STRATON_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(STRATON_DIR)/bin/t5hmi $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
endef
+endif
+
+# STRATON BIN
+ifeq ($(BR2_PACKAGE_STRATON_BIN),y)
+STRATON_SITE=http://ask_for_binary
+STRATON_SITE_METHOD=wget
+#STRATON_SOURCE=straton-$(STRATON_VERSION).tar.gz
+
+define STRATON_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(STRATON_DIR)/straton $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
+endef
+
+endif
+
+# STRATON DEMO
+ifeq ($(BR2_PACKAGE_STRATON_DEMO),y)
+STRATON_SITE=ftp://ftp2.armadeus.com
+STRATON_SOURCE=straton_demo-$(STRATON_VERSION).tar.gz
+
+define STRATON_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(STRATON_DIR)/straton $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
+endef
+endif
$(eval $(call GENTARGETS,package,straton))
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-28 12:41:08
|
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 fb171838bb8d3160d1e1dea4ee32f33e4ea58b60 (commit)
via 4f651a301ad705e2b421b85f29a741b8d0fab198 (commit)
from 044fd59f56b8510b6074c264d088403a574d7b09 (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 fb171838bb8d3160d1e1dea4ee32f33e4ea58b60
Merge: 4f651a301ad705e2b421b85f29a741b8d0fab198 044fd59f56b8510b6074c264d088403a574d7b09
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 28 14:40:24 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4f651a301ad705e2b421b85f29a741b8d0fab198
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 27 15:32:36 2011 +0200
[buildroot] select cu by default for apf27 and apf51
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 +++---
buildroot/configs/apf51_defconfig | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 50ce472..d5d6c43 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11
-# Fri Jun 24 10:57:47 2011
+# Buildroot version: 2010.11-00241-g76c7fa1-dirty
+# Mon Jun 27 15:30:22 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -718,7 +718,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
+BR2_PACKAGE_UUCP=y
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index be8848b..f0f10da 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11
-# Fri Jun 24 10:57:47 2011
+# Buildroot version: 2010.11-00241-g76c7fa1-dirty
+# Mon Jun 27 15:30:22 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -759,7 +759,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
+BR2_PACKAGE_UUCP=y
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 08:43:27
|
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 044fd59f56b8510b6074c264d088403a574d7b09 (commit)
from ee8eb7655cb49b082c0c601e590a389bbeb153e9 (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 044fd59f56b8510b6074c264d088403a574d7b09
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 10:42:54 2011 +0200
[LINUX] fpga/wishbone_twin_uart: correct the way platform_devices are registered
-----------------------------------------------------------------------
Summary of changes:
.../linux/modules/fpga/wishbone_twin_uart/16750.c | 40 ++++++++-----------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/16750.c b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
index 20a418d..caf1c1b 100644
--- a/target/linux/modules/fpga/wishbone_twin_uart/16750.c
+++ b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
@@ -62,21 +62,22 @@ static struct plat_serial8250_port ocore_16750_uart1_data[] = {
}
};
-static struct platform_device ocore_16750_uart0_device = {
- .name = "serial8250",
- .id = 0,
- .dev = {
- .release = plat_uart_release,
- .platform_data = ocore_16750_uart0_data,
+static struct platform_device ocore_16750_uart_devices[] = {
+ {
+ .name = "serial8250",
+ .id = 0,
+ .dev = {
+ .release = plat_uart_release,
+ .platform_data = ocore_16750_uart0_data,
+ },
},
-};
-
-static struct platform_device ocore_16750_uart1_device = {
- .name = "serial8250",
- .id = 1,
- .dev = {
- .release = plat_uart_release,
- .platform_data = ocore_16750_uart1_data,
+ {
+ .name = "serial8250",
+ .id = 1,
+ .dev = {
+ .release = plat_uart_release,
+ .platform_data = ocore_16750_uart1_data,
+ },
},
};
@@ -113,21 +114,14 @@ static int __init ocore_16750_init(void)
return -ENODEV;
}
- ret = platform_device_register(&ocore_16750_uart0_device);
- if (ret < 0)
- return ret;
-
- ret = platform_device_register(&ocore_16750_uart1_device);
- if (ret < 0)
- return ret;
+ ret = platform_device_register(ocore_16750_uart_devices);
return ret;
}
static void __exit ocore_16750_exit(void)
{
- platform_device_unregister(&ocore_16750_uart0_device);
- platform_device_unregister(&ocore_16750_uart1_device);
+ platform_device_unregister(ocore_16750_uart_devices);
}
module_init(ocore_16750_init);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 08:08:18
|
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 ee8eb7655cb49b082c0c601e590a389bbeb153e9 (commit)
from efd1d04d09e582d7ac1d53947d31299e3bda60da (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 ee8eb7655cb49b082c0c601e590a389bbeb153e9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 10:07:08 2011 +0200
[BUILDROOT] Install FPGA firmware in /lib/firmware/fpga/ instead of /firmware/fpga/
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/fpga_firmware/fpga_firmware.mk | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index fc61d88..96dbfed 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -7,12 +7,13 @@
ifneq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),)
FIRMWARES += $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
endif
+FPGA_FIRMWARE_TARGET_DIR:=/lib/firmware/fpga/
$(STAMP_DIR)/.fpga_firmware_installed:
@$(call MESSAGE,"Installing some FPGA firmwares")
- mkdir -p $(TARGET_DIR)/firmware/fpga/
+ mkdir -p $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)
for firmware in $(FIRMWARES); do \
- $(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/firmware/fpga/ ; \
+ $(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
done
touch $@
@@ -22,7 +23,7 @@ fpga-firmware-clean:
@$(call MESSAGE,"Cleaning FPGA firmwares")
for firmware in $(FIRMWARES); do \
firmname=`basename $$firmware` ; \
- rm -f $(TARGET_DIR)/firmware/fpga/$$firmname ; \
+ rm -f $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)/$$firmname ; \
done
rm -f $(STAMP_DIR)/.fpga_firmware_installed
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 06:19:57
|
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 efd1d04d09e582d7ac1d53947d31299e3bda60da (commit)
from f39412fe7cbbd63aa6fb64c0a60b854e78f88d20 (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 efd1d04d09e582d7ac1d53947d31299e3bda60da
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 08:18:59 2011 +0200
[BUILDROOT] Add Armadeus specific package to install mandatory FPGA firmware (APF51). Cleanup a little buildroot/package/armadeus/Config.in while we are at it.
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 11 +++++--
buildroot/package/armadeus/fpga_firmware/Config.in | 15 +++++++++
.../armadeus/fpga_firmware/fpga_firmware.mk | 31 ++++++++++++++++++++
3 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 buildroot/package/armadeus/fpga_firmware/Config.in
create mode 100644 buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 8a450e2..33c7659 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,19 +1,24 @@
menu "Armadeus specific tools/utilities"
-source package/armadeus/ad9889ctrl/Config.in
source package/armadeus/anybusd/Config.in
source package/armadeus/as_devices/Config.in
-source package/armadeus/ch7024ctrl/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
+source package/armadeus/fpga_firmware/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/rxtx/Config.in
source package/armadeus/straton/Config.in
source package/armadeus/straton_ios/Config.in
source package/armadeus/testsuite/Config.in
+
+comment "APF27 specific:"
+source package/armadeus/ad9889ctrl/Config.in
+source package/armadeus/pps/Config.in
+comment "APF51 specific:"
source package/armadeus/tfp410ctrl/Config.in
+comment "APF9328 specific:"
+source package/armadeus/ch7024ctrl/Config.in
endmenu
diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
new file mode 100644
index 0000000..41f9604
--- /dev/null
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+ bool "FPGA Firmware"
+ help
+ Install some required/mandatory FPGA firmwares.
+
+menu "Choose the firmware to install"
+ depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+
+config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
+ bool "APF51 dual UARTs (GSM/GPS)"
+ help
+ Required if your want to use GSM or GPS on the APF51Dev. Firmware
+ will be named /firmware/fpga/apf51_gsm_gps_firmware.bin.
+
+endmenu
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
new file mode 100644
index 0000000..fc61d88
--- /dev/null
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# FPGA firmware
+#
+#############################################################
+
+ifneq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),)
+FIRMWARES += $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
+endif
+
+$(STAMP_DIR)/.fpga_firmware_installed:
+ @$(call MESSAGE,"Installing some FPGA firmwares")
+ mkdir -p $(TARGET_DIR)/firmware/fpga/
+ for firmware in $(FIRMWARES); do \
+ $(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/firmware/fpga/ ; \
+ done
+ touch $@
+
+fpga-firmware: $(STAMP_DIR)/.fpga_firmware_installed
+
+fpga-firmware-clean:
+ @$(call MESSAGE,"Cleaning FPGA firmwares")
+ for firmware in $(FIRMWARES); do \
+ firmname=`basename $$firmware` ; \
+ rm -f $(TARGET_DIR)/firmware/fpga/$$firmname ; \
+ done
+ rm -f $(STAMP_DIR)/.fpga_firmware_installed
+
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE)),y)
+TARGETS+=fpga-firmware
+endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-27 15:47: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 f39412fe7cbbd63aa6fb64c0a60b854e78f88d20 (commit)
via 5abaa358c3fa9a214f9db6f0eaa9377f3ec5c770 (commit)
from 76c7fa1f4ace790ac1ed973fe525166db4ddcd13 (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 f39412fe7cbbd63aa6fb64c0a60b854e78f88d20
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 27 17:46:16 2011 +0200
[FIRMWARE] POD scripts: rename gsm_gps_firmware.* -> apf51_gsm_gps_firmware.*
commit 5abaa358c3fa9a214f9db6f0eaa9377f3ec5c770
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 27 17:43:22 2011 +0200
[FIRMWARE] Rename scripts_pod -> pod_scripts
-----------------------------------------------------------------------
Summary of changes:
.../apf51_gsm_gps_firmware.bin} | Bin 340604 -> 340604 bytes
.../apf51_gsm_gps_firmware.pod} | 2 +-
target/demos/gpio/README | 2 ++
3 files changed, 3 insertions(+), 1 deletions(-)
rename firmware/{scripts_pod/gsm_gps_firmware.bin => pod_scripts/apf51_gsm_gps_firmware.bin} (100%)
rename firmware/{scripts_pod/gsm_gps_firmware.pod => pod_scripts/apf51_gsm_gps_firmware.pod} (96%)
create mode 100644 target/demos/gpio/README
diff --git a/firmware/scripts_pod/gsm_gps_firmware.pod b/firmware/pod_scripts/apf51_gsm_gps_firmware.pod
similarity index 96%
rename from firmware/scripts_pod/gsm_gps_firmware.pod
rename to firmware/pod_scripts/apf51_gsm_gps_firmware.pod
index faaaad1..285151d 100644
--- a/firmware/scripts_pod/gsm_gps_firmware.pod
+++ b/firmware/pod_scripts/apf51_gsm_gps_firmware.pod
@@ -1,4 +1,4 @@
-project.create gsm_gps_firmware
+project.create apf51_gsm_gps_firmware
project.selectplatform standard.apf51
project.addinstance components.uart16750 gsm_uart
project.addinstance components.uart16750 gps_uart
diff --git a/target/demos/gpio/README b/target/demos/gpio/README
new file mode 100644
index 0000000..25edc7b
--- /dev/null
+++ b/target/demos/gpio/README
@@ -0,0 +1,2 @@
+This example only works on APF9328 and APF27 with old GPIO driver.
+For new applications please use gpiolib directly or through as_devices.
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-26 19:07:10
|
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 76c7fa1f4ace790ac1ed973fe525166db4ddcd13 (commit)
from ad208d0a1713b36a426249c7db43a723d017af61 (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 76c7fa1f4ace790ac1ed973fe525166db4ddcd13
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 26 21:06:15 2011 +0200
[BUILDROOT] Makes Xenomai compiles again and improve Makefile a little
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 124 ++++++++++++++------
1 files changed, 90 insertions(+), 34 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index ad0c34e..4e78bd1 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/package/Config.in 2011-06-24 17:18:40.000000000 +0200
+--- buildroot.orig/package/Config.in 2011-06-26 16:36:21.000000000 +0200
++++ buildroot/package/Config.in 2011-06-26 16:42:59.000000000 +0200
@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -16,8 +16,8 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/linux/linux.mk 2011-06-24 17:18:30.000000000 +0200
+--- buildroot.orig/linux/linux.mk 2011-06-26 16:36:21.000000000 +0200
++++ buildroot/linux/linux.mk 2011-06-26 16:42:57.000000000 +0200
@@ -117,6 +117,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -31,19 +31,57 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2011-06-24 13:50:40.000000000 +0200
-@@ -0,0 +1,6 @@
++++ buildroot/package/xenomai/Config.in 2011-06-26 17:03:04.000000000 +0200
+@@ -0,0 +1,44 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
+ help
+ Real-Time Framework for Linux
+
+ http://xenomai.org
++
++if BR2_PACKAGE_XENOMAI
++
++if BR2_x86
++config BR2_PACKAGE_XENOMAI_SMP
++ bool "Enable SMP support"
++ help
++ Enable SMP support
++
++config BR2_PACKAGE_XENOMAI_SEP
++ bool "Enable x86 SEP instructions"
++ help
++ Enable x86 SEP instructions
++ You will also need NPTL
++endif #BR2_x86
++
++config BR2_PACKAGE_XENOMAI_MACH
++ string "Machine architecture"
++ default "generic"
++ depends on BR2_arm
++ help
++ Select for which machine we are compiling.
++ Possible choices are :
++ - at91rm9200
++ - at91sam926x
++ - generic
++ - imx
++ - imx21
++ - integrator
++ - ixp4xx
++ - mx2
++ - mx3
++ - pxa
++ - pxa3xx
++ - s3c2410
++ - sa1100
++
++endif # BR2_PACKAGE_XENOMAI
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2011-06-24 13:50:40.000000000 +0200
-@@ -0,0 +1,101 @@
++++ buildroot/package/xenomai/xenomai.mk 2011-06-26 17:02:00.000000000 +0200
+@@ -0,0 +1,119 @@
+#############################################################
+#
+# xenomai :
@@ -62,8 +100,6 @@ Index: buildroot/package/xenomai/xenomai.mk
+KERNEL_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+KERNEL_DIR:=$(BUILD_DIR)/linux-$(KERNEL_VERSION)
+
-+XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
-+
+XENOMAI_VERSION:=2.4.8
+XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_SITE:=http://download.gna.org/xenomai/stable
@@ -71,26 +107,41 @@ Index: buildroot/package/xenomai/xenomai.mk
+XENOMAI_CAT:=bzcat
+XENOMAI_BINARY:=xeno-load
+XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
++XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
++XENOMAI_CONF:=--host=$(XENOMAI_ARCH)-linux --datarootdir=/xenodoc
+
-+ifeq ($(BR2_CPU_NAME),"imx27")
-+ CPU_TYPE:=mx2
-+else
-+ifeq ($(BR2_CPU_NAME),"imxl")
-+ CPU_TYPE:=imx
++ifeq ($(BR2_arm),y)
++ XENOMAI_CONF +=--enable-arm-mach=$(shell echo $(BR2_PACKAGE_XENOMAI_MACH))
++ ifeq ($(BR2_ARM_EABI),y)
++ XENOMAI_CONF += --enable-$(XENOMAI_ARCH)-eabi=yes
++ else
++ XENOMAI_CONF += --enable-$(XENOMAI_ARCH)-eabi=no
++ endif
+endif
++
++ifeq ($(BR2_x86),y)
++ ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
++ XENOMAI_CONF+=--enable-smp=yes
++ endif
++ ifeq ($(BR2_PACKAGE_XENOMAI_SEP),y)
++ XENOMAI_CONF+=--enable-x86-sep=yes
++ endif
+endif
+
+$(DL_DIR)/$(XENOMAI_SOURCE):
++ @$(call MESSAGE,"Downloading Xenomai")
+ $(call DOWNLOAD,$(XENOMAI_SITE),$(XENOMAI_SOURCE))
+
+xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
+
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
++ @$(call MESSAGE,"Extracting Xenomai")
+ $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(KERNEL_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
++ @$(call MESSAGE,"Patching/Preparing Linux for Xenomai")
++ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-before-adeos-\*.patch
+ $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
+ --linux=$(KERNEL_DIR) \
@@ -104,37 +155,42 @@ Index: buildroot/package/xenomai/xenomai.mk
+xenomai-patch-kernel: $(KERNEL_DIR)/.patched.xenomai
+
+$(XENOMAI_DIR)/.configured: $(KERNEL_DIR)/.patched.xenomai
++ @$(call MESSAGE,"Configuring Xenomai")
+ (cd $(XENOMAI_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-+ ./configure \
-+ --enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
-+ --enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
-+ --host=$(XENOMAI_ARCH)-linux \
-+ --datarootdir=/xenodoc \
++ ./configure $(XENOMAI_CONF) \
+ )
+ touch $@
+
-+$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(XENOMAI_DIR)/.configured
++$(KERNEL_DIR)/.built.xenomai: $(XENOMAI_DIR)/.configured
++ $(MAKE) -C $(BASE_DIR)/.. linux26
++ touch $@
++
++$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(KERNEL_DIR)/.built.xenomai
++ @$(call MESSAGE,"Compiling Xenomai")
+ $(MAKE) -C $(XENOMAI_DIR) CC="$(TARGET_CC)" LD="$(TARGET_LD)"
+
+$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
-+ echo $@
-+ $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
-+ CC=$(TARGET_CC) LD=$(TARGET_LD) \
-+ DESTDIR=$(TARGET_DIR) install
++ @$(call MESSAGE,"Installing Xenomai")
++ # Use fakeroot to pretend to do 'make install' as root
++ $(HOST_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
++ CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
++ DESTDIR="$(TARGET_DIR)" install
+ rm -rf $(TARGET_DIR)/xenodoc
+ echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
+ echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
+
-+xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
++xenomai: linux26 host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
+
+xenomai-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
+ -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
+
-+xenomai-dirclean: xenomai-clean
++xenomai-dirclean: linux26-dirclean
++ if [ -d "$(XENOMAI_DIR)" ]; then \
++ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall; fi
+ rm -rf $(XENOMAI_DIR)
+
+#############################################################
@@ -148,7 +204,7 @@ Index: buildroot/package/xenomai/xenomai.mk
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/xeno-kernel.config 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -213,7 +269,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -228,7 +284,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -256,7 +312,7 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:00:05.000000000 +0200
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,21 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
@@ -279,10 +335,10 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_wit
+
+ /* The `spawn' function family is supported. */
+ #define _POSIX_SPAWN 200112L
-Index: buildroot/toolchain/uClibc/uClibc-0.9.30-spin_locks_are_not_supported_with_old_pthread_api.patch
+Index: buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.30-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:03:39.000000000 +0200
++++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,22 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 17:20: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 ad208d0a1713b36a426249c7db43a723d017af61 (commit)
from 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6 (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 ad208d0a1713b36a426249c7db43a723d017af61
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 19:19:47 2011 +0200
[BUILDROOT] Xenomai: add spin_lock patch for uClibc 0.9.30 too
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 58 +++++++++++++++-----
patches/buildroot/2010.11/cleanup_buildroot.sh | 2 +-
2 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index 80941a4..ad0c34e 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/package/Config.in 2011-06-24 14:02:24.000000000 +0200
++++ buildroot/package/Config.in 2011-06-24 17:18:40.000000000 +0200
@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
--- buildroot.orig/linux/linux.mk 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/linux/linux.mk 2011-06-24 14:02:21.000000000 +0200
++++ buildroot/linux/linux.mk 2011-06-24 17:18:30.000000000 +0200
@@ -117,6 +117,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -253,28 +253,56 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
-Index: buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch 2011-06-24 14:06:22.000000000 +0200
-@@ -0,0 +1,20 @@
-+Spinlocks are still not yet implemented in uClibc for ARM targets.
-+However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
-+If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:00:05.000000000 +0200
+@@ -0,0 +1,21 @@
++Spinlocks are not implemented in uClibc when using old pthread API.
++Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
++_POSIX_SPIN_LOCKS is set, but not implemented, then Xenomai will fail to build.
++
++To check: is LINUXTHREADS_NEW the right #ifdef ?
+
+diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
+--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
-+@@ -124,8 +124,11 @@
++@@ -124,8 +124,10 @@
+ /* We support the Timeouts option. */
+ #define _POSIX_TIMEOUTS 200112L
+
-++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
-++ * in uClibc for ARM targets.
-++ */
-+ /* We support spinlocks. */
-+-#define _POSIX_SPIN_LOCKS 200112L
-++/* #define _POSIX_SPIN_LOCKS 200112L */
++-/* We support spinlocks. */
+++/* We support spinlocks when using new pthread API. */
+++#ifdef LINUXTHREADS_NEW
++ #define _POSIX_SPIN_LOCKS 200112L
+++#endif
+
+ /* The `spawn' function family is supported. */
+ #define _POSIX_SPAWN 200112L
+Index: buildroot/toolchain/uClibc/uClibc-0.9.30-spin_locks_are_not_supported_with_old_pthread_api.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.30-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:03:39.000000000 +0200
+@@ -0,0 +1,22 @@
++Spinlocks are not implemented in uClibc when using old pthread API.
++Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
++_POSIX_SPIN_LOCKS is set, but not implemented, then Xenomai will fail to build.
++
++To check: is LINUXTHREADS_NEW the right #ifdef ?
++
++Index: uClibc-0.9.30.3/libc/sysdeps/linux/common/bits/posix_opt.h
++===================================================================
++--- uClibc-0.9.30.3.orig/libc/sysdeps/linux/common/bits/posix_opt.h 2011-06-24 17:50:34.000000000 +0200
+++++ uClibc-0.9.30.3/libc/sysdeps/linux/common/bits/posix_opt.h 2011-06-24 17:52:30.000000000 +0200
++@@ -124,8 +124,10 @@
++ /* We support the Timeouts option. */
++ #define _POSIX_TIMEOUTS 200112L
++
++-/* We support spinlocks. */
+++/* We support spinlocks when using new pthread API. */
+++#ifdef LINUXTHREADS_NEW
++ #define _POSIX_SPIN_LOCKS 200112L
+++#endif
++
++ /* The `spawn' function family is supported. */
++ #if 0 /* no support in uClibc (yet) */
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index d7d6d26..0f6c8c7 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -53,4 +53,4 @@ rm -rf buildroot/package/portmap/
rm -rf buildroot/package/bluez3/
rm -rf buildroot/package/ngircd/
rm -rf buildroot/package/can-utils/
-
+rm -f buildroot/toolchain/uClibc/*.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 12:13:55
|
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 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6 (commit)
from 6289ef7615fbd629ea9c909d06ac0e99d68eebae (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 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 14:13:07 2011 +0200
[BUILDROOT] Moves uClibc-0.9.29-fix-spin_locks.patch in 072-xenomai-package.patch as this patch is required by xenomai
-----------------------------------------------------------------------
Summary of changes:
.../uClibc/uClibc-0.9.29-fix-spin_locks.patch | 20 ---------
.../buildroot/2010.11/072-xenomai-package.patch | 43 +++++++++++++++----
2 files changed, 34 insertions(+), 29 deletions(-)
delete mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
deleted file mode 100644
index 92b5f87..0000000
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Spinlocks are still not yet implemented in uClibc for ARM targets.
-However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
-If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
-
-diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
---- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
-+++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
-@@ -124,8 +124,11 @@
- /* We support the Timeouts option. */
- #define _POSIX_TIMEOUTS 200112L
-
-+/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
-+ * in uClibc for ARM targets.
-+ */
- /* We support spinlocks. */
--#define _POSIX_SPIN_LOCKS 200112L
-+/* #define _POSIX_SPIN_LOCKS 200112L */
-
- /* The `spawn' function family is supported. */
- #define _POSIX_SPAWN 200112L
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index f32236c..80941a4 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-18 22:37:08.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-19 11:40:16.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/package/Config.in 2011-06-24 14:02:24.000000000 +0200
@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -16,8 +16,8 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-01-18 22:37:08.000000000 +0100
-+++ buildroot/linux/linux.mk 2011-01-18 22:37:08.000000000 +0100
+--- buildroot.orig/linux/linux.mk 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/linux/linux.mk 2011-06-24 14:02:21.000000000 +0200
@@ -117,6 +117,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -31,7 +31,7 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2011-01-19 10:01:03.000000000 +0100
++++ buildroot/package/xenomai/Config.in 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -42,7 +42,7 @@ Index: buildroot/package/xenomai/Config.in
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2011-01-19 11:03:40.000000000 +0100
++++ buildroot/package/xenomai/xenomai.mk 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,101 @@
+#############################################################
+#
@@ -148,7 +148,7 @@ Index: buildroot/package/xenomai/xenomai.mk
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/xeno-kernel.config 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -213,7 +213,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -228,7 +228,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -253,3 +253,28 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch 2011-06-24 14:06:22.000000000 +0200
+@@ -0,0 +1,20 @@
++Spinlocks are still not yet implemented in uClibc for ARM targets.
++However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
++If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
++
++diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
++--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
+++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
++@@ -124,8 +124,11 @@
++ /* We support the Timeouts option. */
++ #define _POSIX_TIMEOUTS 200112L
++
+++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
+++ * in uClibc for ARM targets.
+++ */
++ /* We support spinlocks. */
++-#define _POSIX_SPIN_LOCKS 200112L
+++/* #define _POSIX_SPIN_LOCKS 200112L */
++
++ /* The `spawn' function family is supported. */
++ #define _POSIX_SPAWN 200112L
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 11:35: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 6289ef7615fbd629ea9c909d06ac0e99d68eebae (commit)
via ed52647b81e170e1cb71ab7d1a2d9c0794383802 (commit)
via 428f0d90391c89f5e8762ddb06148c17fb975828 (commit)
from 8d63db2a8e57bbb5a8fd9b534d6a23e934da1577 (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 6289ef7615fbd629ea9c909d06ac0e99d68eebae
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 13:34:55 2011 +0200
Updates some .gitignore files
commit ed52647b81e170e1cb71ab7d1a2d9c0794383802
Merge: 428f0d90391c89f5e8762ddb06148c17fb975828 8d63db2a8e57bbb5a8fd9b534d6a23e934da1577
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 13:28:13 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 428f0d90391c89f5e8762ddb06148c17fb975828
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 13:27:31 2011 +0200
[LINUX] 2.6.38: Add support for PPS baseboard (experimental). Update init scripts to gpiolib while we are at it.
-----------------------------------------------------------------------
Summary of changes:
buildroot/.gitignore | 7 +-
buildroot/package/.gitignore | 2 -
.../365-pps-armadeus-add_pps_baseboard.patch | 246 +++----
.../device/armadeus/pps/pps-linux-2.6.38.1.config | 1 +
.../pps-linux-2.6.38.config} | 757 +++++++++++---------
target/pps/init/S80gpios | 42 +-
target/pps/scripts/reset_wi2wi.sh | 14 +-
7 files changed, 553 insertions(+), 516 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.38}/365-pps-armadeus-add_pps_baseboard.patch (62%)
create mode 120000 buildroot/target/device/armadeus/pps/pps-linux-2.6.38.1.config
copy buildroot/target/device/armadeus/{apf51/apf51-linux-2.6.36.config => pps/pps-linux-2.6.38.config} (77%)
diff --git a/buildroot/.gitignore b/buildroot/.gitignore
index ac6d14b..b742057 100644
--- a/buildroot/.gitignore
+++ b/buildroot/.gitignore
@@ -1,12 +1,11 @@
-/binaries
-/build_*
+/boot/
/dl
/docs/
+/fs/
+/linux/
/output/
-/project_*
/project/
-/toolchain_*
/toolchain
/scripts/
/.*
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 0500b9e..ea0c3b5 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -10,5 +10,3 @@
# except:
!/armadeus/
-!/bluez/
-!/mtd/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/365-pps-armadeus-add_pps_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/365-pps-armadeus-add_pps_baseboard.patch
similarity index 62%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/365-pps-armadeus-add_pps_baseboard.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/365-pps-armadeus-add_pps_baseboard.patch
index 525edd1..da8be15 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/365-pps-armadeus-add_pps_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/365-pps-armadeus-add_pps_baseboard.patch
@@ -3,16 +3,16 @@ 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
+Index: linux-2.6.38.1/arch/arm/mach-imx/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 @@
++++ linux-2.6.38.1/arch/arm/mach-imx/pps.c 2011-06-23 17:39:36.000000000 +0200
+@@ -0,0 +1,262 @@
+ /*
+ * pps.c
+ * Support of PPS baseboard
+ *
-+ * Copyright (C) 2009 Armadeus Systems
++ * Copyright (C) 2009-2011 ARMadeus Systems
+ * Authors: Julien Boibessot <jul...@ar...>
+ * Nicolas Colombain <nic...@ar...>
+ * Fabien Marteau <fab...@ar...>
@@ -32,38 +32,16 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ */
+
+#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/iomux-mx27.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"
++#include "devices-imx27.h"
+
-+/*********/
+/* Wi2Wi */
-+/*********/
-+
+#define BT_RESETn (GPIO_PORTE | 11) /* UART3_RTS */
+#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
+
@@ -72,31 +50,41 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ (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,
++#define USBH2_RST_n_GPIO (GPIO_PORTB | 10)
++
++static int pps_pins[] = {
++ /* SDHC2 (WiFi) */
++ PB4_PF_SD2_D0,
++ PB5_PF_SD2_D1,
++ PB6_PF_SD2_D2,
++ PB7_PF_SD2_D3,
++ PB8_PF_SD2_CMD,
++ PB9_PF_SD2_CLK,
++ /* USBH1 */
++ PB22_PF_USBH1_SUSP,
++ PB23_PF_USB_PWR,
++ PB24_PF_USB_OC,
++ PB25_PF_USBH1_RCV,
++ PB26_PF_USBH1_FS,
++ PB27_PF_USBH1_OE,
++ PB28_PF_USBH1_TXDM,
++ PB29_PF_USBH1_TXDP,
++ PB30_PF_USBH1_RXDM,
++ PB31_PF_USBH1_RXDP,
++ /* USBH2 */
++ 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,
++ (USBH2_RST_n_GPIO | GPIO_GPIO | GPIO_OUT),
+};
+
+static int bt_wifi_init(void)
@@ -105,45 +93,23 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+
+ 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 */
-+ }
++ if (!res) {
++ imx27_add_mxc_mmc(1, NULL);
++ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
++ gpio_set_value(BT_RESETn, 1); /* Bluetooth on */
++ }
+
++ /* These reset pins are driven by userspace afterwards */
+ 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)
++static int pps_usbh1_init(struct platform_device *pdev)
+{
-+ int ret;
++#if 0
+ 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 );
@@ -164,17 +130,16 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
+ pr_debug("reset controller: 0x%08x\n", temp);
+ mdelay(10);
-+
-+ return ret;
++#endif
++ return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);
+}
+
-+struct mxc_usb2_platform_data ehci1_pdata = {
-+ .init = apf27_usbh1_init,
++struct mxc_usbh_platform_data usbh1_pdata = {
++ .init = pps_usbh1_init,
++ .portsc = MXC_EHCI_MODE_SERIAL,
+};
+
-+/***********/
+/* USBH2 */
-+/***********/
+/* define USB registers XXX */
+#define USB_CTRL (IO_ADDRESS(OTG_BASE_ADDR) + 0x600)
+#define UOG_PORTSC1 (IO_ADDRESS(OTG_BASE_ADDR) + 0x184)
@@ -184,30 +149,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+#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,
-+
-+};
-+
++#if 0
+static int usb3315_set_vbus_power(void __iomem *view, int on)
+{
+ int vid, pid, ret = 0;
@@ -254,22 +196,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ /* usb3315_set_vbus_power(view, 0); needed ? */
+ ulpi_clear(SUSPENDM, USB3315_FCNCTL, view);
+}
++#endif
+
-+static int apf27_usbh2_init(struct platform_device *pdev)
++static int pps_usbh2_phy_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;
-+
++#if 0
++ uint32_t temp;
+ temp = readl(USB_CTRL);
+
+ pr_debug("USB_CTRL before: 0x%08x\n", temp);
@@ -296,40 +229,40 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ 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);
++ ret = usb3315_set_vbus_power((void __iomem *)UH2_ULPIVIEW, 1);
++#endif
+
-+ return ret;
++ return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
+}
+
-+struct mxc_usb2_platform_data ehci2_pdata = {
-+ .init = apf27_usbh2_init,
++static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
++ .init = pps_usbh2_phy_init,
++ .portsc = MXC_EHCI_MODE_ULPI,
+};
+
-+/******************/
-+/* Baseboard init */
-+/******************/
+void apf27_baseboard_resume(void)
+{
-+ /* TO BE DONE */
++ /* TO BE DONE */
+}
+
+void apf27_baseboard_suspend(void)
+{
-+ /* TO BE DONE */
++ /* TO BE DONE */
+}
+
+void __init apf27_baseboard_init(void)
+{
-+ printk("\n** Registering PPS ressources: **\n");
++ int ret;
++
++ printk("\n** Registering PPS ressources: **\n");
++ ret = mxc_gpio_setup_multiple_pins(pps_pins,
++ ARRAY_SIZE(pps_pins), "PPS");
++ if (ret)
++ printk(KERN_ERR "pps: Failed to setup pins (%d)\n", ret);
+
-+ /* Init USB */
-+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
-+ mxc_register_device(&mxc_ehci2, &ehci2_pdata);
++ /* init USB */
++ imx27_add_mxc_ehci_hs(1, &usbh1_pdata);
++ imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
+
+ /* init Wi2Wi */
+ bt_wifi_init();
@@ -337,11 +270,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+ printk("done\n");
+}
+
-Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+Index: linux-2.6.38.1/arch/arm/mach-imx/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 @@
+--- linux-2.6.38.1.orig/arch/arm/mach-imx/Kconfig 2011-06-15 12:24:58.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/Kconfig 2011-06-23 17:19:57.000000000 +0200
+@@ -390,6 +390,15 @@
activates the devices you want to use if you have the "Full"
version.
@@ -349,21 +282,20 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ prompt "Armadeus Systems APF27 PPS Secured Gateway"
+ bool
+ depends on MACH_APF27
++ select MACH_APF27_HAS_BASEBOARD
++ select IMX_HAVE_PLATFORM_MXC_MMC
+ help
-+ This selects the APF27 PPS as baseboard.
++ This selects the APF27_PPS as baseboard.
+
endchoice
config MACH_APF27_DEV_EXT
-Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
+Index: linux-2.6.38.1/arch/arm/mach-imx/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 @@
+--- linux-2.6.38.1.orig/arch/arm/mach-imx/Makefile 2011-06-15 12:24:58.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/Makefile 2011-06-23 17:39:11.000000000 +0200
+@@ -42,3 +42,4 @@
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/pps/pps-linux-2.6.38.1.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.38.1.config
new file mode 120000
index 0000000..5017378
--- /dev/null
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.38.1.config
@@ -0,0 +1 @@
+pps-linux-2.6.38.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.38.config
similarity index 77%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
copy to buildroot/target/device/armadeus/pps/pps-linux-2.6.38.config
index 3c76717..d4aa3ea 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36
-# Wed Dec 1 17:27:05 2010
+# Linux/arm 2.6.38.1 Kernel Configuration
+# Thu Jun 23 17:22:12 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_HAVE_PROC_CPU=y
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_LOCKDEP_SUPPORT=y
@@ -17,14 +16,15 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
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
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
#
# General setup
@@ -50,13 +50,26 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_SPARSE_IRQ is not set
#
# RCU Subsystem
#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
# CONFIG_TINY_RCU is not set
+# CONFIG_TINY_PREEMPT_RCU is not set
+CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -64,13 +77,15 @@ CONFIG_RCU_FANOUT=32
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY 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_EXPERT=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
@@ -109,6 +124,7 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
#
# GCOV-based kernel profiling
@@ -187,6 +203,7 @@ CONFIG_MMU=y
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
@@ -216,12 +233,13 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P64X0 is not set
# CONFIG_ARCH_S5P6442 is not set
# CONFIG_ARCH_S5PC100 is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_S5PV310 is not set
# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_TCC_926 is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_U300 is not set
# CONFIG_ARCH_U8500 is not set
@@ -229,66 +247,83 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
+# CONFIG_GPIO_PCA953X is not set
+CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y
+CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_FB=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_MMC=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_PWM=y
+CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
#
# Freescale MXC Implementations
#
# CONFIG_ARCH_MX1 is not set
-# CONFIG_ARCH_MX2 is not set
+CONFIG_ARCH_MX2=y
# CONFIG_ARCH_MX25 is not set
# CONFIG_ARCH_MX3 is not set
# CONFIG_ARCH_MXC91231 is not set
-CONFIG_ARCH_MX5=y
-CONFIG_ARCH_MX51=y
-
-#
-# MX5 platforms:
-#
-# CONFIG_MACH_MX51_BABBAGE is not set
-# CONFIG_MACH_MX51_3DS is not set
-# CONFIG_MACH_EUKREA_CPUIMX51 is not set
-CONFIG_MACH_APF51=y
-CONFIG_MACH_APF51_HAS_BASEBOARD=y
-CONFIG_MACH_APF51_DEV=y
+# CONFIG_ARCH_MX5 is not set
+CONFIG_IMX_HAVE_DMA_V1=y
+CONFIG_SOC_IMX27=y
+# CONFIG_MACH_MX21 is not set
+CONFIG_MACH_MX27=y
+
+#
+# MX27 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_IMX27_VISSTRIM_M10 is not set
+# 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_HAS_BASEBOARD=y
+# CONFIG_MACH_APF27_DEV is not set
+CONFIG_MACH_PPS=y
# CONFIG_MXC_IRQ_PRIOR is not set
-CONFIG_MXC_TZIC=y
+CONFIG_MXC_AVIC=y
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
CONFIG_MXC_ULPI=y
-CONFIG_ARCH_MXC_IOMUX_V3=y
+CONFIG_IMX_HAVE_IOMUX_V1=y
+CONFIG_ARCH_MXC_AUDMUX_V1=y
+
+#
+# System MMU
+#
#
# Processor Type
#
-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_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_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_USE_DOMAINS=y
#
# Processor Features
#
CONFIG_ARM_THUMB=y
-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
-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
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
#
# Bus support
@@ -312,29 +347,29 @@ 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
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_SECCOMP is not set
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -346,6 +381,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_AUTO_ZRELADDR is not set
#
@@ -364,9 +400,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
#
# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
+# CONFIG_VFP is not set
#
# Userspace binary formats
@@ -386,7 +420,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_VERBOSE=y
CONFIG_CAN_PM_TRACE=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
@@ -402,32 +435,39 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=y
# 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_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
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_NET_IPGRE_DEMUX 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_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
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_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -456,17 +496,148 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+# CONFIG_IP_NF_ARP_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
+CONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -479,6 +650,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
#
# Network testing
@@ -495,7 +667,6 @@ 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
@@ -539,13 +710,13 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# 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
# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
#
# Device Drivers
@@ -648,10 +819,6 @@ CONFIG_MTD_NAND_MXC=y
# 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
@@ -675,13 +842,18 @@ CONFIG_BLK_DEV=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
# CONFIG_HMC6352 is not set
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
@@ -697,6 +869,10 @@ CONFIG_EEPROM_AT25=y
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_IWMC3200TOP is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -733,6 +909,7 @@ CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
@@ -745,6 +922,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -752,6 +930,7 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
+CONFIG_MII=m
CONFIG_PHYLIB=y
#
@@ -765,6 +944,7 @@ CONFIG_PHYLIB=y
# CONFIG_VITESSE_PHY is not set
CONFIG_SMSC_PHY=y
# CONFIG_BROADCOM_PHY is not set
+# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
@@ -774,7 +954,6 @@ CONFIG_SMSC_PHY=y
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG 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
@@ -794,7 +973,6 @@ CONFIG_MII=y
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
CONFIG_FEC=y
-# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
@@ -813,7 +991,7 @@ CONFIG_LIBERTAS=m
# CONFIG_LIBERTAS_USB is not set
CONFIG_LIBERTAS_SDIO=m
# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_DEBUG=y
# CONFIG_LIBERTAS_MESH is not set
# CONFIG_P54_COMMON is not set
CONFIG_RT2X00=m
@@ -825,7 +1003,9 @@ CONFIG_RT2X00_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_RT2X00_DEBUG is not set
-# CONFIG_WL12XX is not set
+# CONFIG_RTL8192CE is not set
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX_MENU is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
@@ -840,8 +1020,31 @@ CONFIG_ZD1211RW=m
# 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_CDC_EEM is not set
+CONFIG_USB_NET_CDC_NCM=m
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_SMSC75XX 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_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_INT51X1 is not set
# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
# CONFIG_WAN is not set
#
@@ -866,75 +1069,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_ADP5588 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-CONFIG_KEYBOARD_IMX=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD 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_SENTELIC 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_MOUSE_SYNAPTICS_I2C 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_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_DYNAPRO is not set
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-# CONFIG_TOUCHSCREEN_EETI 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_MCS5000 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_QT602240 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ATI_REMOTE is not set
@@ -946,8 +1093,8 @@ 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
+# CONFIG_INPUT_CMA3000 is not set
#
# Hardware I/O ports
@@ -957,6 +1104,7 @@ CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
# CONFIG_GAMEPORT is not set
#
@@ -983,14 +1131,25 @@ CONFIG_DEVKMEM=y
# CONFIG_SERIAL_MAX3107 is not set
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_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_R3964 is not set
@@ -1013,7 +1172,7 @@ CONFIG_I2C_HELPER_AUTO=y
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_SIMTEC is not set
@@ -1034,7 +1193,6 @@ 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
#
@@ -1042,28 +1200,38 @@ CONFIG_SPI_MASTER=y
#
CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_IMX_VER_0_0=y
CONFIG_SPI_IMX=y
+CONFIG_SPI_MXC_SELECT1=y
+CONFIG_SPI_MXC_SELECT2=y
+# CONFIG_SPI_MXC_SELECT3 is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
#
# SPI Protocol Masters
#
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_TLE62X0 is not set
+CONFIG_SPI_TSC2102=m
#
# PPS support
#
# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
#
+# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
#
@@ -1071,10 +1239,8 @@ CONFIG_GPIOLIB=y
#
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
-# 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
#
@@ -1087,6 +1253,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
#
# AC97 GPIO expanders:
@@ -1096,16 +1263,7 @@ CONFIG_GPIOLIB=y
# MODULbus GPIO expanders:
#
# CONFIG_W1 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_POWER_SUPPLY is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1116,6 +1274,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
@@ -1128,6 +1287,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_F71882FG is not set
@@ -1135,6 +1295,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_G760A is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LM63 is not set
@@ -1152,6 +1313,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_LM93 is not set
# CONFIG_SENSORS_LTC4215 is not set
# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
# CONFIG_SENSORS_LM95241 is not set
# CONFIG_SENSORS_MAX1111 is not set
# CONFIG_SENSORS_MAX1619 is not set
@@ -1160,6 +1322,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
@@ -1179,11 +1342,11 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 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_SENSORS_WM831X is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_THERMAL is not set
@@ -1194,7 +1357,6 @@ 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
@@ -1209,7 +1371,7 @@ CONFIG_SSB_POSSIBLE=y
#
# CONFIG_SSB is not set
CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=y
+# CONFIG_MFD_CORE is not set
# CONFIG_MFD_88PM860X is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -1220,7 +1382,7 @@ CONFIG_MFD_CORE=y
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set
@@ -1230,65 +1392,28 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_MAX8925 is not set
# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_WM8400 is not set
-CONFIG_MFD_WM831X=y
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set
# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_WL1273_CORE is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
#
# Graphics support
#
+CONFIG_HAVE_FB_IMX=y
# CONFIG_DRM is not set
# 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 is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# 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_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
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-# 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
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
@@ -1299,25 +1424,6 @@ CONFIG_BACKLIGHT_GENERIC=m
# Console display driver support
#
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=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1342,6 +1448,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
@@ -1353,62 +1460,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_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_3M_PCT is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX_FF is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CANDO is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EGALAX is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MOSART is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_QUANTA is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_ROCCAT_KONE is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_STANTUM is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON 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
@@ -1474,6 +1526,7 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#
@@ -1509,27 +1562,30 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+# CONFIG_USB_YUREX 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_FSL_USB2=y
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_FSL_USB2=m
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
@@ -1540,17 +1596,68 @@ CONFIG_USB_ETH_RNDIS=y
#
# OTG and related infrastructure
#
+CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_ULPI=y
# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_MMC=y
+
+#
+# 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 is not set
+# 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
+# CONFIG_MMC_CLKGATE is not set
#
# MMC/SD/SDIO Card Drivers
#
-CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1559,10 +1666,13 @@ 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_MMC_DW is not set
+# CONFIG_MMC_USHC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1625,11 +1735,10 @@ CONFIG_RTC_DRV_DS1374=y
# CONFIG_RTC_DRV_M48T35 is not set
# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_MSM6242 is not set
-CONFIG_RTC_MXC=m
+# CONFIG_RTC_MXC is not set
# 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=m
#
# on-CPU RTC drivers
@@ -1638,6 +1747,7 @@ CONFIG_RTC_DRV_WM831X=m
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
+CONFIG_CLKDEV_LOOKUP=y
#
# File systems
@@ -1659,18 +1769,18 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
+# CONFIG_QUOTACTL is not set
CONFIG_AUTOFS4_FS=y
# CONFIG_FUSE_FS is not set
@@ -1717,21 +1827,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
@@ -1758,6 +1854,7 @@ CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
@@ -1765,8 +1862,6 @@ CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@ -1834,7 +1929,6 @@ CONFIG_NLS_ISO8859_1=y
# 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
@@ -1850,20 +1944,28 @@ CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_BKL=y
+# CONFIG_SPARSE_RCU_POINTER is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_LKDTM is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_RING_BUFFER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_STRICT_DEVMEM is not set
CONFIG_ARM_UNWIND=y
# CONFIG_DEBUG_USER is not set
# CONFIG_OC_ETM is not set
@@ -1873,6 +1975,7 @@ CONFIG_ARM_UNWIND=y
#
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
CONFIG_DEFAULT_SECURITY_DAC=y
@@ -1884,35 +1987,37 @@ CONFIG_CRYPTO=y
#
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_PCOMP2=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_AUTHENC=y
# 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
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
#
# Block modes
#
CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CTR is not set
+CONFIG_CRYPTO_CTR=y
# CONFIG_CRYPTO_CTS is not set
CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_LRW is not set
@@ -1922,7 +2027,7 @@ CONFIG_CRYPTO_ECB=m
#
# Hash modes
#
-# CONFIG_CRYPTO_HMAC is not set
+CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_VMAC is not set
@@ -1930,7 +2035,7 @@ CONFIG_CRYPTO_ECB=m
# Digest
#
# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_GHASH=y
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1938,7 +2043,7 @@ CONFIG_CRYPTO_MD5=y
# 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_SHA1=y
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TGR192 is not set
@@ -1947,7 +2052,7 @@ CONFIG_CRYPTO_MD5=y
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_BLOWFISH is not set
@@ -1974,6 +2079,8 @@ CONFIG_CRYPTO_LZO=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_BINARY_PRINTF is not set
@@ -1994,7 +2101,11 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_AVERAGE=y
diff --git a/target/pps/init/S80gpios b/target/pps/init/S80gpios
index db4d844..9c7a91d 100755
--- a/target/pps/init/S80gpios
+++ b/target/pps/init/S80gpios
@@ -1,9 +1,10 @@
#!/bin/sh
#
-# THE ARMADEUS PROJECT
+# Script used to configure userspace usable GPIOs on PPS
#
-# Copyright (C) 2010 The armadeus systems team [Jérémie Scheer]
+# Copyright (C) 2010-2011 The Armadeus Project - ARMadeus Systems
+# Author: Jeremie 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
@@ -20,36 +21,31 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#
-# Script used to configure user space usable GPIOs on PPS
-#
-# Julien Boibessot <jul...@ar...>
-# Fabien Marteau <fab...@ar...>
-#
-
-source /usr/bin/gpio_helpers.sh
+GPIOLIB_DIR=/sys/class/gpio
case "$1" in
start)
echo "Configuring PPS GPIOs"
- /usr/bin/loadgpio.sh
- # Status leds
- gpio_mode PF16 1
- gpio_set_value PF16 1 #STATUS_LED0 (green) on
- # Status leds
- gpio_mode PF17 1
- gpio_set_value PF17 0 #STATUS_LED1 (red) off
+ # Power LED (red) (PF16)
+ echo 176 > $GPIOLIB_DIR/export
+ echo out > $GPIOLIB_DIR/gpio176/direction
+ echo 1 > $GPIOLIB_DIR/gpio176/value # on
- # Second eth
- gpio_mode PC15 1
- gpio_set_value PC15 1 #LAN9500_RESETN
+ # Status LED (green) (PF17)
+ echo 177 > $GPIOLIB_DIR/export
+ echo out > $GPIOLIB_DIR/gpio177/direction
+ echo 0 > $GPIOLIB_DIR/gpio177/value # off
+ # Second eth, LAN9500_RESETN (PC15)
+ echo 79 > $GPIOLIB_DIR/export
+ echo out > $GPIOLIB_DIR/gpio79/direction
+ echo 1 > $GPIOLIB_DIR/gpio79/value # out of reset
;;
stop)
- gpio_set_value PF16 0 #STATUS_LED0 (green) off
- gpio_set_value PF17 1 #STATUS_LED1 (red) off
- gpio_set_value PC15 0 #LAN9500_RESETN
+ echo 0 > $GPIOLIB_DIR/gpio176/value #STATUS_LED0 (green) off
+ echo 1 > $GPIOLIB_DIR/gpio177/value #STATUS_LED1 (red) on
+ echo 0 > $GPIOLIB_DIR/gpio79/value # in reset
;;
restart)
$0 stop
diff --git a/target/pps/scripts/reset_wi2wi.sh b/target/pps/scripts/reset_wi2wi.sh
index f2bf7d8..826aa16 100644
--- a/target/pps/scripts/reset_wi2wi.sh
+++ b/target/pps/scripts/reset_wi2wi.sh
@@ -1,7 +1,5 @@
#
-# THE ARMADEUS PROJECT
-#
-# Copyright (C) 2010 The armadeus systems team [Jérémie Scheer]
+# Copyright (C) 2010-2011 The Armadeus Project - ARMadeus Systems
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as publis...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 09:16:07
|
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 8d63db2a8e57bbb5a8fd9b534d6a23e934da1577 (commit)
via 07ec587b892b07c11577691225f400688911d453 (commit)
from 5361fafbde472338a1ed3993efcca62f112d7d72 (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 8d63db2a8e57bbb5a8fd9b534d6a23e934da1577
Merge: 07ec587b892b07c11577691225f400688911d453 5361fafbde472338a1ed3993efcca62f112d7d72
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 11:14:49 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 07ec587b892b07c11577691225f400688911d453
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 11:13:22 2011 +0200
[BUILDROOT] Tune up tarballs download to overcome SF recurrent problems
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 8 +++---
buildroot/configs/apf27_webradio_defconfig | 29 +++++++++++----------------
buildroot/configs/apf51_defconfig | 8 +++---
buildroot/configs/apf51test_defconfig | 8 +++---
buildroot/configs/apf9328_defconfig | 8 +++---
5 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 82d7f7b..50ce472 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00086-gfb98766-dirty
-# Fri Apr 29 14:06:28 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -74,7 +74,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -89,7 +89,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 3b6248b..e1987b7 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00004-ge0d9cff
-# Tue Mar 22 00:22:47 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -55,20 +55,9 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
# Preset Devices
#
BR2_TARGET_ARMADEUS=y
-# BR2_TARGET_ARMADEUS_APF9328 is not set
-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"
-# 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_TARGET_ARMADEUS_NR_SDRAM="1"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="64"
# BR2_TARGET_ARMLTD is not set
@@ -85,7 +74,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -100,7 +89,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
@@ -129,7 +118,6 @@ BR2_TOOLCHAIN_BUILDROOT=y
#
# Kernel Header Options
#
-# BR2_KERNEL_HEADERS_2_6_33 is not set
# BR2_KERNEL_HEADERS_2_6_34 is not set
# BR2_KERNEL_HEADERS_2_6_35 is not set
# BR2_KERNEL_HEADERS_2_6_36 is not set
@@ -353,6 +341,7 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_LIBGMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
+# BR2_PACKAGE_LIBMPC is not set
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
@@ -499,6 +488,7 @@ BR2_PACKAGE_SDL_TTF=y
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_KBD is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
@@ -550,6 +540,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SQUASHFS is not set
@@ -677,6 +668,7 @@ BR2_PACKAGE_TSLIB=y
#
# Other
#
+# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
# BR2_PACKAGE_LIBDAEMON is not set
@@ -755,6 +747,7 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
# BR2_PACKAGE_NTP_SNTP is not set
@@ -762,6 +755,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
@@ -795,6 +789,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
+# BR2_PACKAGE_WIRELESS_TOOLS_LIB is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
#
@@ -905,7 +900,7 @@ BR2_TARGET_UBOOT_COPYTO=""
# Kernel
#
BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_35 is not set
+# BR2_LINUX_KERNEL_2_6_36 is not set
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index da58d75..be8848b 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00089-g7c11dea
-# Fri Apr 29 13:50:08 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,7 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -114,7 +114,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index f24b6bb..91fd40d 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00089-g7c11dea
-# Fri Apr 29 13:50:08 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,7 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -114,7 +114,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 6b8179b..3b255fb 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00004-ge0d9cff
-# Tue Mar 22 00:22:47 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -74,7 +74,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -90,7 +90,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-24 08:24: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 5361fafbde472338a1ed3993efcca62f112d7d72 (commit)
via 33ae91220a51e27833003f662a24b6469f8d2a40 (commit)
from 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd (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 5361fafbde472338a1ed3993efcca62f112d7d72
Merge: 33ae91220a51e27833003f662a24b6469f8d2a40 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 24 10:23:40 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 33ae91220a51e27833003f662a24b6469f8d2a40
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 24 08:41:08 2011 +0200
[buildroot][package][straton_ios] Artemys nitpick
-----------------------------------------------------------------------
Summary of changes:
target/packages/straton_ios/apf27_ios.c | 2 +-
target/packages/straton_ios/apf51_ios.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/packages/straton_ios/apf27_ios.c b/target/packages/straton_ios/apf27_ios.c
index b172a86..a64986d 100755
--- a/target/packages/straton_ios/apf27_ios.c
+++ b/target/packages/straton_ios/apf27_ios.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "apf27_ios.h"
#include <as_gpio.h>
+#include "apf27_ios.h"
static struct as_gpio_device *led;
static struct as_gpio_device *button;
diff --git a/target/packages/straton_ios/apf51_ios.c b/target/packages/straton_ios/apf51_ios.c
index 69337ef..25e3203 100755
--- a/target/packages/straton_ios/apf51_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "apf51_ios.h"
#include <as_gpio.h>
+#include "apf51_ios.h"
static struct as_gpio_device *led;
static struct as_gpio_device *button;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 07:45:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd (commit)
via f1b1d41fcf3f7bed8fa12c22a314a5f3e99be6bc (commit)
from b24b8626f59ba49613f944e0d2aedc6340fd8484 (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 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd
Merge: f1b1d41fcf3f7bed8fa12c22a314a5f3e99be6bc b24b8626f59ba49613f944e0d2aedc6340fd8484
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 09:40:36 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit f1b1d41fcf3f7bed8fa12c22a314a5f3e99be6bc
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 09:38:48 2011 +0200
[BUILDROOT] Bluez download server has moved
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/110-bluez-add_package.patch | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches/buildroot/2010.11/110-bluez-add_package.patch b/patches/buildroot/2010.11/110-bluez-add_package.patch
index 91ee606..a4cca90 100644
--- a/patches/buildroot/2010.11/110-bluez-add_package.patch
+++ b/patches/buildroot/2010.11/110-bluez-add_package.patch
@@ -45,7 +45,7 @@ Index: buildroot/package/bluez3/bluez-libs.mk
+#
+#############################################################
+BLUEZ3_LIBS_VERSION:=3.36
-+BLUEZ3_LIBS_SITE = http://bluez.sourceforge.net/download
++BLUEZ3_LIBS_SITE = http://bluez.sf.net/download
+BLUEZ3_LIBS_SOURCE = bluez-libs-$(BLUEZ3_LIBS_VERSION).tar.gz
+BLUEZ3_LIBS_INSTALL_STAGING = YES
+BLUEZ3_LIBS_INSTALL_TARGET = YES
@@ -63,8 +63,8 @@ Index: buildroot/package/bluez3/bluez-utils.mk
+#
+#############################################################
+BLUEZ3_UTILS_VERSION:=3.36
-+BLUEZ3_UTILS_SITE=http://bluez.sourceforge.net/download
-+BLUEZ3_UTILS_SOURCE=bluez-utils-$(BLUEZ3_UTILS_VERSION).tar.gz
++BLUEZ3_UTILS_SITE = http://bluez.sf.net/download
++BLUEZ3_UTILS_SOURCE = bluez-utils-$(BLUEZ3_UTILS_VERSION).tar.gz
+
+ifeq ($(strip $(BR2_PACKAGE_ALSA-LIB)),y)
+ALSA_DEP=alsa
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 14:49:54
|
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 b24b8626f59ba49613f944e0d2aedc6340fd8484 (commit)
via 4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22 (commit)
from 9f9623b77ebea67f44e0d554a19973deb7d539da (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 b24b8626f59ba49613f944e0d2aedc6340fd8484
Merge: 4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22 9f9623b77ebea67f44e0d554a19973deb7d539da
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 16:48:38 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jun 23 16:45:52 2011 +0200
Update return values of as_gpio_wait_event()
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 7d1ed64..9bf2b02 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -210,11 +210,13 @@ int32_t as_gpio_wait_event(struct as_gpio_device *gpio_dev, int delay_ms)
poll_set[0].revents = 0;
ret = poll(poll_set, 1, delay_ms);
if (ret > 0) {
- printf("event received\n");
- read(gpio_fd, tmp, sizeof(tmp));
+ return read(gpio_fd, tmp, sizeof(tmp));
+ } else if (ret < 0) {
+ ERROR("poll()");
+ return ret;
}
- return 0;
+ return -ETIMEDOUT;
}
/*------------------------------------------------------------------------------*/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 13:16: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 9f9623b77ebea67f44e0d554a19973deb7d539da (commit)
from c6e921e6ee7d3d2041626fe803780bf485981413 (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 9f9623b77ebea67f44e0d554a19973deb7d539da
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 15:15:26 2011 +0200
[buildroot][package][as_devices] Delete sleep in gpio open
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 826d128..7d1ed64 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -61,8 +61,6 @@ struct as_gpio_device *as_gpio_open(int aGpioNum)
}
close(export_file);
- sleep(1); //XXX
-
snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/value", aGpioNum);
pin_file = open(buf, O_RDWR);
if (pin_file < 0) {
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 11:39:03
|
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 c6e921e6ee7d3d2041626fe803780bf485981413 (commit)
from 2f7e818f0eb1c6714203c8284460963a78206b9f (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 c6e921e6ee7d3d2041626fe803780bf485981413
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 13:35:26 2011 +0200
[buildroot][package][straton_ios] Adapt straton_ios for apf51 (bis)
-----------------------------------------------------------------------
Summary of changes:
target/packages/straton_ios/apf51_ios.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/packages/straton_ios/apf51_ios.c b/target/packages/straton_ios/apf51_ios.c
index b08a592..69337ef 100755
--- a/target/packages/straton_ios/apf51_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "apf27_ios.h"
+#include "apf51_ios.h"
#include <as_gpio.h>
static struct as_gpio_device *led;
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 11:28: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 2f7e818f0eb1c6714203c8284460963a78206b9f (commit)
from 8ca4a12b22aa9960765d2dd6fb62ec8cea95f698 (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 2f7e818f0eb1c6714203c8284460963a78206b9f
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 13:27:20 2011 +0200
[buildroot][package][straton_ios] Adapt straton_ios for apf51
-----------------------------------------------------------------------
Summary of changes:
target/packages/straton_ios/apf51_ios.c | 4 ++--
target/packages/straton_ios/apf51_ios.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/packages/straton_ios/apf51_ios.c b/target/packages/straton_ios/apf51_ios.c
index 660281a..b08a592 100755
--- a/target/packages/straton_ios/apf51_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -9,9 +9,9 @@ static struct as_gpio_device *button;
/* set and get specifics functions */
void led_setvalue(long value) {
if (value == 0)
- as_gpio_set_pin_value(led, 1);
- else
as_gpio_set_pin_value(led, 0);
+ else
+ as_gpio_set_pin_value(led, 1);
return;
}
diff --git a/target/packages/straton_ios/apf51_ios.h b/target/packages/straton_ios/apf51_ios.h
index c26ec1e..f6a7df2 100644
--- a/target/packages/straton_ios/apf51_ios.h
+++ b/target/packages/straton_ios/apf51_ios.h
@@ -1,4 +1,4 @@
-#define PROFIL_NAME "APF27"
+#define PROFIL_NAME "APF51"
/* IO TYPE */
#define IO_LED 0
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 09:55:10
|
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 8ca4a12b22aa9960765d2dd6fb62ec8cea95f698 (commit)
via f5b259d55302769f96e69fd6d0c3ed4c8276d2e2 (commit)
via f22d01dad2f629853b7dfedbe58a59b3ce25b7bb (commit)
from e2223d6de323d3a1a278b040c54cebb490c083ea (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 8ca4a12b22aa9960765d2dd6fb62ec8cea95f698
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:53:13 2011 +0200
[buildroot][package][straton_ios] adding support for apf51
commit f5b259d55302769f96e69fd6d0c3ed4c8276d2e2
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:04:19 2011 +0200
[buildroot][package][as_devices] new version number -> 0.16
commit f22d01dad2f629853b7dfedbe58a59b3ce25b7bb
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:03:17 2011 +0200
[buildroot][package][straton_ios] as_gpio_open has changed
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
.../package/armadeus/straton_ios/straton_ios.mk | 4 ++--
target/packages/straton_ios/Makefile | 3 ++-
.../straton_ios/{straton_ios.c => apf27_ios.c} | 10 +++++-----
.../straton_ios/{straton_ios.h => apf27_ios.h} | 0
.../straton_ios/{straton_ios.c => apf51_ios.c} | 10 +++++-----
.../straton_ios/{straton_ios.h => apf51_ios.h} | 0
7 files changed, 15 insertions(+), 14 deletions(-)
copy target/packages/straton_ios/{straton_ios.c => apf27_ios.c} (91%)
copy target/packages/straton_ios/{straton_ios.h => apf27_ios.h} (100%)
rename target/packages/straton_ios/{straton_ios.c => apf51_ios.c} (91%)
rename target/packages/straton_ios/{straton_ios.h => apf51_ios.h} (100%)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index c1d6faa..08c4c6d 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,7 @@
PYTHON:=python2.4
-AS_DEVICES_VER:=0.15
+AS_DEVICES_VER:=0.16
AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
AS_DEVICES_CAT:=zcat
diff --git a/buildroot/package/armadeus/straton_ios/straton_ios.mk b/buildroot/package/armadeus/straton_ios/straton_ios.mk
index f08a5dd..703d3cc 100644
--- a/buildroot/package/armadeus/straton_ios/straton_ios.mk
+++ b/buildroot/package/armadeus/straton_ios/straton_ios.mk
@@ -13,13 +13,13 @@ STRATON_IOS_SITE=$(TOPDIR)/../target/packages/straton_ios
define STRATON_IOS_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
- BOARD_NAME=$(BOARD_NAME) -C $(@D)
+ BOARD_NAME=$(BR2_BOARD_NAME) -C $(@D)
endef
define STRATON_IOS_INSTALL_STAGING_CMDS
$(INSTALL) -m 0755 $(STRATON_IOS_DIR)/$(STRATON_IOS_BINARY)* $(STAGING_DIR)/usr/lib/
mkdir -p $(STAGING_DIR)/usr/include/straton_ios/
- $(INSTALL) -m 644 $(STRATON_IOS_DIR)/straton_ios.h $(STAGING_DIR)/usr/include/straton_ios/
+ $(INSTALL) -m 644 $(STRATON_IOS_DIR)/$(BR2_BOARD_NAME)_ios.h $(STAGING_DIR)/usr/include/straton_ios/straton_ios.h
endef
define STRATON_IOS_INSTALL_TARGET_CMDS
diff --git a/target/packages/straton_ios/Makefile b/target/packages/straton_ios/Makefile
index 59e3293..ec06682 100644
--- a/target/packages/straton_ios/Makefile
+++ b/target/packages/straton_ios/Makefile
@@ -1,4 +1,5 @@
-OBJ = straton_ios.o
+
+OBJ= $(strip $(BOARD_NAME))_ios.o
LIBRARY=straton_ios
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/apf27_ios.c
similarity index 91%
copy from target/packages/straton_ios/straton_ios.c
copy to target/packages/straton_ios/apf27_ios.c
index 7bbc339..b172a86 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/apf27_ios.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "straton_ios.h"
+#include "apf27_ios.h"
#include <as_gpio.h>
static struct as_gpio_device *led;
@@ -21,16 +21,16 @@ long button_getvalue(void){
/* straton api */
int straton_ios_init(void) {
- /* init BUTTON */
- button = as_gpio_open('F', 13);
+ /* init BUTTON (portF13)*/
+ button = as_gpio_open(173);
if (button == NULL) {
printf("IO error: Can't initialize button\n");
goto error;
}
as_gpio_set_pin_direction(button, "in");
- /* init LED */
- led = as_gpio_open('F', 14);
+ /* init LED (portF14)*/
+ led = as_gpio_open(174);
if (led == NULL) {
printf("IO error: Can't initialize led\n");
goto close_button_error;
diff --git a/target/packages/straton_ios/straton_ios.h b/target/packages/straton_ios/apf27_ios.h
similarity index 100%
copy from target/packages/straton_ios/straton_ios.h
copy to target/packages/straton_ios/apf27_ios.h
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/apf51_ios.c
similarity index 91%
rename from target/packages/straton_ios/straton_ios.c
rename to target/packages/straton_ios/apf51_ios.c
index 7bbc339..660281a 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "straton_ios.h"
+#include "apf27_ios.h"
#include <as_gpio.h>
static struct as_gpio_device *led;
@@ -21,16 +21,16 @@ long button_getvalue(void){
/* straton api */
int straton_ios_init(void) {
- /* init BUTTON */
- button = as_gpio_open('F', 13);
+ /* init BUTTON (GPIO1_3)*/
+ button = as_gpio_open(3);
if (button == NULL) {
printf("IO error: Can't initialize button\n");
goto error;
}
as_gpio_set_pin_direction(button, "in");
- /* init LED */
- led = as_gpio_open('F', 14);
+ /* init LED (GPIO1_2)*/
+ led = as_gpio_open(2);
if (led == NULL) {
printf("IO error: Can't initialize led\n");
goto close_button_error;
diff --git a/target/packages/straton_ios/straton_ios.h b/target/packages/straton_ios/apf51_ios.h
similarity index 100%
rename from target/packages/straton_ios/straton_ios.h
rename to target/packages/straton_ios/apf51_ios.h
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-23 09: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 e2223d6de323d3a1a278b040c54cebb490c083ea (commit)
via 157724ee30cb26ac3616ddafbffae2bffd183545 (commit)
from a52f4784714ed961b9697c538e36387f96b46029 (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 e2223d6de323d3a1a278b040c54cebb490c083ea
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:00:17 2011 +0200
[buidroot][package][as_devices] Change as_gpio_open() argument, use gpio number instead of port letter plus pin number
commit 157724ee30cb26ac3616ddafbffae2bffd183545
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jun 23 09:50:58 2011 +0200
[buildroot][package][anybusd] Add anybusd in armadeus package
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/anybusd/Config.in | 4 +
buildroot/package/armadeus/anybusd/anybusd.mk | 21 ++
.../package/armadeus/as_devices/as_devices.mk | 2 +-
.../mcp25020_ctrl => packages/anybusd}/Makefile | 23 +--
target/packages/anybusd/S60anybusd | 41 ++++
target/packages/anybusd/anybusd.c | 201 ++++++++++++++++++++
target/packages/as_devices/Makefile | 2 +-
target/packages/as_devices/c/as_gpio.c | 32 +---
target/packages/as_devices/c/as_gpio.h | 14 +--
target/packages/as_devices/c/as_gpio_2_6_29.c | 17 +-
target/packages/as_devices/cpp/as_gpio.cpp | 25 +--
target/packages/as_devices/cpp/as_gpio.hpp | 4 +-
.../packages/as_devices/python/AsDevices/AsGpio.py | 16 +--
target/packages/as_devices/python/Makefile | 1 -
.../packages/as_devices/python/src/AsGpio_wrap.c | 51 +-----
target/packages/as_devices/test_c.h | 39 +---
17 files changed, 317 insertions(+), 177 deletions(-)
create mode 100644 buildroot/package/armadeus/anybusd/Config.in
create mode 100644 buildroot/package/armadeus/anybusd/anybusd.mk
copy target/{demos/mcp25020_ctrl => packages/anybusd}/Makefile (51%)
create mode 100755 target/packages/anybusd/S60anybusd
create mode 100644 target/packages/anybusd/anybusd.c
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index b09e93e..8a450e2 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,6 +1,7 @@
menu "Armadeus specific tools/utilities"
source package/armadeus/ad9889ctrl/Config.in
+source package/armadeus/anybusd/Config.in
source package/armadeus/as_devices/Config.in
source package/armadeus/ch7024ctrl/Config.in
source package/armadeus/demos/Config.in
diff --git a/buildroot/package/armadeus/anybusd/Config.in b/buildroot/package/armadeus/anybusd/Config.in
new file mode 100644
index 0000000..e822ab1
--- /dev/null
+++ b/buildroot/package/armadeus/anybusd/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_ANYBUSD
+ bool "anybusd"
+ help
+ Socket daemon for anybus module
diff --git a/buildroot/package/armadeus/anybusd/anybusd.mk b/buildroot/package/armadeus/anybusd/anybusd.mk
new file mode 100644
index 0000000..f5fbe28
--- /dev/null
+++ b/buildroot/package/armadeus/anybusd/anybusd.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# anybusd
+#
+#############################################################
+ANYBUSD_VERSION = 0.1
+ANYBUSD_BIN_NAME = anybusd
+ANYBUSD_INIT_SCRIPT_NAME = S60anybusd
+ANYBUSD_SITE=$(TOPDIR)/../target/packages/anybusd/
+ANYBUSD_SITE_METHOD=copy
+
+define ANYBUSD_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D) all
+endef
+
+define ANYBUSD_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(ANYBUSD_DIR)/$(ANYBUSD_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUSD_BIN_NAME)
+ $(INSTALL) -m 0755 $(ANYBUSD_DIR)/$(ANYBUSD_INIT_SCRIPT_NAME) $(TARGET_DIR)/etc/init.d/$(ANYBUSD_INIT_SCRIPT_NAME)
+endef
+
+$(eval $(call GENTARGETS,package,anybusd))
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index f609288..c1d6faa 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -105,7 +105,7 @@ $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY): python $(AS_DEVICES_DIR)/pytho
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY)/wrappers/*.so
$(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY): python $(AS_DEVICES_DIR)/python/Makefile
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/python
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/python STAGING_DIR=$(STAGING_DIR)
endif
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/packages/anybusd/Makefile
similarity index 51%
copy from target/demos/mcp25020_ctrl/Makefile
copy to target/packages/anybusd/Makefile
index 10882e3..1b7e984 100644
--- a/target/demos/mcp25020_ctrl/Makefile
+++ b/target/packages/anybusd/Makefile
@@ -3,38 +3,29 @@ ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
-INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
-INIT_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
+INITD_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d/
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
DEFINES=TARGET
CFLAGS= -Wall
-EXEC=mcp25020_ctrl
+EXEC=anybusd
+INIT_SCRIPT=S60anybusd
default: $(EXEC)
all: $(EXEC)
-mcp25020_ctrl.o: mcp25020_ctrl.c
+anybusd.o: anybusd.c
$(CC) $(CFLAGS) -c -o $@ $^
-$(EXEC): mcp25020_ctrl.o
+$(EXEC): anybusd.o
$(CC) $(LDFLAGS) -o $@ $^
-install: $(EXEC)
- mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
- cp init_can.sh $(INIT_DIR)/S50init_can.sh
- $(STRIP) $(INSTALL_DIR)/$^
-
-uninstall:
- rm -f $(INSTALL_DIR)/$(EXEC)
- rm -f $(INIT_DIR)/S50init_can.sh
-
clean:
- rm -rf mcp25020_ctrl
+ rm -rf anybusd
rm -rf *.o
.PHONY: clean install uninstall
diff --git a/target/packages/anybusd/S60anybusd b/target/packages/anybusd/S60anybusd
new file mode 100755
index 0000000..9a169fd
--- /dev/null
+++ b/target/packages/anybusd/S60anybusd
@@ -0,0 +1,41 @@
+#! /bin/sh
+
+start() {
+ modprobe anybus_interface_platform
+ modprobe anybus_interface
+ echo -n "Starting Anybusd: "
+ anybusd
+ echo "done"
+}
+
+stop() {
+ rmmod anybus_interface
+ rmmod anybus_interface_platform
+ echo -n "Stopping Anybusd: "
+ killall anybusd
+ echo "done"
+}
+
+restart() {
+ stop
+ start
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|reload|restart}"
+ exit 1
+esac
+
+exit $?
+
diff --git a/target/packages/anybusd/anybusd.c b/target/packages/anybusd/anybusd.c
new file mode 100644
index 0000000..6ec51cb
--- /dev/null
+++ b/target/packages/anybusd/anybusd.c
@@ -0,0 +1,201 @@
+/*
+ * Daemon for interface with HMS Anybus module through FPGA.
+ * (Driver anybus_interface is required)
+ *
+ * Copyright (C) 2011 <jol...@gm...>
+ * Armadeus Systems
+ *
+ * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <signal.h>
+#include <arpa/inet.h>
+#include <errno.h>
+
+#define DAEMON_NAME "anybusd"
+#define PID_FILE "/var/run/anybusd.pid"
+
+/* ctrl_register on Wishbone bus */
+#define ANYBUS_TRANSMIT 0x0002
+#define ANYBUS_RECEIVE 0x0004
+#define ANYBUS_4_CLOCK_CYCLES 0x0020
+#define ANYBUS_TRANSMISSION_ERROR 0x0001
+
+/* FPGA registers*/
+#define CTRL_REG 0x0002
+#define ADDRESS_REG 0x0004
+#define DATA_REG 0x0006
+
+#define ACTION 0x10
+
+/* Indication register on AnyBus module */
+#define ANYBUS_SEND 0x80
+#define ANYBUS_ACK 0x40
+
+#define PORT 4037
+
+void signal_handler(int sig)
+{
+ switch(sig) {
+ case SIGTERM:
+ exit(0);
+ break;
+ default:
+ break;
+ }
+}
+
+void write_fpga(unsigned short address, unsigned short value, void* fpga_mem)
+{
+ *(unsigned short*)(fpga_mem+(address)) = value;
+}
+
+unsigned short read_fpga(unsigned short address, void* fpga_mem)
+{
+ return *(unsigned short*)(fpga_mem+(address));
+}
+
+int write_anybus(unsigned short address, unsigned short value, void* fpga_mem)
+{
+ int n;
+ write_fpga(ADDRESS_REG, address, fpga_mem);
+ write_fpga(DATA_REG, value, fpga_mem);
+ write_fpga(CTRL_REG, ANYBUS_4_CLOCK_CYCLES | ANYBUS_TRANSMIT, fpga_mem);
+
+ if ((n = read_fpga(CTRL_REG, fpga_mem)) & ANYBUS_TRANSMISSION_ERROR) {
+ return -1;
+ }
+ return 0;
+}
+
+int read_anybus(unsigned short address, void* fpga_mem)
+{
+ int n;
+ write_fpga(ADDRESS_REG, address, fpga_mem);
+ write_fpga(CTRL_REG, ANYBUS_4_CLOCK_CYCLES | ANYBUS_RECEIVE, fpga_mem);
+
+ if ((n = read_fpga(CTRL_REG, fpga_mem)) & ANYBUS_TRANSMISSION_ERROR) {
+ return -1;
+ }
+ return read_fpga(DATA_REG, fpga_mem);
+}
+
+int main(int argc, char *argv[])
+{
+ int file_mem;
+ socklen_t sinsize;
+ int listening_socket, socket_client;
+ struct sockaddr_in sin, csin;
+ void* fpga_mem;
+ pid_t pid, sid;
+ char buffer[5];
+ int n, ret;
+ int value;
+
+ signal(SIGTERM, signal_handler);
+
+ pid = fork();
+
+ if (pid < 0) {
+ exit(EXIT_FAILURE);
+ }
+
+ if (pid > 0) {
+ exit(EXIT_SUCCESS);
+ }
+
+ sid = setsid();
+ if (sid < 0) {
+ exit(EXIT_FAILURE);
+ }
+
+ file_mem = open("/dev/anybus_interface", O_RDWR|O_SYNC);
+ if (file_mem < 0) {
+ printf("Can't open /dev/anybus_interface\n");
+ return -1;
+ }
+
+ fpga_mem = mmap(0, 4, PROT_READ|PROT_WRITE, MAP_SHARED, file_mem, 0);
+ if (fpga_mem == MAP_FAILED) {
+ printf("mmap failed\n");
+ close(file_mem);
+ return -1;
+ }
+
+ listening_socket = socket(AF_INET, SOCK_STREAM, 0);
+ if(listening_socket == -1) {
+ perror("socket()");
+ exit(errno);
+ }
+
+ sin.sin_addr.s_addr = htonl(INADDR_ANY);
+ sin.sin_family = AF_INET;
+
+ sin.sin_port = htons(PORT);
+
+ if(bind (listening_socket, (struct sockaddr *) &sin, sizeof sin) == -1) {
+ perror("bind()");
+ exit(errno);
+ }
+
+ if(listen(listening_socket, 1) == -1) {
+ perror("listen()");
+ exit(errno);
+ }
+ sinsize = sizeof csin;
+
+ while(1) {
+ socket_client = accept(listening_socket, (struct sockaddr *)&csin, &sinsize);
+
+ if(socket_client == -1) {
+ perror("accept()");
+ exit(errno);
+ }
+
+ ret = 0;
+
+ while(((n = recv(socket_client,buffer, sizeof buffer, MSG_WAITALL)) > 0) && (ret >= 0)) {
+
+ if(n == 5) {
+ if (buffer[0] == 's') {
+ while(write_anybus((buffer[1] << 8) + buffer[2], (buffer[3] << 4) + buffer[4], fpga_mem) < 0);
+ }
+ else if (buffer[0] == 'r') {
+ value = -1;
+ while((value = read_anybus((buffer[1] << 8) + buffer[2], fpga_mem)) < 0);
+ buffer[3] = value >> 8;
+ buffer[4] = value & 0x00FF;
+ ret = send(socket_client, buffer, sizeof buffer, 0);
+ }
+ }
+ }
+
+ close(socket_client);
+ }
+ close(file_mem);
+ close(listening_socket);
+
+ return 0;
+}
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 94fd1a2..f2de2ec 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -40,7 +40,7 @@ $(C_LIB):
make -C c/
$(P_WRAPPER):
- make -C python/
+ make -C python/ STAGING_DIR=$(STAGING_DIR)
touch $(P_WRAPPER)
install:
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index eb3333b..826d128 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -39,32 +39,21 @@
/*------------------------------------------------------------------------------*/
-struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
+struct as_gpio_device *as_gpio_open(int aGpioNum)
{
struct as_gpio_device *dev;
int pin_file;
int export_file;
int retval;
- int port_num;
char buf[BUFF_SIZE];
- if (((aPortChar - 'A') > 5) || ((aPortChar - 'A') < 0) ) {
- ERROR("Wrong port name %c\n", aPortChar);
- return NULL;
- }
- if ((aPinNum < 0) || (aPinNum >= PORT_SIZE)) {
- ERROR("Wrong port num %d\n", aPinNum);
- return NULL;
- }
- port_num = (aPortChar-'A')*PORT_SIZE + aPinNum;
-
export_file = open("/sys/class/gpio/export", O_WRONLY);
if (export_file < 0) {
ERROR("Can't open /sys/class/gpio/export\nBe sure that gpiolib is under your kernel\n");
return NULL;
}
- retval = as_write_buffer(export_file, port_num);
+ retval = as_write_buffer(export_file, aGpioNum);
if (retval < 0) {
ERROR("/sys/class/gpio/export can't be written\n");
close(export_file);
@@ -74,10 +63,10 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
sleep(1); //XXX
- snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/value", port_num);
+ snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/value", aGpioNum);
pin_file = open(buf, O_RDWR);
if (pin_file < 0) {
- ERROR("Can't export gpio number %d (port %c pin %d)\n", port_num, aPortChar, aPinNum);
+ ERROR("Can't export gpio number %d\n", aGpioNum);
return NULL;
}
close(pin_file);
@@ -88,9 +77,7 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
return NULL;
}
- dev->port_num = port_num;
- dev->port_letter = aPortChar;
- dev->pin_number = aPinNum;
+ dev->port_num = aGpioNum;
return dev;
}
@@ -286,14 +273,7 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *gpio_dev, char *mode)
int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
{
- return aDev->pin_number;
-}
-
-/*------------------------------------------------------------------------------*/
-
-char as_gpio_get_port_letter(struct as_gpio_device *aDev)
-{
- return aDev->port_letter;
+ return aDev->port_num;
}
/*------------------------------------------------------------------------------*/
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index b2b241f..1352f6f 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -40,7 +40,6 @@ extern "C" {
*/
struct as_gpio_device {
int port_num;
- char port_letter;
int pin_number;
int fpin; /* pin file for 2.6.29 interface*/
int irq_mode;
@@ -48,12 +47,11 @@ struct as_gpio_device {
/** @brief Initialize port access
*
- * @param aPortChar character port in UPPER case
- * @param aPinNum int pin number
+ * @param aGpioNum int pin number
*
* @return error if negative value
*/
-struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum);
+struct as_gpio_device *as_gpio_open(int aGpioNum);
/** @brief Set pin direction
*
@@ -125,14 +123,6 @@ const char* as_gpio_get_irq_mode(struct as_gpio_device *gpio_dev);
*/
int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev);
-/** @brief Get port letter
- *
- * @param aDev as_gpio_device pointer structure
- *
- * @return port letter, error if negative
- */
-char as_gpio_get_port_letter(struct as_gpio_device *aDev);
-
/** @brief Close port access
*
* @param aDev as_gpio_device pointer structure
diff --git a/target/packages/as_devices/c/as_gpio_2_6_29.c b/target/packages/as_devices/c/as_gpio_2_6_29.c
index a4c65c7..3c1702a 100644
--- a/target/packages/as_devices/c/as_gpio_2_6_29.c
+++ b/target/packages/as_devices/c/as_gpio_2_6_29.c
@@ -57,14 +57,20 @@
/*------------------------------------------------------------------------------*/
-struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
+struct as_gpio_device *as_gpio_open(int aGpioNum)
{
+ char aPortChar;
+ int aPinNum;
+
struct as_gpio_device *dev;
char gpio_file_path[50];
int ret = 0;
int file;
int value;
+ aPortChar = (aGpioNum/32) + 'A';
+ aPinNum = aGpioNum - (aPortChar-'A');
+
/* make gpio port string path */
ret = snprintf(gpio_file_path,50, "%s%c%d",
GPIO_BASE_PIN, aPortChar, aPinNum);
@@ -271,14 +277,7 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
{
- return aDev->pin_number;
-}
-
-/*------------------------------------------------------------------------------*/
-
-int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev)
-{
- return aDev->port_letter;
+ return aDev->pin_number + ((aDev->port_letter-'A')*32);
}
/*------------------------------------------------------------------------------*/
diff --git a/target/packages/as_devices/cpp/as_gpio.cpp b/target/packages/as_devices/cpp/as_gpio.cpp
index e3b5580..a4a7034 100644
--- a/target/packages/as_devices/cpp/as_gpio.cpp
+++ b/target/packages/as_devices/cpp/as_gpio.cpp
@@ -25,12 +25,12 @@
/** @brief Constructor: Initialize port access
*
- * @param aPortChar character port in UPPER case
- * @param aPinNum int pin number
+ * @param aGpioNum gpio number
+ *
*/
-AsGpio::AsGpio(char aPortChar, int aPinNum)
+AsGpio::AsGpio(int aGpioNum)
{
- mDev = as_gpio_open(aPortChar, aPinNum);
+ mDev = as_gpio_open(aGpioNum);
}
AsGpio::~AsGpio()
@@ -195,20 +195,3 @@ long AsGpio::getPinNum() const
}
}
-/** @brief Get port letter
- *
- * @return port letter
- */
-char AsGpio::getPortLetter() const
-{
- if (mDev != NULL)
- {
- return as_gpio_get_port_letter(mDev);
- }
- else
- {
- std::cerr<<"AsGpio device structure not allocated"<<std::endl;
- return '?';
- }
-}
-
diff --git a/target/packages/as_devices/cpp/as_gpio.hpp b/target/packages/as_devices/cpp/as_gpio.hpp
index cdd2966..d92f701 100644
--- a/target/packages/as_devices/cpp/as_gpio.hpp
+++ b/target/packages/as_devices/cpp/as_gpio.hpp
@@ -28,7 +28,7 @@
class AsGpio
{
public:
- AsGpio(char aPortChar, int aPinNum);
+ AsGpio(int aGpioNum);
virtual ~AsGpio();
long setPinDirection(char* aDirection);
@@ -43,8 +43,6 @@ public:
long getPinNum() const;
- char getPortLetter() const;
-
protected:
mutable struct as_gpio_device *mDev;
};
diff --git a/target/packages/as_devices/python/AsDevices/AsGpio.py b/target/packages/as_devices/python/AsDevices/AsGpio.py
index 2ea71c1..9cce37b 100644
--- a/target/packages/as_devices/python/AsDevices/AsGpio.py
+++ b/target/packages/as_devices/python/AsDevices/AsGpio.py
@@ -40,12 +40,11 @@ class AsGpioError(Exception):
class AsGpio:
""" Drive GPIO
"""
- def __init__(self, aPortLetter, aPinNum):
+ def __init__(self, aGpioNum):
try:
- self.__device = wrapper.gpio_open(aPortLetter, aPinNum)
+ self.__device = wrapper.gpio_open(aPinNum)
except Exception, e:
- raise AsGpioError("Can't open GPIO port "+str(aPortLetter)+\
- " pin "+str(aPinNum)+": "+str(e))
+ raise AsGpioError("Can't open GPIO number "+str(aGpioNum))
def __del__(self):
try:
@@ -131,12 +130,3 @@ class AsGpio:
except Exception, e:
raise AsGpioError(str(e))
- def getPortLetter(self):
- """ Get pin letter
- \param return pin letter
- """
- try:
- return wrapper.getPortLetter(self.__device)
- except Exception, e:
- raise AsGpioError(str(e))
-
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index a3c22b5..cb2af95 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -23,7 +23,6 @@ WRAPPER_DIR=src
PYTHON_VERS=2.4
PYTHON_SUBVERS=5
-STAGING_DIR=$(ARMADEUS_STAGING_DIR)
PYINC=$(STAGING_DIR)/usr/include/python2.4/
PYLIB=$(ARMADEUS_TARGET_DIR)/usr/lib/python$(PYTHON_VERS)
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.c b/target/packages/as_devices/python/src/AsGpio_wrap.c
index 9f6472a..7b594a8 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.c
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.c
@@ -32,7 +32,6 @@ static PyMethodDef AsGpio_wrap_methods[] = {
{"blockingGetPinValue", blockingGetPinValue, METH_VARARGS, "Blocking read pin value"},
{"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
{"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
- {"getPortLetter", getPortLetter, METH_VARARGS, "Get port letter"},
{"getPinNumber", getPinNumber, METH_VARARGS, "Get pin number"},
{"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
{NULL, NULL, 0, NULL} /* Sentinel */
@@ -45,33 +44,31 @@ void initAsGpio_wrap() /* called on first import */
}
/** @brief Initialize pin port access
- * @param aPortChar character port in UPPER case
- * @param aPinNum pin number on port
+ * @param aGpioNum pin number on port
* @return PyObject
*/
static PyObject * gpio_open(PyObject *self, PyObject *args)
{
/* parameters */
- char aPortChar;
- int aPinNum;
+ int aGpioNum;
struct as_gpio_device *dev;
PyObject *ret;
char buff[300];
/* Get arguments */
- if (!PyArg_ParseTuple(args, "ci", &aPortChar, &aPinNum))
+ if (!PyArg_ParseTuple(args, "i", &aGpioNum))
{
PyErr_SetString(PyExc_IOError,
"Wrong parameters.");
return NULL;
}
- dev = as_gpio_open(aPortChar, aPinNum);
+ dev = as_gpio_open(aGpioNum);
if (dev == NULL)
{
snprintf(buff, 300,
- "Initialization error P%c%d. Is kernel module loaded ?",
- aPortChar, aPinNum);
+ "Initialization error %d. Is kernel module loaded ?",
+ aGpioNum);
PyErr_SetString(PyExc_IOError,buff);
return NULL;
}
@@ -351,42 +348,6 @@ static PyObject * getPinNumber(PyObject *self, PyObject *args)
return Py_BuildValue("i", ret);
}
-/** @brief Get port letter
- *
- * @param aDev as_gpio_device pointer structure
- *
- * @return port letter, error if negative
- */
-static PyObject * getPortLetter(PyObject *self, PyObject *args)
-{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- char buf[2];
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_get_port_letter(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
- buf[0] = ret;
- buf[1] = '\0';
-
- return Py_BuildValue("s", buf);
-
-}
-
/** @brief Close port access
*
* @param aFdev as_gpio_device structure pointer
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index 9a1def3..6300126 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -438,8 +438,7 @@ void test_gpio()
struct as_gpio_device *gpio_dev;
int32_t ret;
int32_t value;
- char port_letter = 'F';
- int pin_num = 13;
+ int pin_num = 173; /* default F13 */
int port_direction = 0;
int port_value = 1;
int platform;
@@ -447,24 +446,21 @@ void test_gpio()
platform = as_helpers_get_platform();
switch (platform) {
case APF9328:
- port_letter = 'X';
pin_num = 0x007;
break;
case APF27:
- port_letter = 'F';
- pin_num = 13;
+ pin_num = 173;
break;
case APF51:
- port_letter = 'A';
pin_num = 3;
break;
default:
break;
}
- gpio_dev = as_gpio_open(port_letter, pin_num);
+ gpio_dev = as_gpio_open(pin_num);
if (gpio_dev == NULL)
{
- printf("Error can't open gpio %c\nHave you run loadgpio.sh ?\n", port_letter);
+ printf("Error can't open gpio %d\nHave you got gpiolib ?\n", pin_num);
pressEnterToContinue();
return ;
}
@@ -481,11 +477,10 @@ void test_gpio()
{
system("clear");
printf("**************************\n");
- printf(" Testing GPIO Port%c%d \n", port_letter, pin_num);
+ printf(" Testing GPIO Port%d \n", pin_num);
printf("**************************\n");
printf("Choose ('q' to quit):\n");
- printf(" 1) Change gpio (P%c%d)\n", as_gpio_get_port_letter(gpio_dev),
- as_gpio_get_pin_num(gpio_dev));
+ printf(" 1) Change gpio (%d)\n", as_gpio_get_pin_num(gpio_dev));
printf(" 2) Change direction (%s)\n", as_gpio_get_pin_direction(gpio_dev));
printf(" 3) Change value (%d)\n", as_gpio_get_pin_value(gpio_dev));
printf(" 4) Read pin value\n");
@@ -497,31 +492,17 @@ void test_gpio()
switch (buffer[0])
{
- case '1' : printf("Give letter of port in upper case : ");
- scanf("%s", buffer);
- if (buffer[0] != port_letter)
- {
- ret = as_gpio_close(gpio_dev);
- if(ret < 0)
- {
- printf("Error, can't close gpio\n");
- pressEnterToContinue();
- break;
- }
- }
- port_letter = buffer[0];
-
- printf("Give pin number : ");
+ case '1' : printf("Give pin number : ");
scanf("%d", &pin_num);
- gpio_dev = as_gpio_open(port_letter,pin_num);
+ gpio_dev = as_gpio_open(pin_num);
if (gpio_dev == NULL)
{
- printf("Error, can't open P%c%d\n", port_letter, pin_num);
+ printf("Error, can't open %d\n", pin_num);
pressEnterToContinue();
break;
}
- printf("Ok P%c%d is open\n", port_letter, pin_num);
+ printf("Ok %d is open\n", pin_num);
pressEnterToContinue();
break;
case '2' : printf("Give direction (in/out) : ");
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-22 16:12:54
|
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 a52f4784714ed961b9697c538e36387f96b46029 (commit)
via ed0899b62e13d89deb6cb4bfb6bf5e99a07cb948 (commit)
via b9f9ac0c43275207ede6f94c0d5221b3652409e3 (commit)
from 18af4bc2ad309cab9a7ba7c8df87d20c624ef066 (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 a52f4784714ed961b9697c538e36387f96b46029
Merge: ed0899b62e13d89deb6cb4bfb6bf5e99a07cb948 18af4bc2ad309cab9a7ba7c8df87d20c624ef066
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 22 18:12:17 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ed0899b62e13d89deb6cb4bfb6bf5e99a07cb948
Author: Kevin JOLY <jol...@gm...>
Date: Wed Jun 22 17:55:02 2011 +0200
Rename some functions in mcp25020_ctrl and add GPL licence
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
commit b9f9ac0c43275207ede6f94c0d5221b3652409e3
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 22 17:59:58 2011 +0200
[buildroot][package][straton_ios] adding message when close io
-----------------------------------------------------------------------
Summary of changes:
target/demos/mcp25020_ctrl/mcp25020_ctrl.c | 37 ++++++++++++++++++++++------
target/packages/straton_ios/straton_ios.c | 1 +
2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/target/demos/mcp25020_ctrl/mcp25020_ctrl.c b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
index fb964a3..e4c3bdd 100644
--- a/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
+++ b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
@@ -1,3 +1,24 @@
+/*
+ * Drive a Microchip mcp25020 through CAN bus with Armadeus APF
+ *
+ * Copyright (C) 2011 <jol...@gm...>
+ * Armadeus Systems
+ *
+ * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +47,7 @@
#define LED_ON 0x00
void listen_mode(int can_socket);
-void led_flash(int can_socket, int interval);
+void led_blink(int can_socket, int interval);
void set_led_state(int can_socket, int state);
void sw2_get(int can_socket);
void read_config(int can_socket);
@@ -75,19 +96,19 @@ int main(int argc, char **argv)
if (strcmp(argv[1], "listen") == 0) {
listen_mode(can_socket);/* Entering in listen mode */
- } else if(strcmp(argv[1], "led-flash") == 0) {
+ } else if(strcmp(argv[1], "led-blink") == 0) {
if (argc < 3) {
- printf("led-flash : Please specify the flashing interval in ms (1 to 10000)\n");
+ printf("led-blink : Please specify the blinking interval in ms (1 to 10000)\n");
return EXIT_SUCCESS;
}
if ((atoi(argv[2]) < 1) || (atoi(argv[2]) > 10000)) {
- printf("led-flash : Please specify the flashing interval in ms (1 to 10000)\n");
+ printf("led-blink : Please specify the blinking interval in ms (1 to 10000)\n");
return EXIT_SUCCESS;
}
- led_flash(can_socket, atoi(argv[2]));/* Entering in led flashing mode */
+ led_blink(can_socket, atoi(argv[2]));/* Entering in led blinking mode */
} else if(strcmp(argv[1], "led-state") == 0) {
if (argc < 3) {
@@ -142,7 +163,7 @@ void listen_mode(int can_socket)
}
}
-void led_flash(int can_socket, int interval)
+void led_blink(int can_socket, int interval)
{
struct can_frame frameToSend;
@@ -156,7 +177,7 @@ void led_flash(int can_socket, int interval)
frameToSend.data[2] ^= 0x10; /* Invert the output bit of the LED */
if (write(can_socket, &frameToSend, sizeof(frameToSend)) != sizeof(frameToSend)) {
- perror("led_flash write");
+ perror("led_blink write");
return;
}
@@ -277,7 +298,7 @@ void display_help()
printf("This sofware is a demonstration. It show how to communicate with a MICROCHIP MCP25020 using the can bus with socketCAN\n\n");
printf("USE: can_mcp25020 [TEST]\nTEST are:\n");
printf("\tlisten : Listen on the can bus\n");
- printf("\tled-flash [INTERVAL]: flash the D6 led. You must specify the flashing interval in ms (1 to 10000 ms)\n");
+ printf("\tled-blink [INTERVAL]: blink the D6 led. You must specify the blinking interval in ms (1 to 10000 ms)\n");
printf("\tled-state [ON | OFF]: turn the D6 led on the specified state (ON or OFF)\n");
printf("\tsw2-get : get the value of the switch SW2\n");
printf("\tCONFIG : get the value of several config registers\n\n");
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/straton_ios.c
index 3a2196f..7bbc339 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/straton_ios.c
@@ -47,6 +47,7 @@ error:
}
void straton_ios_close(void) {
+ printf("Straton_ios: close\n");
/* close BUTTON */
as_gpio_close(button);
/* close LED */
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-06-22 13:04: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 18af4bc2ad309cab9a7ba7c8df87d20c624ef066 (commit)
via 3a43fb168e590673519dd9bb3c37fa75a822d00f (commit)
from a9783d21479a11e4974b97ff59e8179255c73572 (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 18af4bc2ad309cab9a7ba7c8df87d20c624ef066
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 22 15:02:57 2011 +0200
[TOOLS] uboot_recover: updates U-Boot image for APF51
commit 3a43fb168e590673519dd9bb3c37fa75a822d00f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 22 14:46:18 2011 +0200
[LINUX] 2.6.29: Add gpiolib support for APF27
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 5 +-
...gpios_functions_to_have_a_working_gpiolib.patch | 56 ++++++++++++++++++++
software/uboot_recover/apf51-u-boot.bin | Bin 251828 -> 251756 bytes
3 files changed, 58 insertions(+), 3 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/366-armadeus-gpio-backport_some_gpios_functions_to_have_a_working_gpiolib.patch
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 76b117a..873c39a 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
-# Wed May 18 11:57:38 2011
+# Tue Jun 21 18:13:55 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -71,7 +71,6 @@ 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
@@ -891,7 +890,7 @@ CONFIG_SPI_MXC_SELECT2=y
CONFIG_SPI_TSC2102=m
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/366-armadeus-gpio-backport_some_gpios_functions_to_have_a_working_gpiolib.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/366-armadeus-gpio-backport_some_gpios_functions_to_have_a_working_gpiolib.patch
new file mode 100644
index 0000000..f7dc98c
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/366-armadeus-gpio-backport_some_gpios_functions_to_have_a_working_gpiolib.patch
@@ -0,0 +1,56 @@
+Makes mxc_gpio_direction_output() actually configure pin as GPIO.
+(backport from 2.6.38)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/plat-mxc/gpio.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/gpio.c 2011-06-22 09:59:15.000000000 +0200
++++ linux-2.6.29.6/arch/arm/plat-mxc/gpio.c 2011-06-22 10:04:31.000000000 +0200
+@@ -29,6 +29,12 @@
+ static struct mxc_gpio_port *mxc_gpio_ports;
+ static int gpio_table_size;
+
++#if defined(CONFIG_ARCH_MX2) || defined(CONFIG_ARCH_MX1)
++# define GPIO_OCR1 0x04
++# define GPIO_OCR2 0x08
++# define GPIO_GIUS 0x20
++#endif
++
+ /* Note: This driver assumes 32 GPIOs are handled in one register */
+
+ static void _clear_gpio_irqstatus(struct mxc_gpio_port *port, u32 index)
+@@ -247,8 +253,32 @@
+ static int mxc_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+ {
+- _set_gpio_direction(chip, offset, 1);
++ struct mxc_gpio_port *port =
++ container_of(chip, struct mxc_gpio_port, chip);
++ void __iomem *reg_ocr1 = port->base + GPIO_OCR1;
++ void __iomem *reg_ocr2 = port->base + GPIO_OCR2;
++ void __iomem *reg_gius = port->base + GPIO_GIUS;
++ u32 ocr1;
++ u32 ocr2;
++ u32 gius;
++
++ /* select DR mux */
++ ocr1 = __raw_readl(reg_ocr1);
++ ocr2 = __raw_readl(reg_ocr2);
++ if (offset < 16) {
++ ocr1 = ocr1 | (3 << (offset*2));
++ __raw_writel(ocr1, reg_ocr1);
++ } else {
++ ocr2 = ocr2 | (3 << ((offset-16)*2));
++ __raw_writel(ocr2, reg_ocr2);
++ }
++ /* set GIUS */
++ gius = __raw_readl(reg_gius);
++ gius = gius | (1 << (offset));
++ __raw_writel(gius, reg_gius);
++
+ mxc_gpio_set(chip, offset, value);
++ _set_gpio_direction(chip, offset, 1);
+ return 0;
+ }
+
diff --git a/software/uboot_recover/apf51-u-boot.bin b/software/uboot_recover/apf51-u-boot.bin
index 5e000c6..c213be3 100644
Binary files a/software/uboot_recover/apf51-u-boot.bin and b/software/uboot_recover/apf51-u-boot.bin differ
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-06-22 06:53:08
|
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 a9783d21479a11e4974b97ff59e8179255c73572 (commit)
from a76ade6bbebb7171c5646c385f1c933cb9bb050c (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 a9783d21479a11e4974b97ff59e8179255c73572
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 22 08:52:15 2011 +0200
[buildroot][package][straton_ios] Fixing somes bugs
-----------------------------------------------------------------------
Summary of changes:
target/packages/straton_ios/straton_ios.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/straton_ios.c
index 1373a91..3a2196f 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/straton_ios.c
@@ -6,11 +6,9 @@
static struct as_gpio_device *led;
static struct as_gpio_device *button;
-
-
/* set and get specifics functions */
void led_setvalue(long value) {
- if (value = 0)
+ if (value == 0)
as_gpio_set_pin_value(led, 1);
else
as_gpio_set_pin_value(led, 0);
@@ -18,7 +16,7 @@ void led_setvalue(long value) {
}
long button_getvalue(void){
- return (long)as_gpio_get_pin_value(button);
+ return (long)!as_gpio_get_pin_value(button);
}
/* straton api */
@@ -37,8 +35,8 @@ int straton_ios_init(void) {
printf("IO error: Can't initialize led\n");
goto close_button_error;
}
- return 0;
as_gpio_set_pin_direction(led, "out");
+ return 0;
/*close_led_error:*/
as_gpio_close(led);
hooks/post-receive
--
armadeus
|