armadeus-commitlog Mailing List for armadeus (Page 95)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
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: Fabien M <fa...@us...> - 2011-04-15 12:19:52
|
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 54a615476b3df9e8b0161ceb3d94f5e2a2d8a5c8 (commit)
from 181b8e9668b40f1529871dc562aa2e815fba975e (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 54a615476b3df9e8b0161ceb3d94f5e2a2d8a5c8
Author: Kevin JOLY <jol...@gm...>
Date: Fri Apr 15 13:46:35 2011 +0200
Update demo can_mcp25020
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 9 +-
target/demos/mcp25020_ctrl/Makefile | 15 ++-
target/demos/mcp25020_ctrl/mcp25020_ctrl.c | 149 +++++++++++++---------------
3 files changed, 81 insertions(+), 92 deletions(-)
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index bd12889..f4d4d2f 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -1,4 +1,3 @@
-
config BR2_PACKAGE_ARMADEUS_DEMOS
bool "Armadeus misc demos"
default n
@@ -67,12 +66,12 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
config BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020
bool "DEMOS_MCP25020"
- depends on BR2_PACKAGE_SOCKETCAN
+ depends on BR2_PACKAGE_IPROUTE2
help
Test for CAN bus communication with MCP25020.
- Requires socket CAN.
+ Requires package iproute2.
-comment "DEMOS_MCP25020 requires socket CAN"
- depends on !BR2_PACKAGE_SOCKETCAN
+comment "DEMOS_MCP25020 requires package iproute2"
+ depends on !BR2_PACKAGE_IPROUTE2
endmenu
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/demos/mcp25020_ctrl/Makefile
index a338327..10882e3 100644
--- a/target/demos/mcp25020_ctrl/Makefile
+++ b/target/demos/mcp25020_ctrl/Makefile
@@ -11,21 +11,26 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
DEFINES=TARGET
CFLAGS= -Wall
-default: mcp25020_ctrl
+EXEC=mcp25020_ctrl
-all: mcp25020_ctrl
+default: $(EXEC)
+
+all: $(EXEC)
mcp25020_ctrl.o: mcp25020_ctrl.c
$(CC) $(CFLAGS) -c -o $@ $^
-install: mcp25020_ctrl
+$(EXEC): mcp25020_ctrl.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)/mcp25020_ctrl
+ $(STRIP) $(INSTALL_DIR)/$^
uninstall:
- rm -f $(INSTALL_DIR)/mcp25020_ctrl
+ rm -f $(INSTALL_DIR)/$(EXEC)
rm -f $(INIT_DIR)/S50init_can.sh
clean:
diff --git a/target/demos/mcp25020_ctrl/mcp25020_ctrl.c b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
index 929f03c..fb964a3 100644
--- a/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
+++ b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
@@ -22,13 +22,14 @@
#endif
#define SW2_MASK 0x01 /* Mask of the SW2 bit */
-
-int listen_mode(int can_socket);
-int led_flash(int can_socket);
-int led_on(int can_socket);
-int led_off(int can_socket);
-int sw2_get(int can_socket);
-int read_config(int can_socket);
+#define LED_OFF 0x10
+#define LED_ON 0x00
+
+void listen_mode(int can_socket);
+void led_flash(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);
void display_help();
void int_quit(int sig);
@@ -41,7 +42,7 @@ int main(int argc, char **argv)
struct sockaddr_can addr;
int can_socket;
- quit=0;
+ quit = 0;
signal(SIGINT, int_quit); /* Capture the ctrl+C sequence */
/* If no arguments is given */
@@ -75,11 +76,34 @@ 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) {
- led_flash(can_socket);/* Entering in led flashing mode */
- } else if(strcmp(argv[1], "led-on") == 0) {
- led_on(can_socket);/* Entering in led on mode */
- } else if(strcmp(argv[1], "led-off") == 0) {
- led_off(can_socket);/* Entering in led off mode */
+
+ if (argc < 3) {
+ printf("led-flash : Please specify the flashing 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");
+ return EXIT_SUCCESS;
+ }
+
+ led_flash(can_socket, atoi(argv[2]));/* Entering in led flashing mode */
+ } else if(strcmp(argv[1], "led-state") == 0) {
+
+ if (argc < 3) {
+ printf("led-state : Please specify ON or OFF\n");
+ return EXIT_SUCCESS;
+ }
+
+ if (strcmp(argv[2], "ON") == 0) {
+ set_led_state(can_socket, LED_ON);
+ } else if (strcmp(argv[2], "OFF") == 0) {
+ set_led_state(can_socket, LED_OFF);
+ } else {
+ printf("led-state : Please specify ON or OFF\n");
+ return EXIT_SUCCESS;
+ }
+
} else if(strcmp(argv[1], "sw2-get") == 0) {
sw2_get(can_socket);/* Entering in get state of the SW2 switch mode */
} else if(strcmp(argv[1], "config") == 0) {
@@ -93,16 +117,16 @@ int main(int argc, char **argv)
return EXIT_SUCCESS;
}
-int listen_mode(int can_socket)
+void listen_mode(int can_socket)
{
struct can_frame receivedCanFrame;
- int i, size;
+ int i;
while (quit != 1) {
/* Read the data received by the interface */
- if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ if (read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame)) < 0) {
perror("read");
- return size;
+ return;
}
if (receivedCanFrame.can_id & CAN_RTR_FLAG) {/* If the last data received was a remote request frame */
@@ -116,14 +140,10 @@ int listen_mode(int can_socket)
}
printf("\n");
}
-
- return EXIT_SUCCESS;
}
-int led_flash(int can_socket)
+void led_flash(int can_socket, int interval)
{
- int size;
-
struct can_frame frameToSend;
frameToSend.can_id = 0x500; /* ID */
@@ -135,21 +155,17 @@ int led_flash(int can_socket)
while (quit != 1) {
frameToSend.data[2] ^= 0x10; /* Invert the output bit of the LED */
- if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ if (write(can_socket, &frameToSend, sizeof(frameToSend)) != sizeof(frameToSend)) {
perror("led_flash write");
- return size;
+ return;
}
- usleep(200000); /* Wait 200ms ... */
+ usleep(interval * 1000); /* Wait... */
}
-
- return EXIT_SUCCESS;
}
-int sw2_get(int can_socket)
+void sw2_get(int can_socket)
{
- int size;
-
struct can_frame frameToSend;
struct can_frame receivedCanFrame;
@@ -158,78 +174,49 @@ int sw2_get(int can_socket)
while (quit != 1) {
/* Send the RTR frame */
- if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ if (write(can_socket, &frameToSend, sizeof(frameToSend)) != sizeof(frameToSend)) {
perror("sw2_get write");
- return size;
+ return;
}
/* Read the frame containing the information */
- if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ if (read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame)) < 0) {
perror("sw2_get read");
- return size;
+ return;
}
-
- if ((receivedCanFrame.data[1] & SW2_MASK) == 1) /* If the SW2 bit is on, */
- printf("SW2 is released\n"); /* the SW2 switch is released */
+ if ((receivedCanFrame.data[1] & SW2_MASK) == 1) /* If the SW2 bit is on */
+ printf("SW2 is released\n");
else
- printf("SW2 is pushed\n");/* the SW2 switch is pushed */
+ printf("SW2 is pushed\n");
- /* Wait 1s */
sleep(1);
}
-
- return EXIT_SUCCESS;
}
-int led_on(int can_socket)
+void set_led_state(int can_socket, int state)
{
- int size;
-
struct can_frame frameToSend;
frameToSend.can_id = 0x500; /* ID */
frameToSend.can_dlc = 3; /* We want to send 3 bytes */
frameToSend.data[0] = 0x1E; /* Byte 1 */
frameToSend.data[1] = 0x10; /* Byte 2 */
- frameToSend.data[2] = 0x00; /* Byte 3 (bit 4 = 0 to turn the led ON) */
+ frameToSend.data[2] = state; /* Byte 3 (bit 4 = 0 to turn the led ON) */
/* Send the frame */
- if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ if (write(can_socket, &frameToSend, sizeof(frameToSend)) != sizeof(frameToSend)) {
perror("led_on write");
- return size;
+ return;
}
-
- return EXIT_SUCCESS;
-}
-
-int led_off(int can_socket)
-{
- int size;
-
- struct can_frame frameToSend;
-
- frameToSend.can_id = 0x500; /* ID */
- frameToSend.can_dlc = 3; /* We want to send 3 bytes */
- frameToSend.data[0] = 0x1E; /* Byte 1 */
- frameToSend.data[1] = 0x10; /* Byte 2 */
- frameToSend.data[2] = 0x10; /* Byte 3 (bit 4 = 1 to turn the led OFF) */
-
- /* Send the frame */
- if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
- perror("led_off write");
- return size;
- }
-
- return EXIT_SUCCESS;
}
-int read_config(int can_socket)
+void read_config(int can_socket)
{
struct can_frame frameToSend;
struct can_frame receivedCanFrame;
- int i,j, size;
+ int i,j;
for (i = 0; i < 7; i++) {
@@ -257,15 +244,15 @@ int read_config(int can_socket)
}
/* Send the RTR frame */
- if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ if (write(can_socket, &frameToSend, sizeof(frameToSend)) != sizeof(frameToSend)) {
perror("read_config write");
- return size;
+ return;
}
/* Read the frame containing the information */
- if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ if (read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame)) < 0) {
perror("read_config read");
- return size;
+ return;
}
printf("ID: 0x%X -> %d byte(s): ", receivedCanFrame.can_id, receivedCanFrame.can_dlc);
@@ -275,8 +262,6 @@ int read_config(int can_socket)
printf("\n");
}
-
- return EXIT_SUCCESS;
}
@@ -292,9 +277,8 @@ 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 : flash the D6 led (interval: 200ms)\n");
- printf("\tled-on : turn the D6 led on\n");
- printf("\tled-off : turn the D6 led off\n");
+ printf("\tled-flash [INTERVAL]: flash the D6 led. You must specify the flashing 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");
printf("\tMore informations, please contact jol...@gm...\n");
@@ -304,5 +288,6 @@ void int_quit(int sig)
{
signal(sig, SIG_IGN); /* Ignore the ctrl+c sequence for the system */
printf("Exiting...\n");
- quit=1;
+ quit = 1;
}
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-15 12:12: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 181b8e9668b40f1529871dc562aa2e815fba975e (commit)
from 96d28377434501120fd4d464928e3f451f664a58 (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 181b8e9668b40f1529871dc562aa2e815fba975e
Author: Kevin JOLY <jol...@gm...>
Date: Fri Apr 15 13:46:34 2011 +0200
Update makefile busybox: Fix the conflict between ip (busybox) and iproute2
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 ++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
diff --git a/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
new file mode 100644
index 0000000..97562df
--- /dev/null
+++ b/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
@@ -0,0 +1,36 @@
+This patch disable the ip tools options of the busybox config when the iproute2 package is selected
+in buildroot config. It modify the makefile of the busybox package in buildroot.
+We need to disable ip from busybox if we choose to use iproute2 because by default,
+the binary used for ip is the ip of busybox (/bin/ip) and we need to use ip of iproute2
+(/sbin/ip). This patch fix the conflict with the two binaries.
+
+Signed-off-by: Kevin Joly <jol...@gm...>
+
+Index: buildroot/package/busybox/busybox.mk
+===================================================================
+--- buildroot.orig/package/busybox/busybox.mk 2011-04-14 15:30:09.765201003 +0200
++++ buildroot/package/busybox/busybox.mk 2011-04-14 15:21:00.000000000 +0200
+@@ -100,6 +100,15 @@
+ endef
+ endif
+
++# If IPROUTE2 is selected, disable all the ip tools of busybox
++ifeq ($(BR2_PACKAGE_IPROUTE2),y)
++define BUSYBOX_IPROUTE2
++ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IP,$(BUSYBOX_BUILD_CONFIG))
++ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN,$(BUSYBOX_BUILD_CONFIG))
++ $(call KCONFIG_DISABLE_OPT,CONFIG_IP,$(BUSYBOX_BUILD_CONFIG))
++endef
++endif
++
+ define BUSYBOX_COPY_CONFIG
+ cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
+ endef
+@@ -116,6 +125,7 @@
+ $(BUSYBOX_PREFER_STATIC)
+ $(BUSYBOX_NETKITBASE)
+ $(BUSYBOX_NETKITTELNET)
++ $(BUSYBOX_IPROUTE2)
+ @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
+ -C $(@D) oldconfig
+ endef
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-14 10:15:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 96d28377434501120fd4d464928e3f451f664a58 (commit)
via b9806306962d854c43cc111f349c92d15ee4d506 (commit)
from ab617c5cfc95337575baef95930fc1f82d65757b (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 96d28377434501120fd4d464928e3f451f664a58
Author: Kevin JOLY <jol...@gm...>
Date: Thu Apr 14 11:07:16 2011 +0200
[BUILDROOT] Update makefile of socketcan (strip command added)
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
commit b9806306962d854c43cc111f349c92d15ee4d506
Author: Kevin JOLY <jol...@gm...>
Date: Thu Apr 14 10:57:28 2011 +0200
[DEMOS] Demo for can mcp25020 IOexpander chip added
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 10 +
buildroot/package/armadeus/demos/demos.mk | 8 +-
patches/buildroot/2010.11/042-socketcan.patch | 13 +-
target/demos/mcp25020_ctrl/Makefile | 36 +++
target/demos/mcp25020_ctrl/init_can.sh | 10 +
target/demos/mcp25020_ctrl/mcp25020_ctrl.c | 308 +++++++++++++++++++++++++
6 files changed, 376 insertions(+), 9 deletions(-)
create mode 100644 target/demos/mcp25020_ctrl/Makefile
create mode 100755 target/demos/mcp25020_ctrl/init_can.sh
create mode 100644 target/demos/mcp25020_ctrl/mcp25020_ctrl.c
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index e15ce36..bd12889 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -65,4 +65,14 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
help
Test for LCD dead pixels. Needs SDL.
+config BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020
+ bool "DEMOS_MCP25020"
+ depends on BR2_PACKAGE_SOCKETCAN
+ help
+ Test for CAN bus communication with MCP25020.
+ Requires socket CAN.
+
+comment "DEMOS_MCP25020 requires socket CAN"
+ depends on !BR2_PACKAGE_SOCKETCAN
+
endmenu
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index 785f573..db6f92a 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -9,7 +9,7 @@ ARMADEUS-DEMOS_SOURCE:=$(TOPDIR)/../target/demos
ARMADEUS-DEMOS_DIR:=$(BUILD_DIR)/armadeus-demos-$(ARMADEUS-DEMOS_VER)
ARMADEUS-DEMOS_TARGET_DIR:=$(TARGET_DIR)/usr/local/bin
ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
-
+ARMADEUS-DEMOS_TARGET_INIT_DIR:=$(TARGET_DIR)/etc/init.d
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
ARMADEUS-DEMOS_SUBDIRS+=armanoid
@@ -58,7 +58,6 @@ ARMADEUS-DEMOS_SUBDIRS+=test_lcd
ARMADEUS-DEMOS_DEPS=sdl
endif
-
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
ARMADEUS-DEMOS_DEPS+=sdl_ttf sdl_mixer
endif
@@ -66,6 +65,9 @@ ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
ARMADEUS-DEMOS_DEPS+=sdl_image
endif
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020),y)
+ARMADEUS-DEMOS_SUBDIRS+=mcp25020_ctrl
+endif
$(ARMADEUS-DEMOS_DIR)/.unpacked:
mkdir -p $(ARMADEUS-DEMOS_DIR)/
@@ -88,7 +90,7 @@ $(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install INSTALL_DIR=$(ARMADEUS-DEMOS_TARGET_DIR) \
- INSTALL_DATA_DIR=$(ARMADEUS-DEMOS_TARGET_DATA_DIR) STRIP=$(TARGET_STRIP)) || exit 1 ; \
+ INSTALL_DATA_DIR=$(ARMADEUS-DEMOS_TARGET_DATA_DIR) INIT_DIR=$(ARMADEUS-DEMOS_TARGET_INIT_DIR) STRIP=$(TARGET_STRIP)) || exit 1 ; \
fi \
done
touch $@
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index 59a016a..710825b 100644
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ b/patches/buildroot/2010.11/042-socketcan.patch
@@ -5,8 +5,8 @@ Signed-off-by: Kevin Joly <jol...@gm...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-04-12 14:13:34.037382997 +0200
-+++ buildroot/package/Config.in 2011-04-12 14:14:25.261382995 +0200
+--- buildroot.orig/package/Config.in 2011-04-14 11:00:01.037201002 +0200
++++ buildroot/package/Config.in 2011-04-14 11:01:48.489201004 +0200
@@ -428,6 +428,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/socketcan/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in 2011-04-12 14:13:34.057382996 +0200
++++ buildroot/package/socketcan/Config.in 2011-04-14 11:00:01.061201003 +0200
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
@@ -38,8 +38,8 @@ Index: buildroot/package/socketcan/Config.in
Index: buildroot/package/socketcan/socketcan.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2011-04-12 14:18:14.589382996 +0200
-@@ -0,0 +1,54 @@
++++ buildroot/package/socketcan/socketcan.mk 2011-04-14 11:02:47.957201006 +0200
+@@ -0,0 +1,55 @@
+#############################################################
+#
+# Socket CAN
@@ -75,7 +75,8 @@ Index: buildroot/package/socketcan/socketcan.mk
+
+$(TARGET_DIR)/usr/local/bin/$(PROGRAMS): $(SOCKETCAN_DIR)/can-utils/$(PROGRAMS)
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
-+
++ $(TARGET_STRIP) $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
++
+SOCKETCAN socketcan: $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
+
+socketcan-source: $(DL_DIR)/$(SOCKETCAN_SOURCE)
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/demos/mcp25020_ctrl/Makefile
new file mode 100644
index 0000000..a338327
--- /dev/null
+++ b/target/demos/mcp25020_ctrl/Makefile
@@ -0,0 +1,36 @@
+# Default values for local compiling:
+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
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+
+DEFINES=TARGET
+CFLAGS= -Wall
+
+default: mcp25020_ctrl
+
+all: mcp25020_ctrl
+
+mcp25020_ctrl.o: mcp25020_ctrl.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+install: mcp25020_ctrl
+ mkdir -p $(INSTALL_DIR)
+ cp $^ $(INSTALL_DIR)
+ cp init_can.sh $(INIT_DIR)/S50init_can.sh
+ $(STRIP) $(INSTALL_DIR)/mcp25020_ctrl
+
+uninstall:
+ rm -f $(INSTALL_DIR)/mcp25020_ctrl
+ rm -f $(INIT_DIR)/S50init_can.sh
+
+clean:
+ rm -rf mcp25020_ctrl
+ rm -rf *.o
+
+.PHONY: clean install uninstall
+
diff --git a/target/demos/mcp25020_ctrl/init_can.sh b/target/demos/mcp25020_ctrl/init_can.sh
new file mode 100755
index 0000000..3365644
--- /dev/null
+++ b/target/demos/mcp25020_ctrl/init_can.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+modprobe can
+modprobe can-dev
+modprobe can-raw
+modprobe mcp251x
+ip link set can0 up type can bitrate 125000
+ifconfig can0 up
+
+exit 0
diff --git a/target/demos/mcp25020_ctrl/mcp25020_ctrl.c b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
new file mode 100644
index 0000000..929f03c
--- /dev/null
+++ b/target/demos/mcp25020_ctrl/mcp25020_ctrl.c
@@ -0,0 +1,308 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
+#include <net/if.h>
+
+#include <linux/can.h>
+#include <linux/can/raw.h>
+
+#ifndef PF_CAN
+#define PF_CAN 29
+#endif
+
+#ifndef AF_CAN
+#define AF_CAN PF_CAN
+#endif
+
+#define SW2_MASK 0x01 /* Mask of the SW2 bit */
+
+int listen_mode(int can_socket);
+int led_flash(int can_socket);
+int led_on(int can_socket);
+int led_off(int can_socket);
+int sw2_get(int can_socket);
+int read_config(int can_socket);
+void display_help();
+void int_quit(int sig);
+
+/* Global variable */
+int quit;
+
+int main(int argc, char **argv)
+{
+ struct ifreq ifr;
+ struct sockaddr_can addr;
+ int can_socket;
+
+ quit=0;
+ signal(SIGINT, int_quit); /* Capture the ctrl+C sequence */
+
+ /* If no arguments is given */
+ if (argc < 2) {
+ display_help();
+ return EXIT_SUCCESS;
+ }
+
+ /* Interface selection on can0 */
+ strcpy(ifr.ifr_name, "can0");
+
+ /* Socket creation */
+ if ((can_socket = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0 ) {
+ perror("socket");
+ return EXIT_FAILURE;
+ }
+
+ /* Association of the socket with the interface */
+ ioctl(can_socket, SIOCGIFINDEX, &ifr);
+
+ /* Socket param */
+ addr.can_family = AF_CAN;
+ addr.can_ifindex = ifr.ifr_ifindex;
+
+ /* Bind of the socket */
+ if(bind(can_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
+ perror("bind");
+ return EXIT_FAILURE;
+ }
+
+ if (strcmp(argv[1], "listen") == 0) {
+ listen_mode(can_socket);/* Entering in listen mode */
+ } else if(strcmp(argv[1], "led-flash") == 0) {
+ led_flash(can_socket);/* Entering in led flashing mode */
+ } else if(strcmp(argv[1], "led-on") == 0) {
+ led_on(can_socket);/* Entering in led on mode */
+ } else if(strcmp(argv[1], "led-off") == 0) {
+ led_off(can_socket);/* Entering in led off mode */
+ } else if(strcmp(argv[1], "sw2-get") == 0) {
+ sw2_get(can_socket);/* Entering in get state of the SW2 switch mode */
+ } else if(strcmp(argv[1], "config") == 0) {
+ read_config(can_socket);
+ } else {
+ display_help();/* Display display_help */
+ }
+
+ close(can_socket);
+
+ return EXIT_SUCCESS;
+}
+
+int listen_mode(int can_socket)
+{
+ struct can_frame receivedCanFrame;
+ int i, size;
+
+ while (quit != 1) {
+ /* Read the data received by the interface */
+ if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ perror("read");
+ return size;
+ }
+
+ if (receivedCanFrame.can_id & CAN_RTR_FLAG) {/* If the last data received was a remote request frame */
+ printf("ID: 0x%X is a remote request of %d byte(s) ", (receivedCanFrame.can_id ^ CAN_RTR_FLAG), receivedCanFrame.can_dlc);
+ }
+ else {/* If the last frame received was a data frame */
+ printf("ID: 0x%X -> %d byte(s): ", receivedCanFrame.can_id, receivedCanFrame.can_dlc);
+
+ for (i= 0; i<receivedCanFrame.can_dlc; i++)
+ printf("0x%X ",receivedCanFrame.data[i]);
+ }
+ printf("\n");
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int led_flash(int can_socket)
+{
+ int size;
+
+ struct can_frame frameToSend;
+
+ frameToSend.can_id = 0x500; /* ID */
+ frameToSend.can_dlc = 3; /* We want to send 3 bytes */
+ frameToSend.data[0] = 0x1E; /* Byte 1 */
+ frameToSend.data[1] = 0x10; /* Byte 2 */
+ frameToSend.data[2] = 0x10; /* Byte 3 */
+
+ while (quit != 1) {
+ frameToSend.data[2] ^= 0x10; /* Invert the output bit of the LED */
+
+ if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ perror("led_flash write");
+ return size;
+ }
+
+ usleep(200000); /* Wait 200ms ... */
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int sw2_get(int can_socket)
+{
+ int size;
+
+ struct can_frame frameToSend;
+ struct can_frame receivedCanFrame;
+
+ frameToSend.can_id = 0x280 | CAN_RTR_FLAG; /* Remote request frame */
+ frameToSend.can_dlc = 8; /* The data received must contains 8 byte of datas */
+
+ while (quit != 1) {
+ /* Send the RTR frame */
+ if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ perror("sw2_get write");
+ return size;
+ }
+
+ /* Read the frame containing the information */
+ if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ perror("sw2_get read");
+ return size;
+ }
+
+
+ if ((receivedCanFrame.data[1] & SW2_MASK) == 1) /* If the SW2 bit is on, */
+ printf("SW2 is released\n"); /* the SW2 switch is released */
+ else
+ printf("SW2 is pushed\n");/* the SW2 switch is pushed */
+
+ /* Wait 1s */
+ sleep(1);
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int led_on(int can_socket)
+{
+ int size;
+
+ struct can_frame frameToSend;
+
+ frameToSend.can_id = 0x500; /* ID */
+ frameToSend.can_dlc = 3; /* We want to send 3 bytes */
+ frameToSend.data[0] = 0x1E; /* Byte 1 */
+ frameToSend.data[1] = 0x10; /* Byte 2 */
+ frameToSend.data[2] = 0x00; /* Byte 3 (bit 4 = 0 to turn the led ON) */
+
+ /* Send the frame */
+ if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ perror("led_on write");
+ return size;
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int led_off(int can_socket)
+{
+ int size;
+
+ struct can_frame frameToSend;
+
+ frameToSend.can_id = 0x500; /* ID */
+ frameToSend.can_dlc = 3; /* We want to send 3 bytes */
+ frameToSend.data[0] = 0x1E; /* Byte 1 */
+ frameToSend.data[1] = 0x10; /* Byte 2 */
+ frameToSend.data[2] = 0x10; /* Byte 3 (bit 4 = 1 to turn the led OFF) */
+
+ /* Send the frame */
+ if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ perror("led_off write");
+ return size;
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int read_config(int can_socket)
+{
+ struct can_frame frameToSend;
+ struct can_frame receivedCanFrame;
+
+ int i,j, size;
+
+ for (i = 0; i < 7; i++) {
+
+ frameToSend.can_id = 0x280 | CAN_RTR_FLAG | i; /* Remote request frame */
+ switch (i) {
+
+ case 1 :
+ frameToSend.can_dlc = 7;
+ break;
+
+ case 2 :
+ frameToSend.can_dlc = 5;
+ break;
+
+ case 3 :
+ frameToSend.can_dlc = 3;
+ break;
+
+ case 4 :
+ frameToSend.can_dlc = 6;
+ break;
+
+ default :
+ frameToSend.can_dlc = 8;
+ }
+
+ /* Send the RTR frame */
+ if ((size = write(can_socket, &frameToSend, sizeof(frameToSend))) != sizeof(frameToSend)) {
+ perror("read_config write");
+ return size;
+ }
+
+ /* Read the frame containing the information */
+ if ((size = read(can_socket, &receivedCanFrame, sizeof(receivedCanFrame))) < 0) {
+ perror("read_config read");
+ return size;
+ }
+
+ printf("ID: 0x%X -> %d byte(s): ", receivedCanFrame.can_id, receivedCanFrame.can_dlc);
+
+ for (j= 0; j<receivedCanFrame.can_dlc; j++)
+ printf("0x%X ",receivedCanFrame.data[j]);
+
+ printf("\n");
+ }
+
+ return EXIT_SUCCESS;
+}
+
+
+
+void display_help()
+{/* Display display_help */
+ printf("#################################\n");
+ printf("# #\n");
+ printf("# Armadeus Systems #\n");
+ printf("# Demo can_mcp25020 #\n");
+ printf("# #\n");
+ printf("#################################\n\n");
+ 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 : flash the D6 led (interval: 200ms)\n");
+ printf("\tled-on : turn the D6 led on\n");
+ printf("\tled-off : turn the D6 led off\n");
+ printf("\tsw2-get : get the value of the switch SW2\n");
+ printf("\tCONFIG : get the value of several config registers\n\n");
+ printf("\tMore informations, please contact jol...@gm...\n");
+}
+
+void int_quit(int sig)
+{
+ signal(sig, SIG_IGN); /* Ignore the ctrl+c sequence for the system */
+ printf("Exiting...\n");
+ quit=1;
+}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-04-13 15:48:06
|
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 ab617c5cfc95337575baef95930fc1f82d65757b (commit)
via c1cc2d545edabd009ef4bd751c75cecb7f8ceea0 (commit)
from 03b5a8a29f94b1419e099e831b43f984eb693b4c (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 ab617c5cfc95337575baef95930fc1f82d65757b
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 13 17:47:36 2011 +0200
[DEBUG] Makes imxssi support i.MX51
commit c1cc2d545edabd009ef4bd751c75cecb7f8ceea0
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 13 16:53:15 2011 +0200
[LINUX] [2.6.38] Makes APF51Dev audio output usable (with correct init script)
-----------------------------------------------------------------------
Summary of changes:
...soc-imx-add_apf51dev_wm8960_audio_support.patch | 20 ++--
.../428-armadeus-asoc-add_debug_to_wm8960.patch | 127 ++++++++++++++++++++
...deus-asoc-wm8960-change_channels_min_to_2.patch | 25 ++++
target/linux/debug/imxssi/imxssi.c | 70 ++++++++---
4 files changed, 215 insertions(+), 27 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/428-armadeus-asoc-add_debug_to_wm8960.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/430-armadeus-asoc-wm8960-change_channels_min_to_2.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
index 4f7dc04..c226430 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+Index: linux-2.6.38.1/sound/soc/imx/apf51dev-wm8960.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c 2011-03-16 23:07:40.000000000 +0100
++++ linux-2.6.38.1/sound/soc/imx/apf51dev-wm8960.c 2011-04-08 11:05:28.000000000 +0200
@@ -0,0 +1,166 @@
+/*
+ * ASoC audio for APF51Dev (i.MX51 using Wolfson's WM8960)
@@ -114,7 +114,7 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+ .cpu_dai_name = "imx-ssi.0",
+ .codec_dai_name = "wm8960-hifi",
+ .ops = &apf51dev_sound_hifi_ops,
-+ }, {
++ },/* {
+ .name = "WM8960 Capture",
+ .stream_name = "Capture",
+ .codec_name = "wm8960-codec.1-001a",
@@ -122,7 +122,7 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+ .cpu_dai_name = "imx-ssi.0",
+ .codec_dai_name = "wm8960-hifi",
+ .ops = &apf51dev_sound_hifi_ops,
-+ },
++ },*/
+};
+
+static struct snd_soc_card apf51dev_soc_card = {
@@ -169,10 +169,10 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+MODULE_AUTHOR("Julien Boibessot <jul...@ar...>");
+MODULE_DESCRIPTION("APF51Dev ALSA SoC driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.38-rc3/sound/soc/imx/Kconfig
+Index: linux-2.6.38.1/sound/soc/imx/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/sound/soc/imx/Kconfig 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/sound/soc/imx/Kconfig 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/sound/soc/imx/Kconfig 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/sound/soc/imx/Kconfig 2011-04-06 09:16:53.000000000 +0200
@@ -52,4 +52,14 @@
Enable I2S based access to the TLV320AIC23B codec attached
to the SSI interface
@@ -188,10 +188,10 @@ Index: linux-2.6.38-rc3/sound/soc/imx/Kconfig
+ combo
+
endif # SND_IMX_SOC
-Index: linux-2.6.38-rc3/sound/soc/imx/Makefile
+Index: linux-2.6.38.1/sound/soc/imx/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/sound/soc/imx/Makefile 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/sound/soc/imx/Makefile 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/sound/soc/imx/Makefile 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/sound/soc/imx/Makefile 2011-04-06 09:16:53.000000000 +0200
@@ -8,10 +8,12 @@
obj-$(CONFIG_SND_MXC_SOC_MX2) += snd-soc-imx-mx2.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/428-armadeus-asoc-add_debug_to_wm8960.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/428-armadeus-asoc-add_debug_to_wm8960.patch
new file mode 100644
index 0000000..5bf0cae
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/428-armadeus-asoc-add_debug_to_wm8960.patch
@@ -0,0 +1,127 @@
+Index: linux-2.6.38.1/sound/soc/codecs/wm8960.c
+===================================================================
+--- linux-2.6.38.1.orig/sound/soc/codecs/wm8960.c 2011-04-06 11:06:59.000000000 +0200
++++ linux-2.6.38.1/sound/soc/codecs/wm8960.c 2011-04-13 14:48:47.000000000 +0200
+@@ -8,6 +8,8 @@
+ * published by the Free Software Foundation.
+ */
+
++#define DEBUG
++
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>
+@@ -16,6 +18,9 @@
+ #include <linux/i2c.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
++#ifdef DEBUG
++#include <linux/proc_fs.h>
++#endif
+ #include <sound/core.h>
+ #include <sound/pcm.h>
+ #include <sound/pcm_params.h>
+@@ -917,12 +922,81 @@
+ return 0;
+ }
+
++#ifdef DEBUG
++
++static u8 current_reg_addr;
++
++static int wm8960_proc_read_register( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
++{
++ int len;
++ char given_param[16];
++ u8 reg_addr;
++ u16 reg_val;
++ struct snd_soc_codec *codec = data;
++
++ if (count <= 0) {
++ printk("Empty string transmitted !\n");
++ return 0;
++ }
++ if (count > 4) {
++ len = 4;
++ printk("Only 4x[0-9] decimal values supported !\n");
++ } else {
++ len = count;
++ }
++
++ if (copy_from_user(given_param, buf, len)) {
++ return -EFAULT;
++ }
++
++ reg_addr = (u8)(simple_strtol(given_param, 0, 16));
++ current_reg_addr = reg_addr;
++ reg_val = snd_soc_read(codec, reg_addr);
++ printk("Read 0x%04x @ 0x%02x\n", reg_val, reg_addr);
++
++ return len;
++}
++
++static int wm8960_proc_write_register( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
++{
++ int len, ret;
++ char given_param[16];
++ u16 reg_val;
++ struct snd_soc_codec *codec = data;
++
++ if (count <= 0) {
++ printk("Empty string transmitted !\n");
++ return 0;
++ }
++ if (count > 4) {
++ len = 4;
++ printk("Only 4x[0-9] decimal values supported !\n");
++ } else {
++ len = count;
++ }
++
++ if (copy_from_user(given_param, buf, len)) {
++ return -EFAULT;
++ }
++
++ reg_val = (u16)(simple_strtol(given_param, 0, 16));
++ printk("Writing 0x%04x @ 0x%02x\n", reg_val, current_reg_addr);
++ snd_soc_write(codec, current_reg_addr, reg_val);
++ udelay(100);
++
++ return len;
++}
++#endif /* DEBUG */
++
+ static int wm8960_probe(struct snd_soc_codec *codec)
+ {
+ struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+ struct wm8960_data *pdata = dev_get_platdata(codec->dev);
+ int ret;
+ u16 reg;
++#ifdef DEBUG
++ struct proc_dir_entry *proc_read, *proc_write;
++#endif
+
+ wm8960->set_bias_level = wm8960_set_bias_level_out3;
+ codec->control_data = wm8960->control_data;
+@@ -979,6 +1053,21 @@
+ ARRAY_SIZE(wm8960_snd_controls));
+ wm8960_add_widgets(codec);
+
++#ifdef DEBUG
++ /* create proc files */
++ proc_read = create_proc_entry("driver/wmread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
++ proc_write = create_proc_entry("driver/wmwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);
++ if ((proc_read == NULL) || (proc_write == NULL)) {
++ printk(KERN_ERR "wm8960" ": Could not register one /proc file. Terminating\n");
++ return -ENOMEM;
++ } else {
++ proc_read->write_proc = wm8960_proc_read_register;
++ proc_read->data = codec;
++ proc_write->write_proc = wm8960_proc_write_register;
++ proc_write->data = codec;
++ }
++#endif
++
+ return 0;
+ }
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/430-armadeus-asoc-wm8960-change_channels_min_to_2.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/430-armadeus-asoc-wm8960-change_channels_min_to_2.patch
new file mode 100644
index 0000000..820b984
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/430-armadeus-asoc-wm8960-change_channels_min_to_2.patch
@@ -0,0 +1,25 @@
+Otherwise sound is played two times too fast.
+Clean ?
+
+Signed-off-by: Julien Boibessot <jul...@ar...<
+
+Index: linux-2.6.38.1/sound/soc/codecs/wm8960.c
+===================================================================
+--- linux-2.6.38.1.orig/sound/soc/codecs/wm8960.c 2011-04-13 14:50:58.000000000 +0200
++++ linux-2.6.38.1/sound/soc/codecs/wm8960.c 2011-04-13 15:09:57.000000000 +0200
+@@ -882,13 +882,13 @@
+ .name = "wm8960-hifi",
+ .playback = {
+ .stream_name = "Playback",
+- .channels_min = 1,
++ .channels_min = 2,
+ .channels_max = 2,
+ .rates = WM8960_RATES,
+ .formats = WM8960_FORMATS,},
+ .capture = {
+ .stream_name = "Capture",
+- .channels_min = 1,
++ .channels_min = 2,
+ .channels_max = 2,
+ .rates = WM8960_RATES,
+ .formats = WM8960_FORMATS,},
diff --git a/target/linux/debug/imxssi/imxssi.c b/target/linux/debug/imxssi/imxssi.c
index ea7e7d3..9bf5c60 100644
--- a/target/linux/debug/imxssi/imxssi.c
+++ b/target/linux/debug/imxssi/imxssi.c
@@ -2,7 +2,7 @@
* imxssi.c - Tool to send SSI data from Linux's userspace
*
* Maintainers: E. Jarrige, J. Boibessot
- * (c) Copyright 2008 by Armadeus Systems
+ * (c) Copyright 2008-2011 by Armadeus Systems
* Derivated from pxaregs (c) Copyright 2002 by M&N Logistik-Loesungen Online GmbH
*
* This program is free software; you can redistribute it and/or modify
@@ -34,22 +34,26 @@
#include <getopt.h>
-//#define DEBUG TRUE
-#ifdef DEBUG
-# define debug(fmt, arg...) printf(fmt, ##arg)
-#else
-# define debug(fmt, arg...) ({ if (0) printf(fmt, ##arg);})
-#endif
+#define debug(fmt, arg...) ({ if (show_debug) printf(fmt, ##arg);})
+
#ifdef IMXL
# include "imxregs.h"
# define SSI_TRANSMIT_DATA_REG 0x00218000
# define SSI_FIFO_STATUS_REGISTER 0x00218020
-#else
+#elif IMX27
# include "imx27regs.h"
# define SSI_TRANSMIT_DATA_REG 0x10010000 /* FIFO 0 */
# define SSI_RECEIVE_DATA_REG 0x10010008
# define SSI_FIFO_STATUS_REGISTER 0x1001002C
+#elif IMX51
+# include "imx51regs.h"
+# define SSI_TRANSMIT_DATA_REG 0x83fcc000 /* FIFO 0 */
+# define SSI_RECEIVE_DATA_REG 0x83fcc008
+# define SSI_FIFO_STATUS_REGISTER 0x83fcc02c
+#else
+#error "Undefined processor"
#endif
+
#define RFCNT_MASK 0xF000
#define TFCNT_MASK 0x0F00 /* FIFO 0 for i.MX27 */
#define RFCNT_SHIFT 12
@@ -62,7 +66,7 @@ static int fd = -1;
#define TEST_SIGNAL_MAX_SAMPLES 130712
static int *table;
// static int ttable[130712];
-
+static int show_debug = 0;
/* Get value of the register at the given address */
static int getmem(u32 addr)
@@ -148,12 +152,18 @@ static void setreg(char *name, u32 val)
putmem(regs[found].addr, mem);
}
+int num_states = 8;
+char progress[8] = {
+ '|', '/', '-', ' ', '|', '/', '-', ' ',
+};
+
static void audio(u32 type, u32 samples, float level)
{
volatile void *map, *STX0, *SRX0, *SFCSR, *dma;
static int fd = -1;
u32 counter = 0;
u32 i;
+ int state = 0;
debug("type %d samples %d level %f\n", type, samples, level);
@@ -171,14 +181,14 @@ static void audio(u32 type, u32 samples, float level)
ttable[i] = 0; */
if (type == TYPE_TRIANGLE) {
- for (i=0; i<(samples/2); i++) {
+ for (i = 0; i < (samples/2); i++) {
table[i] = roundf(-32768 + ((i*(65535/samples))*2*level));
table[samples-1-i] = roundf(-32768 + ((i*(65535/samples))*2*level));
// printf("tab[%d]=%x tab[%d]=%x\n", i, table[i], samples-1-i, table[samples-1-i]);
}
} else if (type == TYPE_SINUS) {
double cosx;
- for (i=0; i<samples; i++) {
+ for (i = 0; i < samples; i++) {
cosx = cos(((double)i/samples)*2*M_PI);
table[i] = roundf(cosx*32767*level);
}
@@ -237,7 +247,7 @@ static void audio(u32 type, u32 samples, float level)
}
#ifndef IMXL
} else if (type == TYPE_LOOP) {
- /* Loop audio in to audio out (only possible on APF27Dev) */
+ /* Loop audio in to audio out (only possible on APF27Dev & APF51Dev) */
while (1) {
/* Wait until Rx FIFO is half full */
while (((*(volatile u32*)(SFCSR) & RFCNT_MASK) >> RFCNT_SHIFT) < 4);
@@ -255,6 +265,13 @@ static void audio(u32 type, u32 samples, float level)
*(volatile u32*) STX0 = table[counter & 0x0FFFF];
*(volatile u32*) STX0 = table[counter & 0x0FFFF];
counter = (counter+1) % samples;
+ if (counter == 0) {
+ if (show_debug) {
+ printf("\r%c", progress[state]);
+ fflush(stdout);
+ }
+ state = (state + 1) % (num_states - 1);
+ }
}
}
@@ -273,8 +290,9 @@ static void usage(const char* prog_name)
#endif
" -t type 0:triangular/ramp 1:sinusoid\n"
" -s samples nb of samples per period\n"
- " -l level 0.0 .. 1.0 signal amplitude\n\n"
- " !! tsc210x has to be configured in master mode !!\n",
+ " -l level 0.0 .. 1.0 signal amplitude\n"
+ " -d, --debug shows debug informations\n\n"
+ " !! audio CODEC has to be configured in master mode !!\n",
prog_name);
exit(1);
@@ -291,6 +309,7 @@ int main(int argc, char *argv[])
static struct option long_options[] = {
{"help", 0, 0, 'h'},
{"loop", 0, 0, 'L'},
+ {"debug", 0, 0, 'd'},
{0, 0, 0, 0}
};
@@ -300,7 +319,7 @@ int main(int argc, char *argv[])
level = 0.2;
opterr = 0;
- while ((option = getopt_long(argc, argv, "hLt:s:l:", long_options, &option_index)) != -1)
+ while ((option = getopt_long(argc, argv, "hLt:s:l:d", long_options, &option_index)) != -1)
{
switch (option)
{
@@ -324,6 +343,10 @@ int main(int argc, char *argv[])
type = TYPE_LOOP;
break;
+ case 'd':
+ show_debug = 1;
+ break;
+
case '?':
if ((optopt == 's') || (optopt == 't') || (optopt == 'l'))
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
@@ -337,7 +360,8 @@ int main(int argc, char *argv[])
abort();
}
}
-
+
+ /* Setup Audio Mux & SSI */
#ifdef IMXL
setreg("SFCSR", 0x0088);
setreg("STCCR", 0x6103);
@@ -345,15 +369,27 @@ int main(int argc, char *argv[])
setreg("STCR", 0x028D);
setreg("SCSR", 0xDB41);
#else
+# ifdef IMX27
+ /* Clock */
setreg("PCCR0", 0xd5010013);
setreg("PCCR1", 0xa21a0e30);
+ /* Audio Mux */
setreg("PPCR1", 0x00001000);
setreg("HPCR1", 0xcc007000);
+ /* SSI */
setreg("STCR_1", 0x0000028d); /* I2S mode */
setreg("SRCR_1", 0x0000028d); /* I2S mode */
setreg("STCCR_1", 0x0000e000);
- setreg("SCR_1", 0x00000057); /* I2S mode */
+# elif IMX51
+ /* Audio Mux (SSI1 <-> Port 3, synchronous) */
+ setreg("PTCR1", 0x94800800);
+ setreg("PDCR1", 0x00004000);
+ setreg("PTCR3", 0x00000800);
+ setreg("PDCR3", 0x00000000);
+# endif
+ setreg("SCR_1", 0x00000057); /* I2S mode, Tx & Rx on, SSI on */
#endif
+
audio(type, val, level);
return 0;
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2011-04-13 09:58:51
|
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 03b5a8a29f94b1419e099e831b43f984eb693b4c (commit)
via ffa6397da5d100d533f39132d899a2bc3ab295a0 (commit)
from b47f13d5e124998907cb99d680a133c21058d99d (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 03b5a8a29f94b1419e099e831b43f984eb693b4c
Merge: ffa6397da5d100d533f39132d899a2bc3ab295a0 b47f13d5e124998907cb99d680a133c21058d99d
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Apr 13 11:57:57 2011 +0200
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ffa6397da5d100d533f39132d899a2bc3ab295a0
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Apr 13 11:57:18 2011 +0200
[LINUX] Add direction to PWM0 GPIO port in patch 426.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-mx2-iomux-correct_gpio_port_names.patch | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
index 6704474..fb84a72 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
@@ -2,16 +2,16 @@ Fix GPIO port names.
Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:02.000000000 +0200
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:49.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-13 11:43:30.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-13 11:48:05.000000000 +0200
@@ -105,7 +105,7 @@
#define PD31_PF_CSPI1_MOSI (GPIO_PORTD | GPIO_PF | GPIO_OUT | 31)
#define PE3_PF_UART2_CTS (GPIO_PORTE | GPIO_PF | GPIO_OUT | 3)
#define PE4_PF_UART2_RTS (GPIO_PORTE | GPIO_PF | GPIO_IN | 4)
-#define PE5_PF_PWMO (GPIO_PORTE | GPIO_PF | 5)
-+#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_PF | 5)
++#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_PF | GPIO_OUT | 5)
#define PE6_PF_UART2_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 6)
#define PE7_PF_UART2_RXD (GPIO_PORTE | GPIO_PF | GPIO_IN | 7)
#define PE8_PF_UART3_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 8)
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-12 13:06:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b47f13d5e124998907cb99d680a133c21058d99d (commit)
from e4e2a2df874bb3900fecf8b903a43a15ce662dd4 (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 b47f13d5e124998907cb99d680a133c21058d99d
Author: Kevin JOLY <jol...@gm...>
Date: Tue Apr 12 14:21:57 2011 +0200
[BUILDROOT][PACKAGE]Update makefile of the package socketCAN for linux-2.6.38.1
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2010.11/042-socketcan.patch | 27 +++++++++++-------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index f6c2b7d..59a016a 100644
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ b/patches/buildroot/2010.11/042-socketcan.patch
@@ -5,8 +5,8 @@ Signed-off-by: Kevin Joly <jol...@gm...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-04-11 17:20:44.237382997 +0200
-+++ buildroot/package/Config.in 2011-04-11 17:21:39.009383007 +0200
+--- buildroot.orig/package/Config.in 2011-04-12 14:13:34.037382997 +0200
++++ buildroot/package/Config.in 2011-04-12 14:14:25.261382995 +0200
@@ -428,6 +428,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/socketcan/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in 2011-04-11 15:53:33.000000000 +0200
++++ buildroot/package/socketcan/Config.in 2011-04-12 14:13:34.057382996 +0200
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
@@ -38,8 +38,8 @@ Index: buildroot/package/socketcan/Config.in
Index: buildroot/package/socketcan/socketcan.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2011-04-11 17:06:23.000000000 +0200
-@@ -0,0 +1,57 @@
++++ buildroot/package/socketcan/socketcan.mk 2011-04-12 14:18:14.589382996 +0200
+@@ -0,0 +1,54 @@
+#############################################################
+#
+# Socket CAN
@@ -51,8 +51,11 @@ Index: buildroot/package/socketcan/socketcan.mk
+SOCKETCAN_DIR:=$(BUILD_DIR)/$(SOCKETCAN_NAME)
+SOCKETCAN_SOURCE:=$(SOCKETCAN_NAME).tar.bz2
+SOCKETCAN_CAT:=$(BZCAT)
-+PROGRAMS := can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
-+
++PROGRAMS_ISOTP = isotpdump,isotprecv,isotpsend,isotpsniffer,isotptun,isotpserver
++PROGRAMS_CANGW = cangw
++PROGRAMS_SLCAN = slcan_attach,slcand
++PROGRAMS_CAN_UTILS = can-calc-bit-timing,candump,cansniffer,cansend,canplayer,cangen,canbusload,log2long,log2asc,asc2log,canlogserver,bcmserver,slcanpty,canfdtest
++PROGRAMS = {$(PROGRAMS_ISOTP),$(PROGRAMS_CANGW),$(PROGRAMS_SLCAN),$(PROGRAMS_CAN_UTILS)}
+
+$(DL_DIR)/$(SOCKETCAN_SOURCE):
+ (cd $(BUILD_DIR); \
@@ -63,31 +66,26 @@ Index: buildroot/package/socketcan/socketcan.mk
+ )
+
+$(SOCKETCAN_DIR)/.unpacked: $(DL_DIR)/$(SOCKETCAN_SOURCE)
-+ $(SOCKETCAN_CAT) $($(SOCKETCAN_EXE)DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ $(SOCKETCAN_CAT) $(DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(SOCKETCAN_DIR) package/socketcan $(SOCKETCAN_NAME)\*.patch
+ touch $@
+
-+
+$(SOCKETCAN_DIR)/can-utils/$(PROGRAMS): $(SOCKETCAN_DIR)/.unpacked
+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils CC="$(TARGET_CC)"
-+ touch $@
+
+$(TARGET_DIR)/usr/local/bin/$(PROGRAMS): $(SOCKETCAN_DIR)/can-utils/$(PROGRAMS)
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
-+ touch $@
-+
++
+SOCKETCAN socketcan: $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
+
+socketcan-source: $(DL_DIR)/$(SOCKETCAN_SOURCE)
+
+socketcan-clean:
+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils clean
-+ rm -rf $(TARGET_DIR)/local/bin/$(PROGRAMS)
+
+socketcan-dirclean:
+ rm -rf $(SOCKETCAN_DIR)
+
-+
+############################################################
+#
+# Toplevel Makefile options
@@ -96,4 +94,3 @@ Index: buildroot/package/socketcan/socketcan.mk
+ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN)),y)
+TARGETS+=socketcan
+endif
-+
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2011-04-12 12:49: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 e4e2a2df874bb3900fecf8b903a43a15ce662dd4 (commit)
from 2a65a834ff56439cde683386f9efabcf5a598114 (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 e4e2a2df874bb3900fecf8b903a43a15ce662dd4
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Apr 12 14:49:25 2011 +0200
[LINUX] [2.6.29.6] Fix bug with MXC_IO_ADDRESS in Armadeus' backlight driver.
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/backlight/imx_bl_2.6.23.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/linux/modules/backlight/imx_bl_2.6.23.c b/target/linux/modules/backlight/imx_bl_2.6.23.c
index 2487438..a422bf9 100644
--- a/target/linux/modules/backlight/imx_bl_2.6.23.c
+++ b/target/linux/modules/backlight/imx_bl_2.6.23.c
@@ -30,8 +30,8 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#ifdef CONFIG_ARCH_IMX
#define LCDC_BASE_ADDR IMX_LCDC_BASE
-#define MXC_IO_ADDRESS IO_ADDRESS
#endif /* CONFIG_ARCH_IMX */
+#define MXC_IO_ADDRESS IO_ADDRESS
#else
#ifdef CONFIG_ARCH_MX1
#include <mach/mx1.h>
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-11 16:52: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 2a65a834ff56439cde683386f9efabcf5a598114 (commit)
via 3cca2d1bd73b3c5edf93e3c78838887941603a0a (commit)
from 432c0e22ff87d4220b9505d6e63caea163d2ccad (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 2a65a834ff56439cde683386f9efabcf5a598114
Author: Kevin JOLY <jol...@gm...>
Date: Mon Apr 11 18:38:17 2011 +0200
[LINUX][APF27-DEV] Update modalias mcp251x-->mcp2515
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
commit 3cca2d1bd73b3c5edf93e3c78838887941603a0a
Author: Kevin JOLY <jol...@gm...>
Date: Mon Apr 11 17:38:14 2011 +0200
[BUILDROOT][APF27-DEV] Upgrade socketcan for linux 2.6.38
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 13 +-
patches/buildroot/2010.11/042-socketcan.patch | 162 +++-----------------
2 files changed, 27 insertions(+), 148 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index c1d5a5a..fe25fe2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -7,11 +7,12 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Jeremie Scheer <jer...@ar...>
+Signed-off-by: Kevin Joly <jol...@gm...>
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-04-08 14:10:00.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-04-11 18:32:16.857382999 +0200
@@ -0,0 +1,728 @@
+ /*
+ * apf27.c
@@ -744,7 +745,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-04-08 13:48:21.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-04-11 18:32:16.857382999 +0200
@@ -0,0 +1,938 @@
+ /*
+ * apf27-dev.c
@@ -1271,7 +1272,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
+#endif
+#ifdef CONFIG_CAN_MCP251X
+ {
-+ .modalias = "mcp251x",
++ .modalias = "mcp2515",
+ .max_speed_hz = 8000000, /* 8MHz */
+ .bus_num = 1, /* SPI2 */
+ .mode = 0,
@@ -1687,7 +1688,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-04-08 13:48:21.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-04-11 18:32:16.861382996 +0200
@@ -0,0 +1,168 @@
+/*
+ * apf27-lcd.c
@@ -1860,7 +1861,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-04-08 13:48:21.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-04-11 18:32:16.861382996 +0200
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2040,7 +2041,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-08 14:09:01.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-11 18:35:22.017382998 +0200
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index 8ff0bb8..f6c2b7d 100644
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ b/patches/buildroot/2010.11/042-socketcan.patch
@@ -1,11 +1,12 @@
Add socketcan package to BR
Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Kevin Joly <jol...@gm...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:23:59.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:01.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-04-11 17:20:44.237382997 +0200
++++ buildroot/package/Config.in 2011-04-11 17:21:39.009383007 +0200
@@ -428,6 +428,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
@@ -17,8 +18,8 @@ Index: buildroot/package/Config.in
Index: buildroot/package/socketcan/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in 2011-01-27 15:24:01.000000000 +0100
-@@ -0,0 +1,21 @@
++++ buildroot/package/socketcan/Config.in 2011-04-11 15:53:33.000000000 +0200
+@@ -0,0 +1,15 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
+ help
@@ -34,71 +35,54 @@ Index: buildroot/package/socketcan/Config.in
+ as possible to the TCP/IP protocols to allow programmers, familiar
+ with network programming, to easily learn how to use CAN sockets.
+
-+config BR2_PACKAGE_SOCKETCAN_TEST
-+ bool "install test tools"
-+ depends on BR2_PACKAGE_SOCKETCAN
-+ help
-+ Compile and install socketcan test tools too.
-+
Index: buildroot/package/socketcan/socketcan.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2011-01-27 15:24:01.000000000 +0100
-@@ -0,0 +1,68 @@
++++ buildroot/package/socketcan/socketcan.mk 2011-04-11 17:06:23.000000000 +0200
+@@ -0,0 +1,57 @@
+#############################################################
+#
+# Socket CAN
+#
+#############################################################
+SOCKETCAN_TRUNK:=http://svn.berlios.de/svnroot/repos/socketcan/trunk
-+SOCKETCAN_REVISION:=874
++SOCKETCAN_REVISION:=1235
+SOCKETCAN_NAME:=socketcan-svn-rev$(SOCKETCAN_REVISION)
+SOCKETCAN_DIR:=$(BUILD_DIR)/$(SOCKETCAN_NAME)
+SOCKETCAN_SOURCE:=$(SOCKETCAN_NAME).tar.bz2
-+SOCKETCAN_CAT=$(BZCAT)
-+SOCKETCAN_EXE=candump
++SOCKETCAN_CAT:=$(BZCAT)
++PROGRAMS := can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
++
+
+$(DL_DIR)/$(SOCKETCAN_SOURCE):
+ (cd $(BUILD_DIR); \
-+ $(SVN_CO) -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
++ svn co -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
+ tar -cjvf $(SOCKETCAN_SOURCE) --exclude=.svn $(SOCKETCAN_NAME); \
+ rm -rf $(SOCKETCAN_DIR); \
+ mv $(SOCKETCAN_SOURCE) $(DL_DIR)/$(SOCKETCAN_SOURCE); \
+ )
+
+$(SOCKETCAN_DIR)/.unpacked: $(DL_DIR)/$(SOCKETCAN_SOURCE)
-+ $(SOCKETCAN_CAT) $(DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ $(SOCKETCAN_CAT) $($(SOCKETCAN_EXE)DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(SOCKETCAN_DIR) package/socketcan $(SOCKETCAN_NAME)\*.patch
+ touch $@
+
-+$(SOCKETCAN_DIR)/.compiled: $(SOCKETCAN_DIR)/.unpacked
-+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SOCKETCAN_DIR)/can-utils
-+ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN_TEST)),y)
-+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SOCKETCAN_DIR)/test
-+endif
++
++$(SOCKETCAN_DIR)/can-utils/$(PROGRAMS): $(SOCKETCAN_DIR)/.unpacked
++ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils CC="$(TARGET_CC)"
+ touch $@
+
-+$(TARGET_DIR)/usr/bin/$(SOCKETCAN_EXE): $(SOCKETCAN_DIR)/.compiled
-+ $(MAKE) STRIP_CMD="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(SOCKETCAN_DIR)/can-utils strip
-+ $(MAKE) INSTALL_DIR=$(TARGET_DIR)/usr/bin -C $(SOCKETCAN_DIR)/can-utils install
-+ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN_TEST)),y)
-+ $(MAKE) STRIP_CMD="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(SOCKETCAN_DIR)/test strip
-+ $(MAKE) INSTALL_DIR=$(TARGET_DIR)/usr/bin -C $(SOCKETCAN_DIR)/test install
-+endif
++$(TARGET_DIR)/usr/local/bin/$(PROGRAMS): $(SOCKETCAN_DIR)/can-utils/$(PROGRAMS)
++ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
+ touch $@
+
-+SOCKETCAN socketcan: uclibc $(TARGET_DIR)/usr/bin/$(SOCKETCAN_EXE)
++SOCKETCAN socketcan: $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
+
+socketcan-source: $(DL_DIR)/$(SOCKETCAN_SOURCE)
+
+socketcan-clean:
+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils clean
-+ $(MAKE) INSTALL_DIR=$(TARGET_DIR)/usr/bin -C $(SOCKETCAN_DIR)/can-utils uninstall
-+ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN_TEST)),y)
-+ $(MAKE) -C $(SOCKETCAN_DIR)/test distclean
-+ $(MAKE) INSTALL_DIR=$(TARGET_DIR)/usr/bin -C $(SOCKETCAN_DIR)/test clean
-+endif
-+ rm $(SOCKETCAN_DIR)/.compiled
++ rm -rf $(TARGET_DIR)/local/bin/$(PROGRAMS)
+
+socketcan-dirclean:
+ rm -rf $(SOCKETCAN_DIR)
@@ -113,109 +97,3 @@ Index: buildroot/package/socketcan/socketcan.mk
+TARGETS+=socketcan
+endif
+
-Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch 2011-01-27 15:24:01.000000000 +0100
-@@ -0,0 +1,33 @@
-+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
-+--- socketcan-svn-rev810.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
-++++ socketcan-svn-rev810/can-utils/Makefile 2008-07-16 11:19:21.000000000 +0200
-+@@ -40,6 +40,10 @@
-+ #
-+ # Send feedback to <soc...@li...>
-+
-++ifeq ($(INSTALL_DIR),)
-++ INSTALL_DIR=/usr/local/bin
-++endif
-++
-+ MAKEFLAGS = -k
-+
-+ CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
-+@@ -52,11 +56,17 @@
-+
-+ all: $(PROGRAMS)
-+
-++strip: all
-++ $(STRIP_CMD) $(PROGRAMS)
-++
-+ clean:
-+ rm -f $(PROGRAMS) *.o
-+
-+ install:
-+- cp -f $(PROGRAMS) /usr/local/bin
-++ cp -f $(PROGRAMS) $(INSTALL_DIR)
-++
-++uninstall:
-++ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-+
-+ distclean:
-+ rm -f $(PROGRAMS) *.o *~
-Index: buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch 2011-01-27 15:24:01.000000000 +0100
-@@ -0,0 +1,63 @@
-+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
-+--- socketcan-svn-rev874.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
-++++ socketcan-svn-rev874/can-utils/Makefile 2008-07-16 11:19:21.000000000 +0200
-+@@ -40,6 +40,10 @@
-+ #
-+ # Send feedback to <soc...@li...>
-+
-++ifeq ($(INSTALL_DIR),)
-++ INSTALL_DIR=/usr/local/bin
-++endif
-++
-+ MAKEFLAGS = -k
-+
-+ CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
-+@@ -52,11 +56,17 @@
-+
-+ all: $(PROGRAMS)
-+
-++strip: all
-++ $(STRIP_CMD) $(PROGRAMS)
-++
-+ clean:
-+ rm -f $(PROGRAMS) *.o
-+
-+ install:
-+- cp -f $(PROGRAMS) /usr/local/bin
-++ cp -f $(PROGRAMS) $(INSTALL_DIR)
-++
-++uninstall:
-++ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-+
-+ distclean:
-+ rm -f $(PROGRAMS) *.o *~
-+--- socketcan-svn-rev874.org/test/Makefile 2008-12-06 22:22:28.000000000 +0100
-++++ socketcan-svn-rev874/test/Makefile 2008-12-06 22:33:10.000000000 +0100
-+@@ -40,6 +40,10 @@
-+ #
-+ # Send feedback to <soc...@li...>
-+
-++ifeq ($(INSTALL_DIR),)
-++ INSTALL_DIR=/usr/local/bin
-++endif
-++
-+ CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
-+ -fno-strict-aliasing \
-+ -DPF_CAN=29 \
-+@@ -64,11 +68,14 @@
-+
-+ all: $(PROGRAMS)
-+
-++strip: all
-++ $(STRIP_CMD) $(PROGRAMS)
-++
-+ install:
-+- cp -f $(PROGRAMS) /usr/local/bin
-++ cp -f $(PROGRAMS) $(INSTALL_DIR)
-+
-+ clean:
-+- rm -f $(PROGRAMS)
-++ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-+
-+ distclean:
-+ rm -f $(PROGRAMS) *~
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-04-11 08:50:53
|
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 432c0e22ff87d4220b9505d6e63caea163d2ccad (commit)
via bea11b0008f57296683b2395cbe2bd405b74bdb2 (commit)
from c370a7ae9bf6763560df39995b445b0bf2777176 (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 432c0e22ff87d4220b9505d6e63caea163d2ccad
Merge: bea11b0008f57296683b2395cbe2bd405b74bdb2 c370a7ae9bf6763560df39995b445b0bf2777176
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 11 10:49:50 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit bea11b0008f57296683b2395cbe2bd405b74bdb2
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 11 10:48:47 2011 +0200
[LINUX] Makes Armadeus custom drivers compile again on new BR
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/Makefile | 2 +-
target/linux/modules/display/Makefile | 2 +-
target/linux/modules/fpga/Makefile | 4 ----
target/linux/modules/gpio/Makefile | 2 +-
target/linux/modules/isp1761/Makefile | 4 ----
5 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/target/linux/modules/Makefile b/target/linux/modules/Makefile
index 6e14e40..e075544 100755
--- a/target/linux/modules/Makefile
+++ b/target/linux/modules/Makefile
@@ -25,7 +25,7 @@ KDIR := $(LINUX_DIR)
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux- modules
DIRS := $(shell ls)
clean:
diff --git a/target/linux/modules/display/Makefile b/target/linux/modules/display/Makefile
index 7783230..06d7ba2 100644
--- a/target/linux/modules/display/Makefile
+++ b/target/linux/modules/display/Makefile
@@ -1,5 +1,5 @@
#
-# Makefile for the i.MXL backlight driver
+# Makefile for the hx5116_display driver
#
# Part executed when called from kernel build system:
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index 463ba70..905acf8 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -26,9 +26,5 @@ PWD := $(shell pwd)
# Armadeus custom drivers common targets (default, clean, etc...)
include ../Makefile.in
-install:
- echo "Installing Armadeus drivers..."
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-
endif
diff --git a/target/linux/modules/gpio/Makefile b/target/linux/modules/gpio/Makefile
index 1b06f42..d536614 100755
--- a/target/linux/modules/gpio/Makefile
+++ b/target/linux/modules/gpio/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_ARMADEUS_GPIO_DRIVER) += gpio.o
obj-$(CONFIG_ARMADEUS_PPDEV_DRIVER) += ppdev.o
gpio-objs := core.o
-ppdev-objs := ppdevemu.o
+ppdev-objs := ppdevemu.o
# Part executed when called from standard make in this directory:
# (preferably use Makefile in parent directory)
diff --git a/target/linux/modules/isp1761/Makefile b/target/linux/modules/isp1761/Makefile
index fb7db04..63f4599 100644
--- a/target/linux/modules/isp1761/Makefile
+++ b/target/linux/modules/isp1761/Makefile
@@ -22,8 +22,4 @@ PWD := $(shell pwd)
# Armadeus custom drivers common targets (default, clean, etc...)
include ../Makefile.in
-install:
- echo "Installing Armadeus drivers..."
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-
endif
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2011-04-08 15:32: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 c370a7ae9bf6763560df39995b445b0bf2777176 (commit)
via 5ebd91d8660e05626c47e4f25ef57d208199af07 (commit)
via dc92496fdb458b28a76bae47b5fe6ce59cf4e3ef (commit)
via 86290b7a6caaa0634fcaf7b628fb6a6e4a5687e0 (commit)
via 33021bb72ba04429b05816c96b1ce7347a03bd42 (commit)
via 8b975748b66cdecbcfeaf9485c59f0559a9274ba (commit)
via 5e751660805224eaf043fd0344b1fbd5b64a88d3 (commit)
from 4e73a16427dc35f5c3fa0dee2b4f89d565252f54 (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 c370a7ae9bf6763560df39995b445b0bf2777176
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:30:10 2011 +0200
[LINUX] [2.6.38.1] Convert Armadeus driver PWM from Linux 2.6.38.1 (pwm.c).
commit 5ebd91d8660e05626c47e4f25ef57d208199af07
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:29:23 2011 +0200
[LINUX] [2.6.38.1] Convert Armadeus driver IMX Backlight from Linux 2.6.29.6 (imx_bl_2.6.23.c)
commit dc92496fdb458b28a76bae47b5fe6ce59cf4e3ef
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:27:45 2011 +0200
[LINUX] [2.6.38.1] Convert driver ad9889 from Linux 2.6.29.6 in patch 314.
commit 86290b7a6caaa0634fcaf7b628fb6a6e4a5687e0
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:26:17 2011 +0200
[LINUX] [2.6.38.1] Convert preprocessor variables in patch 291 (board-apf27.h) from Linux 2.6.29.6.
commit 33021bb72ba04429b05816c96b1ce7347a03bd42
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:24:57 2011 +0200
[LINUX] [2.6.38.1] Fix PWM's GPIO variable name in patch 426.
commit 8b975748b66cdecbcfeaf9485c59f0559a9274ba
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:21:13 2011 +0200
[LINUX] [2.6.38.1] Add an option to mach-imx's Kconfig to support PWM in patch 282.
commit 5e751660805224eaf043fd0344b1fbd5b64a88d3
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:18:31 2011 +0200
[LINUX] [2.6.38.1] Make PWM device be registered in apf27.c' (patch 281).
[LINUX] [2.6.38.1] Convert the apf27 platform file in patch 281 from Linux 2.6.29.6.
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 76 ++++++++-----------
...-apf27-armadeus-add_apf27_to_build_system.patch | 11 ++--
...291-apf27-armadeus-add_mach_board-apf27_h.patch | 7 +-
.../2.6.38/314-armadeus-ad9889-add_driver.patch | 37 +++++-----
...rmadeus-mx2-iomux-correct_gpio_port_names.patch | 17 +++++
target/linux/modules/backlight/imx_bl_2.6.23.c | 40 +++++++++-
target/linux/modules/pwm/pwm.c | 48 ++++++++++++-
7 files changed, 161 insertions(+), 75 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index f493ce8..c1d5a5a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -6,12 +6,13 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-03-21 11:56:54.000000000 +0100
-@@ -0,0 +1,745 @@
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-04-08 14:10:00.000000000 +0200
+@@ -0,0 +1,728 @@
+ /*
+ * apf27.c
+ *
@@ -96,7 +97,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
+#endif
++#ifdef CONFIG_ARMADEUS_PWM_DRIVER
++#define CONFIG_PWM
++#endif
+
++extern const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst;
+
+static int apf27_pins[] = {
+ /* CONSOLE */
@@ -146,6 +151,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ /* I2C2 */
+ PC5_PF_I2C2_SDA,
+ PC6_PF_I2C2_SCL,
++ /* PWM */
++ PE5_PF_PWM0,
+};
+
+int lan8700_wakeup(struct phy_device *phydev)
@@ -160,29 +167,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ return 0;
+}
+
-+#ifdef CONFIG_PWM
-+static int mxc_pwm0_pins[] = {
-+ PE5_PF_PWM0
-+};
-+
-+static int apf27_pwm_0_init(void)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_pwm0_pins, ARRAY_SIZE(mxc_pwm0_pins), "PWM0");
-+}
-+
-+static int apf27_pwm_0_exit(void)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_pwm0_pins, ARRAY_SIZE(mxc_pwm0_pins));
-+ return 0;
-+}
-+
-+static struct imx_pwm_platform_data apf27_pwm_0_data = {
-+ .init = apf27_pwm_0_init,
-+ .exit = apf27_pwm_0_exit,
-+};
-+#endif
-+
-+
+/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
+static struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
+ .width = 2,
@@ -700,7 +684,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ imx27_add_mxc_nand(&apf27_nand_board_info);
+
+#ifdef CONFIG_PWM
-+ mxc_register_device(&mxc_pwm_device0, &apf27_pwm_0_data);
++ imx_add_mxc_pwm(&imx27_mxc_pwm_data);
+#endif
+
+ imx27_add_imx2_wdt(NULL);
@@ -757,11 +741,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ .init_machine = apf27_init,
+ .timer = &apf27_timer,
+MACHINE_END
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-03-21 14:14:34.000000000 +0100
-@@ -0,0 +1,934 @@
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-04-08 13:48:21.000000000 +0200
+@@ -0,0 +1,938 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -827,7 +811,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#include <linux/can/platform/mcp251x.h>
+#if 0
+#include "../../../drivers/armadeus/pwm/pwm.h"
-+#include <media/ad9889.h>
+#include <mach/imx_dam.h>
+#include <mach/imx_sound.h>
+#include <mach/imx-alsa.h>
@@ -835,6 +818,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#endif
+#include <mach/ssi.h>
+
++#include <media/ad9889.h>
++
+#include <media/soc_camera.h>
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
+#include "cpufreq_imx.h"
@@ -848,6 +833,9 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#include "devices-imx27.h"
+//#include "crm_regs.h"
+
++#include <mach/mx27.h>
++#define VA_GPIO_BASE MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
++
+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+extern void apf27_lcd_init(void);
+#endif
@@ -1032,8 +1020,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+};
+
+static struct ad9889_fb_data apf27_ad9889_fb_data;
-+extern void acquire_console_sem(void);
-+extern void release_console_sem(void);
++extern void console_lock(void);
++extern void console_unlock(void);
+
+static void ad9889_display_connected(void)
+{
@@ -1069,13 +1057,13 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+ temp_var.vmode = FB_VMODE_NONINTERLACED,
+ temp_var.nonstd = 0;
+
-+ acquire_console_sem();
++ console_lock();
+ /* tel the FB client that params have been changed */
+ info->flags |= FBINFO_MISC_USEREVENT;
+ /* set new params */
+ fb_set_var(info, &temp_var);
+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
++ console_unlock();
+}
+
+static void ad9889_display_disconnected(void)
@@ -1086,13 +1074,13 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+ if (apf27_ad9889_fb_data.PA31_GIUS_old_state)
+ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO);
+
-+ acquire_console_sem();
++ console_lock();
+ /* inform the console that the FB params have been changed */
+ info->flags |= FBINFO_MISC_USEREVENT;
+ /* restore old FB params */
+ fb_set_var(info, &apf27_ad9889_fb_data.var);
+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
++ console_unlock();
+}
+
+static struct ad9889_config apf27_ad9889_config = {
@@ -1696,10 +1684,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#endif
+}
+
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-03-21 11:56:54.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-04-08 13:48:21.000000000 +0200
@@ -0,0 +1,168 @@
+/*
+ * apf27-lcd.c
@@ -1869,10 +1857,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+ return;
+}
+
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-03-21 11:56:54.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-04-08 13:48:21.000000000 +0200
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2049,10 +2037,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
+ printk("done\n");
+}
+
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-21 14:25:38.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-08 14:09:01.000000000 +0200
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
index 0d1c4bb..c0d8790 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Kconfig 2011-02-09 14:47:30.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig 2011-02-14 16:09:34.000000000 +0100
-@@ -350,4 +350,121 @@
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Kconfig 2011-04-04 14:51:50.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig 2011-04-04 14:54:28.000000000 +0200
+@@ -350,4 +350,122 @@
Include support for i-MXT (aka td60) platform. This
includes specific configurations for the module and its peripherals.
@@ -16,6 +16,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
+ select IMX_HAVE_PLATFORM_MXC_EHCI
+ select IMX_HAVE_PLATFORM_MXC_NAND
+ select IMX_HAVE_PLATFORM_SPI_IMX
++ select IMX_HAVE_PLATFORM_MXC_PWM
+ select MXC_ULPI if USB_ULPI
+ select SERIAL_IMX_UART1
+ help
@@ -126,8 +127,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
endif
Index: linux-2.6.38-rc3/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Makefile 2011-02-09 14:47:30.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/Makefile 2011-02-09 14:47:31.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Makefile 2011-04-04 14:51:50.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Makefile 2011-04-04 14:53:56.000000000 +0200
@@ -38,3 +38,7 @@
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
index afea8ad..98ed759 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
@@ -1,9 +1,10 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf27.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h 2010-12-22 14:34:38.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf27.h 2011-03-28 18:07:48.000000000 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2010 Armadeus Systems
@@ -38,7 +39,7 @@ Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h
+
+/* FPGA addresses */
+#define APF27_FPGA_VIRT (CS5_BASE_ADDR_VIRT)
-+#define APF27_FPGA_PHYS (CS5_BASE_ADDR)
++#define APF27_FPGA_PHYS (MX27_CS5_BASE_ADDR)
+#define ARMADEUS_FPGA_BASE_ADDR_VIRT (APF27_FPGA_VIRT)
+#define ARMADEUS_FPGA_BASE_ADDR_PHYS (APF27_FPGA_PHYS)
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
index 5bbb959..734cca3 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
@@ -1,12 +1,13 @@
Adds a driver for Analog Devices AD9889 digital video encoder.
Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.36/drivers/media/video/Makefile
+Index: linux-2.6.38-rc3/drivers/media/video/Makefile
===================================================================
---- linux-2.6.36.orig/drivers/media/video/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/media/video/Makefile 2010-11-25 11:05:40.000000000 +0100
-@@ -44,6 +44,7 @@
+--- linux-2.6.38-rc3.orig/drivers/media/video/Makefile 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/drivers/media/video/Makefile 2011-03-29 10:14:12.000000000 +0200
+@@ -37,6 +37,7 @@
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
@@ -14,11 +15,11 @@ Index: linux-2.6.36/drivers/media/video/Makefile
obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
-Index: linux-2.6.36/drivers/media/video/Kconfig
+Index: linux-2.6.38-rc3/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.36.orig/drivers/media/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/media/video/Kconfig 2010-11-25 11:05:40.000000000 +0100
-@@ -448,6 +448,16 @@
+--- linux-2.6.38-rc3.orig/drivers/media/video/Kconfig 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/drivers/media/video/Kconfig 2011-03-29 10:14:12.000000000 +0200
+@@ -434,6 +434,16 @@
To compile this driver as a module, choose M here: the
module will be called saa7185.
@@ -35,11 +36,11 @@ Index: linux-2.6.36/drivers/media/video/Kconfig
config VIDEO_ADV7170
tristate "Analog Devices ADV7170 video encoder"
depends on VIDEO_V4L2 && I2C
-Index: linux-2.6.36/drivers/media/video/ad9889.c
+Index: linux-2.6.38-rc3/drivers/media/video/ad9889.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/media/video/ad9889.c 2010-11-25 11:05:40.000000000 +0100
-@@ -0,0 +1,513 @@
++++ linux-2.6.38-rc3/drivers/media/video/ad9889.c 2011-03-29 10:13:25.000000000 +0200
+@@ -0,0 +1,515 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
+ *
@@ -69,7 +70,7 @@ Index: linux-2.6.36/drivers/media/video/ad9889.c
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
-+#include <media/v4l2-i2c-drv.h>
++#include <media/v4l2-ctrls.h>
+#include <media/ad9889.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
@@ -546,17 +547,19 @@ Index: linux-2.6.36/drivers/media/video/ad9889.c
+};
+MODULE_DEVICE_TABLE(i2c, ad9889_id);
+
-+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-+ .name = "ad9889",
-+ /*.command = ad9889_command,*/
++static struct i2c_driver ad9889_driver = {
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = "ad9889",
++ },
+ .probe = ad9889_probe,
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
-Index: linux-2.6.36/include/media/ad9889.h
+Index: linux-2.6.38-rc3/include/media/ad9889.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/include/media/ad9889.h 2010-11-25 11:05:40.000000000 +0100
++++ linux-2.6.38-rc3/include/media/ad9889.h 2011-03-28 18:12:54.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
new file mode 100644
index 0000000..6704474
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
@@ -0,0 +1,17 @@
+Fix GPIO port names.
+
+Signed-off-by: Jeremie Scheer <jer...@ar...>
+
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+===================================================================
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:02.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:49.000000000 +0200
+@@ -105,7 +105,7 @@
+ #define PD31_PF_CSPI1_MOSI (GPIO_PORTD | GPIO_PF | GPIO_OUT | 31)
+ #define PE3_PF_UART2_CTS (GPIO_PORTE | GPIO_PF | GPIO_OUT | 3)
+ #define PE4_PF_UART2_RTS (GPIO_PORTE | GPIO_PF | GPIO_IN | 4)
+-#define PE5_PF_PWMO (GPIO_PORTE | GPIO_PF | 5)
++#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_PF | 5)
+ #define PE6_PF_UART2_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 6)
+ #define PE7_PF_UART2_RXD (GPIO_PORTE | GPIO_PF | GPIO_IN | 7)
+ #define PE8_PF_UART3_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 8)
diff --git a/target/linux/modules/backlight/imx_bl_2.6.23.c b/target/linux/modules/backlight/imx_bl_2.6.23.c
index c261352..2487438 100644
--- a/target/linux/modules/backlight/imx_bl_2.6.23.c
+++ b/target/linux/modules/backlight/imx_bl_2.6.23.c
@@ -26,9 +26,23 @@
#include <mach/imxfb.h> /* Backlight machinfo struct is defined here */
#include <mach/hardware.h>
#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#ifdef CONFIG_ARCH_IMX
-#define LCDC_BASE_ADDR IMX_LCDC_BASE
-#endif
+#define LCDC_BASE_ADDR IMX_LCDC_BASE
+#define MXC_IO_ADDRESS IO_ADDRESS
+#endif /* CONFIG_ARCH_IMX */
+#else
+#ifdef CONFIG_ARCH_MX1
+#include <mach/mx1.h>
+#define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
+#define MXC_IO_ADDRESS MX1_IO_ADDRESS
+#else
+# include <mach/mx2x.h>
+#define LCDC_BASE_ADDR MX27_LCDC_BASE_ADDR
+#define MXC_IO_ADDRESS MX27_IO_ADDRESS
+#endif /* CONFIG_ARCH_MX1 */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) */
#define DRIVER_NAME "imx-bl"
#define DRIVER_VERSION "0.2"
@@ -61,10 +75,10 @@ static int imxbl_send_intensity(struct backlight_device *bd)
if( bl_machinfo->set_bl_intensity ) {
bl_machinfo->set_bl_intensity(intensity);
} else { /* Otherwise use this default one: */
- shadow = readl(IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c); /* PWMR / LPCCR */
+ shadow = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c); /* PWMR / LPCCR */
shadow &= ~PWMR_PW(0xff);
shadow |= PWMR_PW(intensity);
- writel(shadow, IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
+ writel(shadow, MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
pr_debug("Setting backlight intensity to %d\n", intensity);
}
@@ -130,8 +144,23 @@ static int imxbl_probe(struct platform_device *pdev)
if (!machinfo->limit_mask)
machinfo->limit_mask = -1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ struct backlight_properties props;
+
+ memset(&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = machinfo->max_intensity;
+ props.power = FB_BLANK_UNBLANK;
+ props.brightness = machinfo->default_intensity;
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
imx_backlight_device = backlight_device_register(DRIVER_NAME,
&pdev->dev, NULL, &imxbl_ops);
+#else
+ imx_backlight_device = backlight_device_register(DRIVER_NAME,
+ &pdev->dev, NULL, &imxbl_ops, &props);
+#endif
+
if (IS_ERR (imx_backlight_device)) {
printk("can't register backlight device\n");
return PTR_ERR (imx_backlight_device);
@@ -139,9 +168,12 @@ static int imxbl_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, imx_backlight_device);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
imx_backlight_device->props.max_brightness = machinfo->max_intensity;
imx_backlight_device->props.power = FB_BLANK_UNBLANK;
imx_backlight_device->props.brightness = machinfo->default_intensity;
+#endif
+
backlight_update_status(imx_backlight_device);
printk("i.MX Backlight driver v" DRIVER_VERSION " initialized.\n");
diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index 82c686e..933f529 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -43,6 +43,10 @@
#include <linux/circ_buf.h>
#include <linux/platform_device.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#include <linux/slab.h>
+#endif
+
#include "pwm.h"
#ifdef CONFIG_ARCH_MX2
@@ -109,7 +113,12 @@
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#define DRIVER_NAME "imx-pwm"
+#else
+#define DRIVER_NAME "mxc_pwm"
+#endif
+
#define DRIVER_VERSION "0.8"
@@ -418,12 +427,19 @@ static int pwm_fasync(int fd, struct file *filp, int mode)
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
int pwm_ioctl(struct inode * inode, struct file *filp, unsigned int cmd, unsigned long arg)
+#else
+int pwm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+#endif
{
char *str=NULL;
int ret = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = dev_table[iminor(inode)];
-
+#else
+ struct pwm_device *pwm = dev_table[iminor(filp->f_dentry->d_inode)];
+#endif
switch (cmd) {
/* Set PWM Mode (Tone or Playback) */
case PWM_IOC_SMODE:
@@ -631,7 +647,11 @@ struct file_operations pwm_fops = {
release: pwm_release,
read: pwm_read,
write: pwm_write,
- ioctl: pwm_ioctl,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ ioctl: pwm_ioctl,
+#else
+ unlocked_ioctl: pwm_ioctl,
+#endif
fasync: pwm_fasync
};
@@ -850,10 +870,12 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
return -ENODEV;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (!pdata) {
dev_err(&pdev->dev, "platform data not supplied\n");
return -ENOENT;
}
+#endif
pwm = kmalloc(sizeof(struct pwm_device), GFP_KERNEL);
if (!pwm) {
@@ -912,9 +934,11 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
init_waitqueue_head(&pwm->write_wait);
init_waitqueue_head(&pwm->exit_wait);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
/* init gpio */
if (pdata->init)
pdata->init();
+#endif
/* Create /dev */
pwm->dev = device_create(pwm_class, NULL, MKDEV(gMajor, pdev->id), NULL, "pwm%i", pdev->id);
@@ -955,8 +979,10 @@ error_file:
error_dev_create:
device_destroy(pwm_class, MKDEV(gMajor, pdev->id));
error_platform_init:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit)
pdata->exit();
+#endif
free_irq(pwm->irq, pwm);
error_chrdev:
unregister_chrdev(gMajor, DRIVER_NAME);
@@ -982,7 +1008,11 @@ static inline void unregister_sys_file(struct pwm_device *pwm)
static int imx_pwm_drv_remove(struct platform_device *pdev)
{
struct resource *res;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
unregister_sys_file(pwm);
@@ -993,8 +1023,10 @@ static int imx_pwm_drv_remove(struct platform_device *pdev)
release_mem_region(res->start, res->end - res->start + 1);
kfree(pwm);
dev_table[pdev->id] = NULL;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit())
pdata->exit();
+#endif
return 0;
}
@@ -1002,26 +1034,38 @@ static int imx_pwm_drv_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int imx_pwm_drv_suspend(struct platform_device *pdev, pm_message_t state)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
clk_disable(pwm->clk);
dev_dbg(&pdev->dev, "suspended\n");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit())
pdata->exit();
+#endif
return 0;
}
static int imx_pwm_drv_resume(struct platform_device *pdev)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
clk_enable(pwm->clk);
dev_dbg(&pdev->dev, "resumed\n");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->init())
pdata->init();
+#endif
return 0;
}
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-06 15:36: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 4e73a16427dc35f5c3fa0dee2b4f89d565252f54 (commit)
via 6a1928947b4b7b923508ba0786134ebd15179d7b (commit)
from 052d46939ef1911b460646dbe391aee6efd12b57 (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 4e73a16427dc35f5c3fa0dee2b4f89d565252f54
Merge: 6a1928947b4b7b923508ba0786134ebd15179d7b 052d46939ef1911b460646dbe391aee6efd12b57
Author: Fabien Marteau <fab...@ar...>
Date: Wed Apr 6 17:36:22 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6a1928947b4b7b923508ba0786134ebd15179d7b
Author: Fabien Marteau <fab...@ar...>
Date: Wed Apr 6 17:35:35 2011 +0200
[u-boot][apf51][software][u-boot_recover] Delete #! tabulation
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf51_recover.py | 74 +++++++++++++++---------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index 955a505..56a1728 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -116,7 +116,7 @@ class apf51Bootloader:
def __displayProgress(self, text):
sys.stdout.write(chr(13))
print text,
- sys.stdout.flush()
+ sys.stdout.flush()
# addr: address to read
# count: number of bytes to read
@@ -208,7 +208,7 @@ class apf51Bootloader:
data = f.read(16)
self.__displayProgress("%d bytes transfered" % total)
print ""
- f.close()
+ f.close()
return
def buildcmd(self, cmd, addr, ds, cnt, data, ft):
@@ -304,7 +304,7 @@ class apf51Bootloader:
self.put("73FA88B8","00000006","l")
# DDR_SR_A1
self.put("73FA88BC","00000000","l")
-
+
def initSDRAM2(self):
print "SDRAM INIT2 APF",
#ESDCTL0: 13 ROW, 10 COL, 32Bit
@@ -326,7 +326,7 @@ class apf51Bootloader:
self.put("83FD900C","C33574AA","l")
#ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
self.put("83FD9010","000a1700","l")
-
+
def initSDRAM1(self, sdramType):
print "SDRAM INIT1 APF",
#ESDCTL0: 13 ROW, 10 COL, 32Bit
@@ -388,7 +388,7 @@ class UBoot:
if not os.path.exists(BINARY):
raise Error("file "+BINARY+" doesn't exit",0)
fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
- print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
+ print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
self.bootstrap.download("90000000", BINARY, fsize, "AA")
self.bootstrap.put("90000000", "90000004", "l")
#self.bootstrap.download("1FFE2000",BINARY, "00000400", "AA")
@@ -428,7 +428,7 @@ if __name__ == "__main__":
ser = serial.Serial(port, SPEED, timeout=2)
except Exception, msg:
print "unable to open serial port %s" % port
- print msg
+ print msg
sys.exit()
ser.flush()
@@ -436,29 +436,29 @@ if __name__ == "__main__":
uboot = UBoot(apfBootloader, ser)
apfBootloader.getstatus()
-# apfBootloader.get("CFFF0000","4", "l")
-# apfBootloader.get("CFFF0004","4", "l")
-# apfBootloader.get("CFFF0008","4", "l")
-# apfBootloader.get("CFFF000C","4", "l")
-# apfBootloader.get("CFFF0400","4", "l")
-# apfBootloader.get("CFFF0404","4", "l")
-# apfBootloader.get("CFFF0408","4", "l")
-# apfBootloader.get("CFFF040C","4", "l")
-# apfBootloader.get("1FFE1A98","4", "l")
-# apfBootloader.get("1FFE0800","4", "l")
-# apfBootloader.get("1FFE0804","4", "l")
-# apfBootloader.get("1FFE0808","4", "l")
-# apfBootloader.get("1FFE080C","4", "l")
-# apfBootloader.get("1FFE0810","4", "l")
-# apfBootloader.get("1FFE2000","4", "l")
-# apfBootloader.get("1FFE2004","4", "l")
-# apfBootloader.get("1FFE2008","4", "l")
-# apfBootloader.get("1FFE200C","4", "l")
-# apfBootloader.get("1FFE0810","4", "l")
-# apfBootloader.get("73FD0000","4", "l")
-# apfBootloader.get("73FD0004","4", "l")
-# apfBootloader.get("73FD0008","4", "l")
-# apfBootloader.get("73FD0014","4", "l")
+# apfBootloader.get("CFFF0000","4", "l")
+# apfBootloader.get("CFFF0004","4", "l")
+# apfBootloader.get("CFFF0008","4", "l")
+# apfBootloader.get("CFFF000C","4", "l")
+# apfBootloader.get("CFFF0400","4", "l")
+# apfBootloader.get("CFFF0404","4", "l")
+# apfBootloader.get("CFFF0408","4", "l")
+# apfBootloader.get("CFFF040C","4", "l")
+# apfBootloader.get("1FFE1A98","4", "l")
+# apfBootloader.get("1FFE0800","4", "l")
+# apfBootloader.get("1FFE0804","4", "l")
+# apfBootloader.get("1FFE0808","4", "l")
+# apfBootloader.get("1FFE080C","4", "l")
+# apfBootloader.get("1FFE0810","4", "l")
+# apfBootloader.get("1FFE2000","4", "l")
+# apfBootloader.get("1FFE2004","4", "l")
+# apfBootloader.get("1FFE2008","4", "l")
+# apfBootloader.get("1FFE200C","4", "l")
+# apfBootloader.get("1FFE0810","4", "l")
+# apfBootloader.get("73FD0000","4", "l")
+# apfBootloader.get("73FD0004","4", "l")
+# apfBootloader.get("73FD0008","4", "l")
+# apfBootloader.get("73FD0014","4", "l")
apfBootloader.initIOMUX()
apfBootloader.initSDRAM1("APF51")
@@ -499,7 +499,7 @@ if __name__ == "__main__":
apfBootloader.put("90000024", "80000000", "l")
time.sleep(1)
-
+
apfBootloader.get("90000000", "4", "l")
apfBootloader.get("90000004", "4", "l")
apfBootloader.get("90000008", "4", "l")
@@ -532,17 +532,17 @@ if __name__ == "__main__":
apfBootloader.get("90000018", "4", "l")
apfBootloader.get("9000001C", "4", "l")
apfBootloader.get("90000024", "4", "l")
-
+
# configure iomux as gpio for NAND_RB1 et RB2
# apfBootloader.put("73FA8120", "00000003", "l")
# apfBootloader.put("73FA8124", "00000003", "l")
# apfBootloader.put("73FA8128", "00000003", "l")
print 'NFC'
- apfBootloader.get("83FDB02C","4", "l")
- apfBootloader.get("83FDB024","4", "l")
- apfBootloader.get("83FDB02C","4", "l")
+ apfBootloader.get("83FDB02C","4", "l")
+ apfBootloader.get("83FDB024","4", "l")
+ apfBootloader.get("83FDB02C","4", "l")
print 'config3'
- apfBootloader.get("83FDB028","4", "l")
+ apfBootloader.get("83FDB028","4", "l")
print 'SBMR'
apfBootloader.get("73FD0004","4", "l")
@@ -554,7 +554,7 @@ if __name__ == "__main__":
# apfBootloader.put("73FC0080", "00000000", "l")
# apfBootloader.get("1FFE2000","4", "l")
-
+
# apfBootloader.get("90000004","4", "l")
# apfBootloader.get("90000008","4", "l")
# apfBootloader.get("9000000C","4", "l")
@@ -563,7 +563,7 @@ if __name__ == "__main__":
# apfBootloader.get("90001140","4", "l")
# apfBootloader.get("90001148","4", "l")
# apfBootloader.get("9000114C","4", "l")
-
+
eraseAll = raw_input('Would you like to erase the environment variables ? y/N: ')
if eraseAll == 'y':
uboot.resetenv()
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-04-06 07:10:32
|
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 052d46939ef1911b460646dbe391aee6efd12b57 (commit)
via c346c522633424d3f69cfb40c71f955798a47771 (commit)
from 0bec233eff1b77d606cfd6650304d36b00d94726 (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 052d46939ef1911b460646dbe391aee6efd12b57
Merge: c346c522633424d3f69cfb40c71f955798a47771 0bec233eff1b77d606cfd6650304d36b00d94726
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 6 09:09:53 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c346c522633424d3f69cfb40c71f955798a47771
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 6 09:09:32 2011 +0200
[LINUX] Moves APF27 support from 2.6.38-rc3 to 2.6.38.1
-----------------------------------------------------------------------
Summary of changes:
...6.38-rc3.config => apf27-linux-2.6.38.1.config} | 0
.../armadeus/apf27/apf27-linux-2.6.38.config | 13 ++++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-2.6.38-rc3.config => apf27-linux-2.6.38.1.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.1.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 6586bea..23c1431 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Tue Mar 22 11:42:18 2011
+# Linux/arm 2.6.38.1 Kernel Configuration
+# Fri Apr 1 16:25:18 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -20,6 +20,7 @@ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_FIQ=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y
@@ -300,6 +301,10 @@ CONFIG_IMX_HAVE_IOMUX_V1=y
CONFIG_ARCH_MXC_AUDMUX_V1=y
#
+# System MMU
+#
+
+#
# Processor Type
#
CONFIG_CPU_ARM926T=y
@@ -1592,6 +1597,7 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
+CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
@@ -1636,7 +1642,7 @@ CONFIG_USB_HID=y
#
# CONFIG_HID_3M_PCT is not set
# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_ACRUX is not set
# CONFIG_HID_APPLE is not set
# CONFIG_HID_BELKIN is not set
# CONFIG_HID_CANDO is not set
@@ -1909,6 +1915,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-04-05 21:11:41
|
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 0bec233eff1b77d606cfd6650304d36b00d94726 (commit)
from ffaec3b5562ffa7fba9863033ba1a75c0f726c2a (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 0bec233eff1b77d606cfd6650304d36b00d94726
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 5 23:09:04 2011 +0200
[LINUX] 2.6.38: Makes temporary fix to have working WiFi on APF51Dev board
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 19 +++--
.../420-armadeus-esdhc-add_gpio_SD_detection.patch | 87 +++++++++++---------
..._possibility_to_deactivate_SDIO_interrupt.patch | 56 +++++++++++++
3 files changed, 114 insertions(+), 48 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index f9c6b5a..5c8869f 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:24.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:48.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-04-05 18:28:35.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-04-05 22:56:58.000000000 +0200
@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -43,8 +43,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-30 18:01:24.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:48.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-04-05 18:28:35.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-04-05 22:56:58.000000000 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -56,8 +56,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-30 18:33:36.000000000 +0200
-@@ -0,0 +1,478 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-04-05 23:04:25.000000000 +0200
+@@ -0,0 +1,481 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -385,10 +385,13 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+#define ESDHC_CARD_DETECT (GPIO_PORTB | 29)
+static struct esdhc_platform_data edshc0_pdata = {
-+ .wp_gpio = 0, /* write protect pin */
+ .cd_gpio = ESDHC_CARD_DETECT, /* card detect pin */
+};
+
++static struct esdhc_platform_data edshc1_pdata = {
++ .no_sdio_irq = 1, /* Temporary ! (for Wi2Wi) */
++};
++
+static int init_gpio(void)
+{
+#define USER_LED_GPIO (GPIO_PORTA | 2)
@@ -502,7 +505,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ init_gpio();
+
+ imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
-+ imx51_add_sdhci_esdhc_imx(1, NULL);
++ imx51_add_sdhci_esdhc_imx(1, &edshc1_pdata);
+
+ spi_register_board_info(apf51dev_spi1_board_info,
+ ARRAY_SIZE(apf51dev_spi1_board_info));
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/420-armadeus-esdhc-add_gpio_SD_detection.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/420-armadeus-esdhc-add_gpio_SD_detection.patch
index 1cef100..d33c384 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/420-armadeus-esdhc-add_gpio_SD_detection.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/420-armadeus-esdhc-add_gpio_SD_detection.patch
@@ -2,11 +2,11 @@ Add support for GPIO SD detection
Signed-off-by: Nicolas Colombain <nic...@ar...>
-Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
+Index: linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c
===================================================================
---- linux-2.6.38-rc3.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2011-02-08 14:49:41.000000000 +0100
-+++ linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c 2011-02-08 15:09:30.000000000 +0100
-@@ -15,13 +15,40 @@
+--- linux-2.6.38.1.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2011-03-30 18:33:47.000000000 +0200
++++ linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c 2011-04-05 18:11:27.000000000 +0200
+@@ -15,13 +15,41 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/clk.h>
@@ -14,6 +14,7 @@ Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
#include <linux/mmc/host.h>
#include <linux/mmc/sdhci-pltfm.h>
+#include <linux/platform_device.h>
++#include <linux/slab.h>
+#include <mach/esdhc.h>
#include <mach/hardware.h>
#include "sdhci.h"
@@ -47,7 +48,7 @@ Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg)
{
void __iomem *base = host->ioaddr + (reg & ~0x3);
-@@ -86,6 +113,13 @@ static void esdhc_writeb_le(struct sdhci
+@@ -86,6 +114,13 @@
esdhc_clrset_le(host, 0xff, val, reg);
}
@@ -61,54 +62,60 @@ Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -103,7 +137,39 @@ static unsigned int esdhc_pltfm_get_min_
+@@ -103,7 +138,42 @@
static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pdata)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
struct clk *clk;
-+ struct esdhc_platform_data *plat;
++ struct esdhc_platform_data *pdat;
+ int rc;
++ char *irq_name;
+
-+ plat = pdev->dev.platform_data;
++ pdat = pdev->dev.platform_data;
+
-+ if ((plat != NULL) && gpio_is_valid(plat->cd_gpio)) {
-+ host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
++ if (pdat != NULL) {
++ if (pdat->cd_gpio && gpio_is_valid(pdat->cd_gpio)) {
++ rc = gpio_request(pdat->cd_gpio, "sdhci_cd");
++ if (rc) {
++ dev_err(mmc_dev(host->mmc),
++ "failed to allocate cd gpio\n");
++ goto out;
++ }
++ gpio_direction_input(pdat->cd_gpio);
+
-+ rc = gpio_request(plat->cd_gpio, "sdhci_cd");
-+ if (rc) {
-+ dev_err(mmc_dev(host->mmc),
-+ "failed to allocate cd gpio\n");
-+ goto out;
-+ }
-+ gpio_direction_input(plat->cd_gpio);
++ irq_name = kzalloc(16, GFP_KERNEL);
++ if (!irq_name) {
++ rc = -ENOMEM;
++ goto out_gpio;
++ }
++ snprintf(irq_name, 16, "%s-cd", mmc_hostname(host->mmc));
++ rc = request_irq(gpio_to_irq(pdat->cd_gpio), carddetect_irq,
++ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
++ irq_name, host);
+
-+ rc = request_irq(gpio_to_irq(plat->cd_gpio), carddetect_irq,
-+ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-+ mmc_hostname(host->mmc), host);
++ if (rc) {
++ dev_err(mmc_dev(host->mmc), "request irq error\n");
++ goto out_alloc;
++ }
+
-+ if (rc) {
-+ dev_err(mmc_dev(host->mmc), "request irq error\n");
-+ goto out_cd;
-+ }
-+ }
-+ else {
-+ if (plat != NULL) {
-+ dev_err(mmc_dev(host->mmc), "wrong cd gpio in platform data\n");
-+ return -ENXIO;
++ host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+ }
+ }
clk = clk_get(mmc_dev(host->mmc), NULL);
if (IS_ERR(clk)) {
-@@ -121,17 +187,33 @@ static int esdhc_pltfm_init(struct sdhci
+@@ -121,17 +191,36 @@
host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK;
return 0;
+
-+out_cd:
-+ if (gpio_is_valid(plat->cd_gpio))
-+ gpio_free(plat->cd_gpio);
++out_alloc:
++ kfree(irq_name);
++
++out_gpio:
++ if (gpio_is_valid(pdat->cd_gpio))
++ gpio_free(pdat->cd_gpio);
+
+out:
+ return rc;
@@ -118,12 +125,12 @@ Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
-+ struct esdhc_platform_data *plat;
++ struct esdhc_platform_data *pdat;
+
-+ plat = pdev->dev.platform_data;
++ pdat = pdev->dev.platform_data;
+
-+ if (gpio_is_valid(plat->cd_gpio))
-+ gpio_free(plat->cd_gpio);
++ if (gpio_is_valid(pdat->cd_gpio))
++ gpio_free(pdat->cd_gpio);
clk_disable(pltfm_host->clk);
clk_put(pltfm_host->clk);
@@ -135,10 +142,10 @@ Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
.read_w = esdhc_readw_le,
.write_w = esdhc_writew_le,
.write_b = esdhc_writeb_le,
-Index: linux-2.6.38-rc3/drivers/mmc/host/sdhci-esdhc-imx.c
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/esdhc.h 2011-02-08 14:49:41.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/esdhc.h 2011-02-08 15:09:30.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/esdhc.h 2011-03-30 18:33:47.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h 2011-04-05 18:09:34.000000000 +0200
@@ -12,5 +12,6 @@
struct esdhc_platform_data {
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
new file mode 100644
index 0000000..1102f8a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
@@ -0,0 +1,56 @@
+Allows to deactivate SDIO interrupt usage.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38.1/include/linux/mmc/sdhci.h
+===================================================================
+--- linux-2.6.38.1.orig/include/linux/mmc/sdhci.h 2011-04-05 15:18:40.000000000 +0200
++++ linux-2.6.38.1/include/linux/mmc/sdhci.h 2011-04-05 15:19:26.000000000 +0200
+@@ -85,6 +85,8 @@
+ #define SDHCI_QUIRK_NO_HISPD_BIT (1<<29)
+ /* Controller treats ADMA descriptors with length 0000h incorrectly */
+ #define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30)
++/* Controller do not handle SDIO interrupts correctly */
++#define SDHCI_QUIRK_NO_SDIO_IRQ (1<<31)
+
+ int irq; /* Device IRQ */
+ void __iomem *ioaddr; /* Mapped address */
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h
+===================================================================
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/esdhc.h 2011-04-05 15:18:40.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h 2011-04-05 15:19:26.000000000 +0200
+@@ -13,5 +13,6 @@
+ struct esdhc_platform_data {
+ unsigned int wp_gpio; /* write protect pin */
+ unsigned int cd_gpio; /* card detect pin */
++ unsigned int no_sdio_irq;
+ };
+ #endif /* __ASM_ARCH_IMX_ESDHC_H */
+Index: linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c
+===================================================================
+--- linux-2.6.38.1.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2011-04-05 15:22:09.000000000 +0200
++++ linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c 2011-04-05 15:23:48.000000000 +0200
+@@ -165,6 +165,9 @@
+
+ host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+ }
++
++ if (pdat->no_sdio_irq)
++ host->quirks |= SDHCI_QUIRK_NO_SDIO_IRQ;
+ }
+
+ clk = clk_get(mmc_dev(host->mmc), NULL);
+Index: linux-2.6.38.1/drivers/mmc/host/sdhci.c
+===================================================================
+--- linux-2.6.38.1.orig/drivers/mmc/host/sdhci.c 2011-04-05 15:24:22.000000000 +0200
++++ linux-2.6.38.1/drivers/mmc/host/sdhci.c 2011-04-05 15:26:07.000000000 +0200
+@@ -1879,7 +1879,8 @@
+ mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
+
+ mmc->f_max = host->max_clk;
+- mmc->caps |= MMC_CAP_SDIO_IRQ;
++ if (!(host->quirks & SDHCI_QUIRK_NO_SDIO_IRQ))
++ mmc->caps |= MMC_CAP_SDIO_IRQ;
+
+ /*
+ * A controller may support 8-bit width, but the board itself
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-04-01 09:54:50
|
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 ffaec3b5562ffa7fba9863033ba1a75c0f726c2a (commit)
via 736d15b1e0163c50c87935ee336dd0a272a404c9 (commit)
from f7676a67496e2b2f5a071518913ad5c8f502e938 (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 ffaec3b5562ffa7fba9863033ba1a75c0f726c2a
Merge: 736d15b1e0163c50c87935ee336dd0a272a404c9 f7676a67496e2b2f5a071518913ad5c8f502e938
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 1 11:54:17 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 736d15b1e0163c50c87935ee336dd0a272a404c9
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 1 11:53:41 2011 +0200
[u-boot] Change nand clock to 23.75Mhz
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index ad62869..d18fd86 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -375,7 +375,7 @@
#define CONFIG_AHB_CLK_FREQ 133 /* MHZ AHB frequency from PLL2*/
#define CONFIG_IPG_CLK_FREQ 66 /* 66.5 MHZ IPG frequency from PLL2*/
#define CONFIG_PERCLK_FREQ 55 /* 55.4 MHZ PERCLK frequency */
-#define CONFIG_NFC_FREQ 27 /* MHZ NFC Clock from EMI clk*/
+#define CONFIG_NFC_FREQ 23 /* MHZ NFC Clock from EMI clk*/
#define CONFIG_USB_FREQ 54 /* external USB serial bus frequency PLL3 */
#define CONFIG_ESDHC_FREQ 54 /* MHz ESDHC controller frequency / PLL3 */
#define CONFIG_UART_FREQ 66 /* 66.5 MHz UART controller frequency from PLL2*/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 15:48:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f7676a67496e2b2f5a071518913ad5c8f502e938 (commit)
from 5865f71d804689ce1450eddb047976a62f983e57 (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 f7676a67496e2b2f5a071518913ad5c8f502e938
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 17:43:44 2011 +0200
[LINUX] 2.6.38: Add CAN Bus support in default APF51 config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 22 +++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
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 dfccead..2407359 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
@@ -550,7 +550,27 @@ CONFIG_DNS_RESOLVER=y
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_SLCAN is not set
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_MCP251X=m
+# CONFIG_CAN_SJA1000 is not set
+
+#
+# CAN USB interfaces
+#
+# CONFIG_CAN_EMS_USB is not set
+# CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_SOFTING is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
# CONFIG_IRDA is not set
CONFIG_BT=m
CONFIG_BT_L2CAP=m
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 13:50:36
|
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 5865f71d804689ce1450eddb047976a62f983e57 (commit)
from 68876b7ec35d04ba79f0c3137836ac4955549c64 (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 5865f71d804689ce1450eddb047976a62f983e57
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 15:47:25 2011 +0200
[U-BOOT] Remove no more supported 1.1.6 patches
-----------------------------------------------------------------------
Summary of changes:
.../target/u-boot/u-boot-1.1.6-100-apx9328.patch | 2257 --------------------
.../target/u-boot/u-boot-1.1.6-101-apx9328.patch | 99 -
.../target/u-boot/u-boot-1.1.6-110-apx-tools.patch | 409 ----
.../u-boot/u-boot-1.1.6-120-apx-example.patch | 73 -
.../u-boot/u-boot-1.1.6-140-apx-dm9000.patch | 727 -------
buildroot/target/u-boot/u-boot-1.1.6-150-imx.patch | 69 -
.../target/u-boot/u-boot-1.1.6-200-spartan.patch | 24 -
7 files changed, 0 insertions(+), 3658 deletions(-)
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-100-apx9328.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-101-apx9328.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-110-apx-tools.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-120-apx-example.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-140-apx-dm9000.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-150-imx.patch
delete mode 100644 buildroot/target/u-boot/u-boot-1.1.6-200-spartan.patch
diff --git a/buildroot/target/u-boot/u-boot-1.1.6-100-apx9328.patch b/buildroot/target/u-boot/u-boot-1.1.6-100-apx9328.patch
deleted file mode 100644
index 4ec7605..0000000
--- a/buildroot/target/u-boot/u-boot-1.1.6-100-apx9328.patch
+++ /dev/null
@@ -1,2257 +0,0 @@
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/apx9328.c u-boot-1.1.6/board/apx9328/apx9328.c
---- ref/u-boot-1.1.6/board/apx9328/apx9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/apx9328.c 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,75 @@
-+/*
-+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/imx-regs.h>
-+#include "apx9328fpga.h"
-+
-+extern void imx_gpio_mode (int gpio_mode);
-+
-+int
-+board_init (void)
-+{
-+ DECLARE_GLOBAL_DATA_PTR;
-+
-+ gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
-+ gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
-+
-+ return 0;
-+}
-+
-+int
-+dram_init (void)
-+{
-+ DECLARE_GLOBAL_DATA_PTR;
-+
-+#if ( CONFIG_NR_DRAM_BANKS > 0 )
-+ gd->bd->bi_dram[0].start = CFG_SDRAM_1_BASE;
-+ gd->bd->bi_dram[0].size = CFG_SDRAM_1_SIZE;
-+#endif
-+#if ( CONFIG_NR_DRAM_BANKS > 1 )
-+ gd->bd->bi_dram[1].start = CFG_SDRAM_2_BASE;
-+ gd->bd->bi_dram[1].size = CFG_SDRAM_2_SIZE;
-+#endif
-+
-+ return 0;
-+}
-+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int
-+misc_init_r (void)
-+{
-+#if (CONFIG_FPGA)
-+ APX9328_init_fpga ();
-+#endif
-+
-+#if (CONFIG_DRIVER_DM9000)
-+ imx_gpio_mode (GPIO_PORTB | GPIO_GPIO | GPIO_IN | 14);
-+#endif
-+ return 0;
-+}
-+
-+void
-+show_boot_progress (int status)
-+{
-+ return;
-+}
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/apx9328fpga.c u-boot-1.1.6/board/apx9328/apx9328fpga.c
---- ref/u-boot-1.1.6/board/apx9328/apx9328fpga.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/apx9328fpga.c 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,100 @@
-+/*
-+ * (C) Copyright 2005
-+ * Nicolas Colombin <th...@us...>
-+ * Eric Jarrige <jo...@us...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+
-+/*
-+ * Spartan 3 FPGA configuration support for the APX9328 daughter board
-+ */
-+
-+#include <common.h>
-+#include <spartan3.h>
-+#include <command.h>
-+#include <asm/arch/imx-regs.h>
-+#include <asm/io.h>
-+#include "apx9328fpga.h"
-+
-+#if (CONFIG_FPGA)
-+#if 0
-+#define FPGA_DEBUG
-+#endif
-+
-+#ifdef FPGA_DEBUG
-+#define PRINTF(fmt,args...) printf (fmt ,##args)
-+#else
-+#define PRINTF(fmt,args...)
-+#endif
-+
-+/* Note that these are pointers to code that is in Flash. They will be
-+ * relocated at runtime.
-+ * Spartan3 code is used to download our Spartan 3 :) code is compatible.
-+ * Just take care about the file size
-+*/
-+Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
-+ fpga_pre_fn,
-+ fpga_pgm_fn,
-+ fpga_clk_fn,
-+ fpga_init_fn,
-+ fpga_done_fn,
-+ fpga_wr_fn,
-+};
-+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
-+ slave_serial,
-+ XILINX_XC3S400_SIZE,
-+ (void *) &fpga_fns,
-+ 0}
-+};
-+
-+/*
-+ * Initialize the fpga. Return 1 on success, 0 on failure.
-+ */
-+int
-+APX9328_init_fpga (void)
-+{
-+ char *autoload = getenv ("firmware_autoload");
-+ DECLARE_GLOBAL_DATA_PTR;
-+
-+ int i,lout=1;
-+
-+ PRINTF ("%s:%d: Initialize FPGA interface (relocation offset = 0x%.8lx)\n",
-+ __FUNCTION__, __LINE__, gd->reloc_off);
-+ fpga_init (gd->reloc_off);
-+
-+ for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
-+ PRINTF ("%s:%d: Adding fpga %d\n", __FUNCTION__, __LINE__, i);
-+ fpga_add (fpga_xilinx, &fpga[i]);
-+ }
-+
-+ if (( autoload ) && (0 == strcmp(autoload, "1"))) {
-+ if (FPGA_SUCCESS != fpga_load( 0, (void *)CONFIG_FIRMWARE_ADDR,
-+ (size_t) CONFIG_FIRMWARE_LEN )) {
-+ lout = 0;
-+ printf("Firmware not loaded!\n");
-+ }
-+ }
-+ return 1;
-+}
-+
-+#endif /* CONFIG_FPGA */
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/apx9328fpga.h u-boot-1.1.6/board/apx9328/apx9328fpga.h
---- ref/u-boot-1.1.6/board/apx9328/apx9328fpga.h 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/apx9328fpga.h 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,31 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+
-+/*
-+ * Spartan 3 FPGA configuration support for the APX9328 daughter board
-+ */
-+
-+#include "fpga.h"
-+extern int APX9328_init_fpga (void);
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/config.mk u-boot-1.1.6/board/apx9328/config.mk
---- ref/u-boot-1.1.6/board/apx9328/config.mk 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/config.mk 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,10 @@
-+#
-+# This config file is used for compilation of armadeus sources
-+#
-+# You might change location of U-Boot in memory by setting right TEXT_BASE.
-+# This allows for example having one copy located at the end of ram and stored
-+# in flash device and later on while developing use other location to test
-+# the code in RAM device only.
-+#
-+
-+TEXT_BASE = 0x0BF80000
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/fpga.c u-boot-1.1.6/board/apx9328/fpga.c
---- ref/u-boot-1.1.6/board/apx9328/fpga.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/fpga.c 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,140 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+#include <common.h>
-+
-+#if (CONFIG_FPGA)
-+
-+#include <asm/arch/imx-regs.h>
-+#include <asm/io.h>
-+#include <config.h>
-+
-+extern void imx_gpio_mode (int gpio_mode);
-+
-+
-+#define GPIO_PORT(x) ((x >> 5) & 3)
-+#define GPIO_SET(x) (DR(GPIO_PORT(x)) |= (1<<(x & GPIO_PIN_MASK)))
-+#define GPIO_CLEAR(x) (DR(GPIO_PORT(x)) &= ~(1<<(x & GPIO_PIN_MASK)))
-+#define GPIO_WRITE(x,y) ( y ? GPIO_SET(x) : GPIO_CLEAR(x) )
-+#define GPIO_READ(x) ((SSR (GPIO_PORT(x)) & (1<<(x & GPIO_PIN_MASK))))
-+
-+#if 0
-+#define FPGA_DEBUG
-+#endif
-+
-+#ifdef FPGA_DEBUG
-+#define PRINTF(fmt,args...) printf (fmt ,##args)
-+#else
-+#define PRINTF(fmt,args...)
-+#endif
-+
-+/*
-+ * Port bit numbers for the serial slave controls
-+ */
-+#define FPGA_INIT CFG_FPGA_INIT
-+#define FPGA_DONE CFG_FPGA_DONE
-+#define FPGA_DIN CFG_FPGA_DATA
-+#define FPGA_PROGRAM CFG_FPGA_PRG
-+#define FPGA_CLOCK CFG_FPGA_CLK
-+
-+/* Note that these are pointers to code that is in Flash. They will be
-+ * relocated at runtime.
-+ * Spartan2 code is used to download our Spartan 3 :) code is compatible.
-+ * Just take care about the file size
-+*/
-+
-+/*
-+ * nitialize GPIO port B before download
-+ */
-+int
-+fpga_pre_fn (int cookie)
-+{
-+ PRINTF ("%s:%d: FPGA PRE ", __FUNCTION__, __LINE__);
-+
-+ // Initialize GPIO pins
-+ imx_gpio_mode (FPGA_INIT | GPIO_GPIO | GPIO_IN );
-+ imx_gpio_mode (FPGA_DONE | GPIO_GPIO | GPIO_IN );
-+ imx_gpio_mode (FPGA_DIN | GPIO_GPIO | GPIO_OUT );
-+ imx_gpio_mode (FPGA_PROGRAM | GPIO_GPIO | GPIO_OUT );
-+ imx_gpio_mode (FPGA_CLOCK | GPIO_GPIO | GPIO_OUT );
-+ return cookie;
-+}
-+
-+/*
-+ * Set the FPGA's active-low program line to the specified level
-+ */
-+int
-+fpga_pgm_fn (int assert, int flush, int cookie)
-+{
-+ PRINTF ("%s:%d: FPGA PROGRAM %s", __FUNCTION__, __LINE__,
-+ assert?"high":"low");
-+ GPIO_WRITE( FPGA_PROGRAM, !assert);
-+ return assert;
-+}
-+
-+/*
-+ * Set the FPGA's active-high clock line to the specified level
-+ */
-+int
-+fpga_clk_fn (int assert_clk, int flush, int cookie)
-+{
-+ PRINTF ("%s:%d: FPGA CLOCK %s", __FUNCTION__, __LINE__,
-+ assert_clk?"high":"low");
-+ GPIO_WRITE( FPGA_CLOCK, assert_clk);
-+ return assert_clk;
-+}
-+
-+/*
-+ * Test the state of the active-low FPGA INIT line. Return 1 on INIT
-+ * asserted (low).
-+ */
-+int
-+fpga_init_fn (int cookie)
-+{
-+ PRINTF ("%s:%d: INIT check... ", __FUNCTION__, __LINE__);
-+ return(!GPIO_READ(FPGA_INIT));
-+}
-+
-+/*
-+ * Test the state of the active-high FPGA DONE pin
-+ */
-+int
-+fpga_done_fn (int cookie)
-+{
-+ PRINTF ("%s:%d: DONE check... ", __FUNCTION__, __LINE__);
-+ return(GPIO_READ(FPGA_DONE));
-+}
-+
-+/*
-+ * Set the FPGA's data line to the specified level
-+ */
-+int
-+fpga_wr_fn (int assert_write, int flush, int cookie)
-+{
-+ PRINTF ("%s:%d: DATA write... ", __FUNCTION__, __LINE__);
-+ GPIO_WRITE( FPGA_DIN, assert_write);
-+ return assert_write;
-+}
-+
-+#endif /* CONFIG_FPGA */
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/fpga.h u-boot-1.1.6/board/apx9328/fpga.h
---- ref/u-boot-1.1.6/board/apx9328/fpga.h 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/fpga.h 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,30 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+extern int fpga_pre_fn (int cookie);
-+extern int fpga_pgm_fn (int assert_pgm, int flush, int cookie);
-+extern int fpga_init_fn (int cookie);
-+extern int fpga_done_fn (int cookie);
-+extern int fpga_clk_fn (int assert_clk, int flush, int cookie);
-+extern int fpga_wr_fn (int assert_write, int flush, int cookie);
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/i2c.c u-boot-1.1.6/board/apx9328/i2c.c
---- ref/u-boot-1.1.6/board/apx9328/i2c.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/i2c.c 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,327 @@
-+/*
-+ * Eric Jarrige <jo...@us...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ */
-+
-+#include <common.h>
-+
-+#ifdef CONFIG_HARD_I2C
-+
-+#include <asm/io.h>
-+#include <asm/arch/imx-regs.h>
-+#include <i2c.h>
-+
-+/*#define DEBUG_I2C*/
-+
-+extern void imx_gpio_mode (int gpio_mode);
-+
-+/*-----------------------------------------------------------------------
-+ * Definitions
-+ */
-+
-+#define I2C_ACK 0 /* level to ack a byte */
-+#define I2C_NOACK 1 /* level to noack a byte */
-+
-+
-+#ifdef DEBUG_I2C
-+#define PRINTD(fmt,args...) do { \
-+ DECLARE_GLOBAL_DATA_PTR; \
-+ if (gd->have_console) \
-+ printf (fmt ,##args); \
-+ } while (0)
-+#else
-+#define PRINTD(fmt,args...)
-+#endif
-+
-+/*-----------------------------------------------------------------------
-+ * Local functions
-+ */
-+
-+/*-----------------------------------------------------------------------
-+ * START: High -> Low on SDA while SCL is High
-+ * after check for a bus free
-+ */
-+static void
-+imxi2c_send_start (void)
-+{
-+ while ((I2SR & I2SR_IBB)) ;
-+ I2CR |= I2CR_MSTA;
-+ I2SR &= ~I2SR_IIF;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * STOP: Low -> High on SDA while SCL is High
-+ * after the end of previous transfer
-+ */
-+static void
-+imxi2c_send_stop (void)
-+{
-+ while (!(I2SR & I2SR_ICF)) ;
-+ I2CR &= ~I2CR_MSTA;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Send 8 bits and look for an acknowledgement.
-+ */
-+static int
-+imxi2c_write_byte (uchar data)
-+{
-+ while (!(I2SR & I2SR_ICF)) ; /* Wait end of transfer */
-+
-+ I2CR |= I2CR_MTX;
-+ I2SR &= ~I2SR_IIF;
-+ I2DR = data;
-+
-+ while (!(I2SR & I2SR_IIF)) ; /* checking IIF before ICF seems required */
-+
-+ I2SR &= ~I2SR_IIF;
-+
-+ while (!(I2SR & I2SR_ICF)) ; /* Wait end of transfer */
-+
-+ return (I2SR & I2SR_RXAK); /* not a nack is an ack */
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * if ack == I2C_ACK, ACK the byte so can continue reading, else
-+ * send I2C_NOACK to end the read.
-+ */
-+static uchar
-+imxi2c_read_byte (int ack)
-+{
-+ int data;
-+
-+ while (!(I2SR & I2SR_ICF)) ;
-+ I2CR &= ~I2CR_MTX;
-+
-+ if (ack)
-+ {
-+ I2CR |= I2CR_TXAK;
-+ }
-+ else
-+ {
-+ I2CR &= ~I2CR_TXAK;
-+ }
-+
-+ data = I2DR;
-+ return (data);
-+}
-+
-+/* ------------------------------------------------------------------------
-+ * API Functions
-+ * ------------------------------------------------------------------------
-+ */
-+
-+/*-----------------------------------------------------------------------
-+ * i2c_init compute the i2c divider to reach the requested speed
-+ * see mxl reference manual
-+ */
-+void
-+i2c_init (int speed, int slaveaddr)
-+{
-+ int hclk_dividers[] = {
-+ 30, 32, 36, 42, 48, 52, 60, 72,
-+ 80, 88, 104, 128, 144, 160, 192, 240,
-+ 288, 320, 384, 480, 576, 640, 768, 960,
-+ 1152, 1280, 1536, 1920, 2304, 2560, 3072, 3840,
-+ 22, 24, 26, 26, 32, 36, 40, 44,
-+ 48, 56, 64, 72, 80, 96, 112, 128,
-+ 160, 192, 224, 256, 320, 384, 448, 512,
-+ 640, 768, 896, 1024, 1280, 1536, 1792, 2048
-+ };
-+ int refDiv = get_HCLK () / speed;
-+ int i, tmpIC;
-+
-+ imx_gpio_mode (PA15_PF_I2C_SDA);
-+ imx_gpio_mode (PA16_PF_I2C_SCL);
-+
-+ tmpIC = (sizeof (hclk_dividers) / sizeof (int)) - 1;
-+ for (i = tmpIC; i >= 0; i--)
-+ {
-+ if ((hclk_dividers[i] >= refDiv)
-+ && (hclk_dividers[i] < hclk_dividers[tmpIC]))
-+ {
-+ tmpIC = i;
-+ }
-+ }
-+
-+ IFDR = tmpIC;
-+ IADR = slaveaddr << 1;
-+
-+ if (I2SR & I2SR_IBB)
-+ imxi2c_send_stop ();
-+
-+ I2CR |= I2CR_IEN;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Probe to see if a chip is present. Also good for checking for the
-+ * completion of EEPROM writes since the chip stops responding until
-+ * the write completes (typically 10mSec).
-+ * probe sends a read command to probe a an address
-+ */
-+int
-+i2c_probe (uchar addr)
-+{
-+ int rc;
-+
-+ imxi2c_send_start ();
-+ rc = imxi2c_write_byte ((addr << 1) | 0);
-+ imxi2c_send_stop ();
-+
-+ return (rc ? 1 : 0);
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Read bytes
-+ */
-+int
-+i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len)
-+{
-+ int shift;
-+ PRINTD ("i2c_read: chip %02X addr %02X alen %d buffer %p len %d\n",
-+ chip, addr, alen, buffer, len);
-+
-+#ifdef CFG_I2C_EEPROM_ADDR_OVERFLOW
-+ /*
-+ * EEPROM chips that implement "address overflow" are ones
-+ * like Catalyst 24WC04/08/16 which has 9/10/11 bits of
-+ * address and the extra bits end up in the "chip address"
-+ * bit slots. This makes a 24WC08 (1Kbyte) chip look like
-+ * four 256 byte chips.
-+ *
-+ * Note that we consider the length of the address field to
-+ * still be one byte because the extra address bits are
-+ * hidden in the chip address.
-+ */
-+ chip |= ((addr >> (alen * 8)) & CFG_I2C_EEPROM_ADDR_OVERFLOW);
-+
-+ PRINTD ("i2c_read: fix addr_overflow: chip %02X addr %02X\n",
-+ chip, addr);
-+#endif
-+
-+ /*
-+ * Do the addressing portion of a write cycle to set the
-+ * chip's address pointer. If the address length is zero,
-+ * don't do the normal write cycle to set the address pointer,
-+ * there is no address pointer in this chip.
-+ */
-+ imxi2c_send_start ();
-+ if (alen > 0)
-+ {
-+ if (imxi2c_write_byte (chip << 1))
-+ { /* write cycle */
-+ imxi2c_send_stop ();
-+ PRINTD ("i2c_read, no chip responded %02X\n", chip);
-+ return (1);
-+ }
-+ shift = (alen - 1) * 8;
-+ while (alen-- > 0)
-+ {
-+ if (imxi2c_write_byte (addr >> shift))
-+ {
-+ PRINTD ("i2c_read, address not <ACK>ed\n");
-+ return (1);
-+ }
-+ shift -= 8;
-+ }
-+ imxi2c_send_stop (); /* reportedly some chips need a full stop */
-+ imxi2c_send_start ();
-+ }
-+ /*
-+ * Send the chip address again, this time for a read cycle.
-+ * Then read the data. On the last byte, we do a NACK instead
-+ * of an ACK(len == 0) to terminate the read.
-+ */
-+ imxi2c_write_byte ((chip << 1) | 1); /* read cycle */
-+ imxi2c_read_byte (len <= 2);
-+ while (len-- > 1)
-+ {
-+ *buffer++ = imxi2c_read_byte (len == 1);
-+ }
-+ imxi2c_send_stop ();
-+ *buffer++ = imxi2c_read_byte (0);
-+ return (0);
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Write bytes
-+ */
-+int
-+i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
-+{
-+ int shift, failures = 0;
-+
-+ PRINTD ("i2c_write: chip %02X addr %02X alen %d buffer %p len %d\n",
-+ chip, addr, alen, buffer, len);
-+
-+ imxi2c_send_start ();
-+ if (imxi2c_write_byte (chip << 1))
-+ { /* write cycle */
-+ imxi2c_send_stop ();
-+ PRINTD ("i2c_write, no chip responded %02X\n", chip);
-+ return (1);
-+ }
-+ shift = (alen - 1) * 8;
-+ while (alen-- > 0)
-+ {
-+ if (imxi2c_write_byte (addr >> shift))
-+ {
-+ PRINTD ("i2c_write, address not <ACK>ed\n");
-+ return (1);
-+ }
-+ shift -= 8;
-+ }
-+
-+ while (len-- > 0)
-+ {
-+ if (imxi2c_write_byte (*buffer++))
-+ {
-+ failures++;
-+ }
-+ }
-+ imxi2c_send_stop ();
-+ return (failures);
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Read a register
-+ */
-+uchar
-+i2c_reg_read (uchar i2c_addr, uchar reg)
-+{
-+ char buf;
-+
-+ i2c_read (i2c_addr, reg, 1, &buf, 1);
-+
-+ return (buf);
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Write a register
-+ */
-+void
-+i2c_reg_write (uchar i2c_addr, uchar reg, uchar val)
-+{
-+ i2c_write (i2c_addr, reg, 1, &val, 1);
-+}
-+
-+#endif /* CONFIG_HARD_I2C */
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/lowlevel_init.S u-boot-1.1.6/board/apx9328/lowlevel_init.S
---- ref/u-boot-1.1.6/board/apx9328/lowlevel_init.S 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/lowlevel_init.S 2006-12-03 12:06:16.000000000 +0100
-@@ -0,0 +1,443 @@
-+/*
-+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ */
-+
-+#include <config.h>
-+#include <version.h>
-+#include <asm/arch/imx-regs.h>
-+
-+.globl lowlevel_init
-+lowlevel_init:
-+
-+ mov r10, lr
-+
-+/* Change PERCLK1DIV to 14 ie 14+1 */
-+ ldr r0, =PCDR
-+ ldr r1, =CFG_PCDR_VAL
-+ str r1, [r0]
-+
-+/* set MCU PLL Control Register 0 */
-+
-+ ldr r0, =MPCTL0
-+ ldr r1, =CFG_MPCTL0_VAL
-+ str r1, [r0]
-+
-+/* set MCU PLL Control Register 1 */
-+
-+ ldr r0, =MPCTL1
-+ ldr r1, =CFG_MPCTL1_VAL
-+ str r1, [r0]
-+
-+/* set mpll restart bit */
-+ ldr r0, =CSCR
-+ ldr r1, [r0]
-+ orr r1,r1,#(1<<21)
-+ str r1, [r0]
-+
-+ mov r2,#0x10
-+1:
-+ mov r3,#0x2000
-+2:
-+ subs r3,r3,#1
-+ bne 2b
-+
-+ subs r2,r2,#1
-+ bne 1b
-+
-+/* set System PLL Control Register 0 */
-+
-+ ldr r0, =SPCTL0
-+ ldr r1, =CFG_SPCTL0_VAL
-+ str r1, [r0]
-+
-+/* set System PLL Control Register 1 */
-+
-+ ldr r0, =SPCTL1
-+ ldr r1, =CFG_SPCTL1_VAL
-+ str r1, [r0]
-+
-+/* set spll restart bit */
-+ ldr r0, =CSCR
-+ ldr r1, [r0]
-+ orr r1,r1,#(1<<22)
-+ str r1, [r0]
-+
-+ mov r2,#0x10
-+1:
-+ mov r3,#0x2000
-+2:
-+ subs r3,r3,#1
-+ bne 2b
-+
-+ subs r2,r2,#1
-+ bne 1b
-+
-+ ldr r0, =CSCR
-+ ldr r1, =CFG_CSCR_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPCR
-+ ldr r1, =CFG_GPCR_VAL
-+ str r1, [r0]
-+
-+/* I have now read the ARM920 DataSheet back-to-Back, and have stumbled upon
-+ *this.....
-+ *
-+ * It would appear that from a Cold-Boot the ARM920T enters "FastBus" mode CP15
-+ * register 1, this stops it using the output of the PLL and thus runs at the
-+ * slow rate. Unless you place the Core into "Asynch" mode, the CPU will never
-+ * use the value set in the CM_OSC registers...regardless of what you set it
-+ * too! Thus, although i thought i was running at 140MHz, i'm actually running
-+ * at 40!..
-+
-+ * Slapping this into my bootloader does the trick...
-+
-+ * MRC p15,0,r0,c1,c0,0 ; read core configuration register
-+ * ORR r0,r0,#0xC0000000 ; set asynchronous clocks and not fastbus mode
-+ * MCR p15,0,r0,c1,c0,0 ; write modified value to core configuration
-+ * register
-+ */
-+ MRC p15,0,r0,c1,c0,0
-+ ORR r0,r0,#0xC0000000
-+ MCR p15,0,r0,c1,c0,0
-+
-+/* ldr r0, =GPR(0)
-+ ldr r1, =CFG_GPR_A_VAL
-+ str r1, [r0]
-+*/
-+
-+ ldr r0, =DR(0)
-+ ldr r1, =CFG_DR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(0)
-+ ldr r1, =CFG_OCR1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(0)
-+ ldr r1, =CFG_OCR2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(0)
-+ ldr r1, =CFG_ICFA1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(0)
-+ ldr r1, =CFG_ICFA2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(0)
-+ ldr r1, =CFG_ICFB1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(0)
-+ ldr r1, =CFG_ICFB2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(0)
-+ ldr r1, =CFG_ICR1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(0)
-+ ldr r1, =CFG_ICR2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(0)
-+ ldr r1, =CFG_IMR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(0)
-+ ldr r1, =CFG_DDIR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(0)
-+ ldr r1, =CFG_GPR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(0)
-+ ldr r1, =CFG_PUEN_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(0)
-+ ldr r1, =CFG_GIUS_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(1)
-+ ldr r1, =CFG_DR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(1)
-+ ldr r1, =CFG_OCR1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(1)
-+ ldr r1, =CFG_OCR2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(1)
-+ ldr r1, =CFG_ICFA1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(1)
-+ ldr r1, =CFG_ICFA2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(1)
-+ ldr r1, =CFG_ICFB1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(1)
-+ ldr r1, =CFG_ICFB2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(1)
-+ ldr r1, =CFG_ICR1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(1)
-+ ldr r1, =CFG_ICR2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(1)
-+ ldr r1, =CFG_IMR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(1)
-+ ldr r1, =CFG_DDIR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(1)
-+ ldr r1, =CFG_GPR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(1)
-+ ldr r1, =CFG_PUEN_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(1)
-+ ldr r1, =CFG_GIUS_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(2)
-+ ldr r1, =CFG_DR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(2)
-+ ldr r1, =CFG_OCR1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(2)
-+ ldr r1, =CFG_OCR2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(2)
-+ ldr r1, =CFG_ICFA1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(2)
-+ ldr r1, =CFG_ICFA2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(2)
-+ ldr r1, =CFG_ICFB1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(2)
-+ ldr r1, =CFG_ICFB2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(2)
-+ ldr r1, =CFG_ICR1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(2)
-+ ldr r1, =CFG_ICR2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(2)
-+ ldr r1, =CFG_IMR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(2)
-+ ldr r1, =CFG_DDIR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(2)
-+ ldr r1, =CFG_GPR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(2)
-+ ldr r1, =CFG_PUEN_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(2)
-+ ldr r1, =CFG_GIUS_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(3)
-+ ldr r1, =CFG_DR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(3)
-+ ldr r1, =CFG_OCR1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(3)
-+ ldr r1, =CFG_OCR2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(3)
-+ ldr r1, =CFG_ICFA1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(3)
-+ ldr r1, =CFG_ICFA2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(3)
-+ ldr r1, =CFG_ICFB1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(3)
-+ ldr r1, =CFG_ICFB2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(3)
-+ ldr r1, =CFG_ICR1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(3)
-+ ldr r1, =CFG_ICR2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(3)
-+ ldr r1, =CFG_IMR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(3)
-+ ldr r1, =CFG_DDIR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(3)
-+ ldr r1, =CFG_GPR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(3)
-+ ldr r1, =CFG_PUEN_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(3)
-+ ldr r1, =CFG_GIUS_D_VAL
-+ str r1, [r0]
-+
-+/* CS3 becomes CS3 by clearing reset default bit 1 in FMCR */
-+
-+ ldr r0, =FMCR
-+ ldr r1, =CFG_FMCR_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS0U
-+ ldr r1, =CFG_CS0U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS0L
-+ ldr r1, =CFG_CS0L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS1U
-+ ldr r1, =CFG_CS1U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS1L
-+ ldr r1, =CFG_CS1L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS2U
-+ ldr r1, =CFG_CS2U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS2L
-+ ldr r1, =CFG_CS2L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS3U
-+ ldr r1, =CFG_CS3U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS3L
-+ ldr r1, =CFG_CS3L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS4U
-+ ldr r1, =CFG_CS4U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS4L
-+ ldr r1, =CFG_CS4L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS5U
-+ ldr r1, =CFG_CS5U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS5L
-+ ldr r1, =CFG_CS5L_VAL
-+ str r1, [r0]
-+
-+ adr r0, sdramsetup /* r0 <- current position of code */
-+ ldr r1, =CFG_SDRAM_1_BASE /* test if we run from flash or RAM */
-+ cmp r1, r0 /* don't reloc during debug*/
-+ bhi sdramsetup
-+ ldr r1, =CFG_FLASH_BASE /* test if we run from flash or RAM */
-+ cmp r0, r1 /* don't reloc during debug */
-+ bmi endofmemsetup
-+
-+/* SDRAM Setup */
-+sdramsetup:
-+ ldr r0, =SDCTL0
-+ ldr r1, =CFG_PRECHARGE_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =CFG_SDRAM_1_BASE+CFG_SDRAM_PRECHARGE_ALL_VAL
-+ ldr r2, [r1]
-+
-+ ldr r1, =CFG_AUTOREFRESH_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =CFG_SDRAM_1_BASE
-+ ldr r2, [r1] /* Issue AutoRefresh Command */
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+
-+ ldr r1, =CFG_SET_MODE_REG_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =CFG_SDRAM_1_BASE+CFG_SDRAM_MODE_REGISTER_VAL
-+ str r2, [r1]
-+
-+ ldr r1, =CFG_NORMAL_RW_CMD
-+ str r1, [r0]
-+
-+endofmemsetup:
-+ mov pc,r10
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/Makefile u-boot-1.1.6/board/apx9328/Makefile
---- ref/u-boot-1.1.6/board/apx9328/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/Makefile 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,47 @@
-+#
-+# (C) Copyright 2000-2004
-+# Wolfgang Denk, DENX Software Engineering, wd...@de....
-+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+
-+include $(TOPDIR)/config.mk
-+
-+LIB = lib$(BOARD).a
-+
-+OBJS := apx9328.o i2c.o apx9328fpga.o fpga.o
-+SOBJS := lowlevel_init.o
-+
-+$(LIB): $(OBJS) $(SOBJS)
-+ $(AR) crv $@ $^
-+
-+clean:
-+ rm -f $(SOBJS) $(OBJS)
-+
-+distclean: clean
-+ rm -f $(LIB) core *.bak .depend
-+
-+#########################################################################
-+
-+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
-+
-+-include .depend
-+
-+#########################################################################
-diff -purN -x '*~' ref/u-boot-1.1.6/board/apx9328/u-boot.lds u-boot-1.1.6/board/apx9328/u-boot.lds
---- ref/u-boot-1.1.6/board/apx9328/u-boot.lds 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/board/apx9328/u-boot.lds 2006-11-26 20:28:03.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*
-+ * (C) Copyright 2000-2004
-+ * Wolfgang Denk, DENX Software Engineering, wd...@de....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+
-+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-+OUTPUT_ARCH(arm)
-+ENTRY(_start)
-+SECTIONS
-+{
-+ . = 0x00000000;
-+
-+ . = ALIGN(4);
-+ .text :
-+ {
-+ cpu/arm920t/start.o (.text)
-+ *(.text)
-+ }
-+
-+ . = ALIGN(4);
-+ .rodata : { *(.rodata) }
-+
-+ . = ALIGN(4);
-+ .data : { *(.data) }
-+
-+ . = ALIGN(4);
-+ .got : { *(.got) }
-+
-+ __u_boot_cmd_start = .;
-+ .u_boot_cmd : { *(.u_boot_cmd) }
-+ __u_boot_cmd_end = .;
-+
-+ . = ALIGN(4);
-+ __bss_start = .;
-+ .bss : { *(.bss) }
-+ _end = .;
-+}
-diff -purN -x '*~' ref/u-boot-1.1.6/include/configs/apx9328.h u-boot-1.1.6/include/configs/apx9328.h
---- ref/u-boot-1.1.6/include/configs/apx9328.h 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.6/include/configs/apx9328.h 2006-12-03 12:08:06.000000000 +0100
-@@ -0,0 +1,954 @@
-+/*
-+ * Eric Jarrige <jo...@us...>
-+ *
-+ * Configuation settings for the Armadeus Project motherboard 9328 board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ * 2005/01/14 Initial version taken from the scb9328 configuration file
-+ * 2005/03/10 apx9328 configuration file and trial to improve of
-+ * hardware register control.
-+ * 2005/08/16 added APX9328 fpgas and ethernet
-+ * 2005/12/02 added filesystem boot over NFS
-+ * 2006/11/26 added filesystem boot over NFS
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+
-+#define CONFIG_IDENT_STRING " apx9328 patch 2.7"
-+
-+#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
-+#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
-+#define CONFIG_APX9328 1 /* on a Armadeus project board */
-+#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-+
-+/*
-+ * Enable the call to misc_init_r() for miscellaneous platform
-+ * dependent initialization.
-+ */
-+
-+#define CONFIG_MISC_INIT_R
-+
-+/*
-+ * Select serial console configuration
-+ */
-+#define CONFIG_IMX_SERIAL1
-+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-+#define CONFIG_BAUDRATE 115200
-+
-+/*
-+ * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
-+ * neccessary in include/cmd_confdefs.h file. (Un)comment for getting
-+ * functionality or size of u-boot code.
-+ */
-+#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
-+ | CFG_CMD_NET \
-+ | CFG_CMD_PING \
-+ | CFG_CMD_DHCP \
-+ | CFG_CMD_JFFS2 \
-+ | CFG_CMD_I2C \
-+ | CFG_CMD_DATE \
-+ | CFG_CMD_EEPROM \
-+ | CONFIG_CMD_ALL \
-+ )
-+
-+#include <cmd_confdefs.h>
-+
-+/*
-+ * Select some advanced features of the commande line parser
-+ */
-+#define CONFIG_AUTO_COMPLETE 1 /* Enable auto completion of */
-+ /* commands using TAB */
-+#define CFG_HUSH_PARSER 1 /* enable the "hush" shell */
-+#define CFG_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-+
-+/* eval_board=evk9328
-+ * Boot options. Setting delay to -1 stops autostart count down.
-+ */
-+#define CONFIG_BOOTDELAY 20
-+
-+#define CONFIG_BOOTARGS \
-+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 "CONFIG_MTDPARTS
-+
-+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
-+#define CONFIG_MTDMAP "apf9328_flash"
-+#define CONFIG_MTDPARTS "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
-+ "128k(U-boot_env),256k(firmware),1536k(kernel),6016k(root)"
-+
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-+ "fileaddr=" MK_STR(CFG_LOAD_ADDR) "\0" \
-+ "filesize=" MK_STR(CFG_MONITOR_LEN) "\0" \
-+ "console=" CONFIG_CONSOLE "\0" \
-+ "mtdparts=" CONFIG_MTDPARTS "\0" \
-+ "uboot_addr=" MK_STR(CFG_MONITOR_BASE) "\0" \
-+ "uboot_len=" MK_STR(CFG_MONITOR_LEN) "\0" \
-+ "env_addr=" MK_STR(CFG_ENV_ADDR) "\0" \
-+ "env_len=" MK_STR(CFG_ENV_SIZE) "\0" \
-+ "firmware_addr=" MK_STR(CONFIG_FIRMWARE_ADDR) "\0" \
-+ "firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
-+ "kernel_addr=" MK_STR(CONFIG_KERNEL_ADDR) "\0" \
-+ "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
-+ "rootfs_addr=" MK_STR(CONFIG_ROOTFS_ADDR) "\0" \
-+ "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
-+ "mmcroot=/dev/mmcblk0p1\0" \
-+ "mmcrootfstype=ext2\0" \
-+ "addnfsargs=setenv bootargs ${bootargs} " \
-+ "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
-+ "addjffsargs=setenv bootargs ${bootargs} " \
-+ "root=/dev/mtdblock4 rootfstype=jffs2\0" \
-+ "addmmcargs=setenv bootargs ${bootargs} " \
-+ "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
-+ "addipargs=setenv bootargs ${bootargs} " \
-+ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
-+ "nfsboot=setenv bootargs ${console} ${mtdparts};" \
-+ "run addnfsargs addipargs; bootm ${kernel_addr}\0" \
-+ "jffsboot=setenv bootargs ${console} ${mtdparts};" \
-+ "run addjffsargs addipargs; bootm ${kernel_addr}\0" \
-+ "mmcboot=setenv bootargs ${console} ${mtdparts};" \
-+ "run addmmcargs addipargs; bootm ${kernel_addr}\0" \
-+ "firmware_autoload=0\0" \
-+ "flash_uboot=protect off ${uboot_addr} +${uboot_len};" \
-+ "era ${uboot_addr} +${uboot_len};" \
-+ "if cp.b ${fileaddr} ${uboot_addr} ${filesize};" \
-+ "then protect on ${uboot_addr} +${uboot_len};" \
-+ "echo Flashing uboot succeed;" \
-+ "else echo Flashing uboot failed;" \
-+ "fi; \0" \
-+ "flash_firmware=era ${firmware_addr} +${firmware_len};" \
-+ "if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;" \
-+ "then echo Flashing Firmware succeed;" \
-+ "else echo Flashing Firmware failed;" \
-+ "fi\0" \
-+ "flash_kernel=era ${kernel_addr} +${kernel_len};" \
-+ "if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;" \
-+ "then echo Flashing kernel succeed;" \
-+ "else echo Flashing kernel failed;" \
-+ "fi\0" \
-+ "flash_rootfs=era ${rootfs_addr} +${rootfs_len};" \
-+ "if cp.b ${fileaddr} ${rootfs_addr} ${filesize};" \
-+ "then echo Flashing rootfs succeed;" \
-+ "else echo Flashing rootfs failed;" \
-+ "fi\0" \
-+ "flash_reset_env=protect off ${env_addr} +${env_len};" \
-+ "era ${env_addr} +${env_len};" \
-+ "echo Erasinf flash environment variables done!" \
-+
-+#define CONFIG_BOOTCOMMAND "run jffsboot"
-+#define CFG_AUTOLOAD "no"
-+
-+#define MACH_TYPE_APX9328 MACH_TYPE_SCB9328
-+
-+#define CONFIG_MACH_TYPE MACH_TYPE_APF9328
-+#define CONFIG_BOOT_PARAMS_ADDR 0x08000100
-+
-+/*
-+ * #define CONFIG_SHOW_BOOT_PROGRESS
-+ */
-+
-+#define CONFIG_ETHADDR 00:1E:AC:00:00:01
-+#define CONFIG_NETMASK 255.255.255.0
-+#define CONFIG_IPADDR 192.168.000.10
-+#define CONFIG_HOSTNAME "armadeus"
-+#define CONFIG_GATEWAYIP 192.168.000.1
-+#define CONFIG_SERVERIP 192.168.000.1
-+#define CONFIG_ROOTPATH "/tftpboot/root"
-+
-+/*
-+ * General options for u-boot. Modify to save memory foot print
-+ */
-+
-+#define CFG_LONGHELP
-+#define CFG_PROMPT "BIOS> " /* prompt string */
-+#define CFG_CBSIZE 256 /* console I/O buffer */
-+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* print buffer size */
-+#define CFG_MAXARGS 16 /* max command args */
-+#define CFG_BARGSIZE CFG_CBSIZE /* boot args buf size */
-+
-+#define CFG_MEMTEST_START 0x08000000 /* memtest test area */
-+#define CFG_MEMTEST_END 0x08700000
-+
-+#undef CFG_CLKS_IN_HZ /* use HZ for freq. display */
-+#define CFG_HZ 1000000 /* incrementer freq: 1 MHz */
-+
-+/*
-+ * Definitions related to passing arguments to kernel.
-+ */
-+
-+#define CONFIG_CMDLINE_TAG 1 /* send commandline to Kernel */
-+#define CONFIG_SETUP_MEMORY_TAGS 1 /* send memory definition to kernel */
-+#define CONFIG_INITRD_TAG 1 /* send initrd params */
-+#undef CONFIG_VFD /* do not send framebuffer setup */
-+
-+/*
-+ * Malloc pool need to host env + 128 Kb reserve for other allocations.
-+ */
-+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + (128<<10) )
-+
-+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
-+
-+#define CONFIG_STACKSIZE (120<<10) /* stack size */
-+
-+#ifdef CONFIG_USE_IRQ
-+#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-+#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
-+#endif
-+
-+/*
-+* Clocks configuration
-+*/
-+/*
-+ * PLL configuration
-+
-+ f_{dpll}=2*f{ref}*(MFI+MFN/(MFD+1))/(PD+1)
-+ f_ref=16,777216MHz
-+ 32768 Hz xtal
-+ 0x07B32DA5: 192.0000173
-+ 0x002a141f: 191,9944MHz
-+ 0x040b2007: 144MHz
-+ 0x0FB32DA5: 96.00000864 MHz
-+ 0x042a141f: 96MHz
-+ 0x0811140d: 64MHz
-+ 0x040e200e: 150MHz
-+ 0x00321431: 200MHz
-+
-+ 16 MHz xtal
-+ 0x08001800: 64MHz mit 16er Quarz
-+ 0x04001800: 96MHz mit 16er Quarz
-+ 0x04002400: 144MHz mit 16er Quarz
-+
-+ 31 |x x x x|x x x x|x x x x|x x x x|x x x x|x x x x|x x x x|x x x x| 0
-+ |XXX|--PD---|-------MFD---------|XXX|--MFI--|-----MFN-----------|
-+ */
-+
-+#define CFG_OSC32 32768 /* 32768 or 32000 Hz crystal */
-+#undef CFG_OSC16 /* there is no external 16MHz external clock */
-+
-+/* MPU CLOCK source before PLL (should be named CFG_SYS_CLK_FREQ) */
-+#define CONFIG_SYS_CLK_FREQ (512*CFG_OSC32)
-+#define CFG_MPCTL0_VAL 0x07B32DA5 /* 192.000017 MHz */
-+#define CFG_MPCTL1_VAL 0
-+
-+/* system clock source before PLL (should be named CFG_SYSPLL_CLK_FREQ) */
-+#ifndef CFG_OSC16
-+#define CONFIG_SYSPLL_CLK_FREQ (512*CFG_OSC32)
-+#if (CFG_OSC32 == 32000)
-+#define CFG_SPCTL0_VAL 0x043F1437 /* 96 MHz */
-+#define CFG_SPCTL1_VAL 0
-+#define CONFIG_SYS_FREQ 96 /* MHz */
-+#else /* CFG_OSC32 == 32768*/
-+#define CFG_SPCTL0_VAL 0x0FB32DA5 /* 96.000009 MHz */
-+#define CFG_SPCTL1_VAL 0
-+#define CONFIG_SYS_FREQ 96 /* MHz */
-+#endif /* CFG_OSC32 */
-+#else /* CFG_OSC16 in use*/
-+#define CONFIG_SYSPLL_CLK_FREQ CFG_OSC16
-+#define CFG_SPCTL0_VAL 0x04001401 /* 96 MHz */
-+#define CFG_SPCTL1_VAL 0x0C000040
-+#define CONFIG_SYS_FREQ 96 /* MHz */
-+#endif /* CFG_OSC16 */
-+
-+/* external bus frequency (have to be a CONFIG_SYS_FREQ ratio) */
-+#define CONFIG_SYS_BUS_FREQ 96 /* 96|48... MHz (BCLOCK and HCLOCK) */
-+#define CONFIG_USB_FREQ 48 /* 48 MHz */
-+#define CONFIG_PERIF1_FREQ 16 /* 16 MHz UART, Timer PWM*/
-+#define CONFIG_PERIF2_FREQ 48 /* 48 MHz LCD SD SPI*/
-+#define CONFIG_PERIF3_FREQ 16 /* 16 MHz SSI*/
-+
-+
-+/*
-+ * SDRAM definition parameter
-+ */
-+#define CONFIG_NR_DRAM_BANKS 1 /* we have and support only 1 bank of SDRAM */
-+
-+#define CFG_SDRAM_MBYTE_SYZE 16
-+
-+#if (CFG_SDRAM_MBYTE_SYZE == 8)
-+/* micron 8MB */
-+#define CFG_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-+#define CFG_SDRAM_1_SIZE 0x00800000 /* 8 MB */
-+#define CFG_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
-+#define CFG_SDRAM_NUM_ROW 11 /* 11, 12 or 13 row address bits */
-+#define CFG_SDRAM_REFRESH 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-+#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-+#define CFG_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-+#define CFG_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-+#define CFG_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-+#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-+#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-+#endif
-+
-+#if (CFG_SDRAM_MBYTE_SYZE == 16)
-+/* micron 16MB */
-+#define CFG_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-+#define CFG_SDRAM_1_SIZE 0x01000000 /* 16 MB */
-+#define CFG_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
-+#define CFG_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
-+#define CFG_SDRAM_REFRESH 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-+#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-+#define CFG_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-+#define CFG_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-+#define CFG_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-+#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-+#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-+#endif
-+
-+#if (CFG_SDRAM_MBYTE_SYZE == 32)
-+/* micron 32MB */
-+#define CFG_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-+#define CFG_SDRAM_1_SIZE 0x02000000 /* 32 MB */
-+#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-+#define CFG_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
-+#define CFG_SDRAM_REFRESH 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-+#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-+#define CFG_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-+#define CFG_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-+#define CFG_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-+#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-+#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-+#endif
-+
-+#if (CFG_SDRAM_MBYTE_SYZE == 64)
-+/* micron 64MB */
-+#define CFG_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-+#define CFG_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-+#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-+#define CFG_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
-+#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-+#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-+#define CFG_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-+#define CFG_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-+#define CFG_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-+#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-+#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-+#endif
-+
-+/*
-+ * Configuration for a maximum 32MB of FLASH memory
-+ */
-+#define CFG_MAX_FLASH_BANKS 1 /* FLASH banks count (not chip count) */
-+#define CFG_MAX_FLASH_SECT 256 /* number of sector in FLASH bank */
-+#define CFG_FLASH_BASE 0x10000000 /* location of flash memory */
-+
-+/* This should be defined if CFI FLASH device is present. */
-+#define CFG_FLASH_CFI 1
-+#define CFG_FLASH_CFI_DRIVER 1
-+#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
-+#define CFG_FLASH_PROTECTION 1
-+
-+/*
-+ * This is setting for JFFS2 support in u-boot.
-+ * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
-+ */
-+#define CFG_JFFS2_FIRST_BANK 0
-+#define CFG_JFFS2_FIRST_SECTOR 5
-+#define CFG_JFFS2_NUM_BANKS 1
-+/*
-+ * Environment setup. Definitions of monitor location and size with
-+ * definition of environment setup ends up in 2 possibilities.
-+ * 1. Embeded environment - in u-boot code is space for environment
-+ * 2. Environment is read from predefined sector of flash
-+ * Right now we support 2. possiblity, but expecting no env placed
-+ * on mentioned address right now. This also needs to provide whole
-+ * sector for it - for us 256Kb is really waste of memory. U-boot uses
-+ * default env. and until kernel parameters could be sent to kernel
-+ * env. has no sense to us.
-+ */
-+
-+#define CFG_MONITOR_BASE 0x10000000
-+#define CFG_MONITOR_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
-+#define CFG_ENV_IS_IN_FLASH 1
-+#define CFG_ENV_ADDR 0x10040000 /* absolute address for now */
-+#define CFG_ENV_SIZE 0x00020000
-+#define CFG_ENV_SECT_SIZE 0x00020000
-+#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
-+#define CONFIG_FIRMWARE_ADDR 0x10060000
-+#define CONFIG_FIRMWARE_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
-+#define CONFIG_KERNEL_ADDR 0x100A0000
-+#define CONFIG_KERNEL_LEN 0x00180000 /* 1.5MB */
-+#define CONFIG_ROOTFS_ADDR 0x10220000
-+#define CONFIG_ROOTFS_LEN 0x005E0000 /* almost 6MB */
-+
-+/*
-+ * Default load address for user programs and kernel
-+ */
-+#define CFG_LOAD_ADDR 0x08000000
-+#define CONFIG_LOADADDR 0x08000000
-+#define CFG_TFTP_LOADADDR 0x08000000
-+/*
-+ * Hardware drivers
-+ */
-+
-+/* DM9000 ethernet chipset assigned to CS4 */
-+/* For the apf board DM9000 base is 0x15C00000 and data is base+2 */
-+/* For the apm board DM9000 base is 0x15C3FFFC and data is base+4 */
-+#define CONFIG_DRIVER_DM9000 1
-+#undef CONFIG_DM9000_DEBUG
-+#define CONFIG_DM9000_BASE 0x15C00000
-+#define DM9000_IO CONFIG_DM9000_BASE
-+#define DM9000_DATA (CONFIG_DM9000_BASE+2)
-+#define CONFIG_DM9000_USE_16BIT
-+
-+/*-----------------------------------------------------------------------
-+ * FPGA stuff
-+ */
-+#define CONFIG_FPGA_COUNT 1
-+/* only digital value for CONFIG_FPGA is supported (investigation pending) */
-+#define CONFIG_FPGA 0x801 /* CFG_XILINX_SPARTAN3 */
-+#define CFG_FPGA_WAIT 250
-+#define CFG_FPGA_PROG_FEEDBACK
-+#define CFG_FPGA_CHECK_CTRLC
-+#define CFG_FPGA_CHECK_ERROR
-+/* FPGA program pin configuration */
-+#define CFG_FPGA_PRG (GPIO_PORTB | 18) /* FPGA prog pin (SSI output) */
-+#define CFG_FPGA_CLK (GPIO_PORTB | 19) /* FPGA clk pin (SSI output) */
-+#define CFG_FPGA_DATA (GPIO_PORTB | 17) /* FPGA data pin (SSI output) */
-+#define CFG_FPGA_INIT (GPIO_PORTB | 15) /* FPGA init pin (SSI input) */
-+#define CFG_FPGA_DONE (GPIO_PORTB | 16) /* FPGA done pin (SSI input) */
-+
-+/*
-+ * I2C bus
-+ */
-+
-+#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-+
-+#define CFG_I2C_SPEED 400000 /* 400 kHz */
-+#define CFG_I2C_SLAVE 0x7F
-+
-+# define CFG_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC256 */
-+# define CFG_I2C_EEPROM_ADDR_LEN 2 /* bytes of address */
-+/* mask of address bits that overflow into the "EEPROM chip address" */
-+/*#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x00*/
-+#define CFG_EEPROM_PAGE_WRITE_BITS 6
-+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
-+
-+#define CONFIG_RTC_DS1374
-+
-+/*
-+ * External interfaces module
-+ *
-+ * CSxU_VAL:
-+ * 63| x |x|x x|x x x x|x x| x | x |x x x x|48
-+ * |DTACK_SEL|0|BCD| BCS |PSZ|PME|SYNC| DOL |
-+ *
-+ * 47| x x | x x x x x x | x | x x x x | x x x x |32
-+ * | CNC | WSC | 0 | WWS | EDC |
-+ *
-+ * CSxL_VAL:
-+ * 31| x x x x | x x x x | x x x x | x x x x |24
-+ * | OEA | OEN | WEA | WEN |
-+ * 23|x x x x| x | x x x | x x x x |x x| x | x | 0
-+ * | CSA |EBC| DSZ | 0|SP|0|WP|0 0|PA |CSEN |
-+ */
-+
-+/* CS0 configuration for flash memory Micron MT28F128J3-150 */
-+#define CFG_CS0_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-+#define CFG_CS0_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
-+ /* 3=8bits on D[7:0] 6=32 bits..*/
-+#define CFG_CS0_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-+#define CFG_CS0_WRITE_PROTECT 0 /* 1 : write access prohibited */
-+#define CFG_CS0_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-+#define CFG_CS0_READ_CYC_LGTH 150 /* ns */
-+#define CFG_CS0_OE_ASSERT_DLY 0 /* ns */
-+#define CFG_CS0_OE_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS0_CS_NEG_LGTH 0 /* ns CS HIGH to CS LOW : tCWH */
-+#define CFG_CS0_XTRA_DEAD_CYC 35 /* ns from CS HIGH to tristate bus */
-+
-+#define CFG_CS0_WRITE_XTRA_LGTH 0 /* ns */
-+#define CFG_CS0_EB_ASSERT_DLY 0 /* ns */
-+#define CFG_CS0_EB_NEG_DLY 0 /* ns */
-+#define CFG_CS0_CS_ASSERT_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS0_SYNC_ENABLE 1 /* enable synchronous burst mode */
-+#define CFG_CS0_SYNC_PAGE_MODE_EMUL 1 /* enable page mode emulation */
-+#define CFG_CS0_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-+#define CFG_CS0_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-+#define CFG_CS0_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-+#define CFG_CS0_SYNC_DAT_OUT_LGTH 25 /* ns */
-+
-+/* CS1 configuration for */
-+#define CFG_CS1_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-+#define CFG_CS1_PIN_ASSERT 0 /* chip select pin state when */
-+ /* chip select disabled */
-+#define CFG_CS1_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins*/
-+ /* 3=8bits on D[7:0] 6=32 bits..*/
-+#define CFG_CS1_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-+#define CFG_CS1_WRITE_PROTECT 0 /* 1 : write access prohibited */
-+#define CFG_CS1_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-+
-+#define CFG_CS1_READ_CYC_LGTH 30 /* ns */
-+#define CFG_CS1_OE_ASSERT_DLY 0 /* ns */
-+#define CFG_CS1_OE_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS1_CS_NEG_LGTH 0 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-+#define CFG_CS1_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-+
-+#define CFG_CS1_WRITE_XTRA_LGTH 0 /* ns */
-+#define CFG_CS1_EB_ASSERT_DLY 0 /* ns */
-+#define CFG_CS1_EB_NEG_DLY 0 /* ns */
-+#define CFG_CS1_CS_ASSERT_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS1_SYNC_ENABLE 0 /* enable synchronous burst mode */
-+#define CFG_CS1_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation */
-+#define CFG_CS1_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-+#define CFG_CS1_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-+#define CFG_CS1_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-+#define CFG_CS1_SYNC_DAT_OUT_LGTH 0 /* ns */
-+
-+/* CS2 configuration for */
-+#define CFG_CS2_CHIP_SELECT_ENABLE 0 /* 1 : enable CS0 peripherals */
-+#define CFG_CS2_PIN_ASSERT 0 /* chip select pin state when */
-+ /*chip select disabled */
-+#define CFG_CS2_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
-+ /* 3=8bits on D[7:0] 6=32 bits..*/
-+#define CFG_CS2_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-+#define CFG_CS2_WRITE_PROTECT 0 /* 1 : write access prohibited */
-+#define CFG_CS2_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-+
-+#define CFG_CS2_READ_CYC_LGTH 0 /* ns */
-+#define CFG_CS2_OE_ASSERT_DLY 0 /* ns */
-+#define CFG_CS2_OE_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS2_CS_NEG_LGTH 0 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-+#define CFG_CS2_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-+
-+#define CFG_CS2_WRITE_XTRA_LGTH 0 /* ns */
-+#define CFG_CS2_EB_ASSERT_DLY 0 /* ns */
-+#define CFG_CS2_EB_NEG_DLY 0 /* ns */
-+#define CFG_CS2_CS_ASSERT_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS2_SYNC_ENABLE 0 /* enable synchronous burst mode */
-+#define CFG_CS2_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation*/
-+#define CFG_CS2_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-+#define CFG_CS2_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-+#define CFG_CS2_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-+#define CFG_CS2_SYNC_DAT_OUT_LGTH 0 /* ns */
-+
-+/* CS3 configuration for */
-+#define CFG_CS3_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-+#define CFG_CS3_PIN_ASSERT 0 /* chip select pin state when */
-+ /* chip select disabled */
-+#define CFG_CS3_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
-+ /* 3=8bits on D[7:0] 6=32 bits..*/
-+#define CFG_CS3_SUPERVISOR_PROTECT 0 /* 1: user mode access prohibited*/
-+#define CFG_CS3_WRITE_PROTECT 0 /* 1: write access prohibited */
-+#define CFG_CS3_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal*/
-+
-+#define CFG_CS3_READ_CYC_LGTH 0 /* ns */
-+#define CFG_CS3_OE_ASSERT_DLY 0 /* ns */
-+#define CFG_CS3_OE_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS3_CS_NEG_LGTH 0 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-+#define CFG_CS3_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-+
-+#define CFG_CS3_WRITE_XTRA_LGTH 0 /* ns */
-+#define CFG_CS3_EB_ASSERT_DLY 0 /* ns */
-+#define CFG_CS3_EB_NEG_DLY 0 /* ns */
-+#define CFG_CS3_CS_ASSERT_NEG_DLY 0 /* ns */
-+
-+#define CFG_CS3_SYNC_ENABLE 0 /* enable synchronous burst mode*/
-+#define CFG_CS3_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation*/
-+#define CFG_CS3_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-+#define CFG_CS3_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-+#define CFG_CS3_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-+#define CFG_CS3_SYNC_DAT_OUT_LGTH 0 /* ns */
-+
-+/* CS4 configuration for DM9000 ethernet chipset */
-+#define CFG_CS4_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-+#define CFG_CS4_PIN_ASSERT 0 /* chip select pin state when */
-+ /* chip select disabled */
-+#define CFG_CS4_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
-+ /* 3=8bits on D[7:0] 6=32 bits..*/
-+#define CFG_CS4_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited*/
-+#define CFG_CS4_WRITE_PROTECT 0 /* 1 : write access prohibited */
-+#define CFG_CS4_EB_SIGNAL_CONTROL...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 13:43:49
|
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 68876b7ec35d04ba79f0c3137836ac4955549c64 (commit)
from c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2 (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 68876b7ec35d04ba79f0c3137836ac4955549c64
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 15:43:22 2011 +0200
[BUILDROOT] Remove no more needed buildroot/package/bluez3/ (moved as patch)
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/bluez3/Config.in | 16 ----
buildroot/package/bluez3/bluetooth.conf | 33 --------
buildroot/package/bluez3/bluetooth.default | 37 ---------
buildroot/package/bluez3/bluez-libs.mk | 13 ---
buildroot/package/bluez3/bluez-pand-devup.sh | 2 -
buildroot/package/bluez3/bluez-utils-bluepin.sh | 2 -
buildroot/package/bluez3/bluez-utils.mk | 99 -----------------------
buildroot/package/bluez3/hcid.conf | 57 -------------
buildroot/package/bluez3/rfcomm-getty | 9 --
buildroot/package/bluez3/rfcomm.conf | 16 ----
10 files changed, 0 insertions(+), 284 deletions(-)
delete mode 100644 buildroot/package/bluez3/Config.in
delete mode 100644 buildroot/package/bluez3/bluetooth.conf
delete mode 100644 buildroot/package/bluez3/bluetooth.default
delete mode 100644 buildroot/package/bluez3/bluez-libs.mk
delete mode 100644 buildroot/package/bluez3/bluez-pand-devup.sh
delete mode 100644 buildroot/package/bluez3/bluez-utils-bluepin.sh
delete mode 100644 buildroot/package/bluez3/bluez-utils.mk
delete mode 100644 buildroot/package/bluez3/hcid.conf
delete mode 100644 buildroot/package/bluez3/rfcomm-getty
delete mode 100644 buildroot/package/bluez3/rfcomm.conf
diff --git a/buildroot/package/bluez3/Config.in b/buildroot/package/bluez3/Config.in
deleted file mode 100644
index 72b3c8b..0000000
--- a/buildroot/package/bluez3/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_BLUEZ_LIBS
- bool "bluez"
- select BR2_PACKAGE_PKGCONFIG
- help
- Install the bluez library
-
-config BR2_PACKAGE_BLUEZ_UTILS
- bool "bluez-utils"
- default n
- depends on BR2_PACKAGE_DBUS
- select BR2_PACKAGE_BLUEZ_LIBS
- help
- Install the bluez utilities
-
-comment "bluez-utils not available (need dbus)"
- depends on !BR2_PACKAGE_DBUS
diff --git a/buildroot/package/bluez3/bluetooth.conf b/buildroot/package/bluez3/bluetooth.conf
deleted file mode 100644
index aa642a2..0000000
--- a/buildroot/package/bluez3/bluetooth.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- This configuration file specifies the required security policies
- for Bluetooth core service to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- ../system.conf have denied everything, so we just punch some holes -->
-
- <policy user="root">
- <allow own="org.bluez"/>
- </policy>
-
- <policy at_console="true">
- <allow send_destination="org.bluez.Manager"/>
- <allow receive_sender="org.bluez.Manager"/>
-
- <allow send_path="/org/bluez"/>
-
- <allow send_destination="org.bluez.Adapter"/>
- <allow receive_sender="org.bluez.Adapter"/>
-
- <allow send_destination="org.bluez.Service"/>
- <allow receive_sender="org.bluez.Service"/>
-
- <allow send_destination="org.bluez.Database"/>
- <allow receive_sender="org.bluez.Database"/>
-
- <allow send_destination="org.bluez.Security"/>
- <allow receive_sender="org.bluez.Security"/>
- </policy>
-
-</busconfig>
diff --git a/buildroot/package/bluez3/bluetooth.default b/buildroot/package/bluez3/bluetooth.default
deleted file mode 100644
index 4817d38..0000000
--- a/buildroot/package/bluez3/bluetooth.default
+++ /dev/null
@@ -1,37 +0,0 @@
-# Bluetooth configuraton file
-
-# Start of hcid (allowed values are "true" and "false")
-HCID_ENABLE=true
-
-# Config file for hcid
-HCID_CONFIG="/etc/bluetooth/hcid.conf"
-
-# Start sdpd (allowed values are "true" and "false")
-SDPD_ENABLE=true
-
-# Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=true
-
-# Arguments to hidd
-HIDD_OPTIONS=""
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=true
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=true
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Start dund (allowed values are "true" and "false")
-DUND_ENABLE=false
-
-# Arguments to dund
-DUND_OPTIONS="--listen --persist"
-
-# Start pand (allowed values are "true" and "false")
-PAND_ENABLE=false
-
-# Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
diff --git a/buildroot/package/bluez3/bluez-libs.mk b/buildroot/package/bluez3/bluez-libs.mk
deleted file mode 100644
index d903d75..0000000
--- a/buildroot/package/bluez3/bluez-libs.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################################################
-#
-# bluez-libs
-#
-#############################################################
-BLUEZ_LIBS_VERSION:=3.36
-BLUEZ_LIBS_SITE = http://bluez.sourceforge.net/download
-BLUEZ_LIBS_SOURCE = bluez-libs-$(BLUEZ_LIBS_VERSION).tar.gz
-BLUEZ_LIBS_INSTALL_STAGING = YES
-BLUEZ_LIBS_INSTALL_TARGET = YES
-
-$(eval $(call AUTOTARGETS,package,bluez-libs))
-
diff --git a/buildroot/package/bluez3/bluez-pand-devup.sh b/buildroot/package/bluez3/bluez-pand-devup.sh
deleted file mode 100644
index 6015470..0000000
--- a/buildroot/package/bluez3/bluez-pand-devup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/sbin/ifup $1
diff --git a/buildroot/package/bluez3/bluez-utils-bluepin.sh b/buildroot/package/bluez3/bluez-utils-bluepin.sh
deleted file mode 100644
index dccb76e..0000000
--- a/buildroot/package/bluez3/bluez-utils-bluepin.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "PIN:`/bin/cat /etc/bluetooth/pin`"
diff --git a/buildroot/package/bluez3/bluez-utils.mk b/buildroot/package/bluez3/bluez-utils.mk
deleted file mode 100644
index a833043..0000000
--- a/buildroot/package/bluez3/bluez-utils.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#############################################################
-#
-# bluez-utils - User space programs for controling Bluetooth
-#
-#############################################################
-BLUEZ_UTILS_VERSION:=3.36
-BLUEZ_UTILS_SITE=http://bluez.sourceforge.net/download
-BLUEZ_UTILS_SOURCE=bluez-utils-$(BLUEZ_UTILS_VERSION).tar.gz
-
-#BLUEZ_HCIDUMP_SOURCE=bluez-hcidump-1.39.tar.gz
-#BLUEZ_HCIDUMP_BUILD_DIR=$(BUILD_DIR)/bluez-hcidump-1.39
-
-
-ifeq ($(strip $(BR2_PACKAGE_ALSA-LIB)),y)
-ALSA_DEP=alsa
-WITH_ALSA=--with-alsa=$(STAGING_DIR)
-else
-WITH_ALSA=--without-alsa
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_OPENOBEX)),y)
-OBEX_DEP=openobex
-WITH_OBEX=--with-openobex=$(STAGING_DIR)
-else
-OBEX_DEP=
-WITH_OBEX=--without-obex
-endif
-
-BLUEZ_UTILS_CONF_OPT = \
- $(WITH_OBEX) \
- $(WITH_ALSA) \
- --disable-pie \
- --disable-expat \
- --enable-network \
- --enable-serial \
- --enable-audio \
- --enable-input \
- --enable-sync \
- --enable-hcid \
- --enable-hidd \
- --enable-pand \
- --disable-test \
- --enable-configfiles \
- --disable-manpages \
- --enable-initscripts \
- --disable-pcmciarules \
- --disable-bccmd \
- --enable-avctrl \
- --enable-hid2hci \
- --disable-dfutool
-
-# --disable-pie: uClibc doesn't handle "position independent executables" (segfault at launching)
-# sdpd is obsolete
-
-#$(BLUEZ_UTILS_BUILD_DIR)/.configured: $(BLUEZ_UTILS_BUILD_DIR)/.unpacked $(TARGET_DIR)/usr/lib/libbluetooth.so $(OBEX_DEP)
-
-BLUEZ_UTILS_DEPENDENCIES = bluez-libs dbus $(OBEX_DEP) $(ALSA_DEP)
-
-$(eval $(call AUTOTARGETS,package,bluez-utils))
-
-# Hook to prevent link with Host asound and libusb
-# (seems not needed with recent BR)
-$(BLUEZ_UTILS_HOOK_POST_CONFIGURE):
- @$(call MESSAGE,"Post configuring")
- $(SED) 's,^sys_lib_search_path_spec=.*,sys_lib_search_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib",' $(@D)/libtool
- touch $@
-
-
-
-$(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/.configured
- $(MAKE) -C $(BLUEZ_HCIDUMP_BUILD_DIR)
-
-$(STAGING_DIR)/usr/lib/libbluetooth.so $(STAGING_DIR)/usr/lib/libbluetooth.a: $(BLUEZ_LIBS_BUILD_DIR)/src/libbluetooth.la
- $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(BLUEZ_LIBS_BUILD_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libbluetooth.la
-
-$(TARGET_DIR)/usr/sbin/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump
- $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_HCIDUMP_BUILD_DIR) install
- rm -rf $(TARGET_DIR)/usr/share/man
-
-$(TARGET_DIR)/usr/sbin/hciattach: $(BLUEZ_UTILS_BUILD_DIR)/tools/hciattach
- (list='hcid dund hidd audio input network pand rfcomm sdpd tools'; for p in $$list; do \
- $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_UTILS_BUILD_DIR)/$$p install; \
- done)
- mkdir -p $(TARGET_DIR)/etc/bluetooth/pan $(TARGET_DIR)/etc/bluetooth/rfcomm
- install -D -m 0644 package/bluez/hcid.conf $(TARGET_DIR)/etc/bluetooth/hcid.conf
- install -D -m 0755 package/bluez/bluez-utils-bluepin.sh $(TARGET_DIR)/etc/bluetooth/bluepin
- install -D -m 0755 package/bluez/bluez-pand-devup.sh $(TARGET_DIR)/etc/bluetooth/pan/dev-up
- install -D -m 0755 package/bluez/rfcomm-getty $(TARGET_DIR)/etc/bluetooth/rfcomm/rfcomm-getty
- echo "1234" > $(TARGET_DIR)/etc/bluetooth/pin
- chmod 0600 $(TARGET_DIR)/etc/bluetooth/pin
- install -D -m 0644 package/bluez/rfcomm.conf $(TARGET_DIR)/etc/bluetooth/rfcomm.conf
- #install -D -m 0755 package/bluez/bluetooth.init $(TARGET_DIR)/etc/init.d/S30bluetooth TBDJB
- mkdir -p $(TARGET_DIR)/etc/default
- install -D -m 0644 package/bluez/bluetooth.default $(TARGET_DIR)/etc/default/bluetooth
- install -D -m 0644 package/bluez/bluetooth.conf $(TARGET_DIR)/etc/dbus-1/system.d/bluetooth.conf
-
-#bluez-hcidump: bluez-libs $(TARGET_DIR)/usr/sbin/hcidump
-
diff --git a/buildroot/package/bluez3/hcid.conf b/buildroot/package/bluez3/hcid.conf
deleted file mode 100644
index 87ee30d..0000000
--- a/buildroot/package/bluez3/hcid.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# HCI daemon configuration file.
-#
-
-# HCId options
-options {
- # Automatically initialize new devices
- autoinit yes;
-
- # Security Manager mode
- # none - Security manager disabled
- # auto - Use local PIN for incoming connections
- # user - Always ask user for a PIN
- #
- security auto;
-
- # Pairing mode
- # none - Pairing disabled
- # multi - Allow pairing with already paired devices
- # once - Pair once and deny successive attempts
- pairing multi;
-
- # Default PIN code for incoming connections
- passkey "BlueZ";
-}
-
-# Default settings for HCI devices
-device {
- # Local device name
- # %d - device id
- # %h - host name
- name "%h (%d)";
-
- # Local device class
- class 0x820116;
-
- # Default packet type
- #pkt_type DH1,DM1,HV1;
-
- # Inquiry and Page scan
- iscan enable; pscan enable;
-
- # Default link mode
- # none - no specific policy
- # accept - always accept incoming connections
- # master - become master on incoming connections,
- # deny role switch on outgoing connections
- lm accept;
-
- # Default link policy
- # none - no specific policy
- # rswitch - allow role switch
- # hold - allow hold mode
- # sniff - allow sniff mode
- # park - allow park mode
- lp rswitch,hold,sniff,park;
-}
diff --git a/buildroot/package/bluez3/rfcomm-getty b/buildroot/package/bluez3/rfcomm-getty
deleted file mode 100644
index f1d7a45..0000000
--- a/buildroot/package/bluez3/rfcomm-getty
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-while true;
- do
- rfcomm show rfcomm0 > /dev/null 2> /dev/null
- if [ "$?" != "1" ] ; then
- /sbin/getty -w -L rfcomm0 115200 vt100;
- fi
- sleep 1;
-done
diff --git a/buildroot/package/bluez3/rfcomm.conf b/buildroot/package/bluez3/rfcomm.conf
deleted file mode 100644
index cdbbf5b..0000000
--- a/buildroot/package/bluez3/rfcomm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# RFCOMM configuration file.
-#
-
-rfcomm0 {
- bind yes;
-
- # Bluetooth address of the device
- device 11:22:33:44:55:66;
-
- # RFCOMM channel for the connection
- channel 1;
-
- # Description of the connection
- comment "Bluetooth Serial Console";
-}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 11:55:01
|
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 c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2 (commit)
via 115a2d1b91a0dd5a54072e6fc44c715138d4013f (commit)
from f7a38a31bd7365dec5ad240d62f208c48a67e926 (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 c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 13:53:33 2011 +0200
[BUILDROOT] Remove no more needed target/ubifs/ stuff
commit 115a2d1b91a0dd5a54072e6fc44c715138d4013f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 13:42:10 2011 +0200
[BUILDROOT] Makes bluez a patch against BR instead of a patch + versionned files mix
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27_webradio_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 4 +-
buildroot/configs/apf9328_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
buildroot/target/ubifs/.gitignore | 2 -
buildroot/target/ubifs/mkfs-ubifs-head.patch | 43 -----
buildroot/target/ubifs/ubinize.cfg | 7 -
.../buildroot/2010.11/110-bluez-add_package.patch | 100 ++++++++++-
patches/buildroot/2010.11/111-bluez-hacks.patch | 198 ++++++++++++++++++++
patches/buildroot/2010.11/cleanup_buildroot.sh | 2 +
11 files changed, 304 insertions(+), 60 deletions(-)
delete mode 100644 buildroot/target/ubifs/.gitignore
delete mode 100644 buildroot/target/ubifs/mkfs-ubifs-head.patch
delete mode 100644 buildroot/target/ubifs/ubinize.cfg
create mode 100644 patches/buildroot/2010.11/111-bluez-hacks.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 89f6796..f9c9708 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -652,7 +652,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 438ead5..3b6248b 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -723,7 +723,7 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1faec4e..462c1fc 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -697,8 +697,8 @@ BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-BR2_PACKAGE_BLUEZ_LIBS=y
-BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BLUEZ3_LIBS=y
+BR2_PACKAGE_BLUEZ3_UTILS=y
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_CTORRENT is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index fdb1a0a..6b8179b 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -654,7 +654,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 4eff67c..32eadd0 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -666,7 +666,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/target/ubifs/.gitignore b/buildroot/target/ubifs/.gitignore
deleted file mode 100644
index 28329da..0000000
--- a/buildroot/target/ubifs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Config.in
-/ubifsroot.mk
diff --git a/buildroot/target/ubifs/mkfs-ubifs-head.patch b/buildroot/target/ubifs/mkfs-ubifs-head.patch
deleted file mode 100644
index 07f3bab..0000000
--- a/buildroot/target/ubifs/mkfs-ubifs-head.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
---- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
-+++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <byteswap.h>
- #include <linux/types.h>
- #include <linux/fs.h>
-+#include <linux/ext2_fs.h>
-
- #include <getopt.h>
- #include <sys/types.h>
-@@ -70,6 +71,31 @@
- #error MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
- #endif
-
-+#ifndef FS_COMPR_FL
-+#define FS_COMPR_FL EXT2_COMPR_FL
-+#endif
-+
-+#ifndef FS_SYNC_FL
-+#define FS_SYNC_FL EXT2_SYNC_FL
-+#endif
-+
-+#ifndef FS_IMMUTABLE_FL
-+#define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-+#endif
-+
-+#ifndef FS_APPEND_FL
-+#define FS_APPEND_FL EXT2_APPEND_FL
-+#endif
-+
-+#ifndef FS_DIRSYNC_FL
-+#define FS_DIRSYNC_FL EXT2_DIRSYNC_FL
-+#endif
-+
-+#ifndef FS_IOC_GETFLAGS
-+#define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
-+#endif
-+
-+
- extern int verbose;
- extern int debug_level;
-
diff --git a/buildroot/target/ubifs/ubinize.cfg b/buildroot/target/ubifs/ubinize.cfg
deleted file mode 100644
index 6515271..0000000
--- a/buildroot/target/ubifs/ubinize.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[ubifs]
-mode=ubi
-vol_id=0
-vol_type=dynamic
-vol_name=rootfs
-vol_alignment=1
-vol_flags=autoresize
diff --git a/patches/buildroot/2010.11/110-bluez-add_package.patch b/patches/buildroot/2010.11/110-bluez-add_package.patch
index 6902d29..91ee606 100644
--- a/patches/buildroot/2010.11/110-bluez-add_package.patch
+++ b/patches/buildroot/2010.11/110-bluez-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:54.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:56.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-03-31 10:13:14.000000000 +0200
++++ buildroot/package/Config.in 2011-03-31 10:15:40.000000000 +0200
@@ -380,6 +380,7 @@
source "package/boa/Config.in"
endif
@@ -14,3 +14,99 @@ Index: buildroot/package/Config.in
source "package/bmon/Config.in"
source "package/bridge-utils/Config.in"
source "package/ctorrent/Config.in"
+Index: buildroot/package/bluez3/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/Config.in 2011-03-31 11:38:54.000000000 +0200
+@@ -0,0 +1,15 @@
++config BR2_PACKAGE_BLUEZ3_LIBS
++ bool "bluez (v3)"
++ select BR2_PACKAGE_PKGCONFIG
++ help
++ Install the bluez v3 library
++
++config BR2_PACKAGE_BLUEZ3_UTILS
++ bool "bluez-utils (v3)"
++ depends on BR2_PACKAGE_DBUS
++ select BR2_PACKAGE_BLUEZ3_LIBS
++ help
++ Install the bluez v3 utilities
++
++comment "bluez-utils not available (need dbus)"
++ depends on !BR2_PACKAGE_DBUS
+Index: buildroot/package/bluez3/bluez-libs.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-libs.mk 2011-03-31 11:40:46.000000000 +0200
+@@ -0,0 +1,13 @@
++#############################################################
++#
++# bluez-libs
++#
++#############################################################
++BLUEZ3_LIBS_VERSION:=3.36
++BLUEZ3_LIBS_SITE = http://bluez.sourceforge.net/download
++BLUEZ3_LIBS_SOURCE = bluez-libs-$(BLUEZ3_LIBS_VERSION).tar.gz
++BLUEZ3_LIBS_INSTALL_STAGING = YES
++BLUEZ3_LIBS_INSTALL_TARGET = YES
++
++$(eval $(call AUTOTARGETS,package,bluez3-libs))
++
+Index: buildroot/package/bluez3/bluez-utils.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-utils.mk 2011-03-31 11:42:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#############################################################
++#
++# bluez-utils - User space programs for controling Bluetooth
++#
++#############################################################
++BLUEZ3_UTILS_VERSION:=3.36
++BLUEZ3_UTILS_SITE=http://bluez.sourceforge.net/download
++BLUEZ3_UTILS_SOURCE=bluez-utils-$(BLUEZ3_UTILS_VERSION).tar.gz
++
++ifeq ($(strip $(BR2_PACKAGE_ALSA-LIB)),y)
++ALSA_DEP=alsa
++WITH_ALSA=--with-alsa=$(STAGING_DIR)
++else
++WITH_ALSA=--without-alsa
++endif
++
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX)),y)
++OBEX_DEP=openobex
++WITH_OBEX=--with-openobex=$(STAGING_DIR)
++else
++OBEX_DEP=
++WITH_OBEX=--without-obex
++endif
++
++BLUEZ3_UTILS_CONF_OPT = \
++ $(WITH_OBEX) \
++ $(WITH_ALSA) \
++ --disable-pie \
++ --disable-expat \
++ --enable-network \
++ --enable-serial \
++ --enable-audio \
++ --enable-input \
++ --enable-sync \
++ --enable-hcid \
++ --enable-hidd \
++ --enable-pand \
++ --disable-test \
++ --enable-configfiles \
++ --disable-manpages \
++ --enable-initscripts \
++ --disable-pcmciarules \
++ --disable-bccmd \
++ --enable-avctrl \
++ --enable-hid2hci \
++ --disable-dfutool
++
++# --disable-pie: uClibc doesn't handle "position independent executables" (segfault at launching)
++
++BLUEZ3_UTILS_DEPENDENCIES = bluez3-libs dbus $(OBEX_DEP) $(ALSA_DEP)
++
++$(eval $(call AUTOTARGETS,package,bluez3-utils))
++
diff --git a/patches/buildroot/2010.11/111-bluez-hacks.patch b/patches/buildroot/2010.11/111-bluez-hacks.patch
new file mode 100644
index 0000000..f2fe6b1
--- /dev/null
+++ b/patches/buildroot/2010.11/111-bluez-hacks.patch
@@ -0,0 +1,198 @@
+Index: buildroot/package/bluez3/bluez-utils.mk
+===================================================================
+--- buildroot.orig/package/bluez3/bluez-utils.mk 2011-03-31 11:51:14.000000000 +0200
++++ buildroot/package/bluez3/bluez-utils.mk 2011-03-31 11:52:23.000000000 +0200
+@@ -51,3 +51,40 @@
+
+ $(eval $(call AUTOTARGETS,package,bluez3-utils))
+
++# Hook to prevent link with Host asound and libusb
++# (seems not needed with recent BR)
++#$(BLUEZ_UTILS_HOOK_POST_CONFIGURE):
++# @$(call MESSAGE,"Post configuring")
++# $(SED) 's,^sys_lib_search_path_spec=.*,sys_lib_search_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib",' $(@D)/libtool
++# touch $@
++
++#$(STAGING_DIR)/usr/lib/libbluetooth.so $(STAGING_DIR)/usr/lib/libbluetooth.a: $(BLUEZ_LIBS_BUILD_DIR)/src/libbluetooth.la
++# $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(BLUEZ_LIBS_BUILD_DIR) install
++# $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libbluetooth.la
++
++$(TARGET_DIR)/usr/sbin/hciattach: $(BLUEZ_UTILS_BUILD_DIR)/tools/hciattach
++ mkdir -p $(TARGET_DIR)/etc/bluetooth/pan $(TARGET_DIR)/etc/bluetooth/rfcomm
++ install -D -m 0644 package/bluez/hcid.conf $(TARGET_DIR)/etc/bluetooth/hcid.conf
++ install -D -m 0755 package/bluez/bluez-utils-bluepin.sh $(TARGET_DIR)/etc/bluetooth/bluepin
++ install -D -m 0755 package/bluez/bluez-pand-devup.sh $(TARGET_DIR)/etc/bluetooth/pan/dev-up
++ install -D -m 0755 package/bluez/rfcomm-getty $(TARGET_DIR)/etc/bluetooth/rfcomm/rfcomm-getty
++ echo "1234" > $(TARGET_DIR)/etc/bluetooth/pin
++ chmod 0600 $(TARGET_DIR)/etc/bluetooth/pin
++ install -D -m 0644 package/bluez/rfcomm.conf $(TARGET_DIR)/etc/bluetooth/rfcomm.conf
++ #install -D -m 0755 package/bluez/bluetooth.init $(TARGET_DIR)/etc/init.d/S30bluetooth TBDJB
++ mkdir -p $(TARGET_DIR)/etc/default
++ install -D -m 0644 package/bluez/bluetooth.default $(TARGET_DIR)/etc/default/bluetooth
++
++
++#hcidump stuff:
++#BLUEZ_HCIDUMP_SOURCE=bluez-hcidump-1.39.tar.gz
++#BLUEZ_HCIDUMP_BUILD_DIR=$(BUILD_DIR)/bluez-hcidump-1.39
++
++$(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/.configured
++ $(MAKE) -C $(BLUEZ_HCIDUMP_BUILD_DIR)
++
++$(TARGET_DIR)/usr/sbin/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump
++ $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_HCIDUMP_BUILD_DIR) install
++
++#bluez-hcidump: bluez-libs $(TARGET_DIR)/usr/sbin/hcidump
++
+Index: buildroot/package/bluez3/bluetooth.default
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluetooth.default 2011-03-31 11:54:16.000000000 +0200
+@@ -0,0 +1,37 @@
++# Bluetooth configuraton file
++
++# Start of hcid (allowed values are "true" and "false")
++HCID_ENABLE=true
++
++# Config file for hcid
++HCID_CONFIG="/etc/bluetooth/hcid.conf"
++
++# Start sdpd (allowed values are "true" and "false")
++SDPD_ENABLE=true
++
++# Start hidd (allowed values are "true" and "false")
++HIDD_ENABLE=true
++
++# Arguments to hidd
++HIDD_OPTIONS=""
++
++# Run hid2hci (allowed values are "true" and "false")
++HID2HCI_ENABLE=true
++
++# Bind rfcomm devices (allowed values are "true" and "false")
++RFCOMM_ENABLE=true
++
++# Config file for rfcomm
++RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
++
++# Start dund (allowed values are "true" and "false")
++DUND_ENABLE=false
++
++# Arguments to dund
++DUND_OPTIONS="--listen --persist"
++
++# Start pand (allowed values are "true" and "false")
++PAND_ENABLE=false
++
++# Arguments to pand
++PAND_OPTIONS="--listen --role NAP"
+Index: buildroot/package/bluez3/bluez-pand-devup.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-pand-devup.sh 2011-03-31 11:55:21.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++/sbin/ifup $1
+Index: buildroot/package/bluez3/bluez-utils-bluepin.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-utils-bluepin.sh 2011-03-31 11:55:48.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++echo "PIN:`/bin/cat /etc/bluetooth/pin`"
+Index: buildroot/package/bluez3/hcid.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/hcid.conf 2011-03-31 11:56:57.000000000 +0200
+@@ -0,0 +1,57 @@
++#
++# HCI daemon configuration file.
++#
++
++# HCId options
++options {
++ # Automatically initialize new devices
++ autoinit yes;
++
++ # Security Manager mode
++ # none - Security manager disabled
++ # auto - Use local PIN for incoming connections
++ # user - Always ask user for a PIN
++ #
++ security auto;
++
++ # Pairing mode
++ # none - Pairing disabled
++ # multi - Allow pairing with already paired devices
++ # once - Pair once and deny successive attempts
++ pairing multi;
++
++ # Default PIN code for incoming connections
++ passkey "BlueZ";
++}
++
++# Default settings for HCI devices
++device {
++ # Local device name
++ # %d - device id
++ # %h - host name
++ name "%h (%d)";
++
++ # Local device class
++ class 0x820116;
++
++ # Default packet type
++ #pkt_type DH1,DM1,HV1;
++
++ # Inquiry and Page scan
++ iscan enable; pscan enable;
++
++ # Default link mode
++ # none - no specific policy
++ # accept - always accept incoming connections
++ # master - become master on incoming connections,
++ # deny role switch on outgoing connections
++ lm accept;
++
++ # Default link policy
++ # none - no specific policy
++ # rswitch - allow role switch
++ # hold - allow hold mode
++ # sniff - allow sniff mode
++ # park - allow park mode
++ lp rswitch,hold,sniff,park;
++}
+Index: buildroot/package/bluez3/rfcomm-getty
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/rfcomm-getty 2011-03-31 11:56:37.000000000 +0200
+@@ -0,0 +1,9 @@
++#!/bin/sh
++while true;
++ do
++ rfcomm show rfcomm0 > /dev/null 2> /dev/null
++ if [ "$?" != "1" ] ; then
++ /sbin/getty -w -L rfcomm0 115200 vt100;
++ fi
++ sleep 1;
++done
+Index: buildroot/package/bluez3/rfcomm.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/rfcomm.conf 2011-03-31 11:57:27.000000000 +0200
+@@ -0,0 +1,16 @@
++#
++# RFCOMM configuration file.
++#
++
++rfcomm0 {
++ bind yes;
++
++ # Bluetooth address of the device
++ device 11:22:33:44:55:66;
++
++ # RFCOMM channel for the connection
++ channel 1;
++
++ # Description of the connection
++ comment "Bluetooth Serial Console";
++}
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 9b8fc8c..077a0d0 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -49,3 +49,5 @@ rm -rf buildroot/fs/ubi/
rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
rm -rf buildroot/package/mysql_client/
+rm -rf buildroot/package/portmap/
+rm -rf buildroot/package/bluez3/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-30 16:59: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 f7a38a31bd7365dec5ad240d62f208c48a67e926 (commit)
via 225a87afc83f8fef3eda24e1c0b7f79911243e7d (commit)
from 10f21965c7a9d1848cc8296dba584ce92df6b1b4 (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 f7a38a31bd7365dec5ad240d62f208c48a67e926
Merge: 225a87afc83f8fef3eda24e1c0b7f79911243e7d 10f21965c7a9d1848cc8296dba584ce92df6b1b4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 30 18:58:48 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 225a87afc83f8fef3eda24e1c0b7f79911243e7d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 30 18:57:17 2011 +0200
[LINUX] [2.6.38] APF51: Add Bluetooth preliminary support
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 13 +--
.../2.6.38/400-armadeus-add_apf51_module.patch | 43 +++++---
.../408-armadeus-add_apf51-dev_baseboard.patch | 100 ++++++++++++-------
3 files changed, 96 insertions(+), 60 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index a5aa5f9..1faec4e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -446,9 +446,11 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_CWIID is not set
+BR2_PACKAGE_DBUS=y
+BR2_DBUS_LIBXML2=y
#
-# dbus not available (need expat or libxml2)
+# dbus-glib needs dbus to be compiled with expat support
#
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
@@ -679,7 +681,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_LIBXML2 is not set
+BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
# BR2_PACKAGE_XERCES is not set
@@ -695,11 +697,8 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
+BR2_PACKAGE_BLUEZ_LIBS=y
+BR2_PACKAGE_BLUEZ_UTILS=y
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_CTORRENT is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 4cb98bd..48dcd3a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:12.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:41.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:18.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:57.000000000 +0200
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -20,10 +20,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+ includes specific configurations for the board and its peripherals.
+
endif
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:41.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:57.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -32,11 +32,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-03-07 16:17:40.000000000 +0100
-@@ -0,0 +1,432 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-03-30 18:33:36.000000000 +0200
+@@ -0,0 +1,443 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -89,9 +89,15 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+
+
+static iomux_v3_cfg_t apf51_pads[] = {
++#ifdef APF51_PROD
++ /* UART3 (Console) */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
++#else
+ /* UART2 (Console) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
++#endif
+
+ /* USB HOST1 */
+ MX51_PAD_USBH1_CLK__USBH1_CLK,
@@ -423,7 +429,12 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
+ ARRAY_SIZE(apf51_pads));
+
++#ifdef APF51_PROD
++ TODO
++ imx51_add_imx_uart(2, &uart_pdata);
++#else
+ imx51_add_imx_uart(1, &uart_pdata);
++#endif
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
+ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
@@ -469,10 +480,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+ .timer = &apf51_timer,
+MACHINE_END
+
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:13.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:22.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:24.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -481,7 +492,7 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
#define MX50_UART1_BASE_ADDR 0x53fbc000
#define MX53_UART1_BASE_ADDR 0x53fbc000
-@@ -111,6 +112,9 @@
+@@ -113,6 +114,9 @@
case MACH_TYPE_MX53_EVK:
uart_base = MX53_UART1_BASE_ADDR;
break;
@@ -491,10 +502,10 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
default:
break;
}
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:14.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:23.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:24.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index ce44488..f9c6b5a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -2,10 +2,10 @@ Add APF51Dev baseboard support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:15.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:35.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:24.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:48.000000000 +0200
@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -41,10 +41,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+endchoice
+
endif
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-24 10:44:15.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:35.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-30 18:01:24.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:48.000000000 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -53,11 +53,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-22 18:33:25.000000000 +0100
-@@ -0,0 +1,452 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-30 18:33:36.000000000 +0200
+@@ -0,0 +1,478 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -123,11 +123,18 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ (_MX51_PAD_EIM_EB2__GPIO2_22 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_PWRDN# */
+ (_MX51_PAD_EIM_EB3__GPIO2_23 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_RESET# */
+
++#ifdef APF51DEV_PROD
+ /* UART2 (Bluetooth) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
+ MX51_PAD_EIM_D25__UART2_CTS,
+ MX51_PAD_EIM_D26__UART2_RTS,
++#else
++ /* UART3 (Bluetooth) - Protos */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
++ /* RTS/CTS on Keypad */
++#endif
+
+ (_MX51_PAD_EIM_CS3__GPIO2_28 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* BT_RESET# */
+
@@ -200,17 +207,22 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_KEY_COL1__KEY_COL1,
+ MX51_PAD_KEY_COL2__KEY_COL2,
+ MX51_PAD_KEY_COL3__KEY_COL3,
++#ifdef APF51DEV_PROD
+ MX51_PAD_KEY_COL4__KEY_COL4,
+ MX51_PAD_KEY_COL5__KEY_COL5,
++#else
++ MX51_PAD_KEY_COL4__UART3_RTS,
++ MX51_PAD_KEY_COL5__UART3_CTS,
++#endif
+
+ /* ONEWIRE */
+
+ /* KEYPAD */
+
-+ /* led */
++ /* LED */
+ (_MX51_PAD_GPIO1_2__GPIO1_2 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
+
-+ /* user switch */
++ /* User switch */
+ (_MX51_PAD_GPIO1_3__GPIO1_3 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
+
+
@@ -377,51 +389,60 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .cd_gpio = ESDHC_CARD_DETECT, /* card detect pin */
+};
+
-+static int initGPIO(void)
++static int init_gpio(void)
+{
-+#define WIFI_PWRDN (GPIO_PORTB | 22)
-+#define WIFI_RESET (GPIO_PORTB | 23)
+#define USER_LED_GPIO (GPIO_PORTA | 2)
+#define USER_SWITCH_GPIO (GPIO_PORTA | 3)
++#define WIFI_PWRDN (GPIO_PORTB | 22)
++#define WIFI_RESET (GPIO_PORTB | 23)
++#define BT_RESET (GPIO_PORTB | 28)
+#define HDMI_DETECT_GPIO (GPIO_PORTD | 17)
+
-+ int rc;
++ int ret;
+
+ /* WIFI */
-+ rc = gpio_request(WIFI_PWRDN, "WIFI");
-+ if (rc){
-+ pr_debug("failed to get WIFI_PWRDN GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(WIFI_PWRDN, "WIFI");
++ if (ret) {
++ pr_warn("failed to get WIFI_PWRDN GPIO: %d\n", ret);
++ return ret;
+ }
-+ rc = gpio_request(WIFI_RESET, "WIFI");
-+ if (rc){
-+ pr_debug("failed to get WIFI_RESET GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(WIFI_RESET, "WIFI");
++ if (ret) {
++ pr_warn("failed to get WIFI_RESET GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_output(WIFI_PWRDN, 1);
+ udelay(1000);
+ gpio_direction_output(WIFI_RESET, 1);
+
++ /* BT */
++ ret = gpio_request(BT_RESET, "BT");
++ if (ret) {
++ pr_warn("failed to get BT_RESET GPIO: %d\n", ret);
++ return ret;
++ }
++ gpio_direction_output(BT_RESET, 1);
++
+ /* USER */
-+ rc = gpio_request(USER_LED_GPIO, "USER_LED_GPIO");
-+ if (rc){
-+ pr_debug("failed to get User LED GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(USER_LED_GPIO, "USER_LED_GPIO");
++ if (ret) {
++ pr_warn("failed to get User LED GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_output(USER_LED_GPIO, 1);
+
-+ rc = gpio_request(USER_SWITCH_GPIO, "USER_SWITCH_GPIO");
-+ if (rc){
-+ pr_debug("failed to get User Switch GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(USER_SWITCH_GPIO, "USER_SWITCH_GPIO");
++ if (ret) {
++ pr_warn("failed to get User Switch GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_input(USER_SWITCH_GPIO);
+
+ /* HDMI */
-+ rc = gpio_request(HDMI_DETECT_GPIO, "HDMI_DETECT_GPIO");
-+ if (rc){
-+ pr_debug("failed to get HDMI detect GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(HDMI_DETECT_GPIO, "HDMI_DETECT_GPIO");
++ if (ret) {
++ pr_warn("failed to get HDMI detect GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_input(HDMI_DETECT_GPIO);
+
@@ -471,9 +492,14 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ ARRAY_SIZE(apf51dev_pads));
+
+ imx51_add_imx_uart(0, &apf51dev_uart_pdata);
-+/* imx51_add_imx_uart(1, &apf51dev_uart_pdata);*/
++#ifdef APF51DEV_PROD
++ TODO
++ imx51_add_imx_uart(1, &apf51dev_uart_pdata);
++#else
++ imx51_add_imx_uart(2, &apf51dev_uart_pdata);
++#endif
+
-+ initGPIO();
++ init_gpio();
+
+ imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
+ imx51_add_sdhci_esdhc_imx(1, NULL);
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-03-30 12:25:00
|
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 10f21965c7a9d1848cc8296dba584ce92df6b1b4 (commit)
from 5fbad6a21aeba8c9e3e652f24d0a0970557ece61 (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 10f21965c7a9d1848cc8296dba584ce92df6b1b4
Author: Fabien Marteau <fab...@ar...>
Date: Wed Mar 30 14:24:05 2011 +0200
[software] Adding apf51 u-boot binary for u-boot-recover
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf51-u-boot.bin | Bin 0 -> 251828 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 software/uboot_recover/apf51-u-boot.bin
diff --git a/software/uboot_recover/apf51-u-boot.bin b/software/uboot_recover/apf51-u-boot.bin
new file mode 100644
index 0000000..5e000c6
Binary files /dev/null and b/software/uboot_recover/apf51-u-boot.bin differ
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-03-28 09:25: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 5fbad6a21aeba8c9e3e652f24d0a0970557ece61 (commit)
from 47ca87996c374279a7becce56ab2790c3e219e1f (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 5fbad6a21aeba8c9e3e652f24d0a0970557ece61
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 28 11:25:15 2011 +0200
[u-boot] WEIM clock at 95MHz and 4 wait states for read/write
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index dc10f3a..ad62869 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -371,7 +371,7 @@
#define CONFIG_ARM_CLK_FREQ 800 /* MHZ CPU frequency from PLL1*/
#define CONFIG_AXIA_CLK_FREQ 166 /* MHZ AXI A frequency from PLL2*/
#define CONFIG_AXIB_CLK_FREQ 110 /* 110.8 133 MHZ AXI B frequency from PLL2*/
-#define CONFIG_EMI_CLK_FREQ 83 /* MHZ AHB frequency from PLL2*/
+#define CONFIG_EMI_CLK_FREQ 95 /* MHZ AHB frequency from PLL2*/
#define CONFIG_AHB_CLK_FREQ 133 /* MHZ AHB frequency from PLL2*/
#define CONFIG_IPG_CLK_FREQ 66 /* 66.5 MHZ IPG frequency from PLL2*/
#define CONFIG_PERCLK_FREQ 55 /* 55.4 MHZ PERCLK frequency */
@@ -597,7 +597,7 @@
#define CONFIG_FPGA_RCR1_VALUE 0x04000010
#define CONFIG_FPGA_RCR2_VALUE 0x00000000
-#define CONFIG_FPGA_WCR1_VALUE 0x03000008
+#define CONFIG_FPGA_WCR1_VALUE 0x04000008
#define CONFIG_FPGA_WCR2_VALUE 0x00000000
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-03-25 15:58:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 47ca87996c374279a7becce56ab2790c3e219e1f (commit)
via a8f5cf1a24d8f8d0735a59d64a38bd65beebad47 (commit)
via 7dc73205d7dadde4b963d78a4ff791cb12878f5f (commit)
from f2ffce2439c6700fa26f3b83f6119e8b217b375e (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 47ca87996c374279a7becce56ab2790c3e219e1f
Author: Fabien Marteau <fab...@ar...>
Date: Fri Mar 25 16:57:09 2011 +0100
[linux] 409 patch fixed
commit a8f5cf1a24d8f8d0735a59d64a38bd65beebad47
Merge: 7dc73205d7dadde4b963d78a4ff791cb12878f5f f2ffce2439c6700fa26f3b83f6119e8b217b375e
Author: Fabien Marteau <fab...@ar...>
Date: Fri Mar 25 16:54:51 2011 +0100
merge
commit 7dc73205d7dadde4b963d78a4ff791cb12878f5f
Author: Fabien Marteau <fab...@ar...>
Date: Fri Mar 25 16:51:52 2011 +0100
[linux] Fix 409 patch to compile linux for apf51
-----------------------------------------------------------------------
Summary of changes:
...madeus-gpio_select_dr_register_on_output.patch} | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/{409-armadeus-gpio_select_dr_register_on_output.to_fix => 409-armadeus-gpio_select_dr_register_on_output.patch} (75%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
similarity index 75%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
index d4e6d8e..689d329 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
@@ -1,27 +1,26 @@
-Do not work on i.MX51... -> TO FIX !
+Select DR register on output direction for imx27.
-Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
-===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/gpio.c 2011-02-02 11:35:55.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/gpio.c 2011-02-02 11:35:55.000000000 +0100
-@@ -39,6 +39,13 @@
+Signed-off-by: Fabien Marteau <fab...@ar...>
+----
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/gpio.c 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/gpio.c 2011-03-25 16:49:39.000000000 +0100
+@@ -40,6 +40,11 @@
#define GPIO_IMR (cpu_is_mx1_mx2() ? 0x30 : 0x14)
#define GPIO_ISR (cpu_is_mx1_mx2() ? 0x34 : 0x18)
+#if cpu_is_mx1_mx2()
+# define GPIO_OCR1 0x04
+# define GPIO_OCR2 0x08
-+#else
-+/* TODO */
+#endif
+
#define GPIO_INT_LOW_LEV (cpu_is_mx1_mx2() ? 0x3 : 0x0)
#define GPIO_INT_HIGH_LEV (cpu_is_mx1_mx2() ? 0x2 : 0x1)
#define GPIO_INT_RISE_EDGE (cpu_is_mx1_mx2() ? 0x0 : 0x2)
-@@ -257,6 +264,26 @@
+@@ -289,6 +294,27 @@
static int mxc_gpio_direction_output(struct gpio_chip *chip,
unsigned offset, int value)
{
++#if cpu_is_mx1_mx2()
+ struct mxc_gpio_port *port =
+ container_of(chip, struct mxc_gpio_port, chip);
+ void __iomem *reg_ocr1 = port->base + GPIO_OCR1;
@@ -41,7 +40,7 @@ Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
+ __raw_writel(ocr2, reg_ocr2);
+ }
+ spin_unlock_irqrestore(&port->lock, flags);
-+
++#endif
mxc_gpio_set(chip, offset, value);
_set_gpio_direction(chip, offset, 1);
return 0;
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2011-03-24 14:39:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f2ffce2439c6700fa26f3b83f6119e8b217b375e (commit)
from ca5a81d788986ed3066da79c9a909cadc977a850 (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 f2ffce2439c6700fa26f3b83f6119e8b217b375e
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Mar 24 15:39:14 2011 +0100
[PPS] [TEST] Add arguments to configure PPS' test scripts init_wpa, test_ipsec and test_ssh_tunnel.
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/pps.mk | 5 +-
.../scripts/configs/wpa_supplicant/networkConfig | 22 ------
target/pps/scripts/init_wpa.sh | 20 ++----
target/pps/scripts/test_ipsec.sh | 68 ++++++++++----------
target/pps/scripts/test_ssh_tunnel.sh | 28 ++++----
5 files changed, 55 insertions(+), 88 deletions(-)
delete mode 100644 target/pps/scripts/configs/wpa_supplicant/networkConfig
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
index 8febace..9eeceb5 100644
--- a/buildroot/package/armadeus/pps/pps.mk
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -38,17 +38,16 @@ ifeq ($(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS),y)
cp -Rf $(ARMADEUS-PPS_TESTSCRIPTS_WWW_DIR) $(ARMADEUS-PPS_TESTSCRIPTS_WWW_TARGET_DIR)
endif
-$(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_TARGET_DIR)/wpa_supplicant/networkConfig:
+$(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_TARGET_DIR)/ipsec-tools.conf:
ifeq ($(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS),y)
cp -Rf $(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_DIR)/* $(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_TARGET_DIR)
endif
-pps-utils: $(ARMADEUS-PPS_INITS_TARGET_DIR)/S80gpios pps-home pps-configs $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_TESTSCRIPTS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_TARGET_DIR)/wpa_supplicant/networkConfig
+pps-utils: $(ARMADEUS-PPS_INITS_TARGET_DIR)/S80gpios pps-home pps-configs $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_TESTSCRIPTS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_TESTSCRIPTS_CONFIGS_TARGET_DIR)/ipsec-tools.conf
armadeus-pps-utils-clean:
rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
- rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/wpa_supplicant
#############################################################
#
diff --git a/target/pps/scripts/configs/wpa_supplicant/networkConfig b/target/pps/scripts/configs/wpa_supplicant/networkConfig
deleted file mode 100644
index cd387a3..0000000
--- a/target/pps/scripts/configs/wpa_supplicant/networkConfig
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# THE ARMADEUS PROJECT
-#
-# Copyright (C) 2010 The armadeus systems team [Jérémie Scheer]
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-export SSID=
-export PSK=
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index 6a65574..8f7c109 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -18,11 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-if [ -f /etc/wpa_supplicant/networkConfig ]; then
-
-source /etc/wpa_supplicant/networkConfig
-
-if [ "$SSID" != "" -a "$PSK" != "" ]; then
+if [ $# -eq 2 ]; then
#create WPA configuration
mkdir -p /etc/wpa_supplicant/
@@ -30,12 +26,12 @@ if [ "$SSID" != "" -a "$PSK" != "" ]; then
echo "ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=wheel
network={
-ssid=\"$SSID\"
+ssid=\"$1\"
scan_ssid=1
proto=WPA
key_mgmt=WPA-PSK
pairwise=TKIP
-psk=\"$PSK\"
+psk=\"$2\"
}" > /etc/wpa_supplicant/wpa_supplicant.conf
#Hardware reset of wi2wi chip
@@ -60,15 +56,9 @@ psk=\"$PSK\"
echo -e "\nTo check the wifi port (eth1), please enter the command \"ping 192.168.0.251\" on the host PC\n"
echo -e "\nTo restart the WPA Supplicant, before entering the command \"sh init_wpa.sh\", or to stop it, run \"sh stop_wpa.sh\"\n"
-else #[ "$SSID" != "" -a "$PSK" != "" ]; print usage
-
- echo -e '\nThe variables SSID and PSK are not initialized in /etc/wpa_supplicant/networkConfig.\nTo correctly run WPA Supplicant, you must fill these variables in like this:\nexport SSID=mon_ssid\nexport PSK=ma_passphrase\n'
-
-fi
-
-else #[ -f /etc/wpa_supplicant/networkConfig ]; print usage
+else #[ $# -eq 2 ]
- echo -e '\nThe file /etc/wpa_supplicant/networkConfig doesnt exist.\nTo correctly run WPA Supplicant, you have to create this file and declare the variables SSID and PSK like this:\nexport SSID=mon_ssid\nexport PSK=ma_passphrase\n'
+ echo -e "\n$0: Bad arguments number\nUsage: $0 SSID PASSPHRASE\n"
fi
diff --git a/target/pps/scripts/test_ipsec.sh b/target/pps/scripts/test_ipsec.sh
index bbed72d..996a9eb 100644
--- a/target/pps/scripts/test_ipsec.sh
+++ b/target/pps/scripts/test_ipsec.sh
@@ -18,14 +18,14 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-if [ -f /etc/ipsec-tools.conf ]; then
+if [ $# -eq 1 ]; then
- #****** 1: definition *****
+ if [ -f /etc/ipsec-tools.conf ]; then
- #dont forget to edit the file /etc/ipsec-tools.conf on the system with this address
- export IPADDR=
+ #****** 1: definition *****
- if [ "$IPADDR" != "" ]; then
+ #dont forget to edit the file /etc/ipsec-tools.conf on the system with this address
+ export IPADDR=$1
#****** 2:create connection (PPS Ethernet port) ****
ifconfig usb0 down 2>/dev/null
@@ -42,42 +42,42 @@ if [ -f /etc/ipsec-tools.conf ]; then
setkey -D
echo -e "\nNow you can test the IPSec securized connection by activating it on your host PC:\n- First you have to put on your host PC in the directory /etc/ the file ipsec-tools.conf.\n- Then you can run IPSec with the command: sudo /etc/init.d/setkey start\n- On your system, you can run a telnet toward your host PC\n- Check with Wireshark on your host PC that you can't see the protocol TELNET and your password in the datagrams.\n"
- fi
- else
- echo -e '\nThe variable IPADDR is not initialized. \nYou have to fill this variable in the file /usr/local/pps/scripts/test_ipsec.sh\n'
- fi
-else
- echo -e '\nThe file /etc/ipsec-tools.conf doesnt exist.\nYou have to create this file and fill it with the correct datas, like this:\n
- ## Flush the SAD and SPD
- #
- flush;
- spdflush;
+ fi
+ else #[ -f /etc/ipsec-tools.conf ]
+ echo -e '\nThe file /etc/ipsec-tools.conf doesnt exist.\nYou have to create this file and fill it with the correct datas, like this:\n
+ ## Flush the SAD and SPD
+ #
+ flush;
+ spdflush;
- # Attention: Use this keys only for testing purposes!
- # Generate your own keys!
+ # Attention: Use this keys only for testing purposes!
+ # Generate your own keys!
- # AH SAs using 128 bit long keys
- add 192.168.0.225 192.168.0.208 ah 0x200 -A hmac-md5
- 0xc0291ff014dccdd03874d9e8e4cdf3e6;
+ # AH SAs using 128 bit long keys
+ add 192.168.0.225 192.168.0.208 ah 0x200 -A hmac-md5
+ 0xc0291ff014dccdd03874d9e8e4cdf3e6;
- add 192.168.0.208 192.168.0.225 ah 0x300 -A hmac-md5
- 0x96358c90783bbfa3d7b196ceabe0536b;
+ add 192.168.0.208 192.168.0.225 ah 0x300 -A hmac-md5
+ 0x96358c90783bbfa3d7b196ceabe0536b;
- # ESP SAs using 192 bit long keys (168 + 24 parity)
+ # ESP SAs using 192 bit long keys (168 + 24 parity)
- add 192.168.0.225 192.168.0.208 esp 0x201 -E 3des-cbc
- 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831;
- add 192.168.0.208 192.168.0.225 esp 0x301 -E 3des-cbc
- 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df;
+ add 192.168.0.225 192.168.0.208 esp 0x201 -E 3des-cbc
+ 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831;
+ add 192.168.0.208 192.168.0.225 esp 0x301 -E 3des-cbc
+ 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df;
- # Security policies
- spdadd 192.168.0.225 192.168.0.208 any -P out ipsec
- esp/transport//require
- ah/transport//require;
+ # Security policies
+ spdadd 192.168.0.225 192.168.0.208 any -P out ipsec
+ esp/transport//require
+ ah/transport//require;
- spdadd 192.168.0.208 192.168.0.225 any -P in ipsec
- esp/transport//require
- ah/transport//require;\n'
+ spdadd 192.168.0.208 192.168.0.225 any -P in ipsec
+ esp/transport//require
+ ah/transport//require;\n'
+ fi
+else #[ $# -eq 1 ]
+ echo -e "\n$0: Bad arguments number\nUsage: $0 IPADDRESS\n"
fi
diff --git a/target/pps/scripts/test_ssh_tunnel.sh b/target/pps/scripts/test_ssh_tunnel.sh
index 32b70bc..1a0efbe 100644
--- a/target/pps/scripts/test_ssh_tunnel.sh
+++ b/target/pps/scripts/test_ssh_tunnel.sh
@@ -18,16 +18,16 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#****** 1: definition *****
+if [ $# -eq 4 ]; then
-export USERNAME=
-export HOSTNAME=
-#dont forget to add the tunnel port to the file /etc/ssh/sshd_config on your Host PC.
-export PORTNAME= #(configure firewall and NAT for this port if necessary)
-# define tunnel id (port;standard value should be 23; avoid it because NAT config may be already used for ssh )
-export TELNETPORT=
+ #****** 1: definition *****
+ export USERNAME=$1
+ export HOSTADDRESS=$2
+ #dont forget to add the tunnel port to the file /etc/ssh/sshd_config on your Host PC.
+ export VIRTUALPORT=$3 #(configure firewall and NAT for this port if necessary)
+ # define tunnel id (port;standard value should be 23; avoid it because NAT config may be already used for ssh )
+ export TELNETPORT=$4
-if [ "$USERNAME" != "" -a "$HOSTNAME" != "" -a "$PORTNAME" != "" -a "$TELNETPORT" != "" ]; then
# ****** 2: Activate the connection interface (PPS Ethernet port) *****
ifconfig usb0 down 2>/dev/null
ifconfig eth1 down 2>/dev/null
@@ -37,18 +37,18 @@ if [ "$USERNAME" != "" -a "$HOSTNAME" != "" -a "$PORTNAME" != "" -a "$TELNETPORT
# ****** 2: create the ssh tunnel (check first if exists !!!)*****
- ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME" | grep -vq "grep"
- [ $? -eq 1 ] && ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME ;
+ ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTADDRESS -p $VIRTUALPORT" | grep -vq "grep"
+ [ $? -eq 1 ] && ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTADDRESS -p $VIRTUALPORT ;
# *** 3: start telnet (if tunnel exist!!) : !! NOTE: host name is localhost !!! ***
- ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME" | grep -vq "grep"
+ ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTADDRESS -p $VIRTUALPORT" | grep -vq "grep"
res=$?
- [ $res -eq 0 ] && echo -e "\nSSH tunnel is created on localhost, port 23. Now connecting to host $HOSTNAME with telnet.\n You can check if the tunnel is properly encrypting the datas with Wireshark: you must not see the protocol TELNET or your password in the datagrams.\n"
+ [ $res -eq 0 ] && echo -e "\nSSH tunnel is created on localhost, port 23. Now connecting to host $HOSTADDRESS with telnet.\n You can check if the tunnel is properly encrypting the datas with Wireshark: you must not see the protocol TELNET or your password in the datagrams.\n"
[ $res -eq 0 ] && telnet -l $USERNAME localhost
-else
- echo -e "\nOne or many of the variables USERNAME, HOSTNAME, PORTNAME and TELNETPORT are not initialized. \nYou have to fill these variables in the file /usr/local/pps/scripts/test_ssh_tunnel.sh\n"
+else #[ $# -eq 4 ]
+ echo -e "\n$0: Bad arguments number\nUsage: $0 USERNAME HOSTADDRESS VIRTUALPORT TELNETPORT\n"
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-24 14:18: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 ca5a81d788986ed3066da79c9a909cadc977a850 (commit)
from 5196707246294b4a45e6abffacd93b5a29844549 (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 ca5a81d788986ed3066da79c9a909cadc977a850
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 24 15:17:17 2011 +0100
[LINUX] Moves APF51 kernel version to 2.6.38.1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 8 ++++----
...6.38-rc3.config => apf51-linux-2.6.38.1.config} | 0
.../armadeus/apf51/apf51-linux-2.6.38.config | 11 ++++++++---
.../linux/kernel-patches/{2.6.38-rc3 => 2.6.38.1} | 0
4 files changed, 12 insertions(+), 7 deletions(-)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-2.6.38-rc3.config => apf51-linux-2.6.38.1.config} (100%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.38-rc3 => 2.6.38.1} (100%)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index e21d268..a5aa5f9 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -148,8 +148,8 @@ BR2_TOOLCHAIN_BUILDROOT=y
# BR2_KERNEL_HEADERS_2_6_36 is not set
BR2_KERNEL_HEADERS_VERSION=y
# BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_VERSION="2.6.38-rc3"
-BR2_DEFAULT_KERNEL_HEADERS="2.6.38-rc3"
+BR2_DEFAULT_KERNEL_VERSION="2.6.38.1"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.38.1"
#
# uClibc Options
@@ -881,8 +881,8 @@ BR2_LINUX_KERNEL=y
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38-rc3"
-BR2_LINUX_KERNEL_VERSION="2.6.38-rc3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.1"
+BR2_LINUX_KERNEL_VERSION="2.6.38.1"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.1.config
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 6c43b58..dfccead 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-rc3 Kernel Configuration
-# Fri Feb 18 12:09:19 2011
+# Linux/arm 2.6.38.1 Kernel Configuration
+# Thu Mar 24 14:51:11 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -300,6 +300,10 @@ CONFIG_ARCH_MXC_IOMUX_V3=y
CONFIG_ARCH_MXC_AUDMUX_V2=y
#
+# System MMU
+#
+
+#
# Processor Type
#
CONFIG_CPU_32v6K=y
@@ -1476,7 +1480,7 @@ CONFIG_USB_HID=y
#
# CONFIG_HID_3M_PCT is not set
# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_ACRUX is not set
# CONFIG_HID_APPLE is not set
# CONFIG_HID_BELKIN is not set
# CONFIG_HID_CANDO is not set
@@ -1712,6 +1716,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3 b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-03-24 12:49:51
|
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 5196707246294b4a45e6abffacd93b5a29844549 (commit)
via 24cb0027861884cbafd25e569462e7b70ada2fd3 (commit)
via 2084b21848060538c45abae0b2e8a36782592822 (commit)
from 3d397331357fc328533ffb89b4cdd7a822a7c9ca (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 5196707246294b4a45e6abffacd93b5a29844549
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 24 13:47:56 2011 +0100
[DEBUG] Adds i.MX51 SSI & AUDMUX registers to imxregs
commit 24cb0027861884cbafd25e569462e7b70ada2fd3
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 24 13:44:04 2011 +0100
[LINUX] Partially revert commit "Select dr register on output in gpiolib driver" (c84fb0480f297c538bcdab58d81fd0cbe427d53e). It needs to be fixed...
commit 2084b21848060538c45abae0b2e8a36782592822
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 24 13:41:02 2011 +0100
[LINUX] Add preliminary support for sound on APF51Dev
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 28 ++++--
.../408-armadeus-add_apf51-dev_baseboard.patch | 30 +++++--
...adeus-gpio_select_dr_register_on_output.to_fix} | 2 +
...soc-imx-add_apf51dev_wm8960_audio_support.patch | 39 ++++++---
...adeus-audmuxv2-add_MX51_ports_definitions.patch | 32 +++++++
...eus-audmuxv2-makes_debugfs_interface_work.patch | 75 +++++++++++++++++
...write_all_CANCTRL_bits_when_changing_mode.patch | 29 +++++++
...d_license_and_author_infos_to_imx-pcm-fiq.patch | 15 ++++
target/linux/debug/imxregs/imx51regs.h | 87 ++++++++++++++++++++
9 files changed, 308 insertions(+), 29 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/{409-armadeus-gpio_select_dr_register_on_output.patch => 409-armadeus-gpio_select_dr_register_on_output.to_fix} (97%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-add_MX51_ports_definitions.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-makes_debugfs_interface_work.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-mcp2515-dont_overwrite_all_CANCTRL_bits_when_changing_mode.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-snd-soc-imx-add_license_and_author_infos_to_imx-pcm-fiq.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index b358b1b..4cb98bd 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-16 14:45:58.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-16 19:01:05.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:12.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:41.000000000 +0100
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -23,7 +23,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
===================================================================
--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-16 19:01:05.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:41.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-02-16 17:02:46.000000000 +0100
-@@ -0,0 +1,422 @@
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-03-07 16:17:40.000000000 +0100
+@@ -0,0 +1,432 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -363,6 +363,15 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+ return ret;
+}
+
++static int apf51_wm8311_post_init(struct wm831x *wm831x)
++{
++ int ret = 0;
++
++ printk("--- %s 0x%08x\n", __func__, wm831x_reg_read(wm831x, WM831X_INTERRUPT_STATUS_2_MASK));
++
++ return ret;
++}
++
+static struct wm831x_status_pdata apf51_wm8311_led1_pdata = {
+ .default_src = WM831X_STATUS_PRESERVE,
+ .name = "LED1:red:",
@@ -382,6 +391,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+
+static struct wm831x_pdata apf51_wm8311_pdata = {
+ .pre_init = apf51_wm8311_pre_init,
++ .post_init = apf51_wm8311_post_init,
+ .irq_cmos = 1,
+ .irq_base = MXC_BOARD_IRQ_START,
+#if 0
@@ -461,8 +471,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-16 14:45:59.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-16 14:46:00.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:13.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:15.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -483,8 +493,8 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-16 14:46:00.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-16 14:46:00.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:14.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:15.000000000 +0100
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 79ab67f..ce44488 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-22 15:08:04.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-22 17:49:07.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:15.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:35.000000000 +0100
@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -43,8 +43,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-22 15:08:04.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-22 17:49:07.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-24 10:44:15.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:35.000000000 +0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -56,8 +56,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-02-22 17:25:43.000000000 +0100
-@@ -0,0 +1,438 @@
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-22 18:33:25.000000000 +0100
+@@ -0,0 +1,452 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -348,7 +348,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+};
+
+static struct imx_ssi_platform_data apf27dev_ssi_pdata = {
-+ .flags = IMX_SSI_DMA,
++ .flags = IMX_SSI_SYN | IMX_SSI_USE_I2S_SLAVE,
+};
+
+/* I2C2 */
@@ -361,7 +361,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ I2C_BOARD_INFO("eeprom", 0x50),
+ },
+ {
-+ I2C_BOARD_INFO("wm8960", 0x36),
++ I2C_BOARD_INFO("wm8960", 0x1a),
+ .platform_data = &apf51dev_wm8960_pdata,
+ },
+#if 0
@@ -490,6 +490,20 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ ARRAY_SIZE(apf51dev_i2c2_devices));
+
+ imx51_add_ipuv3(&apf51dev_ipu_data);
++
++ /* AUDMUX Port 1 (SSI1/imx-ssi.0)) <-> Port3 */
++ mxc_audmux_v2_configure_port(MX51_AUDMUX_PORT3,
++ MXC_AUDMUX_V2_PTCR_SYN,
++ MXC_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0));
++
++ mxc_audmux_v2_configure_port(MX51_AUDMUX_PORT1_SSI0,
++ MXC_AUDMUX_V2_PTCR_SYN |
++ MXC_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT3) |
++ MXC_AUDMUX_V2_PTCR_TCLKDIR |
++ MXC_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT3) |
++ MXC_AUDMUX_V2_PTCR_TFSDIR,
++ MXC_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT3));
++
+ imx51_add_imx_ssi(0, &apf27dev_ssi_pdata);
+
+#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
similarity index 97%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
index 5f4c998..d4e6d8e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
@@ -1,3 +1,5 @@
+Do not work on i.MX51... -> TO FIX !
+
Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
===================================================================
--- linux-2.6.36.orig/arch/arm/plat-mxc/gpio.c 2011-02-02 11:35:55.000000000 +0100
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
index 80a02e3..4f7dc04 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/421-armadeus-asoc-imx-add_apf51dev_wm8960_audio_support.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c 2011-02-11 17:23:17.000000000 +0100
-@@ -0,0 +1,151 @@
++++ linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c 2011-03-16 23:07:40.000000000 +0100
+@@ -0,0 +1,166 @@
+/*
+ * ASoC audio for APF51Dev (i.MX51 using Wolfson's WM8960)
+ *
@@ -34,7 +34,7 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+
+#define FMT_PLAYBACK (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
+ SND_SOC_DAIFMT_CBM_CFM)
-+#define FMT_CAPTURE (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | \
++#define FMT_CAPTURE (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
+ SND_SOC_DAIFMT_CBM_CFM)
+
+static int apf51dev_sound_hifi_hw_params(struct snd_pcm_substream *substream,
@@ -47,6 +47,14 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+
+ /* TO BE CHECKED !! */
+
++ printk("--- %s %d\n", __func__, __LINE__);
++
++ ret = snd_soc_dai_set_pll(codec_dai, 0, 0, 16000000, 12280000);
++ if (ret) {
++ printk("APF51: Unable to set WM8960 PLL\n");
++ return ret;
++ }
++
+ /* set cpu DAI configuration */
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ ret = snd_soc_dai_set_fmt(codec_dai, FMT_PLAYBACK);
@@ -62,12 +70,12 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+ ret = snd_soc_dai_set_fmt(cpu_dai, FMT_CAPTURE);
+ if (ret)
+ return ret;
-+ ret = snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 4, 32);
++/* ret = snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 4, 32);
+ if (ret)
-+ return ret;
++ return ret;*/
+ }
+
-+ ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x0, 0xfffffffc, 4, 32);
++ ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0xfffffffc, 0xfffffffc, 2, 0);
+ if (ret)
+ return ret;
+
@@ -76,6 +84,7 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+
+static int apf51dev_sound_hifi_hw_free(struct snd_pcm_substream *substream)
+{
++ printk("--- %s %d\n", __func__, __LINE__);
+ return 0;
+}
+
@@ -86,11 +95,13 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+
+static int apf51dev_sound_probe(struct platform_device *pdev)
+{
++ printk("--- %s %d\n", __func__, __LINE__);
+ return 0;
+}
+
+static int apf51dev_sound_remove(struct platform_device *pdev)
+{
++ printk("--- %s %d\n", __func__, __LINE__);
+ return 0;
+}
+
@@ -98,14 +109,18 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+ {
+ .name = "WM8960 Playback",
+ .stream_name = "Playback",
++ .codec_name = "wm8960-codec.1-001a",
++ .platform_name = "imx-fiq-pcm-audio.0",
++ .cpu_dai_name = "imx-ssi.0",
+ .codec_dai_name = "wm8960-hifi",
-+ .cpu_dai_name = "imx-ssi-dai.0",
+ .ops = &apf51dev_sound_hifi_ops,
+ }, {
+ .name = "WM8960 Capture",
+ .stream_name = "Capture",
++ .codec_name = "wm8960-codec.1-001a",
++ .platform_name = "imx-fiq-pcm-audio.0",
++ .cpu_dai_name = "imx-ssi.0",
+ .codec_dai_name = "wm8960-hifi",
-+ .cpu_dai_name = "imx-ssi-dai.0",
+ .ops = &apf51dev_sound_hifi_ops,
+ },
+};
@@ -156,8 +171,8 @@ Index: linux-2.6.38-rc3/sound/soc/imx/apf51dev-wm8960.c
+MODULE_LICENSE("GPL");
Index: linux-2.6.38-rc3/sound/soc/imx/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/sound/soc/imx/Kconfig 2011-02-11 16:53:17.000000000 +0100
-+++ linux-2.6.38-rc3/sound/soc/imx/Kconfig 2011-02-11 17:01:12.000000000 +0100
+--- linux-2.6.38-rc3.orig/sound/soc/imx/Kconfig 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/sound/soc/imx/Kconfig 2011-02-24 10:44:15.000000000 +0100
@@ -52,4 +52,14 @@
Enable I2S based access to the TLV320AIC23B codec attached
to the SSI interface
@@ -175,8 +190,8 @@ Index: linux-2.6.38-rc3/sound/soc/imx/Kconfig
endif # SND_IMX_SOC
Index: linux-2.6.38-rc3/sound/soc/imx/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/sound/soc/imx/Makefile 2011-02-11 16:57:38.000000000 +0100
-+++ linux-2.6.38-rc3/sound/soc/imx/Makefile 2011-02-11 17:01:26.000000000 +0100
+--- linux-2.6.38-rc3.orig/sound/soc/imx/Makefile 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/sound/soc/imx/Makefile 2011-02-24 10:44:15.000000000 +0100
@@ -8,10 +8,12 @@
obj-$(CONFIG_SND_MXC_SOC_MX2) += snd-soc-imx-mx2.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-add_MX51_ports_definitions.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-add_MX51_ports_definitions.patch
new file mode 100644
index 0000000..3c65d14
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-add_MX51_ports_definitions.patch
@@ -0,0 +1,32 @@
+Sent to mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/arch/arm/plat-mxc/include/mach/audmux.h b/arch/arm/plat-mxc/include/mach/audmux.h
+index 5cd6466..6fda788 100644
+--- a/arch/arm/plat-mxc/include/mach/audmux.h
++++ b/arch/arm/plat-mxc/include/mach/audmux.h
+@@ -15,6 +15,14 @@
+ #define MX31_AUDMUX_PORT5_SSI_PINS_5 4
+ #define MX31_AUDMUX_PORT6_SSI_PINS_6 5
+
++#define MX51_AUDMUX_PORT1_SSI0 0
++#define MX51_AUDMUX_PORT2_SSI1 1
++#define MX51_AUDMUX_PORT3 2
++#define MX51_AUDMUX_PORT4 3
++#define MX51_AUDMUX_PORT5 4
++#define MX51_AUDMUX_PORT6 5
++#define MX51_AUDMUX_PORT7 6
++
+ /* Register definitions for the i.MX21/27 Digital Audio Multiplexer */
+ #define MXC_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff)
+ #define MXC_AUDMUX_V1_PCR_INMEN (1 << 8)
+@@ -28,7 +36,7 @@
+ #define MXC_AUDMUX_V1_PCR_TCLKDIR (1 << 30)
+ #define MXC_AUDMUX_V1_PCR_TFSDIR (1 << 31)
+
+-/* Register definitions for the i.MX25/31/35 Digital Audio Multiplexer */
++/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */
+ #define MXC_AUDMUX_V2_PTCR_TFSDIR (1 << 31)
+ #define MXC_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27)
+ #define MXC_AUDMUX_V2_PTCR_TCLKDIR (1 << 26)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-makes_debugfs_interface_work.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-makes_debugfs_interface_work.patch
new file mode 100644
index 0000000..7333180
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/424-armadeus-audmuxv2-makes_debugfs_interface_work.patch
@@ -0,0 +1,75 @@
+audmuxv2 debugfs can't work without the 2 last changes.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
+index 175e364..3d9cf7f 100644
+--- a/arch/arm/plat-mxc/audmux-v2.c
++++ b/arch/arm/plat-mxc/audmux-v2.c
+@@ -44,18 +44,20 @@ static int audmux_open_file(struct inode *inode, struct file *file)
+ static const char *audmux_port_string(int port)
+ {
+ switch (port) {
+- case MX31_AUDMUX_PORT1_SSI0:
+- return "imx-ssi.0";
+- case MX31_AUDMUX_PORT2_SSI1:
+- return "imx-ssi.1";
+- case MX31_AUDMUX_PORT3_SSI_PINS_3:
+- return "SSI3";
+- case MX31_AUDMUX_PORT4_SSI_PINS_4:
+- return "SSI4";
+- case MX31_AUDMUX_PORT5_SSI_PINS_5:
+- return "SSI5";
+- case MX31_AUDMUX_PORT6_SSI_PINS_6:
+- return "SSI6";
++ case 0:
++ return "Port1 (imx-ssi.0)";
++ case 1:
++ return "Port2 (imx-ssi.1)";
++ case 2:
++ return "Port3";
++ case 3:
++ return "Port4";
++ case 4:
++ return "Port5";
++ case 5:
++ return "Port6";
++ case 6:
++ return "Port7";
+ default:
+ return "UNKNOWN";
+ }
+@@ -151,8 +153,8 @@ static void audmux_debugfs_init(void)
+ return;
+ }
+
+- for (i = 1; i < 8; i++) {
+- snprintf(buf, sizeof(buf), "ssi%d", i);
++ for (i = 0; i < 7; i++) {
++ snprintf(buf, sizeof(buf), "port%d", i+1);
+ if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
+ (void *)i, &audmux_debugfs_fops))
+ pr_warning("Failed to create AUDMUX port %d debugfs file\n",
+@@ -186,12 +188,10 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
+
+ static int mxc_audmux_v2_init(void)
+ {
+- int ret;
++ int ret = 0;
+ #if defined(CONFIG_ARCH_MX5)
+ if (cpu_is_mx51()) {
+ audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
+- ret = 0;
+- return ret;
+ }
+ #endif
+ #if defined(CONFIG_ARCH_MX3)
+@@ -223,7 +223,7 @@ static int mxc_audmux_v2_init(void)
+ #endif /* if defined(CONFIG_SOC_IMX25) */
+ audmux_debugfs_init();
+
+- return 0;
++ return ret;
+ }
+
+ postcore_initcall(mxc_audmux_v2_init);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-mcp2515-dont_overwrite_all_CANCTRL_bits_when_changing_mode.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-mcp2515-dont_overwrite_all_CANCTRL_bits_when_changing_mode.patch
new file mode 100644
index 0000000..3977c8e
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-mcp2515-dont_overwrite_all_CANCTRL_bits_when_changing_mode.patch
@@ -0,0 +1,29 @@
+Otherwise CLKOUT config (3 LSB of CANCTRL) can not be changed elsewhere.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38-rc3/drivers/net/can/mcp251x.c
+===================================================================
+--- linux-2.6.38-rc3.orig/drivers/net/can/mcp251x.c 2011-03-09 09:52:52.000000000 +0100
++++ linux-2.6.38-rc3/drivers/net/can/mcp251x.c 2011-03-23 17:03:07.000000000 +0100
+@@ -547,13 +547,16 @@
+
+ if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) {
+ /* Put device into loopback mode */
+- mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_LOOPBACK);
++ mcp251x_write_bits(spi, CANCTRL, CANCTRL_REQOP_MASK,
++ CANCTRL_REQOP_LOOPBACK);
+ } else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) {
+ /* Put device into listen-only mode */
+- mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_LISTEN_ONLY);
++ mcp251x_write_bits(spi, CANCTRL, CANCTRL_REQOP_MASK,
++ CANCTRL_REQOP_LISTEN_ONLY);
+ } else {
+ /* Put device into normal mode */
+- mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_NORMAL);
++ mcp251x_write_bits(spi, CANCTRL, CANCTRL_REQOP_MASK,
++ CANCTRL_REQOP_NORMAL);
+
+ /* Wait for the device to enter normal mode */
+ timeout = jiffies + HZ;
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-snd-soc-imx-add_license_and_author_infos_to_imx-pcm-fiq.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-snd-soc-imx-add_license_and_author_infos_to_imx-pcm-fiq.patch
new file mode 100644
index 0000000..8c30d5a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/425-armadeus-snd-soc-imx-add_license_and_author_infos_to_imx-pcm-fiq.patch
@@ -0,0 +1,15 @@
+Otherwise driver is not usable as module.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38-rc3/sound/soc/imx/imx-pcm-fiq.c
+===================================================================
+--- linux-2.6.38-rc3.orig/sound/soc/imx/imx-pcm-fiq.c 2011-02-24 12:14:52.000000000 +0100
++++ linux-2.6.38-rc3/sound/soc/imx/imx-pcm-fiq.c 2011-02-24 13:58:17.000000000 +0100
+@@ -343,3 +343,6 @@
+ platform_driver_unregister(&imx_pcm_driver);
+ }
+ module_exit(snd_imx_pcm_exit);
++
++MODULE_AUTHOR("Sascha Hauer, Pengutronix");
++MODULE_LICENSE("GPL");
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx51regs.h
index 4aefd73..3555d70 100644
--- a/target/linux/debug/imxregs/imx51regs.h
+++ b/target/linux/debug/imxregs/imx51regs.h
@@ -86,4 +86,91 @@ static struct reg_info regs[] =
{ "I2DR_2", 0x83fc4010, 0, 0xffffffff, 'x', "I2C2 Data I/O Register" },
/* FEC */
{ "EIR", 0x83fec004, 0, 0xffffffff, 'x', "FEC Interrupt Event Register" },
+/* AUDMUX */
+{ "PTCR1", 0x83fd0000, 0, 0xffffffff, 'x', "Port Timing Control Register 1" },
+{ "PDCR1", 0x83fd0004, 0, 0xffffffff, 'x', "Port Data Control Register 1" },
+{ "PTCR2", 0x83fd0008, 0, 0xffffffff, 'x', "Port Timing Control Register 2" },
+{ "PDCR2", 0x83fd000C, 0, 0xffffffff, 'x', "Port Data Control Register 2" },
+{ "PTCR3", 0x83fd0010, 0, 0xffffffff, 'x', "Port Timing Control Register 3" },
+{ "PDCR3", 0x83fd0014, 0, 0xffffffff, 'x', "Port Data Control Register 3" },
+{ "PTCR4", 0x83fd0018, 0, 0xffffffff, 'x', "Port Timing Control Register 4" },
+{ "PDCR4", 0x83fd001C, 0, 0xffffffff, 'x', "Port Data Control Register 4" },
+{ "PTCR5", 0x83fd0020, 0, 0xffffffff, 'x', "Port Timing Control Register 5" },
+{ "PDCR5", 0x83fd0024, 0, 0xffffffff, 'x', "Port Data Control Register 5" },
+{ "PTCR6", 0x83fd0028, 0, 0xffffffff, 'x', "Port Timing Control Register 6" },
+{ "PDCR6", 0x83fd002C, 0, 0xffffffff, 'x', "Port Data Control Register 6" },
+{ "PTCR7", 0x83fd0030, 0, 0xffffffff, 'x', "Port Timing Control Register 7" },
+{ "PDCR7", 0x83fd0034, 0, 0xffffffff, 'x', "Port Data Control Register 7" },
+/* SSI 1 */
+{ "STX0_1", 0x83fcc000, 0, 0xffffffff, 'x', "SSI1 Transmit Data Register 0" },
+{ "STX1_1", 0x83fcc004, 0, 0xffffffff, 'x', "SSI1 Transmit Data Register 1" },
+{ "SRX0_1", 0x83fcc008, 0, 0xffffffff, 'x', "SSI1 Receive Data Register 0" },
+{ "SRX1_1", 0x83fcc00c, 0, 0xffffffff, 'x', "SSI1 Receive Data Register 1" },
+{ "SCR_1", 0x83fcc010, 0, 0xffffffff, 'x', "SSI1 Control Register" },
+{ "SISR_1", 0x83fcc014, 0, 0xffffffff, 'x', "SSI1 Interrupt Status Register" },
+{ "SIER_1", 0x83fcc018, 0, 0xffffffff, 'x', "SSI1 Interrupt Enable Register" },
+{ "STCR_1", 0x83fcc01c, 0, 0xffffffff, 'x', "SSI1 Transmit Configuration Register" },
+{ "SRCR_1", 0x83fcc020, 0, 0xffffffff, 'x', "SSI1 Receive Configuration Register" },
+{ "STCCR_1", 0x83fcc024, 0, 0xffffffff, 'x', "SSI1 Transmit Clock Control Register" },
+{ "SRCCR_1", 0x83fcc028, 0, 0xffffffff, 'x', "SSI& Receive Clock Control Register" },
+{ "SFCSR_1", 0x83fcc02c, 0, 0xffffffff, 'x', "SSI1 FIFO Control/Status Register" },
+{ "STR_1", 0x83fcc030, 0, 0xffffffff, 'x', "SSI1 Test Register1" },
+{ "SOR_1", 0x83fcc034, 0, 0xffffffff, 'x', "SSI1 Option Register2" },
+{ "SACNT_1", 0x83fcc038, 0, 0xffffffff, 'x', "SSI1 AC97 Control Register" },
+{ "SACADD_1", 0x83fcc03c, 0, 0xffffffff, 'x', "SSI1 AC97 Command Address Register" },
+{ "SACDAT_1", 0x83fcc040, 0, 0xffffffff, 'x', "SSI1 AC97 Command Data Register" },
+{ "SATAG_1", 0x83fcc044, 0, 0xffffffff, 'x', "SSI1 AC97 Tag Register" },
+{ "STMSK_1", 0x83fcc048, 0, 0xffffffff, 'x', "SSI1 Transmit Time Slot Mask Register" },
+{ "SRMSK_1", 0x83fcc04c, 0, 0xffffffff, 'x', "SSI1 Receive Time Slot Mask Register" },
+{ "SACCST_1", 0x83fcc050, 0, 0xffffffff, 'x', "SSI1 AC97 Channel Status Register" },
+{ "SACCEN_1", 0x83fcc054, 0, 0xffffffff, 'x', "SSI1 AC97 Channel Enable Register" },
+{ "SACCDIS_1", 0x83fcc058, 0, 0xffffffff, 'x', "SSI1 AC97 Channel Disable Register" },
+/* SSI 2 */
+{ "STX0_2", 0x70014000, 0, 0xffffffff, 'x', "SSI2 Transmit Data Register 0" },
+{ "STX1_2", 0x70014004, 0, 0xffffffff, 'x', "SSI2 Transmit Data Register 1" },
+{ "SRX0_2", 0x70014008, 0, 0xffffffff, 'x', "SSI2 Receive Data Register 0" },
+{ "SRX1_2", 0x7001400c, 0, 0xffffffff, 'x', "SSI2 Receive Data Register 1" },
+{ "SCR_2", 0x70014010, 0, 0xffffffff, 'x', "SSI2 Control Register" },
+{ "SISR_2", 0x70014014, 0, 0xffffffff, 'x', "SSI2 Interrupt Status Register" },
+{ "SIER_2", 0x70014018, 0, 0xffffffff, 'x', "SSI2 Interrupt Enable Register" },
+{ "STCR_2", 0x7001401c, 0, 0xffffffff, 'x', "SSI2 Transmit Configuration Register" },
+{ "SRCR_2", 0x70014020, 0, 0xffffffff, 'x', "SSI2 Receive Configuration Register" },
+{ "STCCR_2", 0x70014024, 0, 0xffffffff, 'x', "SSI2 Transmit Clock Control Register" },
+{ "SRCCR_2", 0x70014028, 0, 0xffffffff, 'x', "SSI2 Receive Clock Control Register" },
+{ "SFCSR_2", 0x7001402c, 0, 0xffffffff, 'x', "SSI2 FIFO Control/Status Register" },
+{ "STR_2", 0x70014030, 0, 0xffffffff, 'x', "SSI2 Test Register1" },
+{ "SOR_2", 0x70014034, 0, 0xffffffff, 'x', "SSI2 Option Register2" },
+{ "SACNT_2", 0x70014038, 0, 0xffffffff, 'x', "SSI2 AC97 Control Register" },
+{ "SACADD_2", 0x7001403c, 0, 0xffffffff, 'x', "SSI2 AC97 Command Address Register" },
+{ "SACDAT_2", 0x70014040, 0, 0xffffffff, 'x', "SSI2 AC97 Command Data Register" },
+{ "SATAG_2", 0x70014044, 0, 0xffffffff, 'x', "SSI2 AC97 Tag Register" },
+{ "STMSK_2", 0x70014048, 0, 0xffffffff, 'x', "SSI2 Transmit Time Slot Mask Register" },
+{ "SRMSK_2", 0x7001404c, 0, 0xffffffff, 'x', "SSI2 Receive Time Slot Mask Register" },
+{ "SACCST_2", 0x70014050, 0, 0xffffffff, 'x', "SSI2 AC97 Channel Status Register" },
+{ "SACCEN_2", 0x70014054, 0, 0xffffffff, 'x', "SSI2 AC97 Channel Enable Register" },
+{ "SACCDIS_2", 0x70014058, 0, 0xffffffff, 'x', "SSI2 AC97 Channel Disable Register" },
+/* SSI 3 */
+{ "STX0_3", 0x83fe8000, 0, 0xffffffff, 'x', "SSI3 Transmit Data Register 0" },
+{ "STX1_3", 0x83fe8004, 0, 0xffffffff, 'x', "SSI3 Transmit Data Register 1" },
+{ "SRX0_3", 0x83fe8008, 0, 0xffffffff, 'x', "SSI3 Receive Data Register 0" },
+{ "SRX1_3", 0x83fe800c, 0, 0xffffffff, 'x', "SSI3 Receive Data Register 1" },
+{ "SCR_3", 0x83fe8010, 0, 0xffffffff, 'x', "SSI3 Control Register" },
+{ "SISR_3", 0x83fe8014, 0, 0xffffffff, 'x', "SSI3 Interrupt Status Register" },
+{ "SIER_3", 0x83fe8018, 0, 0xffffffff, 'x', "SSI3 Interrupt Enable Register" },
+{ "STCR_3", 0x83fe801c, 0, 0xffffffff, 'x', "SSI3 Transmit Configuration Register" },
+{ "SRCR_3", 0x83fe8020, 0, 0xffffffff, 'x', "SSI3 Receive Configuration Register" },
+{ "STCCR_3", 0x83fe8024, 0, 0xffffffff, 'x', "SSI3 Transmit Clock Control Register" },
+{ "SRCCR_3", 0x83fe8028, 0, 0xffffffff, 'x', "SSI3 Receive Clock Control Register" },
+{ "SFCSR_3", 0x83fe802c, 0, 0xffffffff, 'x', "SSI3 FIFO Control/Status Register" },
+{ "STR_3", 0x83fe8030, 0, 0xffffffff, 'x', "SSI3 Test Register1" },
+{ "SOR_3", 0x83fe8034, 0, 0xffffffff, 'x', "SSI3 Option Register2" },
+{ "SACNT_3", 0x83fe8038, 0, 0xffffffff, 'x', "SSI3 AC97 Control Register" },
+{ "SACADD_3", 0x83fe803c, 0, 0xffffffff, 'x', "SSI3 AC97 Command Address Register" },
+{ "SACDAT_3", 0x83fe8040, 0, 0xffffffff, 'x', "SSI3 AC97 Command Data Register" },
+{ "SATAG_3", 0x83fe8044, 0, 0xffffffff, 'x', "SSI3 AC97 Tag Register" },
+{ "STMSK_3", 0x83fe8048, 0, 0xffffffff, 'x', "SSI3 Transmit Time Slot Mask Register" },
+{ "SRMSK_3", 0x83fe804c, 0, 0xffffffff, 'x', "SSI3 Receive Time Slot Mask Register" },
+{ "SACCST_3", 0x83fe8050, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Status Register" },
+{ "SACCEN_3", 0x83fe8054, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Enable Register" },
+{ "SACCDIS_3", 0x83fe8058, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Disable Register" },
};
hooks/post-receive
--
armadeus
|
