armadeus-commitlog Mailing List for armadeus (Page 138)
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: <ar...@us...> - 2008-10-29 15:05:58
|
Revision: 906
http://armadeus.svn.sourceforge.net/armadeus/?rev=906&view=rev
Author: artemys
Date: 2008-10-29 15:05:48 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
[LINUX] Remove fpga/dev_tools/fpgaaccess/.tmp_versions/ directory from SVN (it's a temp dir)
Removed Paths:
-------------
trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/.tmp_versions/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-29 14:48:02
|
Revision: 905
http://armadeus.svn.sourceforge.net/armadeus/?rev=905&view=rev
Author: artemys
Date: 2008-10-29 14:47:51 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
[LINUX] Move old FPGA led driver to fpga/others/
Added Paths:
-----------
trunk/target/linux/modules/fpga/others/led/
Removed Paths:
-------------
trunk/target/linux/modules/led/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-29 14:35:01
|
Revision: 904
http://armadeus.svn.sourceforge.net/armadeus/?rev=904&view=rev
Author: artemys
Date: 2008-10-29 14:35:00 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
[LINUX] imxlkeypad driver config should not depend on FPGA one
Modified Paths:
--------------
trunk/target/linux/modules/imxlkeypad/Kconfig
Modified: trunk/target/linux/modules/imxlkeypad/Kconfig
===================================================================
--- trunk/target/linux/modules/imxlkeypad/Kconfig 2008-10-28 14:51:45 UTC (rev 903)
+++ trunk/target/linux/modules/imxlkeypad/Kconfig 2008-10-29 14:35:00 UTC (rev 904)
@@ -4,7 +4,7 @@
config ARMADEUS_KEYPAD_DRIVER
tristate "Armadeus keypad driver"
default n
- depends on ARMADEUS_FPGA_DRIVERS
+ depends on ARMADEUS_DRIVERS
---help---
GPIO pins can be used to control a matrix keypad with this driver
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-10-28 14:52:00
|
Revision: 903
http://armadeus.svn.sourceforge.net/armadeus/?rev=903&view=rev
Author: jorasse
Date: 2008-10-28 14:51:45 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
[linux] fixed some filename typo
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-framebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-074-tsc2102-touchscreen.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-ramebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-074-sc2102-touchscreen.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-framebuff.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-framebuff.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-framebuff.patch 2008-10-28 14:51:45 UTC (rev 903)
@@ -0,0 +1,19274 @@
+diff -uprN -X dontdiff linux-2.6.12/drivers/video/imxfb.c linux-2.6.12.work/drivers/video/imxfb.c
+--- linux-2.6.12/drivers/video/imxfb.c 2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.work/drivers/video/imxfb.c 2005-12-17 17:35:27.000000000 +0100
+@@ -401,7 +401,12 @@ static void imxfb_setup_gpio(struct imxf
+ /* initialize GPIOs */
+ imx_gpio_mode(PD6_PF_LSCLK);
+ imx_gpio_mode(PD10_PF_SPL_SPR);
++#ifndef CONFIG_MACH_SCB9328
++#ifndef CONFIG_MACH_APF9328
++ /* On apf9328, used to de)activate the display, so we need it as a normal gpio */
+ imx_gpio_mode(PD11_PF_CONTRAST);
++#endif // CONFIG_MACH_APF9328
++#endif /* CONFIG_MACH_SCB9328 */
+ imx_gpio_mode(PD14_PF_FLM_VSYNC);
+ imx_gpio_mode(PD13_PF_LP_HSYNC);
+ imx_gpio_mode(PD7_PF_REV);
+diff -uprN -X dontdiff linux-2.6.12/drivers/video/logo/Kconfig linux-2.6.12.work/drivers/video/logo/Kconfig
+--- linux-2.6.12/drivers/video/logo/Kconfig 2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.work/drivers/video/logo/Kconfig 2005-12-17 17:30:32.000000000 +0100
+@@ -63,5 +63,12 @@ config LOGO_SUPERH_CLUT224
+ depends on LOGO && SUPERH
+ default y
+
++config LOGO_ARMADEUS_CLUT224
++ bool "224-color Armadeus Linux logo"
++ depends on LOGO && ARM
++ default y
++ help
++ Choose this if you want to have the Armadeus Tux as boot logo
++
+ endmenu
+
+diff -uprN -X dontdiff linux-2.6.12/drivers/video/logo/logo_armadeus_clut224.ppm linux-2.6.12.work/drivers/video/logo/logo_armadeus_clut224.ppm
+--- linux-2.6.12/drivers/video/logo/logo_armadeus_clut224.ppm 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.12.work/drivers/video/logo/logo_armadeus_clut224.ppm 2005-12-17 17:37:19.000000000 +0100
+@@ -0,0 +1,19205 @@
++P3
++# CREATOR: The GIMP's PNM Filter Version 1.0
++# Armadeus project 224 colors Tux logo
++80 80
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++6
++6
++6
++10
++10
++10
++10
++10
++10
++10
++10
++10
++6
++6
++6
++6
++6
++6
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++10
++10
++10
++14
++14
++14
++22
++22
++22
++26
++26
++26
++30
++30
++30
++34
++34
++34
++30
++30
++30
++30
++30
++30
++26
++26
++26
++18
++18
++18
++14
++14
++14
++10
++10
++10
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++26
++26
++26
++42
++42
++42
++54
++54
++54
++66
++66
++66
++78
++78
++78
++78
++78
++78
++78
++78
++78
++74
++74
++74
++66
++66
++66
++54
++54
++54
++42
++42
++42
++26
++26
++26
++18
++18
++18
++10
++10
++10
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++22
++22
++22
++42
++42
++42
++66
++66
++66
++86
++86
++86
++66
++66
++66
++38
++38
++38
++38
++38
++38
++22
++22
++22
++26
++26
++26
++34
++34
++34
++54
++54
++54
++66
++66
++66
++86
++86
++86
++70
++70
++70
++46
++46
++46
++26
++26
++26
++14
++14
++14
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++50
++50
++50
++82
++82
++82
++58
++58
++58
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++54
++54
++54
++86
++86
++86
++66
++66
++66
++38
++38
++38
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++50
++50
++50
++78
++78
++78
++34
++34
++34
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++70
++70
++70
++78
++78
++78
++46
++46
++46
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++42
++42
++42
++82
++82
++82
++26
++26
++26
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++46
++46
++46
++34
++34
++34
++6
++6
++6
++2
++2
++6
++42
++42
++42
++78
++78
++78
++42
++42
++42
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++66
++66
++66
++58
++58
++58
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++86
++86
++86
++101
++101
++101
++46
++46
++46
++10
++10
++10
++2
++2
++6
++58
++58
++58
++70
++70
++70
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++86
++86
++86
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++30
++30
++30
++94
++94
++94
++94
++94
++94
++58
++58
++58
++26
++26
++26
++2
++2
++6
++6
++6
++6
++78
++78
++78
++54
++54
++54
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++62
++62
++62
++62
++62
++62
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++54
++54
++54
++38
++38
++38
++18
++18
++18
++10
++10
++10
++2
++2
++6
++2
++2
++6
++34
++34
++34
++82
++82
++82
++38
++38
++38
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++30
++30
++30
++78
++78
++78
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++78
++78
++78
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++54
++54
++54
++66
++66
++66
++26
++26
++26
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++14
++14
++14
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++82
++82
++82
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++2
++2
++6
++6
++6
++6
++6
++6
++6
++22
++22
++22
++34
++34
++34
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++34
++34
++34
++10
++10
++10
++50
++50
++50
++22
++22
++22
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++86
++86
++86
++42
++42
++42
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++2
++2
++6
++38
++38
++38
++116
++116
++116
++94
++94
++94
++22
++22
++22
++22
++22
++22
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++86
++86
++86
++137
++137
++137
++161
++161
++161
++154
++153
++152
++38
++38
++38
++26
++26
++26
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++86
++86
++86
++46
++46
++46
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++14
++14
++14
++134
++134
++134
++198
++198
++198
++195
++195
++195
++116
++116
++116
++10
++10
++10
++2
++2
++6
++2
++2
++6
++6
++6
++6
++101
++98
++89
++187
++187
++187
++210
++210
++210
++218
++218
++218
++214
++214
++214
++134
++134
++134
++14
++14
++14
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++86
++86
++86
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++54
++54
++54
++218
++218
++218
++195
++195
++195
++226
++226
++226
++246
++246
++246
++58
++58
++58
++2
++2
++6
++2
++2
++6
++30
++30
++30
++210
++210
++210
++253
++253
++253
++173
++173
++172
++123
++123
++123
++221
++221
++221
++234
++234
++234
++74
++74
++74
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++82
++82
++82
++2
++2
++6
++106
++106
++106
++171
++171
++170
++26
++26
++26
++86
++86
++86
++226
++226
++226
++123
++123
++123
++10
++10
++10
++14
++14
++14
++46
++46
++46
++231
++231
++231
++190
++190
++190
++6
++6
++6
++70
++70
++70
++90
++90
++90
++238
++238
++238
++159
++158
++157
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++86
++86
++86
++6
++6
++6
++116
++116
++116
++106
++106
++106
++6
++6
++6
++70
++70
++70
++147
++147
++147
++127
++127
++127
++18
++18
++18
++38
++38
++38
++54
++54
++54
++221
++221
++221
++106
++106
++106
++2
++2
++6
++14
++14
++14
++46
++46
++46
++190
++190
++190
++198
++198
++198
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++74
++74
++74
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++94
++94
++94
++14
++14
++14
++101
++101
++101
++127
++127
++127
++2
++2
++6
++18
++18
++18
++116
++116
++116
++130
++98
++46
++121
++92
++8
++121
++92
++8
++100
++78
++10
++161
++161
++161
++106
++106
++106
++2
++2
++6
++2
++2
++6
++2
++2
++6
++195
++195
++195
++195
++195
++195
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++74
++74
++74
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++90
++90
++90
++14
++14
++14
++58
++58
++58
++210
++210
++210
++26
++26
++26
++52
++36
++6
++155
++116
++10
++226
++170
++11
++236
++186
++11
++225
++175
++15
++184
++144
++12
++215
++174
++15
++182
++146
++52
++37
++28
++9
++2
++2
++6
++70
++70
++70
++246
++246
++246
++137
++137
++137
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++66
++66
++66
++26
++26
++26
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++14
++14
++14
++10
++10
++10
++195
++195
++195
++203
++179
++129
++192
++133
++9
++225
++175
++15
++239
++182
++13
++236
++190
++10
++232
++195
++16
++232
++200
++30
++245
++216
++46
++241
++208
++19
++232
++195
++16
++184
++144
++12
++203
++179
++129
++211
++206
++186
++42
++42
++42
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++50
++50
++50
++74
++74
++74
++30
++30
++30
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++86
++86
++86
++14
++14
++14
++2
++2
++6
++121
++87
++25
++192
++133
++9
++219
++162
++10
++239
++182
++13
++236
++186
++11
++232
++195
++16
++241
++208
++19
++245
++216
++46
++245
++216
++46
++245
++216
++46
++246
++215
++20
++241
++208
++19
++241
++208
++19
++226
++184
++13
++121
++87
++25
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++50
++50
++50
++82
++82
++82
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++82
++82
++82
++30
++30
++30
++61
++42
++6
++180
++123
++7
++206
++145
++10
++230
++174
++11
++239
++182
++13
++236
++190
++10
++238
++202
++15
++241
++208
++19
++237
++201
++75
++245
++216
++46
++246
++215
++20
++246
++215
++20
++246
++215
++20
++226
++184
++13
++215
++174
++15
++184
++144
++12
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++94
++94
++94
++42
++42
++42
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++78
++78
++78
++50
++50
++50
++104
++69
++6
++192
++133
++9
++216
++158
++10
++236
++178
++12
++236
++186
++11
++232
++195
++16
++241
++208
++19
++245
++216
++46
++245
++216
++46
++246
++215
++20
++246
++215
++20
++241
++208
++19
++198
++155
++10
++200
++144
++11
++216
++158
++10
++155
++116
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++90
++90
++90
++54
++54
++54
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++78
++78
++78
++46
++46
++46
++22
++22
++22
++137
++92
++6
++210
++164
++10
++239
++182
++13
++236
++190
++10
++238
++202
++15
++241
++208
++19
++246
++215
++20
++246
++215
++20
++241
++208
++19
++210
++164
++10
++185
++133
++11
++210
++150
++10
++216
++158
++10
++210
++150
++10
++100
++78
++10
++2
++2
++6
++6
++6
++6
++54
++54
++54
++14
++14
++14
++2
++2
++6
++2
++2
++6
++62
++62
++62
++74
++74
++74
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++78
++78
++78
++50
++50
++50
++6
++6
++6
++80
++60
++22
++139
++102
++15
++190
++146
++13
++226
++184
++13
++232
++200
++30
++232
++195
++16
++215
++174
++15
++190
++146
++13
++168
++122
++10
++192
++133
++9
++210
++150
++10
++213
++154
++11
++202
++158
++25
++168
++150
++104
++101
++98
++89
++2
++2
++6
++2
++2
++6
++78
++78
++78
++116
++116
++116
++58
++58
++58
++2
++2
++6
++22
++22
++22
++90
++90
++90
++46
++46
++46
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++50
++50
++50
++6
++6
++6
++127
++127
++127
++168
++150
++104
++156
++107
++11
++168
++122
++10
++198
++155
++10
++184
++144
++12
++197
++138
++11
++200
++144
++11
++206
++145
++10
++206
++145
++10
++197
++138
++11
++203
++179
++129
++195
++195
++195
++198
++198
++198
++173
++173
++172
++14
++14
++14
++2
++2
++6
++22
++22
++22
++116
++116
++116
++116
++116
++116
++22
++22
++22
++2
++2
++6
++74
++74
++74
++70
++70
++70
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++50
++50
++50
++101
++101
++101
++26
++26
++26
++10
++10
++10
++137
++137
++137
++190
++190
++190
++168
++150
++104
++156
++107
++11
++197
++138
++11
++200
++144
++11
++197
++138
++11
++192
++133
++9
++180
++123
++7
++190
++142
++34
++203
++179
++129
++187
++187
++187
++202
++202
++202
++221
++221
++221
++214
++214
++214
++66
++66
++66
++2
++2
++6
++2
++2
++6
++50
++50
++50
++62
++62
++62
++6
++6
++6
++2
++2
++6
++10
++10
++10
++90
++90
++90
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++74
++74
++74
++74
++74
++74
++2
++2
++6
++6
++6
++6
++144
++144
++144
++198
++198
++198
++190
++190
++190
++170
++164
++156
++154
++121
++60
++156
++107
++11
++156
++107
++11
++168
++124
++44
++168
++150
++104
++187
++187
++187
++190
++190
++190
++210
++210
++210
++246
++246
++246
++253
++253
++253
++253
++253
++253
++182
++182
++182
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++62
++62
++62
++74
++74
++74
++34
++34
++34
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++22
++22
++22
++54
++54
++54
++94
++94
++94
++18
++18
++18
++2
++2
++6
++46
++46
++46
++234
++234
++234
++221
++221
++221
++190
++190
++190
++190
++190
++190
++190
++190
++190
++187
++187
++187
++187
++187
++187
++190
++190
++190
++190
++190
++190
++195
++195
++195
++214
++214
++214
++242
++242
++242
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++86
++86
++86
++54
++54
++54
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++46
++46
++46
++90
++90
++90
++46
++46
++46
++18
++18
++18
++6
++6
++6
++182
++182
++182
++253
++253
++253
++246
++246
++246
++206
++206
++206
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++206
++206
++206
++231
++231
++231
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++202
++202
++202
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++42
++42
++42
++86
++86
++86
++42
++42
++42
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++38
++38
++38
++74
++74
++74
++66
++66
++66
++2
++2
++6
++6
++6
++6
++90
++90
++90
++250
++250
++250
++253
++253
++253
++253
++253
++253
++238
++238
++238
++198
++198
++198
++190
++190
++190
++190
++190
++190
++195
++195
++195
++221
++221
++221
++246
++246
++246
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++78
++78
++78
++70
++70
++70
++34
++34
++34
++14
++14
++14
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++34
++34
++34
++66
++66
++66
++78
++78
++78
++6
++6
++6
++2
++2
++6
++18
++18
++18
++218
++218
++218
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++226
++226
++226
++231
++231
++231
++246
++246
++246
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++179
++179
++178
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++90
++90
++90
++62
++62
++62
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++58
++58
++58
++90
++90
++90
++18
++18
++18
++2
++2
++6
++2
++2
++6
++111
++111
++110
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++231
++231
++231
++18
++18
++18
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++94
++94
++94
++54
++54
++54
++26
++26
++26
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++50
++50
++50
++90
++90
++90
++26
++26
++26
++2
++2
++6
++2
++2
++6
++14
++14
++14
++195
++195
++195
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++242
++242
++242
++54
++54
++54
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++38
++38
++38
++86
++86
++86
++50
++50
++50
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++38
++38
++38
++82
++82
++82
++34
++34
++34
++2
++2
++6
++2
++2
++6
++2
++2
++6
++42
++42
++42
++195
++195
++195
++246
++246
++246
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++242
++242
++242
++242
++242
++242
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++246
++246
++246
++238
++238
++238
++226
++226
++226
++231
++231
++231
++101
++101
++101
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++38
++38
++38
++82
++82
++82
++42
++42
++42
++14
++14
++14
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++62
++62
++62
++66
++66
++66
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++70
++70
++70
++171
++171
++170
++206
++206
++206
++234
++234
++234
++246
++246
++246
++250
++250
++250
++250
++250
++250
++238
++238
++238
++226
++226
++226
++231
++231
++231
++238
++238
++238
++250
++250
++250
++250
++250
++250
++250
++250
++250
++246
++246
++246
++231
++231
++231
++214
++214
++214
++206
++206
++206
++202
++202
++202
++202
++202
++202
++198
++198
++198
++202
++202
++202
++182
++182
++182
++18
++18
++18
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++62
++62
++62
++66
++66
++66
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++82
++82
++82
++18
++18
++18
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++94
++94
++94
++182
++182
++182
++218
++218
++218
++242
++242
++242
++250
++250
++250
++253
++253
++253
++253
++253
++253
++250
++250
++250
++234
++234
++234
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++238
++238
++238
++226
++226
++226
++210
++210
++210
++202
++202
++202
++195
++195
++195
++195
++195
++195
++210
++210
++210
++159
++158
++157
++6
++6
++6
++14
++14
++14
++50
++50
++50
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++86
++86
++86
++46
++46
++46
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++54
++54
++54
++70
++70
++70
++2
++2
++6
++2
++2
++6
++10
++10
++10
++2
++2
++6
++22
++22
++22
++169
++169
++168
++231
++231
++231
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++242
++242
++242
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++231
++231
++231
++206
++206
++206
++198
++198
++198
++226
++226
++226
++94
++94
++94
++2
++2
++6
++6
++6
++6
++38
++38
++38
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++62
++62
++62
++66
++66
++66
++26
++26
++26
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++74
++74
++74
++50
++50
++50
++2
++2
++6
++26
++26
++26
++26
++26
++26
++2
++2
++6
++106
++106
++106
++238
++238
++238
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++218
++218
++218
++202
++202
++202
++210
++210
++210
++14
++14
++14
++2
++2
++6
++2
++2
++6
++30
++30
++30
++22
++22
++22
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++86
++86
++86
++42
++42
++42
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++90
++90
++90
++22
++22
++22
++2
++2
++6
++42
++42
++42
++2
++2
++6
++18
++18
++18
++218
++218
++218
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++221
++221
++221
++218
++218
++218
++101
++101
++101
++2
++2
++6
++14
++14
++14
++18
++18
++18
++38
++38
++38
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++78
++78
++78
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++54
++54
++54
++82
++82
++82
++2
++2
++6
++26
++26
++26
++22
++22
++22
++2
++2
++6
++123
++123
++123
++253
++253
++253
++253
++253
++253
++252
++252
++252
++240
++240
++239
++216
++215
++215
++161
++161
++161
++106
++105
++104
++66
++66
++66
++44
++43
++41
++34
++33
++31
++38
++37
++36
++56
++55
++54
++84
++83
++82
++130
++130
++129
++182
++182
++182
++217
++217
++217
++237
++237
++237
++252
++252
++252
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++250
++250
++250
++238
++238
++238
++198
++198
++198
++6
++6
++6
++38
++38
++38
++58
++58
++58
++26
++26
++26
++38
++38
++38
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++46
++46
++46
++78
++78
++78
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++74
++74
++74
++58
++58
++58
++2
++2
++6
++42
++42
++42
++2
++2
++6
++22
++22
++22
++231
++231
++231
++252
++252
++252
++240
++240
++239
++182
++182
++182
++111
++111
++110
++46
++46
++46
++26
++25
++23
++26
++25
++23
++25
++24
++22
++25
++24
++22
++25
++24
++22
++25
++24
++22
++25
++24
++22
++25
++24
++22
++26
++25
++23
++26
++25
++23
++49
++48
++47
++106
++106
++106
++192
++192
++192
++249
++249
++249
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++46
++46
++46
++38
++38
++38
++42
++42
++42
++14
++14
++14
++38
++38
++38
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++86
++86
++86
++46
++46
++46
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++42
++42
++42
++90
++90
++90
++18
++18
++18
++18
++18
++18
++26
++26
++26
++2
++2
++6
++116
++116
++116
++251
++251
++251
++217
++216
++216
++123
++123
++123
++44
++43
++41
++26
++25
++23
++26
++25
++23
++25
++24
++22
++28
++27
++25
++33
++32
++30
++36
++35
++33
++36
++35
++33
++35
++34
++32
++32
++31
++28
++29
++28
++27
++26
++25
++23
++26
++25
++23
++26
++25
++23
++26
++25
++23
++87
++86
++84
++217
++216
++216
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++94
++94
++94
++6
++6
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++34
++34
++34
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++74
++74
++74
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++66
++66
++66
++82
++82
++82
++2
++2
++6
++38
++38
++38
++6
++6
++6
++14
++14
++14
++206
++206
++206
++196
++196
++195
++84
++83
++82
++27
++26
++24
++26
++25
++23
++26
++25
++23
++34
++33
++31
++56
++55
++54
++95
++95
++93
++135
++135
++134
++157
++157
++157
++160
++160
++159
++154
++153
++152
++130
++130
++129
++100
++99
++98
++66
++66
++66
++56
++55
++54
++46
++45
++44
++33
++32
++30
++46
++46
++46
++160
++160
++159
++248
++248
++248
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++144
++144
++144
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++46
++46
++46
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++42
++42
++42
++74
++74
++74
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++42
++42
++42
++90
++90
++90
++26
++26
++26
++6
++6
++6
++42
++42
++42
++2
++2
++6
++74
++74
++74
++184
++184
++184
++60
++59
++56
++26
++25
++23
++26
++25
++23
++29
++28
++27
++60
++59
++56
++127
++127
++127
++217
++217
++217
++253
++253
++253
++245
++245
++245
++252
++252
++252
++253
++253
++253
++253
++253
++253
++217
++216
++216
++190
++190
++189
++208
++207
++207
++212
++212
++212
++184
++184
++184
++130
++130
++129
++50
++50
++50
++88
++88
++86
++217
++217
++217
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++182
++182
++182
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++46
++46
++46
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++86
++86
++86
++38
++38
++38
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++66
++66
++66
++82
++82
++82
++2
++2
++6
++22
++22
++22
++18
++18
++18
++2
++2
++6
++147
++147
++147
++100
++99
++98
++26
++25
++23
++26
++25
++23
++29
++28
++27
++79
++79
++77
++181
++181
++180
++251
++251
++251
++248
++248
++248
++198
++198
++197
++130
++130
++129
++198
++198
++197
++253
++253
++253
++252
++252
++252
++115
++114
++113
++35
++34
++32
++111
++111
++110
++231
++231
++230
++253
++253
++253
++218
++218
++218
++66
++66
++66
++35
++34
++32
++161
++161
++161
++249
++249
++249
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++206
++206
++206
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++38
++38
++38
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++86
++86
++86
++46
++46
++46
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++46
++46
++46
++86
++86
++86
++18
++18
++18
++2
++2
++6
++34
++34
++34
++10
++10
++10
++6
++6
++6
++210
++210
++210
++154
++153
++152
++28
++27
++25
++26
++25
++23
++53
++52
++50
++198
++198
++197
++253
++253
++253
++253
++253
++253
++226
++226
++226
++119
++119
++118
++27
++26
++24
++94
++93
++92
++181
++181
++180
++157
++157
++157
++60
++59
++56
++61
++60
++58
++173
++173
++172
++246
++246
++246
++253
++253
++253
++161
++161
++161
++27
++26
++24
++26
++25
++23
++90
++90
++90
++230
++230
++229
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++221
++221
++221
++6
++6
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++82
++82
++82
++54
++54
++54
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++66
++66
++66
++62
++62
++62
++2
++2
++6
++2
++2
++6
++38
++38
++38
++10
++10
++10
++26
++26
++26
++238
++238
++238
++226
++226
++226
++79
++79
++77
++26
++25
++23
++50
++50
++50
++181
++181
++180
++249
++249
++249
++253
++253
++253
++247
++247
++247
++198
++198
++197
++144
++143
++142
++106
++106
++106
++100
++99
++98
++95
++95
++93
++127
++127
++127
++192
++192
++192
++251
++251
++251
++253
++253
++253
++216
++215
++215
++79
++79
++77
++26
++25
++23
++26
++25
++23
++29
++28
++27
++181
++181
++180
++252
++252
++252
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++231
++231
++231
++6
++6
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++66
++66
++66
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++78
++78
++78
++6
++6
++6
++2
++2
++6
++2
++2
++6
++46
++46
++46
++14
++14
++14
++42
++42
++42
++246
++246
++246
++250
++250
++250
++161
++161
++161
++36
++35
++33
++26
++25
++23
++53
++52
++50
++130
++130
++129
++208
++208
++208
++249
++249
++249
++253
++253
++253
++253
++253
++253
++230
++230
++229
++210
++210
++210
++214
++214
++214
++242
++242
++242
++253
++253
++253
++253
++253
++253
++253
++253
++253
++196
++196
++195
++46
++46
++46
++26
++25
++23
++26
++25
++23
++26
++25
++23
++94
++93
++92
++231
++231
++230
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++234
++234
++234
++10
++10
++10
++2
++2
++6
++2
++2
++6
++22
++22
++22
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++66
++66
++66
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++50
++50
++50
++74
++74
++74
++2
++2
++6
++2
++2
++6
++14
++14
++14
++70
++70
++70
++34
++34
++34
++62
++62
++62
++250
++250
++250
++253
++253
++253
++224
++223
++223
++84
++83
++82
++26
++25
++23
++26
++25
++23
++34
++33
++31
++74
++73
++72
++144
++144
++144
++203
++203
++202
++240
++240
++239
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++231
++231
++230
++106
++105
++104
++26
++25
++23
++26
++25
++23
++26
++25
++23
++38
++37
++36
++173
++173
++172
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++234
++234
++234
++14
++14
++14
++2
++2
++6
++2
++2
++6
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++66
++66
++66
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++54
++54
++54
++62
++62
++62
++2
++2
++6
++2
++2
++6
++2
++2
++6
++30
++30
++30
++46
++46
++46
++70
++70
++70
++250
++250
++250
++253
++253
++253
++249
++249
++249
++159
++158
++157
++32
++31
++28
++26
++25
++23
++26
++25
++23
++26
++25
++23
++39
++38
++37
++69
++69
++67
++106
++105
++104
++137
++137
++137
++171
++171
++170
++228
++228
++228
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++176
++176
++175
++35
++34
++32
++26
++25
++23
++26
++25
++23
++26
++25
++23
++99
++98
++97
++230
++230
++229
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++226
++226
++226
++10
++10
++10
++2
++2
++6
++6
++6
++6
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++66
++66
++66
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++58
++58
++58
++62
++62
++62
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++30
++30
++30
++78
++78
++78
++250
++250
++250
++253
++253
++253
++253
++253
++253
++228
++228
++228
++74
++74
++74
++26
++25
++23
++25
++24
++22
++26
++25
++23
++26
++25
++23
++27
++26
++24
++29
++28
++27
++35
++34
++32
++44
++43
++41
++135
++135
++134
++251
++251
++251
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++228
++228
++228
++95
++95
++93
++26
++25
++23
++26
++25
++23
++26
++25
++23
++44
++43
++41
++176
++176
++175
++252
++252
++252
++253
++253
++253
++253
++253
++253
++253
++253
++253
++206
++206
++206
++2
++2
...
[truncated message content] |
|
From: <jo...@us...> - 2008-10-28 13:24:47
|
Revision: 902
http://armadeus.svn.sourceforge.net/armadeus/?rev=902&view=rev
Author: jorasse
Date: 2008-10-28 13:18:44 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
[linux] Changed linux patch naming convention to supprot next buildroot migration
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/linux.mk
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-001-imx1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-002-apm9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-003-ramebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-004-cygwin-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-010-scbfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-020-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-021-apf9328-mtd.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/linux-2.6.12-030-imx_udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-001-imx1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-002-apm9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-003-framebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-004-cygwin-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-010-scbfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-020-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-021-apf9328-mtd.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/linux-2.6.17-030-imx_udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-004-cygwin-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-010-imx1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-012-apm9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-013-framebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-014-i2c-imx.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-020-scbfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-021-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-022-apf9328-mtd.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-023-fblcd-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-030-imx_udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-031-imx-udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-040-imx_mmc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-041-imx_irq.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-050-armadeus-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-055-rtc-ds1374.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-060-rc2-imx_spi.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-062-max1027.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-070-framebuffer-16bits-color-part1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-070-framebuffer-16bits-color-part2.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-071-framebuffer-8bpp-switch.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-072-add-backlight-imxfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-073-tsc2102.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-074-tsc2102-touchscreen.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/linux-2.6.18.1-075-spi2-reg-irq-defines.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-010-imx1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-012-apm9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-013-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-014-imxregs-add-lcd-bpix-mask.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-015-logo-add-armadeus-project-tux.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-018-i2c-imx.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-020-scbfb.no_more_used
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-021-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-021-apf9328_defconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-022-apf9328-mtd.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-023-fblcd-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-024-apf9328-add-board-to-linux-build-system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-030-imx_udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-031-imx-udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-040-imx_mmc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-041-imx_irq.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-050-armadeus-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-055-rtc-ds1374.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-062-max1027.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-072-add-backlight-imxfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-073-tsc2102-integrate-driver-to-linux-build-system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-073-tsc2102.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-074-sc2102-touchscreen.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-075-spi2-reg-irq-defines.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-076-arm-vmlinux-ld-script-patch-for-new-binutils.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-077-arm-checksyscalls.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-078-set_imx_fb_info-sectio-mismatch.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-081-can-proto-numbers.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-082-can-core.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-083-can-raw-proto.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-084-can-bcm-proto.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-085-can-vcan-driver.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-086-can-maintainers.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-087-can-doc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-088-mcp2515.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-090-alsa-create-imx-alsa_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-091-alsa-add-imx-ssi-tsc2102-driver.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-092-alsa-imx-ssi-tsc2102-integrate-driver-to-linux-build-system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-093-imxregs-add-ssi-registers-definition.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-200-hack-kernel-to-export-some-irq-handling-functions.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-013-framebuff.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-014-i2c-imx.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-021-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-022-apf9328-mtd.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-023-fblcd-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-030-imx_udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-031-imx-udc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-040-imx_mmc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-041-imx_irq.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-050-armadeus-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-062-max1027.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-070-framebuffer-16bits-color-part1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-070-framebuffer-16bits-color-part2.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-071-framebuffer-8bpp-switch.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-072-add-backlight-imxfb.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-073-tsc2102.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-074-tsc2102-touchscreen.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-075-spi2-reg-irq-defines.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-076-arm-vmlinux-ld-script-patch-for-new-binutils.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-077-arm-checksyscalls.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-078-set_imx_fb_info-section-mismatch.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-081-can-proto-numbers.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-082-can-core.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-083-can-raw-proto.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-084-can-bcm-proto.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-085-can-vcan-driver.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-088-mcp2515.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/linux-2.6.24.3-090-add_libertas_SPI_support_to_APF9328.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/001-linux-2.6.12-imx1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/002-linux-2.6.12-apm9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/003-linux-2.6.12-framebuff.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/004-linux-2.6.12-cygwin-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/010-linux-2.6.12-scbfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/020-linux-2.6.12-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/021-linux-2.6.12-apf9328-mtd.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/030-linux-2.6.12-imx_udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/001-linux-2.6.17-imx1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/002-linux-2.6.17-apm9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/003-linux-2.6.17-framebuff.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/004-linux-2.6.12-cygwin-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/010-linux-2.6.17-scbfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/020-linux-2.6.17-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/021-linux-2.6.17-apf9328-mtd.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/030-linux-2.6.17-imx_udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/004-linux-2.6.12-cygwin-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/010-linux-2.6.18-imx1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/012-linux-2.6.18-apm9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/013-linux-2.6.18-framebuff.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/014-linux-2.6.18-i2c-imx.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/020-linux-2.6.18-scbfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/022-linux-2.6.18-apf9328-mtd.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/023-linux-2.6.18-fblcd-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/030-linux-2.6-imx_udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/031-linux-2.6.18-imx-udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/040-linux-2.6.18-imx_mmc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/041-linux-2.6.18-imx_irq.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/050-linux-2.6.18-armadeus-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/060-linux-2.6.18-rc2-imx_spi.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/062-linux-2.6.18-max1027.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/070-linux-2.6.18-framebuffer-16bits-color-part1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/070-linux-2.6.18-framebuffer-16bits-color-part2.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/071-linux-2.6.18-framebuffer-8bpp-switch.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/072-linux-2.6.18-add-backlight-imxfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/074-linux-2.6.18-tsc2102-touchscreen.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/075-linux-2.6.18-spi2-reg-irq-defines.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/010-linux-2.6.23.1-imx1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/012-linux-2.6.23.1-apm9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-imxfb-improvements.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/014-imxregs-add-lcd-bpix-mask.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/015-logo-add-armadeus-project-tux.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/018-linux-2.6.23.1-i2c-imx.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.no_more_used
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328_defconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/022-linux-2.6.23.1-apf9328-mtd.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/023-linux-2.6.23.1-fblcd-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/024-apf9328-add-board-to-linux-build-system.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/030-linux-2.6-imx_udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/031-linux-2.6.23.1-imx-udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/040-linux-2.6.23.1-imx_mmc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/050-linux-2.6.23.1-armadeus-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/055-linux-2.6.23.1-rtc-ds1374.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/062-linux-2.6.23.1-max1027.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/072-linux-2.6.23.1-add-backlight-imxfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-linux-2.6.23.1-tsc2102.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-tsc2102-integrate-driver-to-linux-build-system.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/074-linux-2.6.23.1-tsc2102-touchscreen.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/075-linux-2.6.23.1-spi2-reg-irq-defines.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/076-linux-2.6.23.1-arm-vmlinux-ld-script-patch-for-new-binutils.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/077-linux-2.6.23-arm-checksyscalls.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/078-linux-2.6.23-set_imx_fb_info-sectio-mismatch.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/081-can-proto-numbers.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/082-can-core.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/083-can-raw-proto.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/084-can-bcm-proto.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/085-can-vcan-driver.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/086-can-maintainers.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/087-can-doc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/088-mcp2515.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/090-alsa-create-imx-alsa_h.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/091-alsa-add-imx-ssi-tsc2102-driver.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/092-alsa-imx-ssi-tsc2102-integrate-driver-to-linux-build-system.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/093-imxregs-add-ssi-registers-definition.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/200-hack-kernel-to-export-some-irq-handling-functions.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/013-linux-2.6.24.3-framebuff.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/014-linux-2.6.24.3-i2c-imx.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/021-linux-2.6.24.3-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/022-linux-2.6.24.3-apf9328-mtd.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/023-linux-2.6.24-fblcd-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/030-linux-2.6-imx_udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/031-linux-2.6.24.3-imx-udc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/040-linux-2.6.24.3-imx_mmc.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/041-linux-2.6.24.3-imx_irq.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/050-linux-2.6.24.3-armadeus-kconfig.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/062-linux-2.6.24.3-max1027.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/070-linux-2.6.24.3-framebuffer-16bits-color-part1.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/070-linux-2.6.24.3-framebuffer-16bits-color-part2.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/071-linux-2.6.24.3-framebuffer-8bpp-switch.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/072-linux-2.6.24.3-add-backlight-imxfb.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/073-linux-2.6.24.3-tsc2102.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/074-linux-2.6.24.3-tsc2102-touchscreen.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/075-linux-2.6.24.3-spi2-reg-irq-defines.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/076-linux-2.6.24.3-arm-vmlinux-ld-script-patch-for-new-binutils.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/077-linux-2.6.24.3-arm-checksyscalls.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/078-linux-2.6.24.3-set_imx_fb_info-section-mismatch.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/081-can-proto-numbers.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/082-can-core.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/083-can-raw-proto.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/084-can-bcm-proto.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/085-can-vcan-driver.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/088-mcp2515.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.24.3/090-linux-2.6.24.3-add_libertas_SPI_support_to_APF9328.diff
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/001-linux-2.6.12-imx1.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/001-linux-2.6.12-imx1.diff 2008-10-27 16:14:36 UTC (rev 901)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/001-linux-2.6.12-imx1.diff 2008-10-28 13:18:44 UTC (rev 902)
@@ -1,5464 +0,0 @@
-diff -urN linux-2.6.12/arch/arm/configs/mx1fs2_defconfig linux-2.6.12-work/arch/arm/configs/mx1fs2_defconfig
---- linux-2.6.12/arch/arm/configs/mx1fs2_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/configs/mx1fs2_defconfig 2005-06-29 09:22:32.000000000 +0200
-@@ -0,0 +1,728 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.10-imx-svn
-+# Mon Jan 3 19:27:36 2005
-+#
-+CONFIG_ARM=y
-+CONFIG_MMU=y
-+CONFIG_UID16=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_GENERIC_IOMAP=y
-+
-+#
-+# Code maturity level options
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_CLEAN_COMPILE=y
-+CONFIG_BROKEN_ON_SMP=y
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION=""
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_SYSCTL is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_HOTPLUG is not set
-+CONFIG_KOBJECT_UEVENT=y
-+# CONFIG_IKCONFIG is not set
-+CONFIG_EMBEDDED=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SHMEM=y
-+CONFIG_CC_ALIGN_FUNCTIONS=0
-+CONFIG_CC_ALIGN_LABELS=0
-+CONFIG_CC_ALIGN_LOOPS=0
-+CONFIG_CC_ALIGN_JUMPS=0
-+# CONFIG_TINY_SHMEM is not set
-+
-+#
-+# Loadable module support
-+#
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+CONFIG_OBSOLETE_MODPARM=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_CAMELOT is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_IOP3XX is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+CONFIG_ARCH_IMX=y
-+# CONFIG_ARCH_H720X is not set
-+
-+#
-+# IMX Implementations
-+#
-+CONFIG_MACH_MX1FS2=y
-+# CONFIG_MACH_SCB9328 is not set
-+# CONFIG_ARCH_MX1ADS is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+
-+#
-+# Processor Features
-+#
-+# CONFIG_ARM_THUMB is not set
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+
-+#
-+# General setup
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+# CONFIG_XIP_KERNEL is not set
-+
-+#
-+# At least one math emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+CONFIG_FPE_NWFPE_XP=y
-+CONFIG_FPE_FASTFPE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_PM is not set
-+# CONFIG_PREEMPT is not set
-+# CONFIG_ARTHUR is not set
-+CONFIG_CMDLINE=""
-+# CONFIG_LEDS is not set
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Parallel port support
-+#
-+CONFIG_PARPORT=y
-+# CONFIG_PARPORT_PC is not set
-+# CONFIG_PARPORT_ARC is not set
-+# CONFIG_PARPORT_MX1FS2 is not set
-+# CONFIG_PARPORT_OTHER is not set
-+CONFIG_PARPORT_1284=y
-+
-+#
-+# Memory Technology Devices (MTD)
-+#
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+CONFIG_MTD_CFI_AMDSTD_RETRY=0
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_SCB9328 is not set
-+CONFIG_MTD_MX1FS2=y
-+# CONFIG_MTD_MX1ADS is not set
-+# CONFIG_MTD_EDB7312 is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLKMTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+
-+#
-+# NAND Flash Device Drivers
-+#
-+# CONFIG_MTD_NAND is not set
-+
-+#
-+# Plug and Play support
-+#
-+
-+#
-+# Block devices
-+#
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_PARIDE is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_RAM is not set
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CDROM_PKTCDVD is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+# CONFIG_IOSCHED_AS is not set
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+
-+#
-+# Multi-device support (RAID and LVM)
-+#
-+# CONFIG_MD is not set
-+
-+#
-+# Networking support
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+# CONFIG_NETLINK_DEV is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+# CONFIG_IP_PNP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_IP_TCPDIAG=y
-+# CONFIG_IP_TCPDIAG_IPV6 is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_NETFILTER is not set
-+
-+#
-+# SCTP Configuration (EXPERIMENTAL)
-+#
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_NET_DIVERT is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+# CONFIG_NET_SCHED is not set
-+# CONFIG_NET_CLS_ROUTE is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+
-+#
-+# Ethernet (10 or 100Mbit)
-+#
-+# CONFIG_NET_ETHERNET is not set
-+
-+#
-+# Ethernet (1000 Mbit)
-+#
-+
-+#
-+# Ethernet (10000 Mbit)
-+#
-+
-+#
-+# Token Ring devices
-+#
-+
-+#
-+# Wireless LAN (non-hamradio)
-+#
-+# CONFIG_NET_RADIO is not set
-+
-+#
-+# Wan interfaces
-+#
-+# CONFIG_WAN is not set
-+# CONFIG_PLIP is not set
-+CONFIG_PPP=y
-+# CONFIG_PPP_MULTILINK is not set
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=y
-+# CONFIG_PPP_SYNC_TTY is not set
-+CONFIG_PPP_DEFLATE=y
-+CONFIG_PPP_BSDCOMP=y
-+# CONFIG_PPPOE is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_SCSI is not set
-+
-+#
-+# Fusion MPT device support
-+#
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+
-+#
-+# I2O device support
-+#
-+
-+#
-+# ISDN subsystem
-+#
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Userland interfaces
-+#
-+
-+#
-+# Input I/O drivers
-+#
-+# CONFIG_GAMEPORT is not set
-+CONFIG_SOUND_GAMEPORT=y
-+# CONFIG_SERIO is not set
-+
-+#
-+# Input Device Drivers
-+#
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_MULTIPORT is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_IMX=y
-+CONFIG_SERIAL_IMX_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_PRINTER=y
-+# CONFIG_LP_CONSOLE is not set
-+# CONFIG_PPDEV is not set
-+# CONFIG_TIPAR is not set
-+
-+#
-+# IPMI
-+#
-+# CONFIG_IPMI_HANDLER is not set
-+
-+#
-+# Watchdog Cards
-+#
-+# CONFIG_WATCHDOG is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_RTC=m
-+# CONFIG_DTLK is not set
-+# CONFIG_R3964 is not set
-+
-+#
-+# Ftape, the floppy tape device driver
-+#
-+# CONFIG_DRM is not set
-+# CONFIG_RAW_DRIVER is not set
-+
-+#
-+# I2C support
-+#
-+# CONFIG_I2C is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+
-+#
-+# Digital Video Broadcasting Devices
-+#
-+# CONFIG_DVB is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_JBD is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_XFS_FS is not set
-+CONFIG_MINIX_FS=y
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_SYSFS=y
-+CONFIG_DEVFS_FS=y
-+CONFIG_DEVFS_MOUNT=y
-+# CONFIG_DEVFS_DEBUG is not set
-+# CONFIG_DEVPTS_FS_XATTR is not set
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_XATTR is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_RAMFS=y
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+# CONFIG_JFFS2_FS_NAND is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+
-+#
-+# Network File Systems
-+#
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+# CONFIG_EXPORTFS is not set
-+CONFIG_SUNRPC=y
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+
-+#
-+# Native Language Support
-+#
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=y
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+CONFIG_NLS_ISO8859_15=y
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+
-+#
-+# Profiling support
-+#
-+# CONFIG_PROFILING is not set
-+
-+#
-+# Graphics support
-+#
-+CONFIG_FB=y
-+CONFIG_FB_MODE_HELPERS=y
-+# CONFIG_FB_TILEBLITTING is not set
-+CONFIG_FB_IMX=y
-+# CONFIG_FB_VIRTUAL is not set
-+
-+#
-+# Logo configuration
-+#
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+
-+#
-+# Misc devices
-+#
-+
-+#
-+# USB support
-+#
-+# CONFIG_USB is not set
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+
-+#
-+# MMC/SD Card support
-+#
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_WBSD is not set
-+CONFIG_MMC_IMX=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_INFO is not set
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_DEBUG_USER is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+
-+#
-+# Cryptographic options
-+#
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_TEST is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC32=y
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-diff -urN linux-2.6.12/arch/arm/configs/scb9328_defconfig linux-2.6.12-work/arch/arm/configs/scb9328_defconfig
---- linux-2.6.12/arch/arm/configs/scb9328_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/configs/scb9328_defconfig 2005-06-29 09:22:32.000000000 +0200
-@@ -0,0 +1,705 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.10-imx-svn
-+# Tue Jan 4 11:26:35 2005
-+#
-+CONFIG_ARM=y
-+CONFIG_MMU=y
-+CONFIG_UID16=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_GENERIC_IOMAP=y
-+
-+#
-+# Code maturity level options
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_CLEAN_COMPILE=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION=""
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_SYSCTL is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_HOTPLUG is not set
-+CONFIG_KOBJECT_UEVENT=y
-+# CONFIG_IKCONFIG is not set
-+CONFIG_EMBEDDED=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SHMEM=y
-+CONFIG_CC_ALIGN_FUNCTIONS=0
-+CONFIG_CC_ALIGN_LABELS=0
-+CONFIG_CC_ALIGN_LOOPS=0
-+CONFIG_CC_ALIGN_JUMPS=0
-+# CONFIG_TINY_SHMEM is not set
-+
-+#
-+# Loadable module support
-+#
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+CONFIG_OBSOLETE_MODPARM=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_CAMELOT is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_IOP3XX is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+CONFIG_ARCH_IMX=y
-+# CONFIG_ARCH_H720X is not set
-+
-+#
-+# IMX Implementations
-+#
-+# CONFIG_MACH_MX1FS2 is not set
-+CONFIG_MACH_SCB9328=y
-+# CONFIG_ARCH_MX1ADS is not set
-+# CONFIG_IMX_SCB9328_EVK9328 is not set
-+CONFIG_IMX_SCB9328_EVK9328L=y
-+CONFIG_IMX_SCB9328_FLASH_16MB=y
-+# CONFIG_IMX_SCB9328_FLASH_32MB is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+
-+#
-+# Processor Features
-+#
-+# CONFIG_ARM_THUMB is not set
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+
-+#
-+# General setup
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+# CONFIG_XIP_KERNEL is not set
-+
-+#
-+# At least one math emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+CONFIG_FPE_NWFPE_XP=y
-+CONFIG_FPE_FASTFPE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_PM is not set
-+CONFIG_PREEMPT=y
-+# CONFIG_ARTHUR is not set
-+CONFIG_CMDLINE=""
-+CONFIG_LEDS=y
-+CONFIG_LEDS_TIMER=y
-+CONFIG_LEDS_CPU=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Parallel port support
-+#
-+# CONFIG_PARPORT is not set
-+
-+#
-+# Memory Technology Devices (MTD)
-+#
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+CONFIG_MTD_SCB9328=y
-+# CONFIG_MTD_MX1FS2 is not set
-+# CONFIG_MTD_MX1ADS is not set
-+# CONFIG_MTD_EDB7312 is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLKMTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+
-+#
-+# NAND Flash Device Drivers
-+#
-+# CONFIG_MTD_NAND is not set
-+
-+#
-+# Plug and Play support
-+#
-+
-+#
-+# Block devices
-+#
-+# CONFIG_BLK_DEV_FD is not set
-+CONFIG_BLK_DEV_LOOP=m
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_NBD=m
-+# CONFIG_BLK_DEV_RAM is not set
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CDROM_PKTCDVD is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+# CONFIG_IOSCHED_AS is not set
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+
-+#
-+# Multi-device support (RAID and LVM)
-+#
-+# CONFIG_MD is not set
-+
-+#
-+# Networking support
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+# CONFIG_NETLINK_DEV is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+# CONFIG_IP_PNP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_IP_TCPDIAG=y
-+# CONFIG_IP_TCPDIAG_IPV6 is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_NETFILTER is not set
-+
-+#
-+# SCTP Configuration (EXPERIMENTAL)
-+#
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_NET_DIVERT is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+# CONFIG_NET_SCHED is not set
-+# CONFIG_NET_CLS_ROUTE is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+
-+#
-+# Ethernet (10 or 100Mbit)
-+#
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_SMC91X is not set
-+CONFIG_DM9000=y
-+
-+#
-+# Ethernet (1000 Mbit)
-+#
-+
-+#
-+# Ethernet (10000 Mbit)
-+#
-+
-+#
-+# Token Ring devices
-+#
-+
-+#
-+# Wireless LAN (non-hamradio)
-+#
-+# CONFIG_NET_RADIO is not set
-+
-+#
-+# Wan interfaces
-+#
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_SCSI is not set
-+
-+#
-+# Fusion MPT device support
-+#
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+
-+#
-+# I2O device support
-+#
-+
-+#
-+# ISDN subsystem
-+#
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Userland interfaces
-+#
-+
-+#
-+# Input I/O drivers
-+#
-+# CONFIG_GAMEPORT is not set
-+CONFIG_SOUND_GAMEPORT=y
-+# CONFIG_SERIO is not set
-+
-+#
-+# Input Device Drivers
-+#
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_MULTIPORT is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_IMX=y
-+CONFIG_SERIAL_IMX_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+
-+#
-+# IPMI
-+#
-+# CONFIG_IPMI_HANDLER is not set
-+
-+#
-+# Watchdog Cards
-+#
-+# CONFIG_WATCHDOG is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_RTC=m
-+# CONFIG_DTLK is not set
-+# CONFIG_R3964 is not set
-+
-+#
-+# Ftape, the floppy tape device driver
-+#
-+# CONFIG_DRM is not set
-+# CONFIG_RAW_DRIVER is not set
-+
-+#
-+# I2C support
-+#
-+CONFIG_I2C=m
-+CONFIG_I2C_CHARDEV=m
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ISA is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_PCA_ISA is not set
-+
-+#
-+# Hardware Sensors Chip support
-+#
-+# CONFIG_I2C_SENSOR is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ASB100 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_FSCHER is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+
-+#
-+# Other I2C Chip support
-+#
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_RTC8564 is not set
-+CONFIG_I2C_DEBUG_CORE=y
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+
-+#
-+# Digital Video Broadcasting Devices
-+#
-+# CONFIG_DVB is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_JBD is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_SYSFS=y
-+# CONFIG_DEVFS_FS is not set
-+# CONFIG_DEVPTS_FS_XATTR is not set
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_XATTR is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_RAMFS=y
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+# CONFIG_JFFS2_FS_NAND is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+
-+#
-+# Network File Systems
-+#
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+# CONFIG_EXPORTFS is not set
-+CONFIG_SUNRPC=y
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+
-+#
-+# Native Language Support
-+#
-+# CONFIG_NLS is not set
-+
-+#
-+# Profiling support
-+#
-+# CONFIG_PROFILING is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_FB is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+
-+#
-+# Misc devices
-+#
-+
-+#
-+# USB support
-+#
-+# CONFIG_USB is not set
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+
-+#
-+# MMC/SD Card support
-+#
-+# CONFIG_MMC is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_INFO is not set
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_DEBUG_USER is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+
-+#
-+# Cryptographic options
-+#
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_TEST is not set
-+
-+#
-+# Library routines
-+#
-+# CONFIG_CRC_CCITT is not set
-+CONFIG_CRC32=y
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-diff -urN linux-2.6.12/arch/arm/kernel/time.c linux-2.6.12-work/arch/arm/kernel/time.c
---- linux-2.6.12/arch/arm/kernel/time.c 2005-06-29 09:26:45.000000000 +0200
-+++ linux-2.6.12-work/arch/arm/kernel/time.c 2005-06-29 09:22:32.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <linux/profile.h>
- #include <linux/sysdev.h>
- #include <linux/timer.h>
-+#include <linux/pm.h>
-
- #include <asm/hardware.h>
- #include <asm/io.h>
-diff -urN linux-2.6.12/arch/arm/kernel/vmlinux.lds.S linux-2.6.12-work/arch/arm/kernel/vmlinux.lds.S
---- linux-2.6.12/arch/arm/kernel/vmlinux.lds.S 2005-06-29 09:26:45.000000000 +0200
-+++ linux-2.6.12-work/arch/arm/kernel/vmlinux.lds.S 2005-06-29 09:22:32.000000000 +0200
-@@ -161,7 +161,3 @@
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .comment 0 : { *(.comment) }
- }
--
--/* those must never be empty */
--ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
--ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
-diff -urN linux-2.6.12/arch/arm/mach-imx/Kconfig linux-2.6.12-work/arch/arm/mach-imx/Kconfig
---- linux-2.6.12/arch/arm/mach-imx/Kconfig 2005-06-29 09:26:45.000000000 +0200
-+++ linux-2.6.12-work/arch/arm/mach-imx/Kconfig 2005-06-29 09:22:32.000000000 +0200
-@@ -8,4 +8,35 @@
- help
- Say Y here if you are using the Motorola MX1ADS board
-
-+config MACH_MX1FS2
-+ bool "mx1fs2"
-+ depends on ARCH_IMX
-+ help
-+ Say Y here if you are using the viasys mx1fs2 board
-+
-+config MACH_SCB9328
-+ bool "scb9328"
-+ depends on ARCH_IMX
-+ help
-+ Say Y here if you are using the Synertronixx scb9328 board
-+
-+choice
-+ prompt "SCB9328 eval board"
-+ depends on MACH_SCB9328
-+ default IMX_SCB9328_EVK9328
-+
-+config IMX_SCB9328_EVK9328
-+ bool "use evk9328 eval board"
-+ depends on MACH_SCB9328
-+ help
-+ Say Y here if you are using the Synertronixx EVK9328 eval board
-+
-+config IMX_SCB9328_EVK9328L
-+ bool "use evk9328l eval board"
-+ depends on MACH_SCB9328
-+ help
-+ Say Y here if you are using the Synertronixx EVK9328 light eval board
-+
-+endchoice
-+
- endmenu
-diff -urN linux-2.6.12/arch/arm/mach-imx/Kconfig.orig linux-2.6.12-work/arch/arm/mach-imx/Kconfig.orig
---- linux-2.6.12/arch/arm/mach-imx/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/mach-imx/Kconfig.orig 2005-06-29 09:22:07.000000000 +0200
-@@ -0,0 +1,11 @@
-+menu "IMX Implementations"
-+ depends on ARCH_IMX
-+
-+config ARCH_MX1ADS
-+ bool "mx1ads"
-+ depends on ARCH_IMX
-+ select ISA
-+ help
-+ Say Y here if you are using the Motorola MX1ADS board
-+
-+endmenu
-diff -urN linux-2.6.12/arch/arm/mach-imx/Makefile linux-2.6.12-work/arch/arm/mach-imx/Makefile
---- linux-2.6.12/arch/arm/mach-imx/Makefile 2005-03-02 08:38:25.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/mach-imx/Makefile 2005-06-29 09:22:32.000000000 +0200
-@@ -11,9 +11,12 @@
-
- # Specific board support
- obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o
-+obj-$(CONFIG_MACH_MX1FS2) += mx1fs2.o
-+obj-$(CONFIG_MACH_SCB9328) += scb9328.o
-
- # Support for blinky lights
- led-y := leds.o
-
- obj-$(CONFIG_LEDS) += $(led-y)
- led-$(CONFIG_ARCH_MX1ADS) += leds-mx1ads.o
-+led-$(CONFIG_MACH_SCB9328) += leds-scb9328.o
-diff -urN linux-2.6.12/arch/arm/mach-imx/Makefile.boot linux-2.6.12-work/arch/arm/mach-imx/Makefile.boot
---- linux-2.6.12/arch/arm/mach-imx/Makefile.boot 2005-03-02 08:37:30.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/mach-imx/Makefile.boot 2005-06-29 09:22:32.000000000 +0200
-@@ -1,2 +1,3 @@
- zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
--
-+ zreladdr-$(CONFIG_MACH_MX1FS2) := 0x08008000
-+ zreladdr-$(CONFIG_MACH_SCB9328) := 0x08008000
-diff -urN linux-2.6.12/arch/arm/mach-imx/leds-scb9328.c linux-2.6.12-work/arch/arm/mach-imx/leds-scb9328.c
---- linux-2.6.12/arch/arm/mach-imx/leds-scb9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-work/arch/arm/mach-imx/leds-scb9328.c 2005-06-29 09:22:45.000000000 +0200
-@@ -0,0 +1,52 @@
-+/*
-+ * linux/arch/arm/mach-imx/leds-scb9328.c
-+ *
-+ * Copyright (c) 2004 Sascha Hauer <sa...@sa...>
-+ *
-+ * Original (leds-footbridge.c) by Russell King
-+ *
-+ * This program is free software; you c...
[truncated message content] |
|
From: <ar...@us...> - 2008-10-27 16:14:50
|
Revision: 901
http://armadeus.svn.sourceforge.net/armadeus/?rev=901&view=rev
Author: artemys
Date: 2008-10-27 16:14:36 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
[DEBUG] Add UART1 registers to imxregs
Modified Paths:
--------------
trunk/target/linux/debug/imxregs/imxregs.h
Modified: trunk/target/linux/debug/imxregs/imxregs.h
===================================================================
--- trunk/target/linux/debug/imxregs/imxregs.h 2008-10-27 12:18:46 UTC (rev 900)
+++ trunk/target/linux/debug/imxregs/imxregs.h 2008-10-27 16:14:36 UTC (rev 901)
@@ -66,28 +66,71 @@
{ "RMCR", 0x00205034, 0, 0xffffffff, 'x', "Refresh Mode Control Register" },
{ "LCDICR", 0x00205038, 0, 0xffffffff, 'x', "Interrupt Configuration Register" },
{ "LCDISR", 0x00205040, 0, 0xffffffff, 'x', "Interrupt Status Register" },
-// UART
+// UART 1
+{ "URX11D_1", 0x0020602C, 0, 0xffffffff, 'x', "UART1 Receiver Register 11" },
+{ "URX12D_1", 0x00206030, 0, 0xffffffff, 'x', "UART1 Receiver Register 12" },
+{ "URX13D_1", 0x00206034, 0, 0xffffffff, 'x', "UART1 Receiver Register 13" },
+{ "URX14D_1", 0x00206038, 0, 0xffffffff, 'x', "UART1 Receiver Register 14" },
+{ "URX15D_1", 0x0020603C, 0, 0xffffffff, 'x', "UART1 Receiver Register 15" },
+{ "UTX0D_1", 0x00206040, 0, 0xffffffff, 'x', "UART1 Transmitter Register 0" },
+{ "UTX1D_1", 0x00206044, 0, 0xffffffff, 'x', "UART1 Transmitter Register 1" },
+{ "UTX2D_1", 0x00206048, 0, 0xffffffff, 'x', "UART1 Transmitter Register 2" },
+{ "UTX3D_1", 0x0020604C, 0, 0xffffffff, 'x', "UART1 Transmitter Register 3" },
+{ "UTX4D_1", 0x00206050, 0, 0xffffffff, 'x', "UART1 Transmitter Register 4" },
+{ "UTX5D_1", 0x00206054, 0, 0xffffffff, 'x', "UART1 Transmitter Register 5" },
+{ "UTX6D_1", 0x00206058, 0, 0xffffffff, 'x', "UART1 Transmitter Register 6" },
+{ "UTX7D_1", 0x0020605C, 0, 0xffffffff, 'x', "UART1 Transmitter Register 7" },
+{ "UTX8D_1", 0x00206060, 0, 0xffffffff, 'x', "UART1 Transmitter Register 8" },
+{ "UTX9D_1", 0x00206064, 0, 0xffffffff, 'x', "UART1 Transmitter Register 9" },
+{ "UTX10D_1", 0x00206068, 0, 0xffffffff, 'x', "UART1 Transmitter Register 10" },
+{ "UTX11D_1", 0x0020606C, 0, 0xffffffff, 'x', "UART1 Transmitter Register 11" },
+{ "UTX12D_1", 0x00206070, 0, 0xffffffff, 'x', "UART1 Transmitter Register 12" },
+{ "UTX13D_1", 0x00206074, 0, 0xffffffff, 'x', "UART1 Transmitter Register 13" },
+{ "UTX14D_1", 0x00206078, 0, 0xffffffff, 'x', "UART1 Transmitter Register 14" },
+{ "UTX15D_1", 0x0020607C, 0, 0xffffffff, 'x', "UART1 Transmitter Register 15" },
+{ "UCR1_1", 0x00206080, 0, 0xffffffff, 'x', "UART1 Control Register 1" },
+{ "UCR2_1", 0x00206084, 0, 0xffffffff, 'x', "UART1 Control Register 2" },
+{ "UCR3_1", 0x00206088, 0, 0xffffffff, 'x', "UART1 Control Register 3" },
+{ "UCR4_1", 0x0020608C, 0, 0xffffffff, 'x', "UART1 Control Register 4" },
+{ "UFCR_1", 0x00206090, 0, 0xffffffff, 'x', "UART1 FIFO Control Register" },
+{ "USR1_1", 0x00206094, 0, 0xffffffff, 'x', "UART1 Status Register 1" },
+{ "USR2_1", 0x00206098, 0, 0xffffffff, 'x', "UART1 Status Register 2" },
+{ "UESC_1", 0x0020609C, 0, 0xffffffff, 'x', "UART1 Escape Character Register" },
+{ "UTIM_1", 0x002060A0, 0, 0xffffffff, 'x', "UART1 Escape Timer Register" },
+{ "UBIR_1", 0x002060A4, 0, 0xffffffff, 'x', "UART1 BRM Incremental Register" },
+{ "UBMR_1", 0x002060A8, 0, 0xffffffff, 'x', "UART1 BRM Modulator Register" },
+{ "UBRC_1", 0x002060AC, 0, 0xffffffff, 'x', "UART1 Baud Rate Count Register" },
+{ "BIPR1_1", 0x002060B0, 0, 0xffffffff, 'x', "UART1 BRM Incremental Preset Register 1" },
+{ "BIPR2_1", 0x002060B4, 0, 0xffffffff, 'x', "UART1 BRM Incremental Preset Register 2" },
+{ "BIPR3_1", 0x002060B8, 0, 0xffffffff, 'x', "UART1 BRM Incremental Preset Register 3" },
+{ "BIPR4_1", 0x002060BC, 0, 0xffffffff, 'x', "UART1 BRM Incremental Preset Register 4" },
+{ "BMPR1_1", 0x002060C0, 0, 0xffffffff, 'x', "UART1 BRM Modulator Preset Register 1" },
+{ "BMPR2_1", 0x002060C4, 0, 0xffffffff, 'x', "UART1 BRM Modulator Preset Register 2" },
+{ "BMPR3_1", 0x002060C8, 0, 0xffffffff, 'x', "UART1 BRM Modulator Preset Register 3" },
+{ "BMPR4_1", 0x002060CC, 0, 0xffffffff, 'x', "UART1 BRM Modulator Preset Register 4" },
+{ "UTS_1", 0x002060D0, 0, 0xffffffff, 'x', "UART1 Test Register 1" },
+// UART 2
{ "URX11D_2", 0x0020702C, 0, 0xffffffff, 'x', "UART2 Receiver Register 11" },
{ "URX12D_2", 0x00207030, 0, 0xffffffff, 'x', "UART2 Receiver Register 12" },
{ "URX13D_2", 0x00207034, 0, 0xffffffff, 'x', "UART2 Receiver Register 13" },
{ "URX14D_2", 0x00207038, 0, 0xffffffff, 'x', "UART2 Receiver Register 14" },
{ "URX15D_2", 0x0020703C, 0, 0xffffffff, 'x', "UART2 Receiver Register 15" },
-{ "UTX0D_2", 0X00207040, 0, 0xffffffff, 'x', "UART2 Transmitter Register 0" },
-{ "UTX1D_2", 0X00207044, 0, 0xffffffff, 'x', "UART2 Transmitter Register 1" },
-{ "UTX2D_2", 0X00207048, 0, 0xffffffff, 'x', "UART2 Transmitter Register 2" },
-{ "UTX3D_2", 0X0020704C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 3" },
-{ "UTX4D_2", 0X00207050, 0, 0xffffffff, 'x', "UART2 Transmitter Register 4" },
-{ "UTX5D_2", 0X00207054, 0, 0xffffffff, 'x', "UART2 Transmitter Register 5" },
-{ "UTX6D_2", 0X00207058, 0, 0xffffffff, 'x', "UART2 Transmitter Register 6" },
-{ "UTX7D_2", 0X0020705C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 7" },
-{ "UTX8D_2", 0X00207060, 0, 0xffffffff, 'x', "UART2 Transmitter Register 8" },
-{ "UTX9D_2", 0X00207064, 0, 0xffffffff, 'x', "UART2 Transmitter Register 9" },
-{ "UTX10D_2", 0X00207068, 0, 0xffffffff, 'x', "UART2 Transmitter Register 10" },
-{ "UTX11D_2", 0X0020706C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 11" },
-{ "UTX12D_2", 0X00207070, 0, 0xffffffff, 'x', "UART2 Transmitter Register 12" },
-{ "UTX13D_2", 0X00207074, 0, 0xffffffff, 'x', "UART2 Transmitter Register 13" },
-{ "UTX14D_2", 0X00207078, 0, 0xffffffff, 'x', "UART2 Transmitter Register 14" },
-{ "UTX15D_2", 0X0020707C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 15" },
+{ "UTX0D_2", 0x00207040, 0, 0xffffffff, 'x', "UART2 Transmitter Register 0" },
+{ "UTX1D_2", 0x00207044, 0, 0xffffffff, 'x', "UART2 Transmitter Register 1" },
+{ "UTX2D_2", 0x00207048, 0, 0xffffffff, 'x', "UART2 Transmitter Register 2" },
+{ "UTX3D_2", 0x0020704C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 3" },
+{ "UTX4D_2", 0x00207050, 0, 0xffffffff, 'x', "UART2 Transmitter Register 4" },
+{ "UTX5D_2", 0x00207054, 0, 0xffffffff, 'x', "UART2 Transmitter Register 5" },
+{ "UTX6D_2", 0x00207058, 0, 0xffffffff, 'x', "UART2 Transmitter Register 6" },
+{ "UTX7D_2", 0x0020705C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 7" },
+{ "UTX8D_2", 0x00207060, 0, 0xffffffff, 'x', "UART2 Transmitter Register 8" },
+{ "UTX9D_2", 0x00207064, 0, 0xffffffff, 'x', "UART2 Transmitter Register 9" },
+{ "UTX10D_2", 0x00207068, 0, 0xffffffff, 'x', "UART2 Transmitter Register 10" },
+{ "UTX11D_2", 0x0020706C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 11" },
+{ "UTX12D_2", 0x00207070, 0, 0xffffffff, 'x', "UART2 Transmitter Register 12" },
+{ "UTX13D_2", 0x00207074, 0, 0xffffffff, 'x', "UART2 Transmitter Register 13" },
+{ "UTX14D_2", 0x00207078, 0, 0xffffffff, 'x', "UART2 Transmitter Register 14" },
+{ "UTX15D_2", 0x0020707C, 0, 0xffffffff, 'x', "UART2 Transmitter Register 15" },
{ "UCR1_2", 0x00207080, 0, 0xffffffff, 'x', "UART2 Control Register 1" },
{ "UCR2_2", 0x00207084, 0, 0xffffffff, 'x', "UART2 Control Register 2" },
{ "UCR3_2", 0x00207088, 0, 0xffffffff, 'x', "UART2 Control Register 3" },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-10-27 12:19:08
|
Revision: 900
http://armadeus.svn.sourceforge.net/armadeus/?rev=900&view=rev
Author: jorasse
Date: 2008-10-27 12:18:46 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
[U-BOOT] Fixed software examples loading address issues
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/u-boot/130-u-boot-1.3.4-apf9328-example.patch
Modified: trunk/buildroot/target/device/armadeus/u-boot/130-u-boot-1.3.4-apf9328-example.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/130-u-boot-1.3.4-apf9328-example.patch 2008-10-22 07:14:24 UTC (rev 899)
+++ trunk/buildroot/target/device/armadeus/u-boot/130-u-boot-1.3.4-apf9328-example.patch 2008-10-27 12:18:46 UTC (rev 900)
@@ -1,7 +1,15 @@
-diff -purN u-boot-1.3.4.ref/examples/Makefile u-boot-1.3.4/examples/Makefile
---- u-boot-1.3.4.ref/examples/Makefile 2008-08-12 16:08:38.000000000 +0200
-+++ u-boot-1.3.4/examples/Makefile 2008-09-13 16:30:08.000000000 +0200
-@@ -78,6 +78,7 @@ include $(TOPDIR)/config.mk
+--- u-boot-1.3.4/examples/Makefile 2008-08-12 16:08:38.000000000 +0200
++++ u-boot-1.3.4.new/examples/Makefile 2008-10-27 10:04:43.000000000 +0100
+@@ -32,6 +32,8 @@ endif
+ ifeq ($(ARCH),arm)
+ ifeq ($(BOARD),omap2420h4)
+ LOAD_ADDR = 0x80300000
++else ifeq ($(SOC),imx)
++LOAD_ADDR = 0x08000000
+ else
+ LOAD_ADDR = 0xc100000
+ endif
+@@ -78,6 +80,7 @@ include $(TOPDIR)/config.mk
ELF = hello_world
SREC = hello_world.srec
BIN = hello_world.bin
@@ -9,7 +17,7 @@
ifeq ($(CPU),mpc8xx)
ELF += test_burst
-@@ -180,6 +181,9 @@ $(BIN):
+@@ -180,6 +183,9 @@ $(BIN):
$(obj)%.bin: $(obj)%
$(OBJCOPY) -O binary $< $@ 2>/dev/null
@@ -19,9 +27,8 @@
#########################################################################
# defines $(obj).depend target
-diff -purN u-boot-1.3.4.ref/examples/testcmds.txt u-boot-1.3.4/examples/testcmds.txt
---- u-boot-1.3.4.ref/examples/testcmds.txt 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.3.4/examples/testcmds.txt 2008-09-13 16:30:08.000000000 +0200
+--- u-boot-1.3.4/examples/testcmds.txt 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-1.3.4.new/examples/testcmds.txt 2008-10-27 09:35:47.000000000 +0100
@@ -0,0 +1,17 @@
+setenv load_addr 08020000
+setenv test_script 'tftp $load_addr /tftpboot/u-boot/examples/testcmds.img; auto $load_addr'
@@ -40,9 +47,8 @@
+setenv load_addr 08000000
+saveenv
+run run_test
-diff -purN u-boot-1.3.4.ref/examples/tftploadscripts.txt u-boot-1.3.4/examples/tftploadscripts.txt
---- u-boot-1.3.4.ref/examples/tftploadscripts.txt 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.3.4/examples/tftploadscripts.txt 2008-09-13 16:30:08.000000000 +0200
+--- u-boot-1.3.4/examples/tftploadscripts.txt 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-1.3.4.new/examples/tftploadscripts.txt 2008-10-27 09:35:47.000000000 +0100
@@ -0,0 +1,27 @@
+setenv load_addr 08000000
+setenv tftp_script 'tftp $load_addr /tftpboot/u-boot/examples/tftploadscripts.img; auto $load_addr'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-22 07:14:37
|
Revision: 899
http://armadeus.svn.sourceforge.net/armadeus/?rev=899&view=rev
Author: artemys
Date: 2008-10-22 07:14:24 +0000 (Wed, 22 Oct 2008)
Log Message:
-----------
[BUILDROOT] Add patch to allow madplay to compile for ALSA output
Added Paths:
-----------
trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
Added: trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
===================================================================
--- trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff (rev 0)
+++ trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff 2008-10-22 07:14:24 UTC (rev 899)
@@ -0,0 +1,116 @@
+Now this patch is needed for madplay to compile when ALSA is configured with
+ --with-versioned=no option.
+madplay is compiling but still crashes when used... :-(
+
+Index: package/madplay/madplay-audio-alsa.patch
+===================================================================
+--- buildroot.org/package/madplay/madplay-audio-alsa.patch (revision 0)
++++ buildroot/package/madplay/madplay-audio-alsa.patch (revision 0)
+@@ -0,0 +1,107 @@
++--- madplay-0.15.2b/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
+++++ madplay-0.15.2b-new/audio_alsa.c 2007-12-02 16:40:38.000000000 +0100
++@@ -28,31 +28,28 @@
++
++ #include <errno.h>
++
++-#define ALSA_PCM_OLD_HW_PARAMS_API
++-#define ALSA_PCM_OLD_SW_PARAMS_API
++ #include <alsa/asoundlib.h>
++
++ #include <mad.h>
++
++ #include "audio.h"
++
++-char *buf = NULL;
++-int paused = 0;
+++unsigned char *buf = NULL;
+++int paused = 0;
++
++-int rate = -1;
++-int channels = -1;
++-int bitdepth = -1;
++-int sample_size = -1;
++-
++-int buffer_time = 500000;
++-int period_time = 100000;
++-char *defaultdev = "plughw:0,0";
+++unsigned int rate = 0;
+++unsigned int channels = -1;
+++unsigned int bitdepth = -1;
+++unsigned int sample_size = -1;
+++
+++unsigned int buffer_time = 500000;
+++unsigned int period_time = 100000;
+++char *defaultdev = "plughw:0,0";
++
++ snd_pcm_hw_params_t *alsa_hwparams;
++ snd_pcm_sw_params_t *alsa_swparams;
++
++-snd_pcm_sframes_t buffer_size;
++-snd_pcm_sframes_t period_size;
+++snd_pcm_uframes_t buffer_size;
++
++ snd_pcm_format_t alsa_format = -1;
++ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
++@@ -87,29 +84,28 @@
++ return err;
++ }
++ /* set the stream rate */
++- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
+++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
++ if (err < 0) {
++ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
++ return err;
++ }
++- if (err != rate) {
++- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
++- return -EINVAL;
++- }
++ /* set buffer time */
++- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
+++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, &dir);
++ if (err < 0) {
++ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
++ return err;
++ }
++- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
+++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* set period time */
++- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
+++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, &dir);
++ if (err < 0) {
++ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
++ return err;
++ }
++- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
++ /* write the parameters to device */
++ err = snd_pcm_hw_params(handle, params);
++ if (err < 0) {
++@@ -136,13 +132,7 @@
++ if (err < 0) {
++ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
++ return err;
++- }
++- /* allow transfer when at least period_size samples can be processed */
++- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
++- if (err < 0) {
++- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
++- return err;
++- }
+++ }
++ /* align all transfers to 1 samples */
++ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
++ if (err < 0) {
++@@ -279,7 +269,7 @@
++ int play(struct audio_play *play)
++ {
++ int err, len;
++- char *ptr;
+++ unsigned char *ptr;
++
++ ptr = buf;
++ len = play->nsamples;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-21 16:18:21
|
Revision: 898
http://armadeus.svn.sourceforge.net/armadeus/?rev=898&view=rev
Author: artemys
Date: 2008-10-21 16:16:42 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
[BUILD] remove timestamp in automatically generated patches
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-imxfb-improvements.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/090-alsa-create-imx-alsa_h.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/091-alsa-add-imx-ssi-tsc2102-driver.diff
trunk/target/linux/generate_patch.sh
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-imxfb-improvements.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-imxfb-improvements.diff 2008-10-21 16:01:24 UTC (rev 897)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/013-imxfb-improvements.diff 2008-10-21 16:16:42 UTC (rev 898)
@@ -1,8 +1,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/drivers/video/imxfb.c 2007-10-12 18:43:44.000000000 +0200
-+++ linux-2.6.23.1.mod/drivers/video/imxfb.c 2008-07-28 16:58:52.000000000 +0200
+--- linux-2.6.23.1.original/drivers/video/imxfb.c
++++ linux-2.6.23.1.mod/drivers/video/imxfb.c
@@ -42,22 +42,48 @@
*/
#define DEBUG_VAR 1
@@ -231,8 +231,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/drivers/video/imxfb.h 2007-10-12 18:43:44.000000000 +0200
-+++ linux-2.6.23.1.mod/drivers/video/imxfb.h 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.23.1.original/drivers/video/imxfb.h
++++ linux-2.6.23.1.mod/drivers/video/imxfb.h
@@ -1,73 +0,0 @@
-/*
- * linux/drivers/video/imxfb.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-10-21 16:01:24 UTC (rev 897)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-10-21 16:16:42 UTC (rev 898)
@@ -1,8 +1,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-10-16 12:15:26.000000000 +0200
+--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328.c
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c
@@ -0,0 +1,558 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -565,8 +565,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328_lcd_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-10-16 12:04:16.000000000 +0200
+--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328_lcd_config.h
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h
@@ -0,0 +1,200 @@
+/*
+ *
@@ -771,8 +771,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/include/asm-arm/arch-imx/apf9328.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-10-16 12:04:16.000000000 +0200
+--- linux-2.6.23.1.original/include/asm-arm/arch-imx/apf9328.h
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h
@@ -0,0 +1,58 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/090-alsa-create-imx-alsa_h.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/090-alsa-create-imx-alsa_h.diff 2008-10-21 16:01:24 UTC (rev 897)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/090-alsa-create-imx-alsa_h.diff 2008-10-21 16:16:42 UTC (rev 898)
@@ -1,8 +1,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/include/asm-arm/arch-imx/imx-alsa.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/imx-alsa.h 2008-07-22 10:33:24.000000000 +0200
+--- linux-2.6.23.1.original/include/asm-arm/arch-imx/imx-alsa.h
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/imx-alsa.h
@@ -0,0 +1,131 @@
+/*
+ * linux/include/asm-arm/arch-imx/imx-alsa.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/091-alsa-add-imx-ssi-tsc2102-driver.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/091-alsa-add-imx-ssi-tsc2102-driver.diff 2008-10-21 16:01:24 UTC (rev 897)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/091-alsa-add-imx-ssi-tsc2102-driver.diff 2008-10-21 16:16:42 UTC (rev 898)
@@ -1,8 +1,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/sound/arm/imx-alsa.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/sound/arm/imx-alsa.c 2008-07-22 10:33:25.000000000 +0200
+--- linux-2.6.23.1.original/sound/arm/imx-alsa.c
++++ linux-2.6.23.1.mod/sound/arm/imx-alsa.c
@@ -0,0 +1,683 @@
+/*
+ * sound/arm/imx-alsa.c
@@ -690,8 +690,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/sound/arm/imx-alsa-dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/sound/arm/imx-alsa-dma.h 2008-07-22 10:33:25.000000000 +0200
+--- linux-2.6.23.1.original/sound/arm/imx-alsa-dma.h
++++ linux-2.6.23.1.mod/sound/arm/imx-alsa-dma.h
@@ -0,0 +1,50 @@
+/*
+ * linux/sound/arm/imx/imx-alsa-dma.h
@@ -746,8 +746,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102.c 2008-07-22 10:33:25.000000000 +0200
+--- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102.c
++++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102.c
@@ -0,0 +1,345 @@
+/*
+ * sound/arm/imx-alsa-tsc2102.c
@@ -1097,8 +1097,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102.h 2008-07-22 10:33:25.000000000 +0200
+--- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102.h
++++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102.h
@@ -0,0 +1,46 @@
+/*
+ * sound/arm/imx-alsa-tsc2102.h
@@ -1149,8 +1149,8 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102-mixer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102-mixer.c 2008-07-22 10:33:25.000000000 +0200
+--- linux-2.6.23.1.original/sound/arm/imx-alsa-tsc2102-mixer.c
++++ linux-2.6.23.1.mod/sound/arm/imx-alsa-tsc2102-mixer.c
@@ -0,0 +1,288 @@
+/*
+ * sound/arm/imx-alsa-tsc2102-mixer.c
Modified: trunk/target/linux/generate_patch.sh
===================================================================
--- trunk/target/linux/generate_patch.sh 2008-10-21 16:01:24 UTC (rev 897)
+++ trunk/target/linux/generate_patch.sh 2008-10-21 16:16:42 UTC (rev 898)
@@ -15,5 +15,5 @@
echo "DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST" >> $3
echo "(Take a look at armadeus/target/linux/ directory to know how to generate it)" >> $3
-diff -urN $1 $2 >> $3
+diff -urN $1 $2 | sed "s/[0-9]\+-[0-9]\+-[0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+.[0-9]\+ +[0-9]\+//g" >> $3
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-21 16:01:36
|
Revision: 897
http://armadeus.svn.sourceforge.net/armadeus/?rev=897&view=rev
Author: artemys
Date: 2008-10-21 16:01:24 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
[LINUX] Allows fpgaregs to be compiled directly from its directory
Modified Paths:
--------------
trunk/target/linux/debug/fpgaregs/Makefile
Modified: trunk/target/linux/debug/fpgaregs/Makefile
===================================================================
--- trunk/target/linux/debug/fpgaregs/Makefile 2008-10-20 17:18:46 UTC (rev 896)
+++ trunk/target/linux/debug/fpgaregs/Makefile 2008-10-21 16:01:24 UTC (rev 897)
@@ -1,4 +1,4 @@
-CC=../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc
+CC=../../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc
all: fpgaregs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-10-20 17:18:51
|
Revision: 896
http://armadeus.svn.sourceforge.net/armadeus/?rev=896&view=rev
Author: artemys
Date: 2008-10-20 17:18:46 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
[BUILDROOT] corrects aplay: set_params:1012: unable to install sw params BUG
Added Paths:
-----------
trunk/patches/046-buildroot-alsa-lib-no_version.diff
Added: trunk/patches/046-buildroot-alsa-lib-no_version.diff
===================================================================
--- trunk/patches/046-buildroot-alsa-lib-no_version.diff (rev 0)
+++ trunk/patches/046-buildroot-alsa-lib-no_version.diff 2008-10-20 17:18:46 UTC (rev 896)
@@ -0,0 +1,12 @@
+This patch corrects "aplay: set_params:1012: unable to install sw params:" bug.
+
+--- buildroot.org/package/alsa-lib/alsa-lib.mk 2007-10-27 09:15:22.000000000 +0200
++++ buildroot/package/alsa-lib/alsa-lib.mk 2008-10-20 18:54:41.000000000 +0200
+@@ -31,6 +31,7 @@
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
++ --with-versioned=no \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --enable-static \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-17 16:52:27
|
Revision: 895
http://armadeus.svn.sourceforge.net/armadeus/?rev=895&view=rev
Author: FabM
Date: 2008-10-17 16:52:24 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
[DRIVER][FPGA] Unit test driver for i2c_ocores IP
Modified Paths:
--------------
trunk/target/linux/modules/fpga/others/i2ctest/README
trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.c
trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.h
Modified: trunk/target/linux/modules/fpga/others/i2ctest/README
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/README 2008-10-16 11:38:03 UTC (rev 894)
+++ trunk/target/linux/modules/fpga/others/i2ctest/README 2008-10-17 16:52:24 UTC (rev 895)
@@ -1,6 +1,9 @@
This is a really simple driver to test reading and writing
-a value on i2c bus throught ocore-irq_mng FPGA IP.
+a value on i2c memory component throught ocore-irq_mng FPGA IP.
+Frames are like :
+START+ADDR+ACK+SUBADDR+ACK+REPSTART+ADDR+ACK+VALUE+ACK+STOP
+
To use it load i2ctest.ko module with insmod
>insmod i2ctest.ko
Modified: trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.c
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.c 2008-10-16 11:38:03 UTC (rev 894)
+++ trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.c 2008-10-17 16:52:24 UTC (rev 895)
@@ -23,203 +23,230 @@
#include "i2ctest.h"
-#define VALUE 0xbb
-#define ADDR 0x1D
-#define SUBADDR 0x16
-
-
/***************************
* interrupt management
* *************************/
static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
- static int count = 0;
- u16 data;
+ static int count = 0;
+ u16 data;
- /**************/
- /* write 0xbb */
- /**************/
- if(count == 0){
- /*read RxACK bit from Status Register, should be 0 */
- ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- /* write to Transmit sub address, set WR bit acknowledge interrupt*/
- iowrite16(SUBADDR<<8|I2C_WR|I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count++;
- }else if(count == 1){
- ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- /* write to Transmit sub address, set WR bit acknowledge interrupt*/
- iowrite16(VALUE<<8|I2C_STO|I2C_WR|I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count ++;
- }else if(count == 2){
- ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- iowrite16(0x0000|I2C_IACK|I2C_STO,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count++;
+ /***************/
+ /* write VALUE */
+ /***************/
+ if(count == 0){
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+ /* write to Transmit sub address, set WR bit acknowledge interrupt*/
+ iowrite16(SUBADDR,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
+ iowrite16(I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
- /***********************/
- /* read the same value */
- /***********************/
- }else if(count == 3){
- /*read RxACK bit from Status Register, should be 0 */
- ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- /* write 0x2C to Transmit sub address, set WR bit acknowledge interrupt*/
- iowrite16(SUBADDR<<8|I2C_WR|I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count++;
- }else if(count == 4){
- ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- /* write adress on TXR and CTR register repeated start, acknowledge interrupt*/
- iowrite16(ADDR<<9|I2C_ADD_READ|I2C_STA|I2C_WR|I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count++;
- }else if(count == 5){
- /* write on TXR and CTR register, set read bit,acknowledge interrupt*/
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+ }else if(count == 1){
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+
+ /* write to Transmit sub address, set WR bit acknowledge interrupt*/
+ iowrite16(ADDR<<1|I2C_ADD_WRITE,i2cdev->fpga_virtual_base_address+FPGA_I2C_TXR);
+ iowrite16(I2C_STA|I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count ++;
+ }else if(count == 2){
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+ /* write VALUE, set WR bit acknowledge interrupt*/
+ iowrite16(VALUE,i2cdev->fpga_virtual_base_address+FPGA_I2C_TXR);
+ iowrite16(I2C_IACK|I2C_WR|I2C_STO,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+ }else if(count == 3){
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+ /* acknowledge interruption */
+ iowrite16(I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+
+ }else if(count == 4){/**************READ THE VALUE ****************/
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+
+ /* write 0x2C to Transmit sub address, set WR bit acknowledge interrupt*/
+ iowrite16(SUBADDR,i2cdev->fpga_virtual_base_address+FPGA_I2C_TXR);
+ iowrite16(I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+ }else if(count == 5){
+ /*read RxACK bit from Status Register, should be 0 */
+ ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+ /* write adress on TXR and CTR register repeated start, acknowledge interrupt*/
+ iowrite16(ADDR<<1|I2C_ADD_READ,i2cdev->fpga_virtual_base_address+FPGA_I2C_TXR);
+ iowrite16(I2C_STA|I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+ }else if(count == 6){
+ /* write on TXR and CTR register, set read bit,acknowledge interrupt*/
iowrite16(I2C_RD|I2C_ACK|I2C_IACK|I2C_STO,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- count++;
- }else if(count == 6){
- data = ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXT_SR);
- /* write on TXR and CTR register, set read bit,acknowledge interrupt*/
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ count++;
+ }else if(count == 7){
+ /*read RxACK bit from Status Register, should be 0 */
+ data = ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
+ /* read the value */
+ data = ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_RXR);
+ /* write on TXR and CTR register, set read bit,acknowledge interrupt*/
iowrite16(I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
- /* acknowledge irq in irq manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ /* acknowledge irq in irq manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- printk(KERN_INFO "read %04x\n",data);
- count++;
- }
- return IRQ_HANDLED;
+ printk(KERN_INFO "read %04x\n",data);
+ count++;
+ }
+ return IRQ_HANDLED;
}
/****************************
* read proc
* **************************/
-static int read_proc(char *page,char **start,off_t offset,int count,int *eof,void *data){
- /* if(down_interruptible(&i2cdev->sem))
- return -ERESTARTSYS;*/
+static int read_proc(char *page,char **start,off_t offset,
+ int count,int *eof,void *data)
+{
+ PDEBUG("Trying to write %04x on i2c slave\n",VALUE);
- PDEBUG("Trying to write %04x on i2c slave\n",VALUE);
-
- /* unmask interrupt for i2c in interrupt manager*/
- iowrite16(0x0002,i2cdev->fpga_virtual_base_address + FPGA_IRQ_MASK);
- /* set prescale for 400kHz*/
- iowrite16(0x00BF,i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESC);
- PDEBUG("Write %04x at %04x\n",0x00BF,FPGA_I2C_PRESC);
- /* set core enable and interrupt enable*/
- iowrite16(I2C_EN|I2C_IEN,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_CTR);
- PDEBUG("Write %04x at %04x\n",I2C_EN|I2C_IEN,FPGA_I2C_CTR);
- /* write slave adresse on TXR and CTR register*/
- iowrite16(ADDR<<9|I2C_STA|I2C_WR|I2C_IACK,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
+ /* unmask interrupt for i2c in interrupt manager*/
+ iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_MASK);
- PDEBUG("Write %04x at %04x\n",ADDR<<9|I2C_ADD_WRITE|I2C_STA|I2C_WR,FPGA_I2C_TXR_CR);
+ /* set prescale */
+ iowrite16(PRELo,i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCLo);
+ PDEBUG("Write %04x at %04x\n",PRELo,FPGA_I2C_PRESCLo);
+ iowrite16(PREHi,i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCHi);
+ PDEBUG("Write %04x at %04x\n",PRELo,FPGA_I2C_PRESCHi);
- /* PDEBUG("Wrote ?\n");*/
-
-/* up(&i2cdev->sem);*/
- return 0;
+ /* set core enable and interrupt enable*/
+ iowrite16(I2C_EN|I2C_IEN,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CTR);
+ PDEBUG("Write %04x at %04x\n",I2C_EN|I2C_IEN,FPGA_I2C_CTR);
+
+ /* write slave adresse on TXR */
+ iowrite16(ADDR<<1|I2C_ADD_WRITE,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
+ /* and CTR register*/
+ iowrite16(I2C_STA|I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address+FPGA_I2C_CR);
+ PDEBUG("Write %04x at %04x\n",I2C_STA|I2C_WR,FPGA_I2C_TXR);
+
+ return 0;
}
-static int read_proc2(char *page,char **start,off_t offset,int count,int *eof,void *data){
+static int read_proc2(char *page,char **start,off_t offset,int count,
+ int *eof,void *data)
+{
+ PDEBUG("Trying to read on i2c slave\n");
- PDEBUG("Trying to read on i2c slave\n");
-
- /* write slave adresse on TXR and CTR register*/
- iowrite16(ADDR<<9|I2C_ADD_WRITE|I2C_STA|I2C_WR|I2C_IACK,
- i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR_CR);
- return 0;
+ /* write slave adresse on TXR*/
+ iowrite16(ADDR<<1|I2C_ADD_WRITE,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
+ /* write ctr register*/
+ iowrite16(I2C_ADD_WRITE|I2C_STA|I2C_WR|I2C_IACK,
+ i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
+ return 0;
}
/****************************
-* Module management
-* **************************/
+ * Module management
+ * **************************/
static int __init i2ctest_init(void){
- int result;
- u16 data;
- result = 0;
+ int result;
+ u16 data;
+ result = 0;
- mem = NULL;
+ mem = NULL;
- /* Allocate a private structure and reference it as driver's data */
- PDEBUG("Allocate a private structure and reference it as driver s data\n");
- i2cdev = (struct i2ctest_dev *)kmalloc(sizeof(struct i2ctest_dev),GFP_KERNEL);
- if(i2cdev == NULL){
- printk(KERN_WARNING "I2CDEV: unable to allocate private structure\n");
- return -ENOMEM;
- }
+ /* Allocate a private structure and reference it as driver's data */
+ PDEBUG("Allocate a private structure and reference it as driver s data\n");
+ i2cdev = (struct i2ctest_dev *)kmalloc(sizeof(struct i2ctest_dev),GFP_KERNEL);
+ if(i2cdev == NULL){
+ printk(KERN_WARNING "I2CDEV: unable to allocate private structure\n");
+ return -ENOMEM;
+ }
- /* Requested I/O memory */
- if((i2cdev->fpga_virtual_base_address = ioremap(IMX_CS1_PHYS,IMX_CS1_SIZE))==NULL){
- printk(KERN_ERR "ioremap error\n");
- goto error;
- }
+ /* Requested I/O memory */
+ if((i2cdev->fpga_virtual_base_address = ioremap(IMX_CS1_PHYS,IMX_CS1_SIZE))==NULL){
+ printk(KERN_ERR "ioremap error\n");
+ goto error;
+ }
- /* irq registering */
- if(request_irq(IRQ_GPIOA(1),(irq_handler_t)fpga_interrupt,IRQF_SHARED,"fpga",i2cdev)<0){
- printk(KERN_ERR "Can't request fpga irq\n");
- goto error;
- }
- //ioread16(i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
- /* irq ack */
- data=1;
- if((result=iowrite16(data,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK))<0)
- goto error;
+ /* irq registering */
+ if(request_irq(IRQ_GPIOA(1),(irq_handler_t)fpga_interrupt,IRQF_SHARED,"fpga",i2cdev)<0){
+ printk(KERN_ERR "Can't request fpga irq\n");
+ goto error;
+ }
+ //ioread16(i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
+ /* irq ack */
+ data=IRQ;
+ if((result=iowrite16(data,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK))<0)
+ goto error;
- /* create proc entry */
- create_proc_read_entry("i2c_test",0 /* default mode */,
- NULL /* parent dir */, read_proc,
- NULL /* client data */);
+ /* create proc entry */
+ create_proc_read_entry("i2c_test",0 /* default mode */,
+ NULL /* parent dir */, read_proc,
+ NULL /* client data */);
- /* create proc entry */
- create_proc_read_entry("i2c_test2",0 /* default mode */,
- NULL /* parent dir */, read_proc2,
- NULL /* client data */);
+ /* create proc entry */
+ create_proc_read_entry("i2c_test2",0 /* default mode */,
+ NULL /* parent dir */, read_proc2,
+ NULL /* client data */);
- /* OK module inserted ! */
- printk(KERN_INFO "i2ctest module insered\n");
- return 0;
+ /* OK module inserted ! */
+ printk(KERN_INFO "i2ctest module insered\n");
+ return 0;
error:
- printk(KERN_ERR "%s: not inserted\n",DRIVER_NAME);
- free_all();
- return result;
+ printk(KERN_ERR "%s: not inserted\n",DRIVER_NAME);
+ free_all();
+ return result;
}
static void __exit i2ctest_exit(void){
- free_all();
+ free_all();
}
static void free_all(void){
-
- /* free irq*/
- free_irq(IRQ_GPIOA(1),i2cdev);
- /* Free the allocated memory */
- kfree(i2cdev);
+ /* free irq*/
+ free_irq(IRQ_GPIOA(1),i2cdev);
- /* remove proc entry */
- remove_proc_entry("i2c_test",0);
+ /* Free the allocated memory */
+ kfree(i2cdev);
- printk(KERN_INFO "i2ctest module deleted\n");
+ /* remove proc entry */
+ remove_proc_entry("i2c_test",0);
+
+ printk(KERN_INFO "i2ctest module deleted\n");
}
Modified: trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.h
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.h 2008-10-16 11:38:03 UTC (rev 894)
+++ trunk/target/linux/modules/fpga/others/i2ctest/i2ctest.h 2008-10-17 16:52:24 UTC (rev 895)
@@ -73,38 +73,51 @@
# define PDEBUG(fmt,args...) /* no debbuging message */
#endif
-#define FPGA_BUTTON 8
-#define FPGA_LED 4
-#define FPGA_IRQ_MASK 0
-#define FPGA_IRQ_PEND 2
-#define FPGA_IRQ_ACK 2
+/* Addresses */
+#define FPGA_IRQ_MASK (0x0)
+#define FPGA_IRQ_PEND (0x2)
+#define FPGA_IRQ_ACK (0x2)
-#define FPGA_I2C_PRESC 0x10
-#define FPGA_I2C_CTR 0x12
-#define FPGA_I2C_TXR_CR 0x14
-#define FPGA_I2C_RXT_SR 0x16
+#define FPGA_BASE_ADDR (0x20)
+#define FPGA_I2C_PRESCLo (FPGA_BASE_ADDR+0x0)
+#define FPGA_I2C_PRESCHi (FPGA_BASE_ADDR+0x2)
+#define FPGA_I2C_CTR (FPGA_BASE_ADDR+0x4)
+#define FPGA_I2C_TXR (FPGA_BASE_ADDR+0xA)
+#define FPGA_I2C_RXR (FPGA_BASE_ADDR+0xE)
+#define FPGA_I2C_CR (FPGA_BASE_ADDR+0x8)
+#define FPGA_I2C_SR (FPGA_BASE_ADDR+0xC)
+/* Values */
+#define PRELo (0xBF)
+#define PREHi (0x00)
+/* read/write (accelerometer)*/
+#define ADDR (0x1D) /* lis3lv02dl */
+#define SUBADDR (0x16) /* OFFSET_X */
+#define VALUE (0xBB)
+
+/* irq position in irqmngr */
+#define IRQ (0x01)
+
+
/* CTR register */
-#define I2C_EN 0x80
-#define I2C_IEN 0x40
+#define I2C_EN (0x80)
+#define I2C_IEN (0x40)
+
/* CR register */
-#define I2C_STA 0x80
-#define I2C_STO 0x40
-#define I2C_RD 0x20
-#define I2C_WR 0x10
-#define I2C_ACK 0x08
-#define I2C_IACK 0x01
+#define I2C_STA (0x80)
+#define I2C_STO (0x40)
+#define I2C_RD (0x20)
+#define I2C_WR (0x10)
+#define I2C_ACK (0x08)
+#define I2C_IACK (0x01)
-#define I2C_ADD_READ 0x0100
-#define I2C_ADD_WRITE 0
+/* read/write bit */
+#define I2C_ADD_READ (0x01)
+#define I2C_ADD_WRITE (0x00)
#define DRIVER_NAME "i2ctest"
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
-MODULE_DESCRIPTION("I2C tester");
-
struct i2ctest_dev {
struct semaphore sem;
void * fpga_virtual_base_address;
@@ -117,11 +130,19 @@
static int __init i2ctest_init(void);
static void __exit i2ctest_exit(void);
-static int read_proc(char *page,char **start,off_t offset,int count,int *eof,void *data);
-static int read_proc2(char *page,char **start,off_t offset,int count,int *eof,void *data);
+static int read_proc(char *page, char **start, off_t offset,
+ int count,int *eof,void *data);
+static int read_proc2(char *page,char **start,off_t offset,
+ int count,int *eof,void *data);
static void free_all(void);
-static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg);
-
+static irqreturn_t fpga_interrupt(int irq,void *stuff,
+ struct pt_regs *reg);
module_init(i2ctest_init);
module_exit(i2ctest_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
+MODULE_DESCRIPTION("I2C tester");
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-16 11:38:05
|
Revision: 894
http://armadeus.svn.sourceforge.net/armadeus/?rev=894&view=rev
Author: FabM
Date: 2008-10-16 11:38:03 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
[KERNEL]
Modified Paths:
--------------
trunk/target/linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/target/linux/include/asm-arm/arch-imx/apf9328.h
===================================================================
--- trunk/target/linux/include/asm-arm/arch-imx/apf9328.h 2008-10-16 10:24:16 UTC (rev 893)
+++ trunk/target/linux/include/asm-arm/arch-imx/apf9328.h 2008-10-16 11:38:03 UTC (rev 894)
@@ -45,6 +45,10 @@
// Usefull ?
// FPGA
+#define ARMADEUS_FPGA_BASE_ADDR_VIRT ( APF9328_FPGA_VIRT )
+#define ARMADEUS_FPGA_BASE_ADDR_PHYS ( APF9328_FPGA_PHYS )
+#define ARMADEUS_FPGA_IRQ ( APF9328_FPGA_IRQ )
+
#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
#define APF9328_FPGA_PHYS ( IMX_CS1_PHYS )
#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-16 10:24:18
|
Revision: 893
http://armadeus.svn.sourceforge.net/armadeus/?rev=893&view=rev
Author: FabM
Date: 2008-10-16 10:24:16 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
[KERNEL][FPGA] Adding address defines for fpga
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-10-16 10:21:04 UTC (rev 892)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-10-16 10:24:16 UTC (rev 893)
@@ -2,7 +2,7 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-09-17 18:28:30.000000000 +0200
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-10-16 12:15:26.000000000 +0200
@@ -0,0 +1,558 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -566,7 +566,7 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328_lcd_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-09-17 18:28:05.000000000 +0200
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-10-16 12:04:16.000000000 +0200
@@ -0,0 +1,200 @@
+/*
+ *
@@ -772,8 +772,8 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/include/asm-arm/arch-imx/apf9328.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-09-17 18:28:05.000000000 +0200
-@@ -0,0 +1,54 @@
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-10-16 12:04:16.000000000 +0200
+@@ -0,0 +1,58 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
+ *
@@ -821,6 +821,10 @@
+// Usefull ?
+
+// FPGA
++#define ARMADEUS_FPGA_BASE_ADDR_VIRT ( APF9328_FPGA_VIRT )
++#define ARMADEUS_FPGA_BASE_ADDR_PHYS ( APF9328_FPGA_PHYS )
++#define ARMADEUS_FPGA_IRQ ( APF9328_FPGA_IRQ )
++
+#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
+#define APF9328_FPGA_PHYS ( IMX_CS1_PHYS )
+#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-16 10:21:16
|
Revision: 892
http://armadeus.svn.sourceforge.net/armadeus/?rev=892&view=rev
Author: FabM
Date: 2008-10-16 10:21:04 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
[PATCH][MAKEFILE] Little bug correction
Modified Paths:
--------------
trunk/target/linux/Makefile
Modified: trunk/target/linux/Makefile
===================================================================
--- trunk/target/linux/Makefile 2008-10-13 07:25:51 UTC (rev 891)
+++ trunk/target/linux/Makefile 2008-10-16 10:21:04 UTC (rev 892)
@@ -1,6 +1,7 @@
#
# Get important variables from Buildroot:
#
+BASE_DIR=../
BUILDROOT_DIR=../../buildroot
include $(BUILDROOT_DIR)/.config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-13 07:25:59
|
Revision: 891
http://armadeus.svn.sourceforge.net/armadeus/?rev=891&view=rev
Author: FabM
Date: 2008-10-13 07:25:51 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
[FPGA][BRAMTest] Address shifted
Modified Paths:
--------------
trunk/firmware/BRAMTest/BRAMTest.vhdl
trunk/firmware/BRAMTest/BRAMTest_APF.ucf
trunk/firmware/BRAMTest/BRAMtest.ise
trunk/firmware/BRAMTest/bramtest_top.bin
Modified: trunk/firmware/BRAMTest/BRAMTest.vhdl
===================================================================
--- trunk/firmware/BRAMTest/BRAMTest.vhdl 2008-10-10 15:14:20 UTC (rev 890)
+++ trunk/firmware/BRAMTest/BRAMTest.vhdl 2008-10-13 07:25:51 UTC (rev 891)
@@ -26,131 +26,131 @@
use UNISIM.VComponents.all;
entity BRAMTest_Top is -- this is the top
- Port ( DataxD : inout std_logic_vector(15 downto 0);
- AddrxDI : in std_logic_vector(12 downto 0);
- CSxBI : in std_logic;
- WRxBI : in std_logic;
- RDxBI : in std_logic;
- ClkxCI : in std_logic
- --ResetxRB : in std_logic
- );
+ Port (
+ DataxD : inout std_logic_vector(15 downto 0);
+ AddrxDI : in std_logic_vector(12 downto 0);
+ CSxBI : in std_logic;
+ WRxBI : in std_logic;
+ RDxBI : in std_logic;
+ ClkxCI : in std_logic
+ --ResetxRB : in std_logic
+ );
end BRAMTest_Top;
architecture hierarchical of BRAMTest_Top is
-signal DataOutRAMxD : std_logic_vector(15 downto 0);
-signal CSBRAM : std_logic := '0';
-signal WRBRAM : std_logic := '0';
-signal CLKBRAM : std_logic := '0';
+ signal DataOutRAMxD : std_logic_vector(15 downto 0);
+ signal CSBRAM : std_logic := '0';
+ signal WRBRAM : std_logic := '0';
+ signal CLKBRAM : std_logic := '0';
begin
- -- RAMB16_S18: Virtex-II/II-Pro, Spartan-3 1k x 16 + 2 Parity bits Single-Port RAM
- -- Xilinx HDL Language Template version 6.3.1i
+ -- RAMB16_S18: Virtex-II/II-Pro, Spartan-3 1k x 16 + 2 Parity bits Single-Port RAM
+ -- Xilinx HDL Language Template version 6.3.1i
- RAMB16_S18_inst : RAMB16_S18
- generic map (
- INIT => X"00000", -- Value of output RAM registers at startup
- SRVAL => X"00000", -- Ouput value upon SSR assertion
- WRITE_MODE => "WRITE_FIRST", -- WRITE_FIRST, READ_FIRST or NO_CHANGE
- INIT_00 => X"1100001100000000000000000000000000000000000000000000000010010110",
- INIT_01 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_02 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_03 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_04 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_05 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_06 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_07 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_08 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_09 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0A => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0B => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0C => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0D => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0E => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_0F => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_10 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_11 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_12 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_13 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_14 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_15 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_16 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_17 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_18 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_19 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1A => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1B => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1C => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1D => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1E => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_1F => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_20 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_21 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_22 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_23 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_24 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_25 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_26 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_27 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_28 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_29 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2A => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2B => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2C => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2D => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2E => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_2F => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_30 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_31 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_32 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_33 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_34 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_35 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_36 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_37 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_38 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_39 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3A => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3B => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3C => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3D => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3E => X"0000000000000000000000000000000000000000000000000000000000000000",
- INIT_3F => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_00 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_01 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_02 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_03 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_04 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_05 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_06 => X"0000000000000000000000000000000000000000000000000000000000000000",
- INITP_07 => X"0000000000000000000000000000000000000000000000000000000000000000")
- port map (
- DO => DataOutRAMxD, -- 16-bit Data Output
- DOP => open, -- 2-bit parity Output
- ADDR => AddrxDI(9 downto 0), -- 10-bit Address Input
- CLK => CLKBRAM, -- Clock
- DI => DataxD, -- 16-bit Data Input
- DIP => "00", -- 2-bit parity Input
- EN => CSBRAM , -- RAM Enable Input
- SSR => '0', -- Synchronous Set/Reset Input
- WE => WRBRAM -- Write Enable Input
- );
+ RAMB16_S18_inst : RAMB16_S18
+ generic map (
+ INIT => X"00000", -- Value of output RAM registers at startup
+ SRVAL => X"00000", -- Ouput value upon SSR assertion
+ WRITE_MODE => "WRITE_FIRST", -- WRITE_FIRST, READ_FIRST or NO_CHANGE
+ INIT_00 => X"cacaacac000000000000000000000000000000000000000000000000acaccaca",
+ INIT_01 => X"cccc00000000000000000000000000000000000000000000000000000000aaaa",
+ INIT_02 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_03 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_04 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_05 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_06 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_07 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_08 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_09 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0A => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0B => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0C => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0D => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0E => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_0F => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_10 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_11 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_12 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_13 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_14 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_15 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_16 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_17 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_18 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_19 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1A => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1B => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1C => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1D => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1E => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_1F => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_20 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_21 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_22 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_23 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_24 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_25 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_26 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_27 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_28 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_29 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2A => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2B => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2C => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2D => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2E => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_2F => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_30 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_31 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_32 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_33 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_34 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_35 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_36 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_37 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_38 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_39 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3A => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3B => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3C => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3D => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3E => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INIT_3F => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_00 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_01 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_02 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_03 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_04 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_05 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_06 => X"0000000000000000000000000000000000000000000000000000000000000000",
+ INITP_07 => X"0000000000000000000000000000000000000000000000000000000000000000")
+ port map (
+ DO => DataOutRAMxD, -- 16-bit Data Output
+ DOP => open, -- 2-bit parity Output
+ ADDR => AddrxDI(10 downto 1), -- 10-bit Address Input
+ CLK => CLKBRAM, -- Clock
+ DI => DataxD, -- 16-bit Data Input
+ DIP => "00", -- 2-bit parity Input
+ EN => CSBRAM , -- RAM Enable Input
+ SSR => '0', -- Synchronous Set/Reset Input
+ WE => WRBRAM -- Write Enable Input
+ );
-
- OutputEnable: process (DataOutRAMxD, CSxBI, RDxBI)
- begin
+ OutputEnable: process (DataOutRAMxD, CSxBI, RDxBI)
+ begin
if (CSxBI = '0' and RDxBI = '0') then -- fix me
DataxD <= DataOutRAMxD;
else
DataxD <= (others => 'Z'); --
end if;
- end process OutputEnable;
+ end process OutputEnable;
CSBRAM <= not CSxBI;
WRBRAM <= not WRxBI;
CLKBRAM <= ClkxCI;
- -- End of RAMB16_S18_inst instantiation
+-- End of RAMB16_S18_inst instantiation
end hierarchical;
Modified: trunk/firmware/BRAMTest/BRAMTest_APF.ucf
===================================================================
--- trunk/firmware/BRAMTest/BRAMTest_APF.ucf 2008-10-10 15:14:20 UTC (rev 890)
+++ trunk/firmware/BRAMTest/BRAMTest_APF.ucf 2008-10-13 07:25:51 UTC (rev 891)
@@ -1,42 +1,40 @@
-NET "ClkxCI" TNM_NET = "ClkxCI";
-TIMESPEC "TS_ClkxCI" = PERIOD "ClkxCI" 10 ns HIGH 50 %;
-
-#PACE: Start of Constraints generated by PACE
-
-#PACE: Start of PACE I/O Pin Assignments
-NET "AddrxDI<0>" LOC = "P21" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<1>" LOC = "P23" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<2>" LOC = "P24" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<3>" LOC = "P25" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<4>" LOC = "P26" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<5>" LOC = "P27" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<6>" LOC = "P28" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<7>" LOC = "P30" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<8>" LOC = "P31" | IOSTANDARD = LVCMOS33 ;
-NET "AddrxDI<9>" LOC = "P32" | IOSTANDARD = LVCMOS33 ;
-NET "ClkxCI" LOC = "P55" | IOSTANDARD = LVCMOS33 ;
-NET "CSxBI" LOC = "P59" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<0>" LOC = "P1" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<10>" LOC = "P13" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<11>" LOC = "P14" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<12>" LOC = "P15" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<13>" LOC = "P17" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<14>" LOC = "P18" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<15>" LOC = "P20" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<1>" LOC = "P2" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<2>" LOC = "P4" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<3>" LOC = "P5" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<4>" LOC = "P6" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<5>" LOC = "P7" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<6>" LOC = "P8" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<7>" LOC = "P10" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<8>" LOC = "P11" | IOSTANDARD = LVCMOS33 ;
-NET "DataxD<9>" LOC = "P12" | IOSTANDARD = LVCMOS33 ;
-NET "WRxBI" LOC = "P60" | IOSTANDARD = LVCMOS33 ;
-NET "RDxBI" LOC = "P63" | IOSTANDARD = LVCMOS33 ;
-
-#PACE: Start of PACE Area Constraints
-
-#PACE: Start of PACE Prohibit Constraints
-
-#PACE: End of Constraints generated by PACE
+# Constraint file for BRAMTest
+NET "ClkxCI" TNM_NET = "ClkxCI";
+TIMESPEC "TS_ClkxCI" = PERIOD "ClkxCI" 10 ns HIGH 50 %;
+
+NET "DataxD<0>" LOC = "P1" ;
+NET "DataxD<1>" LOC = "P2" ;
+NET "DataxD<2>" LOC = "P4" ;
+NET "DataxD<3>" LOC = "P5" ;
+NET "DataxD<4>" LOC = "P6" ;
+NET "DataxD<5>" LOC = "P7" ;
+NET "DataxD<6>" LOC = "P8" ;
+NET "DataxD<7>" LOC = "P10" ;
+NET "DataxD<8>" LOC = "P11" ;
+NET "DataxD<9>" LOC = "P12" ;
+NET "DataxD<10>" LOC = "P13" ;
+NET "DataxD<11>" LOC = "P14" ;
+NET "DataxD<12>" LOC = "P15" ;
+NET "DataxD<13>" LOC = "P17" ;
+NET "DataxD<14>" LOC = "P18" ;
+NET "DataxD<15>" LOC = "P20" ;
+
+NET "AddrxDI<0>" LOC = "P21" ;
+NET "AddrxDI<1>" LOC = "P23" ;
+NET "AddrxDI<2>" LOC = "P24" ;
+NET "AddrxDI<3>" LOC = "P25" ;
+NET "AddrxDI<4>" LOC = "P26" ;
+NET "AddrxDI<5>" LOC = "P27" ;
+NET "AddrxDI<6>" LOC = "P28" ;
+NET "AddrxDI<7>" LOC = "P30" ;
+NET "AddrxDI<8>" LOC = "P31" ;
+NET "AddrxDI<9>" LOC = "P32" ;
+NET "AddrxDI<10>" LOC = "P33" ;
+NET "AddrxDI<11>" LOC = "P35" ;
+NET "AddrxDI<12>" LOC = "P36" ;
+
+NET "ClkxCI" LOC = "P55" ;
+NET "CSxBI" LOC = "P59" ;
+NET "WRxBI" LOC = "P60" ;
+NET "RDxBI" LOC = "P63" ;
+#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-10-10 15:14:31
|
Revision: 890
http://armadeus.svn.sourceforge.net/armadeus/?rev=890&view=rev
Author: FabM
Date: 2008-10-10 15:14:20 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
[U-Boot] 50ns read cycle for CS1 (FPGA)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/u-boot/110-u-boot-1.3.4-apf9328.patch
Modified: trunk/buildroot/target/device/armadeus/u-boot/110-u-boot-1.3.4-apf9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/110-u-boot-1.3.4-apf9328.patch 2008-09-17 16:32:48 UTC (rev 889)
+++ trunk/buildroot/target/device/armadeus/u-boot/110-u-boot-1.3.4-apf9328.patch 2008-10-10 15:14:20 UTC (rev 890)
@@ -1852,7 +1852,7 @@
+#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_READ_CYC_LGTH 50 /* ns */
+#define CFG_CS1_OE_ASSERT_DLY 0 /* ns */
+#define CFG_CS1_OE_NEG_DLY 0 /* ns */
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-09-17 16:32:40
|
Revision: 889
http://armadeus.svn.sourceforge.net/armadeus/?rev=889&view=rev
Author: artemys
Date: 2008-09-17 16:32:48 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
[LINUX] Change backlight PWM reference clock for LQ043 and MTF-035 LCDs
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
trunk/target/linux/arch/arm/mach-imx/apf9328_lcd_config.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-09-14 12:05:09 UTC (rev 888)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-09-17 16:32:48 UTC (rev 889)
@@ -2,7 +2,7 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-07-25 17:36:46.000000000 +0200
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-09-17 18:28:30.000000000 +0200
@@ -0,0 +1,558 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -566,7 +566,7 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328_lcd_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-07-25 17:36:46.000000000 +0200
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-09-17 18:28:05.000000000 +0200
@@ -0,0 +1,200 @@
+/*
+ *
@@ -653,7 +653,7 @@
+
+ .pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
+ PCR_CLKPOL | PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(5),
-+ .pwmr = 0x000001ff, // Contrast with PWM @ Line_Pulse, max by default
++ .pwmr = 0x000003ff, // Contrast with PWM @ Pixel clock / 256, max width by default
+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .backlight_power = apf9328_lcd_backlight_power,
+ .lcd_power = apf9328_lcd_power,
@@ -674,7 +674,7 @@
+
+ .pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
+ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
-+ .pwmr = 0x000001ff, // Contrast with PWM @ Line_Pulse, max by default
++ .pwmr = 0x000003ff, // Contrast with PWM @ Pixel clock / 256, max width by default
+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .backlight_power = apf9328_lcd_backlight_power,
+};
@@ -772,7 +772,7 @@
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.23.1.original/include/asm-arm/arch-imx/apf9328.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-07-25 17:36:46.000000000 +0200
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-09-17 18:28:05.000000000 +0200
@@ -0,0 +1,54 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/target/linux/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- trunk/target/linux/arch/arm/mach-imx/apf9328_lcd_config.h 2008-09-14 12:05:09 UTC (rev 888)
+++ trunk/target/linux/arch/arm/mach-imx/apf9328_lcd_config.h 2008-09-17 16:32:48 UTC (rev 889)
@@ -83,7 +83,7 @@
.pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
PCR_CLKPOL | PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(5),
- .pwmr = 0x000001ff, // Contrast with PWM @ Line_Pulse, max by default
+ .pwmr = 0x000003ff, // Contrast with PWM @ Pixel clock / 256, max width by default
.dmacr = DEFAULT_DMA_SETTINGS,
.backlight_power = apf9328_lcd_backlight_power,
.lcd_power = apf9328_lcd_power,
@@ -104,7 +104,7 @@
.pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
- .pwmr = 0x000001ff, // Contrast with PWM @ Line_Pulse, max by default
+ .pwmr = 0x000003ff, // Contrast with PWM @ Pixel clock / 256, max width by default
.dmacr = DEFAULT_DMA_SETTINGS,
.backlight_power = apf9328_lcd_backlight_power,
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-09-14 12:04:59
|
Revision: 888
http://armadeus.svn.sourceforge.net/armadeus/?rev=888&view=rev
Author: jorasse
Date: 2008-09-14 12:05:09 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
[LINUX] Add MAX1027 driver in the default configuration
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config
Modified: trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config 2008-09-14 11:17:09 UTC (rev 887)
+++ trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.23.1.config 2008-09-14 12:05:09 UTC (rev 888)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23.1
-# Mon Apr 14 23:01:28 2008
+# Sun Sep 14 10:37:28 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -831,6 +831,7 @@
CONFIG_ARMADEUS_GENERIC_DRIVER=m
CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
+CONFIG_ARMADEUS_FAST_MAX1027=m
#
# FPGA related
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-09-14 11:16:58
|
Revision: 887
http://armadeus.svn.sourceforge.net/armadeus/?rev=887&view=rev
Author: jorasse
Date: 2008-09-14 11:17:09 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
[BUILDROOT] Predefine GCC 4.2.1 by default
Modified Paths:
--------------
trunk/ChangeLog
trunk/patches/004-Buildroot-defconfig.diff
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-14 11:00:48 UTC (rev 886)
+++ trunk/ChangeLog 2008-09-14 11:17:09 UTC (rev 887)
@@ -2,6 +2,7 @@
ChangeLog file for Armadeus Project
Changes to be released
+- [BUILDROOT] Predefine GCC 4.2.1 by default
- [BUILDROOT] uppgrade MPFR to revision 2.3.2 fixing broken internet link issue
- [UBOOT] upgrade to U-Boot release 1.3.4
- [uClibc] undefine _POSIX_SPIN_LOCKS: still not yet implemented in uClibc 0.9.29
Modified: trunk/patches/004-Buildroot-defconfig.diff
===================================================================
--- trunk/patches/004-Buildroot-defconfig.diff 2008-09-14 11:00:48 UTC (rev 886)
+++ trunk/patches/004-Buildroot-defconfig.diff 2008-09-14 11:17:09 UTC (rev 887)
@@ -1,9 +1,9 @@
---- buildroot/.defconfigori 2007-10-27 09:15:37.000000000 +0200
-+++ buildroot/.defconfig 2007-11-23 22:25:11.000000000 +0100
-@@ -1,19 +1,145 @@
+--- buildroot/.defconfig.ori 2007-10-27 09:15:37.000000000 +0200
++++ buildroot/.defconfig 2008-09-14 04:30:31.000000000 +0200
+@@ -1,19 +1,146 @@
#
# Automatically generated make config: don't edit
-+# Fri Nov 23 22:25:11 2007
++# Sun Sep 14 04:30:31 2008
#
BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
@@ -82,6 +82,7 @@
+# BR2_PACKAGE_LINUX_VERSION_2_6_17 is not set
+# BR2_PACKAGE_LINUX_VERSION_2_6_18_1 is not set
+BR2_PACKAGE_LINUX_VERSION_2_6_23_1=y
++# BR2_PACKAGE_LINUX_VERSION_2_6_24 is not set
+BR2_PACKAGE_LINUX_VERSION="2.6.23.1"
+BR2_TARGET_U-BOOT=y
+
@@ -149,25 +150,26 @@
#
# Kernel Header Options
-@@ -25,8 +151,16 @@
+@@ -25,8 +152,16 @@ BR2_WGET="wget --passive-ftp"
# BR2_KERNEL_HEADERS_2_6_9 is not set
# BR2_KERNEL_HEADERS_2_6_11 is not set
# BR2_KERNEL_HEADERS_2_6_12 is not set
+-BR2_KERNEL_HEADERS_2_6_22=y
+-BR2_DEFAULT_KERNEL_HEADERS="2.6.22.8"
+# BR2_KERNEL_HEADERS_2_6_20_4 is not set
+# BR2_KERNEL_HEADERS_2_6_20 is not set
+# BR2_KERNEL_HEADERS_2_6_21_5 is not set
+# BR2_KERNEL_HEADERS_2_6_21 is not set
+# BR2_KERNEL_HEADERS_2_6_22_1 is not set
+# BR2_KERNEL_HEADERS_2_6_22_10 is not set
- BR2_KERNEL_HEADERS_2_6_22=y
--BR2_DEFAULT_KERNEL_HEADERS="2.6.22.8"
-+# BR2_KERNEL_HEADERS_2_6_23 is not set
++# BR2_KERNEL_HEADERS_2_6_22 is not set
++BR2_KERNEL_HEADERS_2_6_23=y
+# BR2_KERNEL_HEADERS_SNAP is not set
-+BR2_DEFAULT_KERNEL_HEADERS="2.6.22.10"
++BR2_DEFAULT_KERNEL_HEADERS="2.6.23"
#
# uClibc Options
-@@ -34,7 +168,6 @@
+@@ -34,7 +169,6 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.22.8"
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
BR2_UCLIBC_VERSION_0_9_29=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -175,7 +177,7 @@
BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
# BR2_ENABLE_LOCALE is not set
# BR2_PTHREADS_NONE is not set
-@@ -42,35 +175,453 @@
+@@ -42,18 +176,20 @@ BR2_UCLIBC_CONFIG="toolchain/uClibc/uCli
BR2_PTHREADS_OLD=y
# BR2_PTHREADS_NATIVE is not set
# BR2_PTHREAD_DEBUG is not set
@@ -196,18 +198,16 @@
-# Gcc Options
+# GCC Options
#
--# BR2_GCC_VERSION_3_4_6 is not set
-+BR2_GCC_VERSION_3_4_6=y
+ # BR2_GCC_VERSION_3_4_6 is not set
# BR2_GCC_VERSION_4_0_4 is not set
- # BR2_GCC_VERSION_4_1_2 is not set
+@@ -61,16 +197,426 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
# BR2_GCC_VERSION_4_2_0 is not set
--BR2_GCC_VERSION_4_2_1=y
-+# BR2_GCC_VERSION_4_2_1 is not set
+ BR2_GCC_VERSION_4_2_1=y
# BR2_GCC_IS_SNAP is not set
--BR2_GCC_VERSION="4.2.1"
-+# BR2_GCC_SUPPORTS_SYSROOT is not set
++BR2_GCC_SUPPORTS_SYSROOT=y
+# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-+BR2_GCC_VERSION="3.4.6"
+ BR2_GCC_VERSION="4.2.1"
++BR2_TOOLCHAIN_SYSROOT=y
# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
+BR2_GCC_CROSS_CXX=y
@@ -330,6 +330,7 @@
+# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBSYSFS is not set
+# BR2_PACKAGE_LIBXML2 is not set
++# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LSOF is not set
+# BR2_PACKAGE_LTP-TESTSUITE is not set
@@ -365,7 +366,6 @@
+# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LINKS is not set
-+# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MDNSRESPONDER is not set
+# BR2_PACKAGE_MROUTED is not set
@@ -441,7 +441,7 @@
+# BR2_PACKAGE_MTD_20061007 is not set
+# BR2_PACKAGE_MTD_20050122 is not set
+# BR2_PACKAGE_MTD_SNAPSHOT is not set
-+
+
+#
+# MTD tools selection
+#
@@ -512,7 +512,7 @@
+# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_SDL is not set
+# BR2_PACKAGE_TIFF is not set
-
++
+#
+# busybox graphic applications
+#
@@ -522,6 +522,7 @@
+#
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_FBSET is not set
++# BR2_PACKAGE_FBGRAB is not set
+
+#
+# other GUIs
@@ -628,12 +629,4 @@
+#
+# bootloader for target device
+#
-+
-+#
-+# Kernel
-+#
-+BR2_KERNEL_none=y
-+# BR2_KERNEL_LINUX_ADVANCED is not set
-+# BR2_KERNEL_LINUX is not set
-+# BR2_KERNEL_HURD is not set
+# BR2_PACKAGE_LINUX is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-09-14 11:00:41
|
Revision: 886
http://armadeus.svn.sourceforge.net/armadeus/?rev=886&view=rev
Author: jorasse
Date: 2008-09-14 11:00:48 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
[BUILDOOT] uppgrade MPFR to revision 2.3.2 fixing broken internet link issue
Revision Links:
--------------
http://armadeus.svn.sourceforge.net/armadeus/?rev=2&view=rev
Modified Paths:
--------------
trunk/ChangeLog
Added Paths:
-----------
trunk/patches/045-buildroot-mpfr.2.3.2.diff
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-13 17:08:18 UTC (rev 885)
+++ trunk/ChangeLog 2008-09-14 11:00:48 UTC (rev 886)
@@ -2,8 +2,10 @@
ChangeLog file for Armadeus Project
Changes to be released
-- [uClibc] undefine _POSIX_SPIN_LOCKS: still not yet implemented in uClibc 0.9.29
- thanks to Creber
+- [BUILDROOT] uppgrade MPFR to revision 2.3.2 fixing broken internet link issue
+- [UBOOT] upgrade to U-Boot release 1.3.4
+- [uClibc] undefine _POSIX_SPIN_LOCKS: still not yet implemented in uClibc 0.9.29
+ thanks to Creber
Changes in release 2.3 (11 February 2008)
- [BUILDROOT] Change FTP server for buildroot and fakeroot files
Added: trunk/patches/045-buildroot-mpfr.2.3.2.diff
===================================================================
--- trunk/patches/045-buildroot-mpfr.2.3.2.diff (rev 0)
+++ trunk/patches/045-buildroot-mpfr.2.3.2.diff 2008-09-14 11:00:48 UTC (rev 886)
@@ -0,0 +1,13 @@
+--- buildroot.ori/package/mpfr/mpfr.mk 2007-10-27 09:15:22.000000000 +0200
++++ buildroot/package/mpfr/mpfr.mk 2008-09-14 02:03:59.000000000 +0200
+@@ -3,8 +3,8 @@
+ # mpfr
+ #
+ #############################################################
+-MPFR_VERSION:=2.3.0
+-MPFR_PATCH:=patches
++MPFR_VERSION:=2.3.2
++MPFR_PATCH:=
+ MPFR_PATCH_FILE:=mpfr-$(MPFR_VERSION).patch
+ MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2
+ MPFR_CAT:=$(BZCAT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-09-13 17:08:11
|
Revision: 885
http://armadeus.svn.sourceforge.net/armadeus/?rev=885&view=rev
Author: jorasse
Date: 2008-09-13 17:08:18 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
[u-boot] upgrade to u-boot release 1.3.4
Modified Paths:
--------------
branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk
Modified: branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk
===================================================================
--- branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk 2008-09-13 15:21:31 UTC (rev 884)
+++ branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk 2008-09-13 17:08:18 UTC (rev 885)
@@ -16,7 +16,7 @@
ADDITIONAL_MAKE_PARAMETERS:=CONFIG_NOSOFTFLOAT=1 ARCH=arm
U-BOOT_TARGET_CONFIG=$(U-BOOT_TARGET_NAME)_defconfig
else #U-BOOT 1.x
-U-BOOT_VERSION:=1.3.2
+U-BOOT_VERSION:=1.3.4
U-BOOT_SOURCE:=u-boot-$(U-BOOT_VERSION).tar.bz2
U-BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
U-BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U-BOOT_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-09-13 15:21:22
|
Revision: 884
http://armadeus.svn.sourceforge.net/armadeus/?rev=884&view=rev
Author: jorasse
Date: 2008-09-13 15:21:31 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
[u-boot] patch 3.0 supporting u-boot release 1.3.4
- introduce armadeus sub-directory to support upcoming apf27 daughter board
- cleanup patch files
- make apm9328 board deprecated and make the apf9328 the reference board
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/Makefile.in
trunk/buildroot/target/device/armadeus/apm9328/Makefile.in
trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/u-boot/100-u-boot-1.3.4-imx.patch
trunk/buildroot/target/device/armadeus/u-boot/110-u-boot-1.3.4-apf9328.patch
trunk/buildroot/target/device/armadeus/u-boot/111-u-boot-1.3.4-apf9328-DM9000.patch
trunk/buildroot/target/device/armadeus/u-boot/112-u-boot-1.3.4-apf9328-makefile.patch
trunk/buildroot/target/device/armadeus/u-boot/120-u-boot-1.3.4-apf9328-tools.patch
trunk/buildroot/target/device/armadeus/u-boot/130-u-boot-1.3.4-apf9328-example.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch
trunk/buildroot/target/device/armadeus/u-boot/101-u-boot-apx9328.patch
trunk/buildroot/target/device/armadeus/u-boot/110-apx-tools.patch
trunk/buildroot/target/device/armadeus/u-boot/120-apx-example.patch
trunk/buildroot/target/device/armadeus/u-boot/140-apx-dm9000.patch
trunk/buildroot/target/device/armadeus/u-boot/150-u-boot-imx.patch
trunk/buildroot/target/device/armadeus/u-boot/200-u-boot-spartan.patch
Modified: trunk/buildroot/target/device/armadeus/apf9328/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/Makefile.in 2008-09-13 10:08:51 UTC (rev 883)
+++ trunk/buildroot/target/device/armadeus/apf9328/Makefile.in 2008-09-13 15:21:31 UTC (rev 884)
@@ -1,3 +1,3 @@
-U-BOOT_TARGET_NAME=apx9328
+U-BOOT_TARGET_NAME=apf9328
LINUX_FORMAT=uImage
LINUX_KCONFIG=$(ARMADEUS_CONFIG_PATH)/linux-$(BR2_PACKAGE_LINUX_VERSION).config
Modified: trunk/buildroot/target/device/armadeus/apm9328/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/apm9328/Makefile.in 2008-09-13 10:08:51 UTC (rev 883)
+++ trunk/buildroot/target/device/armadeus/apm9328/Makefile.in 2008-09-13 15:21:31 UTC (rev 884)
@@ -1,3 +1,3 @@
-U-BOOT_TARGET_NAME=apx9328
+U-BOOT_TARGET_NAME=apf9328
LINUX_FORMAT=uImage
LINUX_KCONFIG=$(ARMADEUS_CONFIG_PATH)/linux.config
Deleted: trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch 2008-09-13 10:08:51 UTC (rev 883)
+++ trunk/buildroot/target/device/armadeus/u-boot/100-apx9328.patch 2008-09-13 15:21:31 UTC (rev 884)
@@ -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_EN...
[truncated message content] |
|
From: <jo...@us...> - 2008-09-13 10:08:40
|
Revision: 883
http://armadeus.svn.sourceforge.net/armadeus/?rev=883&view=rev
Author: jorasse
Date: 2008-09-13 10:08:51 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
[u-boot] added NAND bootloader (SPL) : uboot-nand.bin
Modified Paths:
--------------
branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk
Modified: branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk
===================================================================
--- branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk 2008-09-12 13:09:49 UTC (rev 882)
+++ branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk 2008-09-13 10:08:51 UTC (rev 883)
@@ -22,7 +22,7 @@
U-BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U-BOOT_VERSION)
#U-BOOT_TARGET_NAME:=pcm038 # overloaded by ../apf27/Makefile.in
U-BOOT_UNZIP:=bzcat
-U-BOOT_GENERATED_BIN:=u-boot.bin
+U-BOOT_GENERATED_BIN:=u-boot-nand.bin
ADDITIONAL_MAKE_PARAMETERS:=CONFIG_NOSOFTFLOAT=1 ARCH=arm
U-BOOT_TARGET_CONFIG=$(U-BOOT_TARGET_NAME)_config
@@ -129,13 +129,16 @@
cp $^ $@
###-----
+ifneq ($(BR2_TARGET_ARMADEUS_APF27),)
+u-boot: $(BINARIES_DIR)/u-boot.bin
+else
u-boot: $(BINARIES_DIR)/u-boot.bin $(BINARIES_DIR)/u-boot.brec
+endif
ifneq ($(BR2_TARGET_U-BOOT_NG),)
ln -fs $(U-BOOT_DIR)/scripts/mkimage $(STAGING_DIR)/bin/mkimage
else #U-BOOT 1.x
ln -fs $(U-BOOT_DIR)/tools/mkimage $(STAGING_DIR)/bin/mkimage
endif
-
###-----
u-boot-clean:
make -C $(U-BOOT_DIR) clean
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-09-12 13:09:39
|
Revision: 882
http://armadeus.svn.sourceforge.net/armadeus/?rev=882&view=rev
Author: artemys
Date: 2008-09-12 13:09:49 +0000 (Fri, 12 Sep 2008)
Log Message:
-----------
[LINUX] In new version of max1027 driver: now handle the numerous scan modes of the device + correct some bugs + integrate hwmon interface (if configured) of old driver + do some cleanup
Modified Paths:
--------------
trunk/target/linux/modules/fast_max1027/main.c
Modified: trunk/target/linux/modules/fast_max1027/main.c
===================================================================
--- trunk/target/linux/modules/fast_max1027/main.c 2008-09-11 15:11:45 UTC (rev 881)
+++ trunk/target/linux/modules/fast_max1027/main.c 2008-09-12 13:09:49 UTC (rev 882)
@@ -1,7 +1,7 @@
/*
- * Armadeus Max1027 driver (fast version)
+ * Max1027 driver for kernel >= 2.6.23
*
- * Copyright (C) 2006-2008 Armadeus Project / ArmadeusPort Systems
+ * Copyright (C) 2006-2008 Armadeus Project / Armadeus Systems
* Authors: Nicolas Colombain / Julien Boibessot
*
* This program is free software; you can redistribute it and/or modify
@@ -23,18 +23,10 @@
#include <asm/arch/imx-regs.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/types.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/fcntl.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <asm/uaccess.h> /* copy_to_user */
#include <linux/interrupt.h> /* request_irq */
#include <asm/gpio.h> /* imx_gpio_... */
#include <linux/cdev.h> /* struct cdev */
@@ -43,13 +35,15 @@
#include <linux/sysfs.h>
#include <linux/spi/spi.h>
#include <asm/semaphore.h>
-
#include <linux/delay.h>
-
#include <linux/irq.h> /* set_irq_type */
+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+#include <linux/hwmon.h>
+#endif
+
#define DRIVER_NAME "max1027"
-#define DRIVER_VERSION "0.1"
+#define DRIVER_VERSION "0.2"
#define MAX1027_EOC_IRQ IRQ_GPIOA(10) // CSI_D6 = PortA 10 IRQ_GPIOA(1) can be used for test
@@ -63,25 +57,34 @@
/* register specifics */
#define MAX1027_CONV_CHSEL(x) ((x&0x0f)<<3)
+#define GET_SELECTED_CHANNEL(conv) ( (conv & 0x78) >> 3 )
#define MAX1027_CONV_SCAN(x) ((x&0x03)<<1)
+#define GET_SCAN_MODE(conv) ( (conv & 0x06) >> 1 )
#define MAX1027_CONV_TEMP 0x01
/* All channels and temperature are scanned per conversion */
#define MAX1027_CONV_DEFAULT (MAX1027_REG_CONV | \
MAX1027_CONV_CHSEL(7) | \
MAX1027_CONV_SCAN(0) | MAX1027_CONV_TEMP)
+#define SCAN_MODE_00 0
+#define SCAN_MODE_01 1
+#define SCAN_MODE_10 2
+#define SCAN_MODE_11 3
#define MAX1027_SETUP_CLKSEL(x) ((x&0x03)<<4)
#define MAX1027_SETUP_REFSEL(x) ((x&0x03)<<2)
#define MAX1027_SETUP_DIFFSEL(x) (x&0x03)
#define MAX1027_SETUP_DIFFSEL_MASK 0x03
-/* Internal clock and single ended configuration following setup cmd */
+/* Internal clock and reference stays on */
#define MAX1027_SETUP_DEFAULT (MAX1027_REG_SETUP | \
MAX1027_SETUP_CLKSEL(2) | \
- MAX1027_SETUP_DIFFSEL(2))
+ MAX1027_SETUP_REFSEL(2))
#define MAX1027_AVG_AVGON(x) ((x&0x01)<<4)
#define MAX1027_AVG_NAVG(x) ((x&0x03)<<2)
#define MAX1027_AVG_NSCAN(x) (x&0x03)
+#define GET_NB_SCAN(avg) ( 4 * ((avg & 0x03)+1) )
+/* Averaging Off */
+#define MAX1027_AVG_DEFAULT ( MAX1027_REG_AVG | MAX1027_AVG_AVGON(0) )
#define MAX1027_RESET_ALL (0x0|MAX1027_REG_RESET)
#define MAX1027_RESET_FIFO (0x8|MAX1027_REG_RESET)
@@ -90,27 +93,29 @@
#define MAX1027_BIPO_BCH(x) ((x&0x0f)<<4)
#define NB_CHANNELS 8
-#define RESULT_ARRAY_SIZE (NB_CHANNELS+1)
+#define MAX_RESULTS_PER_CHANNEL 16 /* NSCAN = 11 */
+#define MAX_NB_RESULTS (MAX_RESULTS_PER_CHANNEL+1) /* + temp */
-// Global variables
+/* Global variables */
struct max1027_operations *driver_ops;
static int max1027_major = 0; /* Dynamic major allocation */
-
struct max1027_results {
- u16 temp; /* in 1/8 °C */
u16 ain[NB_CHANNELS];
};
struct adc_channel {
spinlock_t lock;
+ u16 results[MAX_RESULTS_PER_CHANNEL];
+ int nb_results;
+
int id;
int enabled;
int initialized;
int running;
- int eoc; /* 1 if convertion ended */
+ int eoc; /* 1 if conversion ended */
wait_queue_head_t change_wq;
struct fasync_struct *async_queue;
@@ -121,10 +126,12 @@
struct max1027 {
struct class_device *cdev;
struct mutex update_lock;
- struct max1027_results results;
+
+ struct max1027_results results; /* latest channels value */
struct adc_channel* channels[NB_CHANNELS];
int scan_time; /* in jiffies */
unsigned long last_updated; /* in jiffies */
+ int temperature; /* current one in millidegree Celcius */
/* Shadow registers to hold current configuration */
u8 conv_reg;
u8 setup_reg;
@@ -136,18 +143,17 @@
struct tasklet_struct tasklet;
int conversion_running;
};
-#define GET_NB_CHANNELS(max1027) (max1027->conv_reg & MASK >> XX)
#define CS_CHANGE(val) 0 /* <-- ça sert à quoi ce truc ??? */
static struct spi_device *current_spi;
-struct spi_transfer transfer[NB_CHANNELS+1];
+struct spi_transfer transfer[MAX_NB_RESULTS];
struct spi_message message;
-u8 buffer[32];
+u8 buffer[MAX_NB_RESULTS*2]; // each result is sent with 16 bits
-// must be used within mutex and outside of IRQ context !!!
+/* Must be used within mutex and outside of IRQ context !!! */
static void max1027_send_cmd( struct spi_device *spi, u8 cmd )
{
u8 buf = cmd;
@@ -155,13 +161,14 @@
spi_write_then_read(spi, &buf, 1, NULL, 0);
+ /* !! order is important here !! ;-) */
if( cmd & MAX1027_REG_CONV ) {
p_max1027->conv_reg = cmd;
}
- if( cmd & MAX1027_REG_SETUP ) {
+ else if( cmd & MAX1027_REG_SETUP ) {
p_max1027->setup_reg = cmd;
}
- if( cmd & MAX1027_REG_AVG ) {
+ else if( cmd & MAX1027_REG_AVG ) {
p_max1027->avg_reg = cmd;
}
}
@@ -194,20 +201,23 @@
msb = buffer[0] & 0x0f;
lsb = buffer[1];
value = ((msb << 8) | lsb);
- max1027->results.temp = value;
- printk("%d°C ", value >> 3); /* 1 unit = 1/8 °C */
+ max1027->temperature = (value * 1000) >> 3; /* 1 unit = 1/8 °C + save it in millidegree */
+ printk("%d m°C ", max1027->temperature);
}
for( i=start; i<values_to_read; i++ ) {
msb = buffer[i*2] & 0x0f;
- lsb = buffer[(i*2)+1] >> 2;
- value = (msb << 8) | lsb;
- max1027->results.ain[i-start] = value;
+ lsb = buffer[(i*2)+1];
+ value = ((msb << 8) | lsb) >> 2;
+ if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_00 )
+ {
+ //size = GET_SELECTED_CHANNEL(max1027->conv_reg) + 1;
+ max1027->results.ain[i-start] = value;
+ }
printk("0x%04x ", value);
}
printk("\n");
-
/* Wake up waiting userspace apps */
pr_debug("EOC for");
for (i=0; i < NB_CHANNELS; i++ ) {
@@ -292,7 +302,7 @@
channel->running = 0;
/* Read conversion results */
- value = max1027->results.ain[channel->id]; //get_value_for_channel(channel->id);
+ value = max1027->results.ain[channel->id];
/* Copy result to given userspace buffer */
count = min( count, (size_t)sizeof(u32) );
@@ -308,17 +318,46 @@
}
/* Tasklet to get results after EOC IRQ */
-/* Tasklets seems to be unable to call spi_xxx too :-( */
static void read_conversion_results( unsigned long data )
{
struct spi_device *spi = (struct spi_device *)data;
struct max1027 *max1027 = dev_get_drvdata(&spi->dev);
+ int size = 0;
- /* Get conversion results from chip */
- if( max1027->conv_reg & MAX1027_CONV_TEMP )
- max1027_reads_async(spi, 9);
- else
- max1027_reads_async(spi, 8);
+ /* Get conversion results from chip (depends on conversion mode) */
+ if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_00 )
+ {
+ size = GET_SELECTED_CHANNEL(max1027->conv_reg) + 1;
+ if( max1027->conv_reg & MAX1027_CONV_TEMP )
+ max1027_reads_async(spi, size+1);
+ else
+ max1027_reads_async(spi, size);
+ }
+ if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_01 )
+ {
+ size = NB_CHANNELS - GET_SELECTED_CHANNEL(max1027->conv_reg);
+ if( max1027->conv_reg & MAX1027_CONV_TEMP )
+ max1027_reads_async(spi, size+1);
+ else
+ max1027_reads_async(spi, size);
+ }
+ if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_10 )
+ {
+ size = GET_NB_SCAN(max1027->avg_reg);
+ if( max1027->conv_reg & MAX1027_CONV_TEMP )
+ max1027_reads_async(spi, size+1);
+ else
+ max1027_reads_async(spi, size);
+ }
+ if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_11 )
+ {
+ size = 1;
+ if( max1027->conv_reg & MAX1027_CONV_TEMP )
+ max1027_reads_async(spi, size+1);
+ else
+ max1027_reads_async(spi, size);
+ }
+
}
/* EOC (End Of Conversion) IRQ handler */
@@ -400,22 +439,20 @@
.ioctl = max1027_dev_ioctl,
};
+/* sysfs hook functions */
-// buf value <256 -> max1027 config register
static ssize_t max1027_set_conversion(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct spi_device *spi = to_spi_device(dev);
- int val, reg;
+ int val;
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
- val = simple_strtol(buf, NULL, 10);
- printk("%s: 0x%02x\n", __FUNCTION__, val);
+ val = (simple_strtol(buf, NULL, 10)) & 0xff;
+ pr_debug("%s: 0x%02x\n", __FUNCTION__, val);
mutex_lock(&p_max1027->update_lock);
- reg = MAX1027_REG_CONV | (val&0xff);
- max1027_send_cmd( spi, reg );
- p_max1027->conv_reg = (u8)reg;
+ max1027_send_cmd( spi, MAX1027_REG_CONV | val );
mutex_unlock(&p_max1027->update_lock);
return count;
@@ -427,29 +464,26 @@
struct spi_device *spi = to_spi_device(dev);
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
- ret_size = sprintf(buf,"0x%2x", p_max1027->conv_reg);
+ ret_size = sprintf(buf,"0x%02x", p_max1027->conv_reg);
return ret_size;
}
-
// buf value <256 -> max1027 config register
// buf value >=256 -> max1027 Unipolar or Bipolar mode registers
static ssize_t max1027_set_setup(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct spi_device *spi = to_spi_device(dev);
- int val, reg;
+ int val;
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
val = simple_strtol(buf, NULL, 10);
printk("%s: 0x%02x", __FUNCTION__, val);
mutex_lock(&p_max1027->update_lock);
- reg = MAX1027_REG_SETUP | (val&0xff);
- max1027_send_cmd( spi, reg );
- p_max1027->setup_reg = (u8)reg;
- // check whether we need to configure the uni or bipolar mode IOs or not
+ max1027_send_cmd( spi, MAX1027_REG_SETUP | (val&0xff) );
+ /* check whether we need to configure the uni or bipolar mode IOs or not */
if( ((val&0xff) & MAX1027_SETUP_DIFFSEL_MASK) > MAX1027_SETUP_DIFFSEL(1) ) {
max1027_send_cmd( spi, val>>8 );
printk("+ 0x%02x", val);
@@ -466,12 +500,11 @@
struct spi_device *spi = to_spi_device(dev);
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
- ret_size = sprintf(buf,"0x%2x", p_max1027->setup_reg);
+ ret_size = sprintf(buf,"0x%02x", p_max1027->setup_reg);
return ret_size;
}
-// buf value <256 -> max1027 averaging register
static ssize_t max1027_set_averaging(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
@@ -479,11 +512,11 @@
int val;
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
- val = simple_strtol(buf, NULL, 10);
- printk("%s: 0x%02x\n", __FUNCTION__, val);
+ val = (simple_strtol(buf, NULL, 10)) & 0xff;
+ pr_debug("%s: 0x%02x\n", __FUNCTION__, val);
mutex_lock(&p_max1027->update_lock);
- max1027_send_cmd( spi, MAX1027_REG_AVG | (val&0xff) );
+ max1027_send_cmd( spi, MAX1027_REG_AVG | val );
mutex_unlock(&p_max1027->update_lock);
return count;
@@ -495,7 +528,7 @@
struct spi_device *spi = to_spi_device(dev);
struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
- ret_size = sprintf(buf,"0x%2x", p_max1027->avg_reg);
+ ret_size = sprintf(buf,"0x%02x", p_max1027->avg_reg);
return ret_size;
}
@@ -507,9 +540,66 @@
static DEVICE_ATTR(unipolar, S_IWUSR, NULL, max1027_unipolar);
static DEVICE_ATTR(bipolar, S_IWUSR, NULL, max1027_bipolar);*/
+#define show_in(offset) \
+static ssize_t show_in##offset##_input(struct device *dev, \
+ struct device_attribute *attr, char *buf) \
+{ \
+ int result; \
+ ssize_t size; \
+ struct spi_device *spi = to_spi_device(dev); \
+ struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev); \
+ \
+ result = p_max1027->results.ain[offset]; \
+ size = sprintf(buf, "%d\n", (result*2500)>>10); /* millivolt with 2.5V ref */ \
+\
+ return size; \
+}
+
+show_in(0);
+show_in(1);
+show_in(2);
+show_in(3);
+show_in(4);
+show_in(5);
+show_in(6);
+show_in(7);
+
+static DEVICE_ATTR(in0_input, S_IRUGO, show_in0_input, NULL);
+static DEVICE_ATTR(in1_input, S_IRUGO, show_in1_input, NULL);
+static DEVICE_ATTR(in2_input, S_IRUGO, show_in2_input, NULL);
+static DEVICE_ATTR(in3_input, S_IRUGO, show_in3_input, NULL);
+static DEVICE_ATTR(in4_input, S_IRUGO, show_in4_input, NULL);
+static DEVICE_ATTR(in5_input, S_IRUGO, show_in5_input, NULL);
+static DEVICE_ATTR(in6_input, S_IRUGO, show_in6_input, NULL);
+static DEVICE_ATTR(in7_input, S_IRUGO, show_in7_input, NULL);
+
+
+static ssize_t max1027_get_temperature(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int result;
+ ssize_t size;
+ struct spi_device *spi = to_spi_device(dev);
+ struct max1027 *p_max1027 = dev_get_drvdata(&spi->dev);
+
+ result = p_max1027->temperature;
+ size = sprintf(buf, "%d\n", result );
+
+ return size;
+}
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, max1027_get_temperature, NULL);
+
+
#define SYSFS_ERROR_STRING "Unable to create sysfs attribute for max1027"
-int static max1027_create_sys_entries(struct spi_device *spi)
+#define CREATE_SYSFS_FOR_AIN(id) \
+ if ((status = device_create_file(&spi->dev, &dev_attr_in##id##_input))) { \
+ printk(KERN_WARNING SYSFS_ERROR_STRING "in##id## \n"); \
+ goto end; \
+ }
+
+static int max1027_create_sys_entries(struct spi_device *spi)
{
int status = 0;
@@ -528,10 +618,40 @@
goto end;
}
+ if ((status = device_create_file(&spi->dev, &dev_attr_temp1_input))){
+ printk(KERN_WARNING SYSFS_ERROR_STRING " temp1\n");
+ goto end;
+ }
+
+ CREATE_SYSFS_FOR_AIN(0);
+ CREATE_SYSFS_FOR_AIN(1);
+ CREATE_SYSFS_FOR_AIN(2);
+ CREATE_SYSFS_FOR_AIN(3);
+ CREATE_SYSFS_FOR_AIN(4);
+ CREATE_SYSFS_FOR_AIN(5);
+ CREATE_SYSFS_FOR_AIN(6);
+ CREATE_SYSFS_FOR_AIN(7);
+
end:
return status;
}
+static int max1027_remove_sys_entries(struct spi_device *spi)
+{
+ device_remove_file(&spi->dev, &dev_attr_conversion);
+ device_remove_file(&spi->dev, &dev_attr_setup);
+ device_remove_file(&spi->dev, &dev_attr_averaging);
+ device_remove_file(&spi->dev, &dev_attr_temp1_input);
+ device_remove_file(&spi->dev, &dev_attr_in0_input);
+ device_remove_file(&spi->dev, &dev_attr_in1_input);
+ device_remove_file(&spi->dev, &dev_attr_in2_input);
+ device_remove_file(&spi->dev, &dev_attr_in3_input);
+ device_remove_file(&spi->dev, &dev_attr_in4_input);
+ device_remove_file(&spi->dev, &dev_attr_in5_input);
+ device_remove_file(&spi->dev, &dev_attr_in6_input);
+ device_remove_file(&spi->dev, &dev_attr_in7_input);
+}
+
static int __devinit max1027_probe(struct spi_device *spi)
{
struct max1027 *max1027;
@@ -569,6 +689,15 @@
dev_set_drvdata(&spi->dev, max1027);
current_spi = spi; /* <<-- cradingue !! trouver comment faire autrement !! */
+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+ /* register to hwmon */
+ max1027->cdev = hwmon_device_register(&spi->dev);
+ if (IS_ERR(max1027->cdev)) {
+ result = PTR_ERR(max1027->cdev);
+ goto err_hwmon;
+ }
+#endif
+
result = max1027_create_sys_entries(spi);
if (result)
goto err_sys;
@@ -583,12 +712,17 @@
max1027_send_cmd( spi, MAX1027_RESET_ALL );
max1027->conv_reg = (u8)MAX1027_CONV_DEFAULT;
max1027_send_cmd( spi, MAX1027_SETUP_DEFAULT );
+ max1027_send_cmd( spi, MAX1027_AVG_DEFAULT );
printk( DRIVER_NAME " v" DRIVER_VERSION " successfully probed !\n");
return(0);
err_sys:
free_irq(MAX1027_EOC_IRQ, max1027);
+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+err_hwmon:
+ hwmon_device_unregister(max1027->cdev);
+#endif
err_irq:
unregister_chrdev(max1027_major, DRIVER_NAME);
@@ -602,9 +736,10 @@
pr_debug("%s\n", __FUNCTION__);
- device_remove_file(&spi->dev, &dev_attr_conversion);
- device_remove_file(&spi->dev, &dev_attr_setup);
- device_remove_file(&spi->dev, &dev_attr_averaging);
+ max1027_remove_sys_entries(spi);
+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+ hwmon_device_unregister(max1027->cdev);
+#endif
tasklet_kill( &max1027->tasklet );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|