armadeus-commitlog Mailing List for armadeus (Page 117)
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: Julien B a. A. <ar...@us...> - 2009-09-17 16:52:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b7c01051be0b28b80adb15317f45dec4e61b1b0c (commit)
via 03f25ab5182ec1588ac70adf79cf9951feb519d2 (commit)
via 74337d9f215e9e8aec0e6d779289e60b80c40659 (commit)
from a5ee77ecdd46bc25027f6147212dc4d12bfb57a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7c01051be0b28b80adb15317f45dec4e61b1b0c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Sep 17 18:50:30 2009 +0200
[BUILDROOT] Removes empty patches
commit 03f25ab5182ec1588ac70adf79cf9951feb519d2
Merge: 74337d9f215e9e8aec0e6d779289e60b80c40659 a5ee77ecdd46bc25027f6147212dc4d12bfb57a8
Author: Julien Boibessot <jul...@ar...>
Date: Thu Sep 17 18:21:23 2009 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 74337d9f215e9e8aec0e6d779289e60b80c40659
Author: Julien Boibessot <jul...@ar...>
Date: Thu Sep 17 09:37:40 2009 +0200
[LINUX] USE_APF27DEV_IMX_LED_FOR_PM & USE_APF27DEV_IMX_SWITCH_FOR_PM options are only availableon the APF27DEV
-----------------------------------------------------------------------
Summary of changes:
...x_led_and_switch_for_powermanagement_test.patch | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 patches/buildroot/007-qt_opie.patch
delete mode 100644 patches/buildroot/010-uclibc.patch
delete mode 100644 patches/buildroot/011-sdl-image-ttf-config.patch
delete mode 100644 patches/buildroot/012-gdb-arm-corefile-support.patch
delete mode 100644 patches/buildroot/013-strace-arm-support.patch
delete mode 100644 patches/buildroot/015-sdl-mixer-net-config.patch
delete mode 100644 patches/buildroot/016-prboom.patch
delete mode 100644 patches/buildroot/019-lua.patch
delete mode 100644 patches/buildroot/022-alsa-lib-utils.patch
delete mode 100644 patches/buildroot/036-qtopia-build-demos-and-examples.patch
delete mode 100644 patches/buildroot/039-kernelconfig.patch
delete mode 100644 patches/buildroot/041-lockfile-progs.patch
delete mode 100644 patches/buildroot/043-change-setserial-mirror.patch
delete mode 100644 patches/buildroot/044-change-file-package-mirror.patch
delete mode 100644 patches/buildroot/045-mpfr.2.3.2.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch
index ca2a9f1..612c4a1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/317-apf27-armadeus-add_kconfig_option_to_use_imx_led_and_switch_for_powermanagement_test.patch
@@ -1,22 +1,22 @@
-Index: linux-2.6.27.13/kernel/power/Kconfig
+Index: linux-2.6.29.4/kernel/power/Kconfig
===================================================================
---- linux-2.6.27.13.orig/kernel/power/Kconfig 2009-03-13 09:33:23.000000000 +0100
-+++ linux-2.6.27.13/kernel/power/Kconfig 2009-03-13 10:09:37.000000000 +0100
+--- linux-2.6.29.4.orig/kernel/power/Kconfig 2009-09-16 19:29:43.000000000 +0200
++++ linux-2.6.29.4/kernel/power/Kconfig 2009-09-17 09:31:46.000000000 +0200
@@ -204,3 +204,17 @@
random kernel OOPSes or reboots that don't seem to be related to
anything, try disabling/enabling this option (or disabling/enabling
APM in your BIOS).
+
+config USE_APF27DEV_IMX_LED_FOR_PM
-+ bool "Use IMX LED of the APF27Dev for PM test"
-+ depends on PM && MACH_APF27
++ bool "Use D14 LED of the APF27Dev for suspend signaling"
++ depends on PM && MACH_APF27_DEV
+ help
-+ Use IMX LED of the APF27Dev board to show user when the system is
++ Use D14 LED of the APF27Dev board to show user when the system is
+ out of sleep (LED on) or sleeping (LED off).
+
+config USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ bool "Use IMX switch of the APF27Dev for PM test"
-+ depends on PM && MACH_APF27
++ bool "Use S1 switch of the APF27Dev to resume after a suspend"
++ depends on PM && MACH_APF27_DEV
+ help
-+ Use IMX switch of the APF27Dev board to leave sleep mode.
++ Use S1 switch of the APF27Dev board to leave sleep/suspend mode.
+
diff --git a/patches/buildroot/007-qt_opie.patch b/patches/buildroot/007-qt_opie.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/010-uclibc.patch b/patches/buildroot/010-uclibc.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/011-sdl-image-ttf-config.patch b/patches/buildroot/011-sdl-image-ttf-config.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/012-gdb-arm-corefile-support.patch b/patches/buildroot/012-gdb-arm-corefile-support.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/013-strace-arm-support.patch b/patches/buildroot/013-strace-arm-support.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/015-sdl-mixer-net-config.patch b/patches/buildroot/015-sdl-mixer-net-config.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/016-prboom.patch b/patches/buildroot/016-prboom.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/019-lua.patch b/patches/buildroot/019-lua.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/022-alsa-lib-utils.patch b/patches/buildroot/022-alsa-lib-utils.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/036-qtopia-build-demos-and-examples.patch b/patches/buildroot/036-qtopia-build-demos-and-examples.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/039-kernelconfig.patch b/patches/buildroot/039-kernelconfig.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/041-lockfile-progs.patch b/patches/buildroot/041-lockfile-progs.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/043-change-setserial-mirror.patch b/patches/buildroot/043-change-setserial-mirror.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/044-change-file-package-mirror.patch b/patches/buildroot/044-change-file-package-mirror.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/045-mpfr.2.3.2.patch b/patches/buildroot/045-mpfr.2.3.2.patch
deleted file mode 100644
index e69de29..0000000
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2009-09-16 21:56:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a5ee77ecdd46bc25027f6147212dc4d12bfb57a8 (commit)
from 55e93b404fdde9655d6820590e2251d3bfb6eac6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a5ee77ecdd46bc25027f6147212dc4d12bfb57a8
Author: jorasse <jo...@ar...>
Date: Wed Sep 16 23:55:23 2009 +0200
[BUILDROOT] made ubinize generic at least for apf boards
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/{apf27 => }/ubinize.cfg | 2 --
patches/buildroot/076-ubifs.patch | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/{apf27 => }/ubinize.cfg (68%)
diff --git a/buildroot/target/device/armadeus/apf27/ubinize.cfg b/buildroot/target/device/armadeus/ubinize.cfg
similarity index 68%
rename from buildroot/target/device/armadeus/apf27/ubinize.cfg
rename to buildroot/target/device/armadeus/ubinize.cfg
index bbd276d..6515271 100644
--- a/buildroot/target/device/armadeus/apf27/ubinize.cfg
+++ b/buildroot/target/device/armadeus/ubinize.cfg
@@ -1,8 +1,6 @@
[ubifs]
mode=ubi
-image=apf27-rootfs.arm.ubifs
vol_id=0
-vol_size=200MiB
vol_type=dynamic
vol_name=rootfs
vol_alignment=1
diff --git a/patches/buildroot/076-ubifs.patch b/patches/buildroot/076-ubifs.patch
index efe5db6..62b2143 100644
--- a/patches/buildroot/076-ubifs.patch
+++ b/patches/buildroot/076-ubifs.patch
@@ -15,12 +15,12 @@
chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
$(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
-+ cp target/device/armadeus/$(BR2_BOARD_NAME)/ubinize.cfg .
-+ cp $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.ubifs .
++ cp target/device/armadeus/ubinize.cfg .
++ echo "image=$(UBIFS_BASE)" \
++ >> ./ubinize.cfg
+ $(UBINIZE) -o system_ubi.img -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) -p 128KiB -s 512 ubinize.cfg
-+ cp -f system_ubi.img $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.ubifs
++ cp -f system_ubi.img $(UBIFS_BASE)
+ rm system_ubi.img
-+ rm $(BR2_BOARD_NAME)-rootfs.arm.ubifs
+ rm ubinize.cfg
ifneq ($(UBIFS_ROOTFS_COMPRESSOR),)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-16 17:35:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 55e93b404fdde9655d6820590e2251d3bfb6eac6 (commit)
from 83b7997a3a955c02f1d9a46c331b4f38da349fe2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 55e93b404fdde9655d6820590e2251d3bfb6eac6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 16 19:35:01 2009 +0200
[LINUX] Separates module and baseboard power management parts
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 144 +++++++++++---------
1 files changed, 77 insertions(+), 67 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 0ddfef9..e4d113e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-15 10:27:06.000000000 +0200
-@@ -0,0 +1,1277 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-16 19:28:56.000000000 +0200
+@@ -0,0 +1,1221 @@
+ /*
+ * apf27.c
+ *
@@ -95,6 +95,10 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#include "crm_regs.h"
+
+extern void apf27_baseboard_init(void);
++#ifdef CONFIG_PM
++extern void apf27_baseboard_resume(void);
++extern void apf27_baseboard_suspend(void);
++#endif
+
+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
+#define CONFIG_IMX_BACKLIGHT
@@ -966,42 +970,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+/* APF27 power management stuff */
+
-+#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
-+#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
-+#define APF27DEV_USER_LED (GPIO_PORTF | 14)
-+#define APF27DEV_POWER_DOWN_NOT (GPIO_PORTF | 16)
-+
-+static int apf27dev_pwr_ctl_pins[] = {
-+ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
-+#endif
-+};
-+
-+static void apf27dev_power_up(void)
-+{
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
-+}
-+
-+static void apf27dev_power_down(void)
-+{
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
-+}
-+
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
-+{
-+ return IRQ_HANDLED;
-+}
-+#endif
-+
-+static int gpio_pwr_ctl_active(void)
++static void gpio_pwr_ctl_active(void)
+{
-+ int err;
-+
+#ifdef CONFIG_FB_MXC
+ int i;
+ /* force LCD data/control lines to 0 before powering the LCD
@@ -1015,28 +985,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ /* wait a few milli */
+ mdelay(100);
+#endif
-+
-+ err = mxc_gpio_setup_multiple_pins(apf27dev_pwr_ctl_pins,
-+ ARRAY_SIZE(apf27dev_pwr_ctl_pins), "pwr-ctl");
-+ if (err < 0)
-+ pr_err("Failed to register power control pins !\n");
-+
-+ apf27dev_power_up();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
-+ IRQF_TRIGGER_FALLING,
-+ "PM irq", NULL);
-+ if (err < 0)
-+ pr_err("Failed to register PM irq !\n");
-+#endif
-+
-+ return err;
+}
+
-+
+#ifdef CONFIG_PM
+
+#ifdef APF27_PM_DEBUG
@@ -1120,10 +1070,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#ifdef CONFIG_USB_EHCI_MXC
+ isp1504_suspend((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
+#endif
-+ apf27dev_power_down();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 1);
-+#endif
++ apf27_baseboard_suspend();
+#ifdef APF27_PM_DEBUG
+ apf27_force_gpios();
+ dump_clocks();
@@ -1138,10 +1085,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+{
+ printk("___ %s\n", __func__);
+
-+ apf27dev_power_up();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
++ apf27_baseboard_resume();
+
+ return 0;
+}
@@ -1291,8 +1235,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-15 10:21:40.000000000 +0200
-@@ -0,0 +1,576 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-16 19:18:59.000000000 +0200
+@@ -0,0 +1,642 @@
+ /*
+ * apf27-dev.c
+ * Support of AFP27 module's development baseboard
@@ -1837,10 +1781,76 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_VIDEO_OV96xx */
+
+
++/* APF27Dev power management stuff */
++
++#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
++#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
++#define APF27DEV_USER_LED (GPIO_PORTF | 14)
++#define APF27DEV_POWER_DOWN_NOT (GPIO_PORTF | 16)
++
++static int apf27dev_pwr_ctl_pins[] = {
++ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
++#endif
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
++#endif
++};
++
++void apf27_baseboard_resume(void)
++{
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 0);
++#endif
++}
++
++void apf27_baseboard_suspend(void)
++{
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 1);
++#endif
++}
++
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
++{
++ return IRQ_HANDLED;
++}
++#endif
++
++static int apf27dev_pwr_ctrl_gpio_active(void)
++{
++ int err;
++
++ err = mxc_gpio_setup_multiple_pins(apf27dev_pwr_ctl_pins,
++ ARRAY_SIZE(apf27dev_pwr_ctl_pins), "pwr-ctl");
++ if (err < 0)
++ pr_err("Failed to register power control pins !\n");
++
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 0);
++#endif
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
++ IRQF_TRIGGER_FALLING,
++ "PM irq", NULL);
++ if (err < 0)
++ pr_err("Failed to register PM irq !\n");
++#endif
++
++ return err;
++}
++
+void __init apf27_baseboard_init(void)
+{
+ printk(" Registering APF27_Dev ressources:");
+
++ apf27dev_pwr_ctrl_gpio_active();
++
+#ifdef CONFIG_GSM
+ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
+#endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-16 15:56:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 83b7997a3a955c02f1d9a46c331b4f38da349fe2 (commit)
from 8f575258eecd6d7bae17f0435cb5fa68b0de4829 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 83b7997a3a955c02f1d9a46c331b4f38da349fe2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 16 15:39:51 2009 +0200
[TEST] Simplify GPIO test
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/loadgpio.sh | 7 ++++-
target/test/test_gpio.sh | 51 +++++++++++++++++++++++++++------
2 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/target/linux/modules/gpio/loadgpio.sh b/target/linux/modules/gpio/loadgpio.sh
index 16e98c6..7ef3574 100755
--- a/target/linux/modules/gpio/loadgpio.sh
+++ b/target/linux/modules/gpio/loadgpio.sh
@@ -18,10 +18,15 @@ GPIO_MAJOR=`cat /proc/devices | grep GPIO | cut -d " " -f 1`
PPDEV_MAJOR=`cat /proc/devices | grep ppdev | cut -d " " -f 1`
if [ "$GPIO_MAJOR" == "" ]; then
- echo "GPIO module not loaded, exiting"
+ echo "GPIO module failed to load, exiting..."
exit 1
fi
+if [ -d "$GPIO_DEV_DIR" ]; then
+ echo $GPIO_DEV_DIR"xxx devices already created, skipping..."
+ exit 0
+fi
+
mkdir -p $GPIO_DEV_DIR
# For PPDEV
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index e2e54e8..2b55433 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -17,26 +17,59 @@ source ./test_env.sh
GPIO_DEV_DIR=/dev/gpio
GPIO_PROC_DIR=/proc/driver/gpio
+
+setbit()
+{
+ PORT=$1
+ NB=$2
+ VAL=$3
+ cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
+}
+
+gpio_set_value()
+{
+ GPIO=$1
+ VALUE=$2
+ if [ "$VALUE" == "1" ]; then
+ echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
+ else
+ echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
+ fi
+}
+
+# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
+gpio_mode()
+{
+ GPIO=`echo $1 | cut -c 3-4`
+ VALUE=$2
+ PORT=`echo $1 | cut -c 2`
+ PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
+ PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
+
+ setbit $PORT_MODE $GPIO 1
+ setbit $PORT_DIR $GPIO $VALUE
+}
+
blink_led_apf27()
{
- cat $GPIO_PROC_DIR/portFmode | sed "s/[0-1]\([0-1]\{14\}\)$/1\1/" > $GPIO_PROC_DIR/portFmode
- cat $GPIO_PROC_DIR/portFdir | sed "s/[0-1]\([0-1]\{14\}\)$/1\1/" > $GPIO_PROC_DIR/portFdir
+ LED_NAME="D14"
+ gpio_mode PF14 1
for i in `seq 0 5`; do
- echo -ne "\x01" > /dev/gpio/PF14
+ gpio_set_value PF14 0
usleep 500000
- echo -ne "\x00" > /dev/gpio/PF14
+ gpio_set_value PF14 1
usleep 500000
done
}
blink_led_apf9328()
{
- cat $GPIO_PROC_DIR/portDmode | sed "s/[0-1]\([0-1]\{31\}\)$/1\1/" > $GPIO_PROC_DIR/portDmode
- cat $GPIO_PROC_DIR/portDdir | sed "s/[0-1]\([0-1]\{31\}\)$/1\1/" > $GPIO_PROC_DIR/portDdir
+ LED_NAME="a"
+ gpio_mode PD31 1
for i in `seq 0 5`; do
- echo -ne "\x00" > $GPIO_DEV_DIR/PD31
+ gpio_set_value PD31 1
usleep 500000
- echo -ne "\x01" > $GPIO_DEV_DIR/PD31
+ gpio_set_value PD31 0
usleep 500000
done
}
@@ -53,7 +86,7 @@ test_led_gpio()
execute_for_target blink_led_apf9328 blink_led_apf27
- ask_user "Did you see a LED blinking ? (y/n)"
+ ask_user "Did you see "$LED_NAME" LED blinking ? (y/n)"
if [ "$response" != "y" ]; then
exit_failed
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-16 07:48:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8f575258eecd6d7bae17f0435cb5fa68b0de4829 (commit)
from b7165df3f07247dea466d7cfa56fa4bef7b5d5e8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8f575258eecd6d7bae17f0435cb5fa68b0de4829
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 16 09:48:03 2009 +0200
[BUILDROOT] Uses Buildroot generated ubinize, not host installed one
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/076-ubifs.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/buildroot/076-ubifs.patch b/patches/buildroot/076-ubifs.patch
index a575e51..efe5db6 100644
--- a/patches/buildroot/076-ubifs.patch
+++ b/patches/buildroot/076-ubifs.patch
@@ -17,7 +17,7 @@
-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ cp target/device/armadeus/$(BR2_BOARD_NAME)/ubinize.cfg .
+ cp $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.ubifs .
-+ ubinize -o system_ubi.img -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) -p 128KiB -s 512 ubinize.cfg
++ $(UBINIZE) -o system_ubi.img -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) -p 128KiB -s 512 ubinize.cfg
+ cp -f system_ubi.img $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.ubifs
+ rm system_ubi.img
+ rm $(BR2_BOARD_NAME)-rootfs.arm.ubifs
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-15 21:08:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b7165df3f07247dea466d7cfa56fa4bef7b5d5e8 (commit)
from d5c15806568a183dbd34090f2f9207c20c639d49 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7165df3f07247dea466d7cfa56fa4bef7b5d5e8
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 23:08:15 2009 +0200
[LINUX] Improves Mode setting in GPIO driver
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 80 +++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 3ebe648..a54348e 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -46,7 +46,7 @@
#define DRIVER_NAME "Armadeus GPIOs driver"
-#define DRIVER_VERSION "v2.2"
+#define DRIVER_VERSION "2.3"
/* By default, we use dynamic allocation of major numbers -> MAJOR = 0 */
#define GPIO_MAJOR 0
#define GPIO_PROC_DIRNAME "driver/gpio"
@@ -123,6 +123,7 @@ enum {
PULL_UP,
INTERRUPT,
MODE,
+ NB_SETTINGS, /* nb of settings in this enum -> should always be the last ! */
};
struct gpio_settings {
@@ -345,25 +346,48 @@ static unsigned int readFromPort(unsigned int aPort)
static void setPortMode(unsigned int aPort, unsigned int aModeMask)
{
int i;
- int ocr1,ocr2;
+ int ocr1, ocr2, gius;
- ocr1 = ocr2 = 0;
- for( i=0; i< number_of_pins[aPort]; i++ )
- {
- if( i<16 )
- {
- if( (aModeMask>>i)&1 )
+ ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
+ ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
+ gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
+ aModeMask = aModeMask & PORT_MASK[aPort]; /* only sets the allowed pins */
+ for (i=0; i < number_of_pins[aPort]; i++) {
+ if (i < 16) {
+ if ((aModeMask>>i) & 1)
ocr1 = ocr1 | (3<<(i*2));
- }
- else
- {
- if( (aModeMask>>i)&1 )
+ } else {
+ if ((aModeMask>>i) & 1)
ocr2 = ocr2 | (3<<((i-16)*2));
}
}
__raw_writel(ocr1, VA_GPIO_BASE + MXC_OCR1(aPort));
__raw_writel(ocr2, VA_GPIO_BASE + MXC_OCR2(aPort));
- __raw_writel(aModeMask & PORT_MASK[aPort], VA_GPIO_BASE + MXC_GIUS(aPort));
+ gius = gius | aModeMask;
+ __raw_writel(gius, VA_GPIO_BASE + MXC_GIUS(aPort));
+}
+
+static unsigned int getPortMode(unsigned int aPort)
+{
+ int i;
+ int ocr1, ocr2, gius, value = 0;
+
+ ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
+ ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
+ gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
+ /* pin is a GPIO if OCR == 3 AND GIUS == 1 */
+ for (i=0; i < number_of_pins[aPort]; i++) {
+ if (i < 16) {
+ if (((ocr1>>(i*2)) & 3) == 3)
+ value = value | (1<<i);
+ } else {
+ if (((ocr2>>((i-16)*2)) & 3) == 3)
+ value = value | (1<<i);
+ }
+ }
+ value = value & gius;
+
+ return value;
}
static void setPortPull(unsigned int aPort, unsigned int aPullMask)
@@ -393,7 +417,7 @@ char* port_name[NB_PORTS] = { "portA", "portB", "portC", "portD",
"portE", "portF",
#endif
};
-char* port_setting_name[4] = { "Value", "Direction", "Pull-up", "Interrupt" };
+char* port_setting_name[NB_SETTINGS] = { "Value", "Direction", "Pull-up", "Interrupt" , "Mode" };
/* Handles write() done on /dev/gpioxx */
@@ -692,7 +716,7 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
break;
case GPIORDMODE:
- value = __raw_readl(VA_GPIO_BASE + MXC_GIUS(MAX_MINOR - minor));
+ value = getPortMode(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
@@ -746,7 +770,7 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
switch (settings->type) {
case MODE:
- port_status = __raw_readl(VA_GPIO_BASE + MXC_GIUS(port_ID));
+ port_status = getPortMode(port_ID);
break;
case VALUE:
@@ -776,12 +800,13 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
} else {
len = toString(port_status, buffer, number_of_pins[port_ID]/2, 2);
len += toString(port_status2, buffer+len-1, number_of_pins[port_ID]/2, 2);
+ len -= 1;
}
- printk("0x%08x", port_status);
+ pr_debug("%s: 0x%08x", __func__, port_status);
if (settings->type == INTERRUPT)
- printk("0x%08x", port_status2);
- printk("\n");
+ pr_debug(" 0x%08x", port_status2);
+ pr_debug("\n");
*eof = 1;
up(&gpio_sema);
@@ -829,13 +854,13 @@ static int armadeus_gpio_proc_write( __attribute__ ((unused)) struct file *file,
if (strlen(new_gpio_state) > 0) {
/* Convert it from String to Int */
if (settings->type != INTERRUPT) {
- gpio_state = fromString( new_gpio_state, number_of_pins[port_ID], 1);
+ gpio_state = fromString(new_gpio_state, number_of_pins[port_ID], 1);
} else {
gpio_state = fromString(new_gpio_state, number_of_pins[port_ID]/2, 2);
gpio_state2 = fromString(new_gpio_state+(number_of_pins[port_ID]/2), (number_of_pins[port_ID]/2), 2);
}
- switch( settings->type )
+ switch (settings->type)
{
case MODE:
setPortMode(port_ID, gpio_state);
@@ -863,11 +888,12 @@ static int armadeus_gpio_proc_write( __attribute__ ((unused)) struct file *file,
break;
}
- if (settings->type != INTERRUPT)
- printk("/proc wrote 0x%x", gpio_state);
- else
- printk("/proc wrote 0x%x 0x%x",gpio_state, gpio_state2);
- printk(" on %s %s register\n", port_name[port_ID],
+ if (settings->type != INTERRUPT) {
+ pr_debug("/proc wrote 0x%x", gpio_state);
+ } else {
+ pr_debug("/proc wrote 0x%x 0x%x", gpio_state, gpio_state2);
+ }
+ pr_debug(" on %s %s register\n", port_name[port_ID],
port_setting_name[settings->type]);
}
@@ -1079,7 +1105,7 @@ static int __init armadeus_gpio_init(void)
/* Set GPIOs to initial state: iMX and parameters will do it */
- printk( DRIVER_NAME " " DRIVER_VERSION " successfully loaded !\n");
+ printk(DRIVER_NAME " v" DRIVER_VERSION " successfully loaded !\n");
return 0;
}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-15 13:43:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d5c15806568a183dbd34090f2f9207c20c639d49 (commit)
from 27d90aa76fe52ca8271e4174859333d678481449 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d5c15806568a183dbd34090f2f9207c20c639d49
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 15:42:51 2009 +0200
[LINUX] Correct small bug in gpio ioctl handling on APF27 (thanks Luca)
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index bc35029..3ebe648 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -656,7 +656,11 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
/* Extract and test minor */
minor = MINOR(inode->i_rdev);
+#ifndef CONFIG_ARCH_IMX
+ if (minor < FULL_PORTF_MINOR) {
+#else
if (minor < FULL_PORTD_MINOR) {
+#endif
printk("IOCTLs are only available on 'full port' minors !\n");
ret = -EFAULT;
goto out;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-15 08:44:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 27d90aa76fe52ca8271e4174859333d678481449 (commit)
from 48e2dba05305ca23833f28a514f0ce716be93024 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 27d90aa76fe52ca8271e4174859333d678481449
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 10:36:08 2009 +0200
[LINUX] Don't initialize i.MX27 FEC GPIOs if not configured
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 31cd72a..0ddfef9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 18:57:53.000000000 +0200
-@@ -0,0 +1,1274 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-15 10:27:06.000000000 +0200
+@@ -0,0 +1,1277 @@
+ /*
+ * apf27.c
+ *
@@ -299,6 +299,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .flags = 0,
+};
+
++#ifdef CONFIG_FEC_OLD
+static int mxc_fec_pins[] = {
+ PD0_AIN_FEC_TXD0,
+ PD1_AIN_FEC_TXD1,
@@ -329,6 +330,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+{
+ mxc_gpio_release_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins));
+} */
++#endif /* CONFIG_FEC_OLD */
+
+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+static int mxc_lcd_pins[] = {
@@ -1201,8 +1203,9 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ /* init apf27dev power management related pins */
+ gpio_pwr_ctl_active();
+
++#ifdef CONFIG_FEC_OLD
+ gpio_fec_active();
-+
++#endif
+ mxc_register_device(&mxc_uart_device0, &uart0_pdata); /* console */
+ mxc_register_device(&mxc_uart_device2, &uart2_pdata);
+
@@ -1288,7 +1291,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 18:50:02.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-15 10:21:40.000000000 +0200
@@ -0,0 +1,576 @@
+ /*
+ * apf27-dev.c
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-15 07:30:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 48e2dba05305ca23833f28a514f0ce716be93024 (commit)
via 286e1870ef8178fa72f207c51e8a357335e3fabe (commit)
via ee3e2d57f2e1c1fc28827add3f7ad5d34586632b (commit)
from bbdb624916d6c964be5b88b3d1d133fbe2800df5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 48e2dba05305ca23833f28a514f0ce716be93024
Merge: 286e1870ef8178fa72f207c51e8a357335e3fabe bbdb624916d6c964be5b88b3d1d133fbe2800df5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:29:56 2009 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 286e1870ef8178fa72f207c51e8a357335e3fabe
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:27:02 2009 +0200
[BUILDROOT] Updates APF27 default Linux configs (for Optrex TFT)
commit ee3e2d57f2e1c1fc28827add3f7ad5d34586632b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:22:48 2009 +0200
[LINUX] Add Optrex T51638D084 TFT support (APF27 & Freescale framebuffer)
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 3 +-
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 +-
.../2.6.29/023-armadeus-fblcd-kconfig.patch | 15 +++++++--
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 31 +++++++++++++------
...-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch | 6 ++--
...eus-add_Optrex-T51638D084_to_mxcfb_modedb.patch | 30 +++++++++++++++++++
6 files changed, 69 insertions(+), 19 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index 88fb225..9c952fd 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Mon Sep 14 17:42:25 2009
+# Tue Sep 15 09:17:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1131,6 +1131,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
CONFIG_FB_MXC=y
#
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 1d0b3ae..47befd6 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Mon Sep 14 17:42:25 2009
+# Tue Sep 15 09:17:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1131,6 +1131,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
CONFIG_FB_MXC=y
#
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
index f00aecd..9b42276 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.29.4/drivers/video/Kconfig
===================================================================
---- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/drivers/video/Kconfig 2009-06-04 10:03:43.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-09-14 18:39:16.000000000 +0200
++++ linux-2.6.29.4/drivers/video/Kconfig 2009-09-14 18:49:16.000000000 +0200
@@ -395,6 +395,7 @@
If you plan to use the LCD display with your SA-1100 system, say
Y here.
@@ -10,7 +10,7 @@ Index: linux-2.6.29.4/drivers/video/Kconfig
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && ARM && ARCH_IMX
-@@ -402,6 +403,48 @@
+@@ -402,6 +403,55 @@
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -50,10 +50,17 @@ Index: linux-2.6.29.4/drivers/video/Kconfig
+ The native resolution is 240x320.
+
+config FB_IMX_CHIMEI_LW700AT9003_TFT
-+ bool "LW700AT9003"
++ bool "Chimei LW700AT9003"
+ help
+ Chimei LW700AT9003, a 7" 18 bits, TFT panel.
+ The native resolution is 800x600.
++
++config FB_IMX_OPTREX_T51638D084_TFT
++ bool "Optrex T51638D084"
++ help
++ OPTREX_T51638D084, a 8.4" 18 bits, TFT panel.
++ The native resolution is 640x480.
++
+endchoice
+
config FB_CYBER2000
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index a567a7d..31cd72a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 15:49:14.000000000 +0200
-@@ -0,0 +1,1263 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 18:57:53.000000000 +0200
+@@ -0,0 +1,1274 @@
+ /*
+ * apf27.c
+ *
@@ -353,18 +353,23 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ PA23_PF_LD17,
+ PA24_PF_REV,
+ PA25_PF_CLS,
++#ifdef CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ /* For Optrex T51638D084, PS is used as LCD Display ON/OFF */
++ (GPIO_PORTA | 26 | GPIO_OUT| GPIO_GPIO),
++#else
+ PA26_PF_PS,
++#endif
+ PA27_PF_SPL_SPR,
+ PA28_PF_HSYNC,
+ PA29_PF_VSYNC,
+#ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
-+ /* for LQO57 CONTRAST is used as backlight's ON/OFF */
++ /* For Sharp LQO57, CONTRAST is used as backlight's ON/OFF */
+ (GPIO_PORTA | 30 | GPIO_OUT| GPIO_GPIO),
+#else
+ PA30_PF_CONTRAST,
+#endif
+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ /* For LQ043 OE_ACD is used as LCD Display ON/OFF */
++ /* For Sharp LQ043, OE_ACD is used as LCD Display ON/OFF */
+ (GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO)
+#else
+ PA31_PF_OE_ACD
@@ -374,12 +379,16 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+static int apf27_fb_init(struct platform_device *pdev)
+{
+#ifdef CONFIG_FB_MXC
++# ifdef CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ /* For Optrex T51638D084: activates LCD at startup */
++ gpio_set_value(GPIO_PORTA | 26, 1);
++# endif
+# ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ /* For LQ043 OE_ACD is used as LCD Display ON/OFF: activate LCD */
++ /* For Sharp LQ043: activates LCD at startup */
+ gpio_set_value(GPIO_PORTA | 31, 1);
+# endif
+# ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
-+ /* For LQ057: activate backlight at startup */
++ /* For Sharp LQ057: activates backlight at startup */
+ gpio_set_value(GPIO_PORTA | 30, 0);
+# endif
+#endif
@@ -401,8 +410,10 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .mode = "Sharp-LQ043",
+# elif CONFIG_FB_IMX_SHARP_LQ057_TFT
+ .mode = "Sharp-LQ057",
-+#elif CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT
-+ .mode = "LW700AT9003",
++# elif CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT
++ .mode = "Chimei-LW700AT9003",
++# elif CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ .mode = "Optrex-T51638D084",
+# endif
+ .init = apf27_fb_init,
+ .exit = apf27_fb_exit,
@@ -1277,7 +1288,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 15:05:12.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 18:50:02.000000000 +0200
@@ -0,0 +1,576 @@
+ /*
+ * apf27-dev.c
@@ -1718,7 +1729,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
+ .max_speed_hz = 8000000,
+ .bus_num = 0, /* SPI1 */
+ .irq = IRQ_GPIOE(MAX1027_EOC_INT),
-+ .chip_select = 0,
++ .chip_select = 0, /* SS0 */
+ .mode = 0,
+ .platform_data = &apf27_max1027_config,
+ },
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
index e256f83..b2806e2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
@@ -1,13 +1,13 @@
Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
===================================================================
---- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:17:54.000000000 +0200
-+++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:27:52.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:58:12.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:58:53.000000000 +0200
@@ -101,6 +101,19 @@
.vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
},
+ [7] = {
-+ .name = "LW700AT9003",
++ .name = "Chimei-LW700AT9003",
+ .refresh = 60,
+ .xres = 800,
+ .yres = 480,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
new file mode 100644
index 0000000..62732ab
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
@@ -0,0 +1,30 @@
+
+Adds Optrex-T51638D084 support to Freescale's MX2 Framebuffer.
+Depends on some previously applied patches.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:28:22.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:29:26.000000000 +0200
+@@ -114,6 +114,19 @@
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
++ [8] = {
++ .name = "Optrex-T51638D084",
++ .refresh = 60,
++ .xres = 640,
++ .yres = 480,
++ .pixclock = 40000, /* picoS */
++ .left_margin = 48, .right_margin = 144, /* at least 3 & 1 */
++ .upper_margin = 10, .lower_margin = 35,
++ .hsync_len = 64, .vsync_len = 2,
++ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
++ .vmode = FB_VMODE_NONINTERLACED,
++ .flag = 0,
++ },
+ };
+
+ int mxcfb_modedb_sz = ARRAY_SIZE(mxcfb_modedb);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2009-09-14 23:02:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bbdb624916d6c964be5b88b3d1d133fbe2800df5 (commit)
via 5379de657aee310b0eeb6a6ff3cf352ab16917fe (commit)
via e13405e7b5148fa0648f0115f8bd6379b1861dec (commit)
via bae7d22ac99d7960c75f705719f07aefc74c90a9 (commit)
via 330444c4570f731144d30764da93711c7f9f3a35 (commit)
from ee9e1d997a5e63de9979bfb10b1fef79a8ed8435 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bbdb624916d6c964be5b88b3d1d133fbe2800df5
Merge: 5379de657aee310b0eeb6a6ff3cf352ab16917fe ee9e1d997a5e63de9979bfb10b1fef79a8ed8435
Author: jorasse <jo...@ar...>
Date: Tue Sep 15 01:01:26 2009 +0200
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5379de657aee310b0eeb6a6ff3cf352ab16917fe
Author: jorasse <jo...@ar...>
Date: Tue Sep 15 00:05:52 2009 +0200
changed quake patch to regular GIT files
commit e13405e7b5148fa0648f0115f8bd6379b1861dec
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:55:08 2009 +0200
define mtd-utils default configuration
commit bae7d22ac99d7960c75f705719f07aefc74c90a9
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:43:48 2009 +0200
update mtd-utils to support mkfs.ubifs and ubinize
commit 330444c4570f731144d30764da93711c7f9f3a35
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:40:01 2009 +0200
update mtd-utils to support mkfs.ubifs and ubinize
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 11 ++-
buildroot/local/apf9328_test/apf9328_test.config | 17 ++-
buildroot/package/games/quake-pak/Config.in | 7 +
buildroot/package/games/quake-pak/quake-pak.mk | 34 +++++
buildroot/package/games/sdlquake/Config.in | 10 ++
.../sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm | 35 +++++
buildroot/package/games/sdlquake/sdlquake.mk | 31 ++++
.../mtd-utils-all-targets.patch} | 4 +-
buildroot/package/mtd/mtd-utils20090824.git/mtd.mk | 152 +++++++++++++++++++
.../target/device/armadeus/apf27/apf27_defconfig | 11 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 17 ++-
patches/buildroot/081-adds_quake_package.patch | 157 --------------------
.../buildroot/082-mtd-utils_with_ubi-utils.patch | 92 ++++++++++++
13 files changed, 409 insertions(+), 169 deletions(-)
create mode 100644 buildroot/package/games/quake-pak/Config.in
create mode 100644 buildroot/package/games/quake-pak/quake-pak.mk
create mode 100644 buildroot/package/games/sdlquake/Config.in
create mode 100644 buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
create mode 100644 buildroot/package/games/sdlquake/sdlquake.mk
copy buildroot/{target/ubifs/mkfs-ubifs-head.patch => package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch} (83%)
create mode 100644 buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
delete mode 100644 patches/buildroot/081-adds_quake_package.patch
create mode 100644 patches/buildroot/082-mtd-utils_with_ubi-utils.patch
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 9d2b65f..b57596f 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -506,9 +506,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -529,10 +530,18 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index 1daafc8..daa8609 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -504,9 +504,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -526,11 +527,19 @@ BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
-# BR2_PACKAGE_MTD_NANDDUMP is not set
-# BR2_PACKAGE_MTD_NANDWRITE is not set
+BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
+BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_SUMTOOL is not set
+BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/package/games/quake-pak/Config.in b/buildroot/package/games/quake-pak/Config.in
new file mode 100644
index 0000000..0341d49
--- /dev/null
+++ b/buildroot/package/games/quake-pak/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
+ depends on BR2_PACKAGE_SDLQUAKE
+ help
+ This will install the shareware pak/wad data file for the Quake game.
+
+ The file will be placed in the /usr/share/games/quake/ directory.
diff --git a/buildroot/package/games/quake-pak/quake-pak.mk b/buildroot/package/games/quake-pak/quake-pak.mk
new file mode 100644
index 0000000..fbc620e
--- /dev/null
+++ b/buildroot/package/games/quake-pak/quake-pak.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# Quake shareware data files (PAK/WAD)
+#
+#############################################################
+
+QUAKE_PAK_VERSION = 1.0.6
+QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
+QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
+QUAKE_PAK_CAT = $(ZCAT)
+QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
+
+$(DL_DIR)/$(QUAKE_PAK_SOURCE):
+ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
+
+quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
+
+$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
+ mkdir -p $(QUAKE_PAK_TARGET_DIR)
+ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
+
+quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
+
+quake-pak-dirclean:
+ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
+TARGETS+=quake-pak
+endif
diff --git a/buildroot/package/games/sdlquake/Config.in b/buildroot/package/games/sdlquake/Config.in
new file mode 100644
index 0000000..3cd8e51
--- /dev/null
+++ b/buildroot/package/games/sdlquake/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
+ select BR2_PACKAGE_SDL
+ select BR2_PACKAGE_SDL_MIXER
+ select BR2_PACKAGE_SDL_NET
+ help
+ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
+ (Not supported by ID Software)
+
+ http://www.libsdl.org/projects/quake/
diff --git a/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm b/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
new file mode 100644
index 0000000..e87094b
--- /dev/null
+++ b/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
+@@ -33,7 +33,6 @@
+ crc.h \
+ cvar.c \
+ cvar.h \
+- d_copy.S \
+ d_edge.c \
+ d_fill.c \
+ d_iface.h \
+@@ -48,7 +47,6 @@
+ d_sprite.c \
+ d_surf.c \
+ d_zpoint.c \
+- dosasm.S \
+ dosisms.h \
+ draw.c \
+ draw.h \
+@@ -103,7 +101,6 @@
+ r_sprite.c \
+ r_surf.c \
+ r_vars.c \
+- r_varsa.S \
+ render.h \
+ resource.h \
+ sbar.c \
+@@ -136,7 +133,7 @@
+ world.h \
+ zone.c \
+ zone.h \
+- $(X86_SRCS) $(NONX86_SRCS)
++ $(NONX86_SRCS)
+
+ X86_SRCS = \
+ snd_mixa.S \
diff --git a/buildroot/package/games/sdlquake/sdlquake.mk b/buildroot/package/games/sdlquake/sdlquake.mk
new file mode 100644
index 0000000..60f3f23
--- /dev/null
+++ b/buildroot/package/games/sdlquake/sdlquake.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# Quake 1 (SDL_Port)
+#
+#############################################################
+
+SDLQUAKE_VERSION = 1.0.9
+SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
+#SDLQUAKE_AUTORECONF = NO
+SDLQUAKE_INSTALL_STAGING = NO
+SDLQUAKE_INSTALL_TARGET = YES
+
+SDLQUAKE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
+
+SDLQUAKE_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
+
+$(eval $(call AUTOTARGETS,package/games,sdlquake))
+
+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
+$(SDLQUAKE_TARGET_PATCH):
+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
+ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
+ (cd $(SDLQUAKE_DIR); \
+ touch INSTALL NEWS README AUTHORS ChangeLog; \
+ echo "AC_PROG_CC" >> configure.in; \
+ aclocal; \
+ autoconf; \
+ automake --add-missing;)
+ touch $@
diff --git a/buildroot/target/ubifs/mkfs-ubifs-head.patch b/buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
similarity index 83%
copy from buildroot/target/ubifs/mkfs-ubifs-head.patch
copy to buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
index 07f3bab..9d4b502 100644
--- a/buildroot/target/ubifs/mkfs-ubifs-head.patch
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
@@ -1,6 +1,6 @@
diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
---- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
-+++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
+--- mtd-utils/mkfs.ubifs/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
++++ mtd-utils.new/mkfs.ubifs/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
@@ -35,6 +35,7 @@
#include <byteswap.h>
#include <linux/types.h>
diff --git a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
new file mode 100644
index 0000000..7e95223
--- /dev/null
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
@@ -0,0 +1,152 @@
+#############################################################
+#
+# mtd provides jffs2 utilities
+#
+#############################################################
+MTD_VERSION:=a8ce7c2668ef0781326f629eef02cef6c3962b8a
+MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
+MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
+MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+MTD_CAT:=$(ZCAT)
+MTD_NAME:=mtd-utils
+
+#############################################################
+#
+# Build mkfs.jffs2 and sumtool for use on the local host system if
+# needed by target/jffs2root.
+#
+#############################################################
+MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2
+SUMTOOL := $(MTD_HOST_DIR)/sumtool
+MKFS_UBIFS:= $(MTD_HOST_DIR)/mkfs.ubifs/mkfs.ubifs
+UBINIZE:= $(MTD_HOST_DIR)/ubi-utils/ubinize
+MTD_HOST_TARGETS:=$(MKFS_JFFS2) $(SUMTOOL) $(MKFS_UBIFS) $(UBINIZE)
+
+$(DL_DIR)/$(MTD_SOURCE):
+ $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)"
+
+$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_HOST_DIR)
+ mv $(TOOL_BUILD_DIR)/$(MTD_NAME) $(MTD_HOST_DIR)
+ toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
+ package/mtd/mtd-utils20090824.git mtd-utils-all\*.patch
+ toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
+ package/mtd/mtd-utils20090824.git mtd-utils-host\*.patch
+ touch $@
+
+
+$(MTD_HOST_TARGETS): $(MTD_HOST_DIR)/.unpacked
+ CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
+ $(MAKE) \
+ BUILDDIR=$(MTD_HOST_DIR) WITHOUT_XATTR=1 \
+ -C $(MTD_HOST_DIR)
+
+mtd-host: $(MTD_HOST_TARGETS)
+
+mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
+
+mtd-host-clean:
+ -$(MAKE) -C $(MTD_HOST_DIR) clean
+
+mtd-host-dirclean:
+ rm -rf $(MTD_HOST_DIR)
+
+#############################################################
+#
+# build mtd for use on the target system
+#
+#############################################################
+$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_DIR)
+ mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR)
+ toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils20090824.git mtd-utils-all\*.patch
+ toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils20090824.git mtd-utils-target\*.patch
+ touch $@
+
+MTD_TARGETS_n :=
+MTD_TARGETS_y :=
+
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
+MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
+
+MTD_TARGETS_UBI_n :=
+MTD_TARGETS_UBI_y :=
+
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMIRROR) += ubimirror
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
+
+MTD_BUILD_TARGETS_JFFS2 := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y))
+MTD_BUILD_TARGETS_UBI := $(addprefix $(MTD_DIR)/ubi-utils/, $(MTD_TARGETS_UBI_y))
+MTD_BUILD_TARGETS := $(MTD_BUILD_TARGETS_JFFS2) $(MTD_BUILD_TARGETS_UBI)
+
+$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
+ mkdir -p $(TARGET_DIR)/usr/sbin
+ @echo $(MTD_TARGETS_y)
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ BUILDDIR=$(MTD_DIR) \
+ CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR) \
+ $(MTD_BUILD_TARGETS_JFFS2)
+
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ BUILDDIR=$(MTD_DIR)/ubi-utils \
+ CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR)/ubi-utils \
+ $(MTD_BUILD_TARGETS_UBI)
+
+MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
+MTD_UBI_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_UBI_y))
+
+$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/%
+ cp -f $< $@
+ $(STRIPCMD) $@
+
+$(MTD_UBI_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/ubi-utils/%
+ cp -f $< $@
+ $(STRIPCMD) $@
+
+mtd: zlib lzo $(MTD_TARGETS) $(MTD_UBI_TARGETS)
+
+mtd-source: $(DL_DIR)/$(MTD_SOURCE)
+
+mtd-clean:
+ -$(MAKE) -C $(MTD_DIR) clean
+
+mtd-dirclean:
+ rm -rf $(MTD_DIR)
+
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_MTD)),y)
+TARGETS+=mtd
+endif
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 9e7bc47..9b93364 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -504,9 +504,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -527,10 +528,18 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 6e86426..6198a75 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -500,9 +500,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -522,11 +523,19 @@ BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
-# BR2_PACKAGE_MTD_NANDDUMP is not set
-# BR2_PACKAGE_MTD_NANDWRITE is not set
+BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
+BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_SUMTOOL is not set
+BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
deleted file mode 100644
index 940748d..0000000
--- a/patches/buildroot/081-adds_quake_package.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-
-This patch adds Quake packages to buildroot:
-* Quake engine itself (SDL port)
-* a shareware data file (PAK/WAD) to test the engine
-
-It is inspired of OpenEmbedded work.
-
-sdlquake.mk could be simplier if a target FOO_HOOK_POST_INSTALL was
-existing in Makefile.autotools.in.
-
-Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
-EXCEPT x86.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/games/sdlquake/sdlquake.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2009-08-16 14:43:40.000000000 +0200
-@@ -0,0 +1,31 @@
-+#############################################################
-+#
-+# Quake 1 (SDL_Port)
-+#
-+#############################################################
-+
-+SDLQUAKE_VERSION = 1.0.9
-+SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
-+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
-+#SDLQUAKE_AUTORECONF = NO
-+SDLQUAKE_INSTALL_STAGING = NO
-+SDLQUAKE_INSTALL_TARGET = YES
-+
-+SDLQUAKE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
-+
-+SDLQUAKE_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
-+
-+$(eval $(call AUTOTARGETS,package/games,sdlquake))
-+
-+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
-+$(SDLQUAKE_TARGET_PATCH):
-+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
-+ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
-+ (cd $(SDLQUAKE_DIR); \
-+ touch INSTALL NEWS README AUTHORS ChangeLog; \
-+ echo "AC_PROG_CC" >> configure.in; \
-+ aclocal; \
-+ autoconf; \
-+ automake --add-missing;)
-+ touch $@
-Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2009-08-16 13:37:00.000000000 +0200
-@@ -0,0 +1,35 @@
-+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
-++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
-+@@ -33,7 +33,6 @@
-+ crc.h \
-+ cvar.c \
-+ cvar.h \
-+- d_copy.S \
-+ d_edge.c \
-+ d_fill.c \
-+ d_iface.h \
-+@@ -48,7 +47,6 @@
-+ d_sprite.c \
-+ d_surf.c \
-+ d_zpoint.c \
-+- dosasm.S \
-+ dosisms.h \
-+ draw.c \
-+ draw.h \
-+@@ -103,7 +101,6 @@
-+ r_sprite.c \
-+ r_surf.c \
-+ r_vars.c \
-+- r_varsa.S \
-+ render.h \
-+ resource.h \
-+ sbar.c \
-+@@ -136,7 +133,7 @@
-+ world.h \
-+ zone.c \
-+ zone.h \
-+- $(X86_SRCS) $(NONX86_SRCS)
-++ $(NONX86_SRCS)
-+
-+ X86_SRCS = \
-+ snd_mixa.S \
-Index: buildroot/package/games/sdlquake/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2009-08-16 14:51:17.000000000 +0200
-@@ -0,0 +1,10 @@
-+config BR2_PACKAGE_SDLQUAKE
-+ bool "sdlquake"
-+ select BR2_PACKAGE_SDL
-+ select BR2_PACKAGE_SDL_MIXER
-+ select BR2_PACKAGE_SDL_NET
-+ help
-+ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
-+ (Not supported by ID Software)
-+
-+ http://www.libsdl.org/projects/quake/
-Index: buildroot/package/games/quake-pak/quake-pak.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2009-08-16 15:50:54.000000000 +0200
-@@ -0,0 +1,34 @@
-+#############################################################
-+#
-+# Quake shareware data files (PAK/WAD)
-+#
-+#############################################################
-+
-+QUAKE_PAK_VERSION = 1.0.6
-+QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
-+QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
-+QUAKE_PAK_CAT = $(ZCAT)
-+QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
-+
-+$(DL_DIR)/$(QUAKE_PAK_SOURCE):
-+ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
-+
-+quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
-+
-+$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
-+ mkdir -p $(QUAKE_PAK_TARGET_DIR)
-+ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
-+
-+quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
-+
-+quake-pak-dirclean:
-+ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
-+TARGETS+=quake-pak
-+endif
-Index: buildroot/package/games/quake-pak/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2009-08-16 15:46:54.000000000 +0200
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_QUAKE_PAK
-+ bool "shareware Quake PAK/WAD file"
-+ depends on BR2_PACKAGE_SDLQUAKE
-+ help
-+ This will install the shareware pak/wad data file for the Quake game.
-+
-+ The file will be placed in the /usr/share/games/quake/ directory.
diff --git a/patches/buildroot/082-mtd-utils_with_ubi-utils.patch b/patches/buildroot/082-mtd-utils_with_ubi-utils.patch
new file mode 100644
index 0000000..31c060d
--- /dev/null
+++ b/patches/buildroot/082-mtd-utils_with_ubi-utils.patch
@@ -0,0 +1,92 @@
+
+This patch update mtd-utils to the august 24, 2009 GIT revision:
+* adds mkfs.ubifs tool
+* adds ubi-utils tools
+
+enable to build an UBI rootfs from scratch.
+
+Signed-off-by: jorasse <jo...@ar...>
+
+--- buildroot/package/mtd_ori/Config.in 2008-11-03 09:15:23.000000000 +0100
++++ buildroot/package/mtd/Config.in 2009-09-13 23:18:56.000000000 +0200
+@@ -28,6 +28,11 @@ config BR2_PACKAGE_MTD_20050122
+ help
+ Use the stable release.
+
++config BR2_PACKAGE_MTD_UTILS_20090824GIT
++ bool "Use MTD-utils from GIT aug 24, 2009"
++ help
++ Use the 24 aug 2009 GIT revision.
++
+ config BR2_PACKAGE_MTD_UTILS_GIT
+ bool "Use MTD-utils from GIT"
+ help
+@@ -127,7 +132,7 @@ config BR2_PACKAGE_MTD_NANDDUMP
+ config BR2_PACKAGE_MTD_NANDTEST
+ bool "nandtest"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_NANDWRITE
+ bool "nandwrite"
+@@ -152,17 +157,17 @@ config BR2_PACKAGE_MTD_SUMTOOL
+ config BR2_PACKAGE_MTD_UBIATTACH
+ bool "ubiattach"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBICRC32
+ bool "ubicrc32"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIDETACH
+ bool "ubidetach"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIMIRROR
+ bool "ubimirror"
+@@ -172,22 +177,22 @@ config BR2_PACKAGE_MTD_UBIMIRROR
+ config BR2_PACKAGE_MTD_UBIMKVOL
+ bool "ubimkvol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBINFO
+ bool "ubinfo"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIRMVOL
+ bool "ubirmvol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIUPDATEVOL
+ bool "ubiupdatevol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ endif
+
+--- buildroot/package/mtd_ori/mtd.mk 2008-11-03 09:15:23.000000000 +0100
++++ buildroot/package/mtd/mtd.mk 2009-09-13 12:10:23.000000000 +0200
+@@ -7,6 +7,9 @@ endif
+ ifeq ($(strip $(BR2_PACKAGE_MTD_20050122)),y)
+ include package/mtd/20050122/mtd.mk
+ endif
++ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_20090824GIT)),y)
++include package/mtd/mtd-utils20090824.git/mtd.mk
++endif
+ ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_GIT)),y)
+ include package/mtd/mtd-utils.git/mtd.mk
+ endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-09-14 15:52:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ee9e1d997a5e63de9979bfb10b1fef79a8ed8435 (commit)
via b26d22ac1fd6f1815b82ef8a6bf1421d74b2ca0f (commit)
via 5ea454fd41b20406dde93b9a89115c5aba387f1c (commit)
via b33b6c81ae4593f019d56f468f7234a13a7c05fb (commit)
via b2cbdfe12f179a3767ffdead8ba11cc69f42e8b3 (commit)
from db5e520dde5369913275eea4da56d969a6705a74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee9e1d997a5e63de9979bfb10b1fef79a8ed8435
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 14 17:46:21 2009 +0200
[LINUX] Removes bad comment in apf27.c
commit b26d22ac1fd6f1815b82ef8a6bf1421d74b2ca0f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 14 17:45:31 2009 +0200
[BUILDROOT] Updates Linux 2.6.29 APF27 default configs
commit 5ea454fd41b20406dde93b9a89115c5aba387f1c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 14 16:14:14 2009 +0200
[GIT] Add some .gitignore files
commit b33b6c81ae4593f019d56f468f7234a13a7c05fb
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 14 16:13:08 2009 +0200
[LINUX] Separates APF27 and APF27Dev hardware declaration parts
commit b2cbdfe12f179a3767ffdead8ba11cc69f42e8b3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 14 11:29:28 2009 +0200
[TOOLS] Improve verbosity of quiltifying script
-----------------------------------------------------------------------
Summary of changes:
buildroot/.gitignore | 13 +
buildroot/local/apf27_test/linux-2.6.29.4.config | 4 +-
.../armadeus/apf27/apf27-linux-2.6.29.config | 4 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 1019 ++++++++++++--------
...-apf27-armadeus-add_apf27_to_build_system.patch | 41 +-
scripts/quilt.sh | 11 +-
target/linux/.gitignore | 8 +
7 files changed, 673 insertions(+), 427 deletions(-)
create mode 100644 buildroot/.gitignore
create mode 100644 target/linux/.gitignore
diff --git a/buildroot/.gitignore b/buildroot/.gitignore
new file mode 100644
index 0000000..93b53bb
--- /dev/null
+++ b/buildroot/.gitignore
@@ -0,0 +1,13 @@
+/build_*
+/project_*
+/toolchain_*
+/binaries
+/dl
+/.auto.deps
+/.config.cmd
+/.config.old
+/.config
+*.depend
+*.o
+*.orig
+*~
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index fa5791a..88fb225 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Fri Jul 17 11:06:54 2009
+# Mon Sep 14 17:42:25 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -189,6 +189,8 @@ CONFIG_MACH_APF27=y
CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_MX27ADS is not set
# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_PCM970_BASEBOARD is not set
+CONFIG_MACH_APF27_DEV=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 7f66790..1d0b3ae 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Fri Jul 17 11:06:54 2009
+# Mon Sep 14 17:42:25 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -189,6 +189,8 @@ CONFIG_MACH_APF27=y
CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_MX27ADS is not set
# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_PCM970_BASEBOARD is not set
+CONFIG_MACH_APF27_DEV=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index eb42f15..a567a7d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -1,11 +1,16 @@
-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)
+
+Adds support for Armadeus Systems APF27 module (i.MX27 based) and
+APF27Dev companion baseboard.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-06-22 15:19:21.000000000 +0200
-@@ -0,0 +1,1660 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 15:49:14.000000000 +0200
+@@ -0,0 +1,1263 @@
+ /*
+ * apf27.c
+ *
@@ -89,21 +94,11 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#include "devices.h"
+#include "crm_regs.h"
+
-+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
-+#define CONFIG_ARMADEUS_MAX1027 1
-+#endif
-+#ifdef CONFIG_SPI_TSC2102_MODULE
-+#define CONFIG_SPI_TSC2102 1
-+#endif
-+#ifdef CONFIG_CAN_MCP251X_MODULE
-+#define CONFIG_CAN_MCP251X 1
-+#endif
++extern void apf27_baseboard_init(void);
++
+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
+#define CONFIG_IMX_BACKLIGHT
+#endif
-+#ifdef CONFIG_VIDEO_AD9889_MODULE
-+#define CONFIG_VIDEO_AD9889 1
-+#endif
+#ifdef CONFIG_VIDEO_MX27_MODULE
+#define CONFIG_VIDEO_MX27 1
+#endif
@@ -114,8 +109,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#define CONFIG_PWM
+#endif
+
-+//#define CONFIG_GPS
-+//#define CONFIG_GSM
+
+#ifdef CONFIG_PWM
+static int mxc_pwm0_pins[] = {
@@ -194,121 +187,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .exit = apf27_i2c_1_exit,
+};
+
-+static struct i2c_board_info apf27_i2c_devices_bus0[] = {
-+ [0] = {
-+ .type = "ds1374",
-+ .flags = 0, /* FIXME */
-+ .addr = 0x68, /* E0=0, E1=1, E2=0 */
-+ .platform_data = NULL,
-+ .irq = 0
-+ },
-+#ifdef CONFIG_VIDEO_OV96xx
-+ [1] = {
-+ .type = "ov96xx",
-+ .flags = 0, /* FIXME */
-+ .addr = 0x30,
-+ .platform_data = NULL,
-+ .irq = 0
-+ },
-+#endif
-+};
-+
-+#ifdef CONFIG_VIDEO_AD9889
-+#define AD9889_INT 15
-+
-+static int ad9889_pins[] = {
-+ (GPIO_PORTC | GPIO_IN | GPIO_GPIO | AD9889_INT),
-+};
-+
-+static int ad9889_init(void)
-+{
-+ return mxc_gpio_setup_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins), "AD9889");
-+}
-+
-+static int ad9889_exit(void)
-+{
-+ mxc_gpio_release_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins));
-+ return 0;
-+}
-+
-+struct ad9889_fb_data {
-+ struct fb_var_screeninfo var;
-+ int PA31_GIUS_old_state;
-+};
-+
-+static struct ad9889_fb_data apf27_ad9889_fb_data;
-+extern void acquire_console_sem(void);
-+extern void release_console_sem(void);
-+
-+static void ad9889_display_connected(void)
-+{
-+ struct fb_var_screeninfo temp_var;
-+ struct fb_info *info = registered_fb[0];
-+
-+ apf27_ad9889_fb_data.PA31_GIUS_old_state = 0;
-+ /* make sure the LCD OE_ACD pin is correctly configured */
-+ if (__raw_readl(VA_GPIO_BASE + MXC_GIUS(0)) & 0x80000000) {
-+ apf27_ad9889_fb_data.PA31_GIUS_old_state = 1;
-+ mxc_gpio_mode(PA31_PF_OE_ACD);
-+ }
-+
-+ /* save old FB params */
-+ memcpy(&apf27_ad9889_fb_data.var, &info->var, sizeof(struct fb_var_screeninfo));
-+ memcpy(&temp_var, &info->var, sizeof(struct fb_var_screeninfo));
-+
-+ /* set new FB params */
-+ temp_var.xres = 640;
-+ temp_var.yres = 480;
-+ temp_var.pixclock = 37538;
-+ temp_var.left_margin = 47;
-+ temp_var.right_margin = 47; /* at least 3 & 1 */
-+ temp_var.upper_margin = 33;
-+ temp_var.lower_margin = 10;
-+ temp_var.hsync_len = 63;
-+ temp_var.vsync_len = 2;
-+#ifdef CONFIG_FB_MXC
-+ temp_var.sync = FB_SYNC_OE_ACT_HIGH; /* -> Will change PCR */
-+#endif
-+ temp_var.vmode = FB_VMODE_NONINTERLACED,
-+ temp_var.nonstd = 0;
-+
-+ acquire_console_sem();
-+ /* tel the FB client that params have been changed */
-+ info->flags |= FBINFO_MISC_USEREVENT;
-+ /* set new params */
-+ fb_set_var(info, &temp_var);
-+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
-+}
-+
-+static void ad9889_display_disconnected(void)
-+{
-+ struct fb_info *info = registered_fb[0];
-+
-+ /* restore LCD OE_ACD pin */
-+ if (apf27_ad9889_fb_data.PA31_GIUS_old_state)
-+ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO);
-+
-+ acquire_console_sem();
-+ /* inform the console that the FB params have been changed */
-+ info->flags |= FBINFO_MISC_USEREVENT;
-+ /* restore old FB params */
-+ fb_set_var(info, &apf27_ad9889_fb_data.var);
-+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
-+}
-+
-+static struct ad9889_config apf27_ad9889_config = {
-+ .init = ad9889_init,
-+ .exit = ad9889_exit,
-+ .display_connected = ad9889_display_connected,
-+ .display_disconnected = ad9889_display_disconnected,
-+ .data = &apf27_ad9889_fb_data,
-+ .EDID_I2C_addr = 0x3f
-+};
-+
-+#endif /* CONFIG_VIDEO_AD9889 */
-+
+static struct i2c_board_info apf27_i2c_devices_bus1[] = {
+ [0] = {
+ .type = "24c02",
@@ -317,37 +195,22 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .platform_data = NULL,
+ .irq = 0
+ },
-+#ifdef CONFIG_VIDEO_AD9889
-+ [1] = {
-+ .type = "ad9889",
-+ .flags = 0,
-+ .addr = 0x39,
-+ .platform_data = &apf27_ad9889_config,
-+ .irq = IRQ_GPIOC(AD9889_INT)
-+ },
-+#endif /* CONFIG_VIDEO_AD9889 */
+};
+#endif /* CONFIG_I2C */
+
+
+#ifdef CONFIG_SPI
-+#define MAX1027_CS (GPIO_PORTD | 28)
+static int mxc_cspi0_pins[] = {
-+ (MAX1027_CS | GPIO_OUT | GPIO_GPIO ),
-+ //PD28_PF_CSPI1_SS0, /* MAX1027 */
++ /* PD28_PF_CSPI1_SS0, Preferably use a GPIO for CS */
+ PD29_PF_CSPI1_SCLK,
+ PD30_PF_CSPI1_MISO,
+ PD31_PF_CSPI1_MOSI
+};
+
-+#define TSC2101_CS (GPIO_PORTD|21)
-+#define MCP251X_CS (GPIO_PORTD|20)
+static int mxc_cspi1_pins[] = {
-+ (TSC2101_CS | GPIO_OUT | GPIO_GPIO ), /* <- Only if TSC is selected too !! */
-+ (MCP251X_CS | GPIO_OUT | GPIO_GPIO ),
-+ //PD19_PF_CSPI2_SS2,
-+ //PD20_PF_CSPI2_SS1, /* MCP2515 */
-+ //PD21_PF_CSPI2_SS0, /*TSC2101 */
++ /*PD19_PF_CSPI2_SS2,
++ PD20_PF_CSPI2_SS1, Preferably use a GPIO for CS
++ PD21_PF_CSPI2_SS0, */
+ PD22_PF_CSPI2_SCLK,
+ PD23_PF_CSPI2_MISO,
+ PD24_PF_CSPI2_MOSI
@@ -355,7 +218,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+static int gpio_spi0_active(struct platform_device *pdev)
+{
-+ gpio_set_value(MAX1027_CS, 1);
+ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
+}
+
@@ -367,8 +229,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+static int gpio_spi1_active(struct platform_device *pdev)
+{
-+ gpio_set_value(TSC2101_CS, 1);
-+ gpio_set_value(MCP251X_CS, 1);
+ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
+}
+
@@ -417,73 +277,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .flags = 0,
+};
+
-+#ifdef CONFIG_GSM
-+#define GSM_POK_IN (GPIO_PORTE | 11)
-+static int mxc_uart1_pins[] = {
-+ PE3_PF_UART2_CTS,
-+ PE4_PF_UART2_RTS,
-+ PE6_PF_UART2_TXD,
-+ PE7_PF_UART2_RXD,
-+ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO ) /* GSM_PWR_ON_not */
-+};
-+
-+static int uart_mxc_port1_init(struct platform_device *pdev)
-+{
-+ int res = mxc_gpio_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "UART1");
-+ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
-+ mdelay(5000);
-+ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
-+ return res;
-+}
-+
-+static int uart_mxc_port1_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins));
-+
-+ return 0;
-+}
-+
-+static struct imxuart_platform_data uart1_pdata = {
-+ .init = uart_mxc_port1_init,
-+ .exit = uart_mxc_port1_exit,
-+ .flags = IMXUART_HAVE_RTSCTS,
-+};
-+#endif
-+
-+#ifdef CONFIG_GPS
-+#define GPS_WAKEUP (GPIO_PORTB | 20)
-+#define GPS_TIMEPULSE (GPIO_PORTB | 21)
-+
-+static int mxc_uart4_pins[] = {
-+ PB19_AF_UART5_RXD,
-+ PB18_AF_UART5_TXD,
-+ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO ),
-+ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO )
-+};
-+
-+static int uart_mxc_port4_init(struct platform_device *pdev)
-+{
-+ int res = mxc_gpio_setup_multiple_pins(mxc_uart4_pins, ARRAY_SIZE(mxc_uart4_pins), "UART4");
-+ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
-+
-+ return res;
-+}
-+
-+static int uart_mxc_port4_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart4_pins));
-+
-+ return 0;
-+}
-+
-+static struct imxuart_platform_data uart4_pdata = {
-+ .init = uart_mxc_port4_init,
-+ .exit = uart_mxc_port4_exit,
-+ .flags = 0,
-+};
-+#endif
-+
-+static int mxc_uart2_pins[] = {
++static int mxc_uart2_pins[] = {
+ PE8_PF_UART3_TXD,
+ PE9_PF_UART3_RXD,};
+
@@ -733,152 +527,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+}
+#endif /* CONFIG_MMC_MXC */
+
-+#ifdef CONFIG_ARMADEUS_MAX1027
-+#define MAX1027_EOC_INT 15
-+#define MAX1027_CNVST 14
-+static int max1027_pins[] = {
-+ (GPIO_PORTE | GPIO_IN | GPIO_GPIO | MAX1027_EOC_INT),
-+ (GPIO_PORTE | GPIO_OUT | GPIO_GPIO | MAX1027_CNVST),
-+};
-+
-+static int max1027_init(struct spi_device *spi)
-+{
-+ return mxc_gpio_setup_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins), "MAX1027");
-+}
-+
-+static int max1027_exit(struct spi_device *spi)
-+{
-+ mxc_gpio_release_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins));
-+ return 0;
-+}
-+
-+static void max1027_cs(u32 command)
-+{
-+ if( command == SPI_CS_DEASSERT )
-+ gpio_set_value(MAX1027_CS, 1);
-+ else
-+ gpio_set_value(MAX1027_CS, 0);
-+}
-+
-+static struct spi_imx_chip max1027_hw = {
-+ .cs_control = max1027_cs,
-+};
-+
-+static struct max1027_config apf27_max1027_config = {
-+ .conv = MAX1027_CONV_DEFAULT,
-+ .setup = MAX1027_SETUP_DEFAULT,
-+ .avg = MAX1027_AVG_DEFAULT,
-+ .cnvst_pin = (int)(MAX1027_CNVST|GPIO_PORTE),
-+ .init = max1027_init,
-+ .exit = max1027_exit
-+};
-+#endif /* CONFIG_ARMADEUS_MAX1027 */
-+
-+#ifdef CONFIG_SPI_TSC2102
-+#define TSC2101_INT 17
-+static int tsc2101_init_gpio(void)
-+{
-+ /* configure int pin as GPIO */
-+ mxc_gpio_mode( GPIO_PORTF | TSC2101_INT | GPIO_IN | GPIO_GPIO );
-+
-+ return 0;
-+}
-+
-+/* Chip select toggle for TSC2101 */
-+static void tsc2101_cs(u32 command)
-+{
-+ if( command == SPI_CS_DEASSERT )
-+ gpio_set_value(TSC2101_CS, 1);
-+ else
-+ gpio_set_value(TSC2101_CS, 0);
-+}
-+
-+static struct spi_imx_chip tsc2101_hw = {
-+ .cs_control = tsc2101_cs,
-+};
-+
-+static struct tsc210x_config apf27_tsc2101_config = {
-+ .mclk = 12288000, /* MCLK value in Master mode */
-+ .use_internal = 1, /* -> use internal voltage reference */
-+ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
-+ .init = tsc2101_init_gpio,
-+/* .apm_report = palmte_get_power_status,
-+ .alsa_config = &palmte_alsa_config,*/
-+};
-+
-+#endif /* CONFIG_SPI_TSC2102 */
-+
-+#ifdef CONFIG_CAN_MCP251X
-+#define CAN_MCP251X_INT 19
-+static void mcp251X_init_irq(void)
-+{
-+ /* configure int pin as GPIO */
-+ mxc_gpio_mode( GPIO_PORTD | CAN_MCP251X_INT | GPIO_IN | GPIO_GPIO);
-+ /* configure irq */
-+}
-+
-+// Chip select command for MCP251X
-+static void mcp251X_cs(u32 command)
-+{
-+ if( command == SPI_CS_DEASSERT )
-+ gpio_set_value(MCP251X_CS, 1);
-+ else
-+ gpio_set_value(MCP251X_CS, 0);
-+}
-+
-+static struct spi_imx_chip mcp251X_hw = {
-+ .cs_control = mcp251X_cs,
-+};
-+
-+
-+static struct mcp251x_platform_data apf27_mcp251x_config = {
-+ .oscillator_frequency = 16000000,
-+ .board_specific_setup = mcp251X_init_irq,
-+ .device_reset = NULL,
-+ .transceiver_enable = NULL,
-+};
-+
-+#endif /* CONFIG_CAN_MCP251X */
-+
-+
-+static struct spi_board_info spi_board_info[] __initdata = {
-+#ifdef CONFIG_ARMADEUS_MAX1027
-+ {
-+ .modalias = "max1027",
-+ .controller_data = &max1027_hw,
-+ .max_speed_hz = 8000000,
-+ .bus_num = 0, /* SPI1 */
-+ .irq = IRQ_GPIOE(MAX1027_EOC_INT),
-+ .chip_select = 0, /* SS0 */
-+ .mode = 0,
-+ .platform_data = &apf27_max1027_config,
-+ },
-+#endif /* CONFIG_ARMADEUS_MAX1027 */
-+#ifdef CONFIG_SPI_TSC2102
-+ {
-+ .modalias = "tsc210x",
-+ .controller_data = &tsc2101_hw,
-+ .max_speed_hz = 8000000,
-+ .bus_num = 1, /* SPI2 */
-+ .irq = IRQ_GPIOF(TSC2101_INT),
-+ .chip_select = 0,
-+ .mode = 0,
-+ .platform_data = &apf27_tsc2101_config,
-+ },
-+#endif /* CONFIG_SPI_TSC2102 */
-+#ifdef CONFIG_CAN_MCP251X
-+ {
-+ .modalias = "mcp251x",
-+ .controller_data = &mcp251X_hw,
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = 0,
-+ .chip_select = 1,
-+ .irq = IRQ_GPIOD(CAN_MCP251X_INT),
-+ .platform_data = &apf27_mcp251x_config,
-+ },
-+#endif /* CONFIG_CAN_MCP251X */
-+};
+
+#ifdef CONFIG_USB_EHCI_MXC
+static int mxc_usbotg_pins[] = {
@@ -912,7 +560,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ }
+
+ if (on) {
-+
+ /* force disconnection of the DM/DP signals. This
+ avoid powering the connected device through these lines */
+ ulpi_set(RESET, ISP1504_FCNCTL, view);
@@ -1090,34 +737,9 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+}
+
+late_initcall(apf27_late_init);
-+
-+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
-+static struct imx_alsa_codec_config tsc2101_alsa_pdata;
-+
-+static struct resource ssi_resources[] = {
-+ [0] = {
-+ .start = SSI1_BASE_ADDR,
-+ .end = SSI1_BASE_ADDR + 0x6F,
-+ .flags = IORESOURCE_MEM
-+ },
-+};
-+
-+static struct platform_device tsc2101_alsa_device = {
-+ .name = "tsc210x-alsa", /* Should be the same as the driver name */
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(ssi_resources),
-+ .resource = ssi_resources,
-+ .dev = {
-+ .platform_data = &tsc2101_alsa_pdata,
-+ }
-+};
-+# define ALSA_SOUND &tsc2101_alsa_device,
-+# endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
-+
-+#else
-+# define ALSA_SOUND
+#endif /* CONFIG_SND || CONFIG_SND_MODULE */
+
++
+#ifdef DEBUG
+static void apf27_dump_clocks(void)
+{
@@ -1258,7 +880,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#ifdef CONFIG_IMX_BACKLIGHT
+ &imxbl_device,
+#endif
-+ ALSA_SOUND
+ CPU_FREQUENCY
+#ifdef CONFIG_MXC_VPU
+ &mxc_vpu_device,
@@ -1332,7 +953,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+/* APF27 power management stuff */
+
-+
+#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
+#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
+#define APF27DEV_USER_LED (GPIO_PORTF | 14)
@@ -1562,7 +1182,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+};
+#endif /* CONFIG_MACH_APF27_FPGA */
+
-+
+static void __init apf27_init(void)
+{
+ sysdev_class_register(&apf27_pm_sysclass);
@@ -1573,14 +1192,9 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+ gpio_fec_active();
+
-+ mxc_register_device(&mxc_uart_device0, &uart0_pdata);
-+#ifdef CONFIG_GSM
-+ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
-+#endif
++ mxc_register_device(&mxc_uart_device0, &uart0_pdata); /* console */
+ mxc_register_device(&mxc_uart_device2, &uart2_pdata);
-+#ifdef CONFIG_GPS
-+ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
-+#endif
++
+ mxc_register_device(&mxc_nand_device, &apf27_nand_board_info);
+
+#ifdef CONFIG_PWM
@@ -1592,14 +1206,11 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#ifdef CONFIG_USB_EHCI_MXC
+ mxc_register_device(&mxc_otg, &ehci0_pdata);
+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
-+#endif /* CONFIG_USB_EHCI_MXC */
++#endif
+#ifdef CONFIG_I2C
+ mxc_register_device(&imx_i2c_device0, &apf27_i2c_0_data);
+ mxc_register_device(&imx_i2c_device1, &apf27_i2c_1_data);
+
-+ i2c_register_board_info(0, apf27_i2c_devices_bus0,
-+ ARRAY_SIZE(apf27_i2c_devices_bus0));
-+
+ i2c_register_board_info(1, apf27_i2c_devices_bus1,
+ ARRAY_SIZE(apf27_i2c_devices_bus1));
+#endif
@@ -1609,11 +1220,6 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#endif
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
-+ spi_register_board_info(spi_board_info,
-+ ARRAY_SIZE(spi_board_info));
-+#endif
-+
+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+ mxc_register_device(&mxc_fb_device, &apf27_fb_data);
+#endif
@@ -1629,6 +1235,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#endif
+
+ printk("i.MX27 chip revision: %d\n", mx27_revision() );
++
++ apf27_baseboard_init();
+}
+
+static void __init apf27_timer_init(void)
@@ -1666,3 +1274,584 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .init_machine = apf27_init,
+ .timer = &apf27_timer,
+MACHINE_END
+Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 15:05:12.000000000 +0200
+@@ -0,0 +1,576 @@
++ /*
++ * apf27-dev.c
++ * Support of AFP27 module's development baseboard
++ *
++ * Copyright (C) 2009 Armadeus Systems
++ * Authors: Julien Boibessot <jul...@ar...>
++ * Nicolas Colombain <nic...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/mtd/physmap.h>
++#include <asm/mach/flash.h>
++#include <linux/spi/spi.h>
++#include <linux/i2c.h>
++#include <linux/serial.h>
++#include <linux/delay.h>
++#include <linux/irq.h>
++#include <linux/cpufreq.h>
++#include <linux/clk.h>
++#include <linux/dma-mapping.h>
++#include <asm/io.h>
++#include <asm/mach/arch.h>
++#include <asm/mach-types.h>
++#include <asm/mach/time.h>
++// #include <asm/arch/clock.h>
++#include <mach/common.h>
++#include <mach/hardware.h>
++#include <mach/iomux-mx1-mx2.h>
++#include <mach/gpio.h>
++#include <mach/imx_i2c.h>
++//#include <mach/imx_spi.h>
++#include <../mach-imx/include/mach/spi_imx.h>
++#include <mach/imx-uart.h>
++#include <mach/mmc.h>
++#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
++#include <mach/imx_fb.h>
++#include <mach/imxfb.h>
++#endif
++#include <linux/fb.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
++#include <linux/spi/max1027.h>
++#include <linux/spi/tsc2102.h>
++#include "../../../drivers/net/can/mcp251x.h"
++#include "../../../drivers/armadeus/pwm/pwm.h"
++#include <media/ad9889.h>
++#if defined(CONFIG_SND) || defined (CONFIG_SND_MODULE)
++#include <mach/imx_dam.h>
++#include <mach/imx_sound.h>
++#include <mach/imx_ssi.h>
++#include <mach/imx-alsa.h>
++#endif
++#if defined(CONFIG_VIDEO_MX27_MODULE) || defined(CONFIG_VIDEO_MX27)
++#include <mach/imx_cam.h>
++#endif
++#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
++#include "cpufreq_imx.h"
++#endif
++#include <mach/board-apf27.h>
++#include <asm/mach/map.h>
++#ifdef CONFIG_MACH_APF27_FPGA
++#include <mach/fpga.h>
++#endif
++#include "devices.h"
++#include "crm_regs.h"
++
++#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
++#define CONFIG_ARMADEUS_MAX1027 1
++#endif
++#ifdef CONFIG_SPI_TSC2102_MODULE
++#define CONFIG_SPI_TSC2102 1
++#endif
++#ifdef CONFIG_CAN_MCP251X_MODULE
++#define CONFIG_CAN_MCP251X 1
++#endif
++#ifdef CONFIG_IMX_BACKLIGHT_MODULE
++#define CONFIG_IMX_BACKLIGHT
++#endif
++#ifdef CONFIG_VIDEO_AD9889_MODULE
++#define CONFIG_VIDEO_AD9889 1
++#endif
++#ifdef CONFIG_VIDEO_MX27_MODULE
++#define CONFIG_VIDEO_MX27 1
++#endif
++#ifdef CONFIG_VIDEO_OV96xx_MODULE
++#define CONFIG_VIDEO_OV96xx 1
++#endif
++#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
++#define CONFIG_PWM
++#endif
++
++//#define CONFIG_GPS
++//#define CONFIG_GSM
++
++
++#ifdef CONFIG_I2C
++
++static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
++ [0] = {
++ .type = "ds1374",
++ .flags = 0, /* FIXME */
++ .addr = 0x68, /* E0=0, E1=1, E2=0 */
++ .platform_data = NULL,
++ .irq = 0
++ },
++# ifdef CONFIG_VIDEO_OV96xx
++ [1] = {
++ .type = "ov96xx",
++ .flags = 0, /* FIXME */
++ .addr = 0x30,
++ .platform_data = NULL,
++ .irq = 0
++ },
++# endif
++};
++
++# ifdef CONFIG_VIDEO_AD9889
++#define AD9889_INT 15
++
++static int ad9889_pins[] = {
++ (GPIO_PORTC | GPIO_IN | GPIO_GPIO | AD9889_INT),
++};
++
++static int ad9889_init(void)
++{
++ return mxc_gpio_setup_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins), "AD9889");
++}
++
++static int ad9889_exit(void)
++{
++ mxc_gpio_release_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins));
++ return 0;
++}
++
++struct ad9889_fb_data {
++ struct fb_var_screeninfo var;
++ int PA31_GIUS_old_state;
++};
++
++static struct ad9889_fb_data apf27_ad9889_fb_data;
++extern void acquire_console_sem(void);
++extern void release_console_sem(void);
++
++static void ad9889_display_connected(void)
++{
++ struct fb_var_screeninfo temp_var;
++ struct fb_info *info = registered_fb[0];
++
++ apf27_ad9889_fb_data.PA31_GIUS_old_state = 0;
++ /* make sure the LCD OE_ACD pin is correctly configured */
++ if (__raw_readl(VA_GPIO_BASE + MXC_GIUS(0)) & 0x80000000) {
++ apf27_ad9889_fb_data.PA31_GIUS_old_state = 1;
++ mxc_gpio_mode(PA31_PF_OE_ACD);
++ }
++
++ /* save old FB params */
++ memcpy(&apf27_ad9889_fb_data.var, &info->var, sizeof(struct fb_var_screeninfo));
++ memcpy(&temp_var, &info->var, sizeof(struct fb_var_screeninfo));
++
++ /* set new FB params */
++ temp_var.xres = 640;
++ temp_var.yres = 480;
++ temp_var.pixclock = 37538;
++ temp_var.left_margin = 47;
++ temp_var.right_margin = 47; /* at least 3 & 1 */
++ temp_var.upper_margin = 33;
++ temp_var.lower_margin = 10;
++ temp_var.hsync_len = 63;
++ temp_var.vsync_len = 2;
++# ifdef CONFIG_FB_MXC
++ temp_var.sync = FB_SYNC_OE_ACT_HIGH; /* -> Will change PCR */
++# endif
++ temp_var.vmode = FB_VMODE_NONINTERLACED,
++ temp_var.nonstd = 0;
++
++ acquire_console_sem();
++ /* tel the FB client that params have been changed */
++ info->flags |= FBINFO_MISC_USEREVENT;
++ /* set new params */
++ fb_set_var(info, &temp_var);
++ info->flags &= ~FBINFO_MISC_USEREVENT;
++ release_console_sem();
++}
++
++static void ad9889_display_disconnected(void)
++{
++ struct fb_info *info = registered_fb[0];
++
++ /* restore LCD OE_ACD pin */
++ if (apf27_ad9889_fb_data.PA31_GIUS_old_state)
++ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO);
++
++ acquire_console_sem();
++ /* inform the console that the FB params have been changed */
++ info->flags |= FBINFO_MISC_USEREVENT;
++ /* restore old FB params */
++ fb_set_var(info, &apf27_ad9889_fb_data.var);
++ info->flags &= ~FBINFO_MISC_USEREVENT;
++ release_console_sem();
++}
++
++static struct ad9889_config apf27_ad9889_config = {
++ .init = ad9889_init,
++ .exit = ad9889_exit,
++ .display_connected = ad9889_display_connected,
++ .display_disconnected = ad9889_display_disconnected,
++ .data = &apf27_ad9889_fb_data,
++ .EDID_I2C_addr = 0x3f
++};
++
++# endif /* CONFIG_VIDEO_AD9889 */
++
++static struct i2c_board_info apf27dev_i2c_devices_bus1[] = {
++# ifdef CONFIG_VIDEO_AD9889
++ [0] = {
++ .type = "ad9889",
++ .flags = 0,
++ .addr = 0x39,
++ .platform_data = &apf27_ad9889_config,
++ .irq = IRQ_GPIOC(AD9889_INT)
++ },
++# endif /* CONFIG_VIDEO_AD9889 */
++};
++#endif /* CONFIG_I2C */
++
++
++#ifdef CONFIG_GSM
++#define GSM_POK_IN (GPIO_PORTE | 11)
++static int mxc_uart1_pins[] = {
++ PE3_PF_UART2_CTS,
++ PE4_PF_UART2_RTS,
++ PE6_PF_UART2_TXD,
++ PE7_PF_UART2_RXD,
++ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO ) /* GSM_PWR_ON_not */
++};
++
++static int uart_mxc_port1_init(struct platform_device *pdev)
++{
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "UART1");
++ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
++ mdelay(5000);
++ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
++ return res;
++}
++
++static int uart_mxc_port1_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins));
++
++ return 0;
++}
++
++static struct imxuart_platform_data uart1_pdata = {
++ .init = uart_mxc_port1_init,
++ .exit = uart_mxc_port1_exit,
++ .flags = IMXUART_HAVE_RTSCTS,
++};
++#endif /* CONFIG_GSM */
++
++#ifdef CONFIG_GPS
++#define GPS_WAKEUP (GPIO_PORTB | 20)
++#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++
++static int mxc_uart4_pins[] = {
++ PB19_AF_UART5_RXD,
++ PB18_AF_UART5_TXD,
++ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
++ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
++};
++
++static int uart_mxc_port4_init(struct platform_device *pdev)
++{
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart4_pins, ARRAY_SIZE(mxc_uart4_pins), "UART4");
++ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
++
++ return res;
++}
++
++static int uart_mxc_port4_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart4_pins));
++
++ return 0;
++}
++
++static struct imxuart_platform_data uart4_pdata = {
++ .init = uart_mxc_port4_init,
++ .exit = uart_mxc_port4_exit,
++ .flags = 0,
++};
++#endif /* CONFIG_GPS */
++
++
++#ifdef CONFIG_ARMADEUS_MAX1027
++#define MAX1027_EOC_INT 15
++#define MAX1027_CNVST 14
++#define MAX1027_CS (GPIO_PORTD | 28)
++
++static int max1027_pins[] = {
++ (MAX1027_CS | GPIO_OUT | GPIO_GPIO),
++ (GPIO_PORTE | GPIO_IN | GPIO_GPIO | MAX1027_EOC_INT),
++ (GPIO_PORTE | GPIO_OUT | GPIO_GPIO | MAX1027_CNVST),
++};
++
++static int max1027_init(struct spi_device *spi)
++{
++ gpio_set_value(MAX1027_CS, 1);
++ return mxc_gpio_setup_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins), "MAX1027");
++}
++
++static int max1027_exit(struct spi_device *spi)
++{
++ mxc_gpio_release_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins));
++ return 0;
++}
++
++static void max1027_cs(u32 command)
++{
++ if( command == SPI_CS_DEASSERT )
++ gpio_set_value(MAX1027_CS, 1);
++ else
++ gpio_set_value(MAX1027_CS, 0);
++}
++
++static struct spi_imx_chip max1027_hw = {
++ .cs_control = max1027_cs,
++};
++
++static struct max1027_config apf27_max1027_config = {
++ .conv = MAX1027_CONV_DEFAULT,
++ .setup = MAX1027_SETUP_DEFAULT,
++ .avg = MAX1027_AVG_DEFAULT,
++ .cnvst_pin = (int)(MAX1027_CNVST|GPIO_PORTE),
++ .init = max1027_init,
++ .exit = max1027_exit
++};
++#endif /* CONFIG_ARMADEUS_MAX1027 */
++
++#ifdef CONFIG_SPI_TSC2102
++#define TSC2101_INT 17
++#define TSC2101_CS (GPIO_PORTD | 21)
++
++static int tsc2101_pins[] = {
++ (TSC2101_CS | GPIO_OUT | GPIO_GPIO),
++ (GPIO_PORTF | TSC2101_INT | GPIO_IN | GPIO_GPIO), /* configure int pin as GPIO */
++};
++
++static int tsc2101_init_gpio(void)
++{
++ gpio_set_value(TSC2101_CS, 1);
++ return mxc_gpio_setup_multiple_pins(tsc2101_pins, ARRAY_SIZE(tsc2101_pins), "TSC2101");
++}
++
++/* Chip select toggle for TSC2101 */
++static void tsc2101_cs(u32 command)
++{
++ if (command == SPI_CS_DEASSERT)
++ gpio_set_value(TSC2101_CS, 1);
++ else
++ gpio_set_value(TSC2101_CS, 0);
++}
++
++static struct spi_imx_chip tsc2101_hw = {
++ .cs_control = tsc2101_cs,
++};
++
++static struct tsc210x_config apf27_tsc2101_config = {
++ .mclk = 12288000, /* MCLK value in Master mode */
++ .use_internal = 1, /* -> use internal voltage reference */
++ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
++ .init = tsc2101_init_gpio,
++/* .apm_report = palmte_get_power_status,
++ .alsa_config = &palmte_alsa_config,*/
++};
++#endif /* CONFIG_SPI_TSC2102 */
++
++
++#ifdef CONFIG_CAN_MCP251X
++
++#define CAN_MCP251X_INT 19
++#define MCP251X_CS (GPIO_PORTD | 20)
++
++static int mcp251x_pins[] = {
++ (GPIO_PORTD | CAN_MCP251X_INT | GPIO_IN | GPIO_GPIO), /* configure int pin as GPIO */
++ (MCP251X_CS | GPIO_OUT | GPIO_GPIO),
++};
++
++static void mcp251X_init_irq(void)
++{
++ gpio_set_value(MCP251X_CS, 1);
++ mxc_gpio_setup_multiple_pins(mcp251x_pins, ARRAY_SIZE(mcp251x_pins), "MCP251x");
++}
++
++// Chip select command for MCP251X
++static void mcp251X_cs(u32 command)
++{
++ if (command == SPI_CS_DEASSERT)
++ gpio_set_value(MCP251X_CS, 1);
++ else
++ gpio_set_value(MCP251X_CS, 0);
++}
++
++static struct spi_imx_chip mcp251X_hw = {
++ .cs_control = mcp251X_cs,
++};
++
++
++static struct mcp251x_platform_data apf27_mcp251x_config = {
++ .oscillator_frequency = 16000000,
++ .board_specific_setup = mcp251X_init_irq,
++ .device_reset = NULL,
++ .transceiver_enable = NULL,
++};
++
++#endif /* CONFIG_CAN_MCP251X */
++
++
++static struct spi_board_info spi_board_info[] __initdata = {
++#ifdef CONFIG_ARMADEUS_MAX1027
++ {
++ .modalias = "max1027",
++ .controller_data = &max1027_hw,
++ .max_speed_hz = 8000000,
++ .bus_num = 0, /* SPI1 */
++ .irq = IRQ_GPIOE(MAX1027_EOC_INT),
++ .chip_select = 0,
++ .mode = 0,
++ .platform_data = &apf27_max1027_config,
++ },
++#endif /* CONFIG_ARMADEUS_MAX1027 */
++#ifdef CONFIG_SPI_TSC2102
++ {
++ .modalias = "tsc210x",
++ .controller_data = &tsc2101_hw,
++ .max_speed_hz = 8000000,
++ .bus_num = 1, /* SPI2 */
++ .irq = IRQ_GPIOF(TSC2101_INT),
++ .chip_select = 0,
++ .mode = 0,
++ .platform_data = &apf27_tsc2101_config,
++ },
++#endif /* CONFIG_SPI_TSC2102 */
++#ifdef CONFIG_CAN_MCP251X
++ {
++ .modalias = "mcp251x",
++ .controller_data = &mcp251X_hw,
++ .max_speed_hz = 8000000, /* 8MHz */
++ .bus_num = 1, /* SPI2 */
++ .mode = 0,
++ .chip_select = 1,
++ .irq = IRQ_GPIOD(CAN_MCP251X_INT),
++ .platform_data = &apf27_mcp251x_config,
++ },
++#endif /* CONFIG_CAN_MCP251X */
++};
++
++
++#if defined(CONFIG_SND) || defined (CONFIG_SND_MODULE)
++
++#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++static struct imx_alsa_codec_config tsc2101_alsa_pdata;
++
++static struct resource ssi_resources[] = {
++ [0] = {
++ .start = SSI1_BASE_ADDR,
++ .end = SSI1_BASE_ADDR + 0x6F,
++ .flags = IORESOURCE_MEM
++ },
++};
++
++static struct platform_device tsc2101_alsa_device = {
++ .name = "tsc210x-alsa", /* Should be the same as the driver name */
++ .id = 0,
++ .num_resources = ARRAY_SIZE(ssi_resources),
++ .resource = ssi_resources,
++ .dev = {
++ .platform_data = &tsc2101_alsa_pdata,
++ }
++};
++# define ALSA_SOUND &tsc2101_alsa_device,
++# endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
++
++#else
++# define ALSA_SOUND
++#endif /* CONFIG_SND || CONFIG_SND_MODULE */
++
++
++static struct platform_device *platform_devices[] __initdata = {
++ ALSA_SOUND
++};
++
++
++/* Camera stuff: TO BE DONE*/
++
++# ifdef CONFIG_VIDEO_OV96xx
++#define OV9653_PWDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
++#define OV9653_RESET (GPIO_PORTC | 31) /* SSI3_CLK as RESET */
++
++static int apf27dev_ov9653_ctl_pins[] = {
++ (OV9653_PWDN | GPIO_OUT | GPIO_GPIO),
++ (OV9653_RESET | GPIO_OUT | GPIO_GPIO),
++};
++
++static int apf27dev_camera_init(struct platform_device *pdev)
++{
++ /* To be put in ov96xx driver init part: */
++ gpio_set_value(OV9653_PWDN, 0);
++ gpio_set_value(OV9653_RESET, 0);
++
++ return mxc_gpio_setup_multiple_pins(apf27dev_ov9653_ctl_pins,
++ ARRAY_SIZE(apf27dev_ov9653_ctl_pins), "OV9653");
++}
++
++static int apf27dev_camera_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(apf27dev_ov9653_ctl_pins, ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
++
++ return 0;
++}
++/*
++struct mx27_camera_platform_data apf27_camera = {
++ .init = apf27_camera_init,
++ .exit = apf27_camera_exit,
++ .clk = 26600000,
++ .flags = MX27_CAMERA_HSYNC_HIGH | MX27_CAMERA_GATED_CLOCK |
++ MX27_CAMERA_PACK_DIR_MSB,
++};*/
++#endif /* CONFIG_VIDEO_OV96xx */
++
++
++void __init apf27_baseboard_init(void)
++{
++ printk(" Registering APF27_Dev ressources:");
++
++#ifdef CONFIG_GSM
++ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
++#endif
++#ifdef CONFIG_GPS
++ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
++#endif
++
++#ifdef CONFIG_I2C
++ i2c_register_board_info(0, apf27dev_i2c_devices_bus0,
++ ARRAY_SIZE(apf27dev_i2c_devices_bus0));
++
++ i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
++ ARRAY_SIZE(apf27dev_i2c_devices_bus1));
++#endif
++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
++
++#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++ spi_register_board_info(spi_board_info,
++ ARRAY_SIZE(spi_board_info));
++#endif
++/*
++#ifdef CONFIG_VIDEO_MX27
++ mxc_register_device(&mx27_camera_device, &apf27_camera);
++#endif
++*/
++ printk("done\n");
++}
++
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
index 0681ed5..f3a4a0e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.29.4/arch/arm/mach-mx2/Kconfig
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-mx2/Kconfig 2009-06-08 16:58:38.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-mx2/Kconfig 2009-06-08 17:20:05.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/Kconfig 2009-09-14 11:46:32.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/Kconfig 2009-09-14 14:56:54.000000000 +0200
@@ -10,6 +10,20 @@
comment "MX2 Platforms"
depends on ARCH_MX2
@@ -23,15 +23,44 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/Kconfig
config MACH_MX27ADS
bool "MX27ADS platform"
depends on MACH_MX27
+@@ -26,15 +40,26 @@
+
+ choice
+ prompt "Baseboard"
+- depends on MACH_PCM038
++ depends on MACH_PCM038 || MACH_APF27
+ default MACH_PCM970_BASEBOARD
+
+ config MACH_PCM970_BASEBOARD
+ prompt "PHYTEC PCM970 development board"
+ bool
++ depends on MACH_PCM038
+ select MXC_ULPI
+ help
+ This adds board specific devices that can be found on Phytec's
+ PCM970 evaluation board.
+
++config MACH_APF27_DEV
++ prompt "Armadeus Systems APF27Dev development board"
++ bool
++ depends on MACH_APF27
++ help
++ This selects the APF27Dev as baseboard. You have to manually
++ activates the devices you want to use if you have the "Full"
++ version.
++
+ endchoice
++
Index: linux-2.6.29.4/arch/arm/mach-mx2/Makefile
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-mx2/Makefile 2009-06-08 16:58:37.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-mx2/Makefile 2009-06-08 17:16:03.000000000 +0200
-@@ -10,6 +10,7 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/Makefile 2009-09-14 11:46:32.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/Makefile 2009-09-14 14:46:16.000000000 +0200
+@@ -10,6 +10,8 @@
obj-$(CONFIG_MACH_MX27) += clock_imx27.o
obj-$(CONFIG_CPU_FREQ_IMX27) += cpufreq_imx27.o
-+obj-$(CONFIG_MACH_APF27) += apf27.o
++obj-$(CONFIG_MACH_APF27) += apf27.o
++obj-$(CONFIG_MACH_APF27_DEV) += apf27-dev.o
obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
obj-$(CONFIG_MACH_PCM038) += pcm038.o
obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/scripts/quilt.sh b/scripts/quilt.sh
index 49968af..b6ab031 100755
--- a/scripts/quilt.sh
+++ b/scripts/quilt.sh
@@ -3,7 +3,7 @@
make shell_env
. armadeus_env.sh
-echo -e "\nThis script is going to rebuilt a quiltified Linux kernel in the current view..."
+echo -e "\nThis script is going to rebuilt a quiltified Linux kernel in the current view...\n"
if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $ARMADEUS_LINUX_DIR/patches/ to $ARMADEUS_LINUX_PATCH_DIR"
@@ -16,20 +16,23 @@ fi
# else import patches:
# Update repository
-echo "Update (pull) your local repository (y/n) ?"
+echo "Update (pull) your local repository (y/N) ?"
read response
if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
git pull
fi
# Move or delete current Linux dir
-echo "Rename or delete the Linux directory: $ARMADEUS_LINUX_DIR"
-echo " ?? (r/d)"
+echo "Rename or delete the current Linux directory: $ARMADEUS_LINUX_DIR"
+echo " ?? (R/d)"
read response
EXT=`date +%Y_%M_%d_%H%m`
if [ "$response" == "d" ]; then
+ echo "Deleting current Linux dir"
rm -rf $ARMADEUS_LINUX_DIR
else
+ echo "Renaming $ARMADEUS_LINUX_DIR"
+ echo " to " "$ARMADEUS_LINUX_DIR"."$EXT"
mv $ARMADEUS_LINUX_DIR "$ARMADEUS_LINUX_DIR"."$EXT"
fi
diff --git a/target/linux/.gitignore b/target/linux/.gitignore
new file mode 100644
index 0000000..f626b3e
--- /dev/null
+++ b/target/linux/.gitignore
@@ -0,0 +1,8 @@
+*.o
+*.ko
+*.ko.cmd
+*.o.cmd
+*.orig
+*.order
+*.mod.*
+*~
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-31 19:57:23
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via db5e520dde5369913275eea4da56d969a6705a74 (commit)
from f68e8f368cef74a8732822b2afbb6bb1c41552a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db5e520dde5369913275eea4da56d969a6705a74
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 31 21:56:23 2009 +0200
[LINUX] Adds new timing trick to improve i.MXL SDHC controller robustness
-----------------------------------------------------------------------
Summary of changes:
.../040-armadeus-imxmmc-correct_some_freezes.patch | 25 ++++++++++++++++++-
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
index 9bdd20d..91fbdf8 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
@@ -8,7 +8,7 @@ Index: linux-2.6.29/drivers/mmc/host/imxmmc.c
===================================================================
--- linux-2.6.29.orig/drivers/mmc/host/imxmmc.c 2009-03-30 11:05:58.000000000 +0200
+++ linux-2.6.29/drivers/mmc/host/imxmmc.c 2009-03-30 11:09:25.000000000 +0200
-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ static int imxmci_busy_wait_for_status(s
/* The busy-wait is expected there for clock <8MHz due to SDHC hardware flaws */
if (!(stat_mask & STATUS_END_CMD_RESP) || (host->mmc->ios.clock >= 8000000))
@@ -17,7 +17,7 @@ Index: linux-2.6.29/drivers/mmc/host/imxmmc.c
loops, where, *pstat, stat_mask);
return loops;
}
-@@ -333,6 +333,12 @@
+@@ -333,6 +333,12 @@ static void imxmci_start_cmd(struct imxm
/* Ensure, that clock are stopped else command programming and start fails */
imxmci_stop_clock(host);
@@ -30,3 +30,24 @@ Index: linux-2.6.29/drivers/mmc/host/imxmmc.c
if (cmd->flags & MMC_RSP_BUSY)
cmdat |= CMD_DAT_CONT_BUSY;
+@@ -558,7 +564,8 @@ static int imxmci_cpu_driven_data(struct
+ dev_dbg(mmc_dev(host->mmc), "imxmci_cpu_driven_data running STATUS = 0x%x\n",
+ stat);
+
+- udelay(20); /* required for clocks < 8MHz*/
++ if( host->mmc->ios.clock < 8000000 )
++ udelay(200);
+
+ if (host->dma_dir == DMA_FROM_DEVICE) {
+ imxmci_busy_wait_for_status(host, &stat,
+@@ -570,7 +577,8 @@ static int imxmci_cpu_driven_data(struct
+ !(stat & STATUS_TIME_OUT_READ) &&
+ (host->data_cnt < 512)) {
+
+- udelay(20); /* required for clocks < 8MHz*/
++ if( host->mmc->ios.clock < 8000000 )
++ mdelay(5);
+
+ for (i = burst_len; i >= 2 ; i -= 2) {
+ u16 data;
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-31 19:38:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f68e8f368cef74a8732822b2afbb6bb1c41552a7 (commit)
from 724719c3a1ff4ff56a9ec1b090c897fe931707bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f68e8f368cef74a8732822b2afbb6bb1c41552a7
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 31 21:38:28 2009 +0200
[ROOTFS] Add /etc/mtab (symlink to /proc/mounts)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/rootfs/target_skeleton/etc/mtab | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mtab
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mtab b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mtab
new file mode 120000
index 0000000..4c0a094
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mtab
@@ -0,0 +1 @@
+/proc/mounts
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-28 19:56:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 724719c3a1ff4ff56a9ec1b090c897fe931707bd (commit)
from d82b96bc12328bcb2a6c93a4d3b51580a868fe23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 724719c3a1ff4ff56a9ec1b090c897fe931707bd
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 28 21:55:41 2009 +0200
[BUILDROOT] BR2_TARGET_U_BOOT_CONFIG_BOARD was not correctly set
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/u-boot/u-boot.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/u-boot/u-boot.mk b/buildroot/target/device/armadeus/u-boot/u-boot.mk
index fd0aaae..858c8b9 100644
--- a/buildroot/target/device/armadeus/u-boot/u-boot.mk
+++ b/buildroot/target/device/armadeus/u-boot/u-boot.mk
@@ -5,7 +5,7 @@
#############################################################
U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
-BR2_TARGET_U_BOOT_CONFIG_BOARD=$(BOARD_NAME)
+BR2_TARGET_U_BOOT_CONFIG_BOARD=$(BR2_TARGET_UBOOT_BOARDNAME)_config
ifndef BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=$(BOARD_PATH)/$(BOARD_NAME).h
endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-28 16:02:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d82b96bc12328bcb2a6c93a4d3b51580a868fe23 (commit)
from ab7a57c225790a3e7fc988f86297e4b92223e4b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d82b96bc12328bcb2a6c93a4d3b51580a868fe23
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 28 18:02:02 2009 +0200
correct error in a previous commit
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 2938bfe..b42e98a 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ $(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.unpacked
# To be called only one time if one wants to make an automatic build
buildauto: $(BUILDROOT_DIR)/.unpacked
# ! Be sure that /local/downloads exists if you want to use automated build !
- sed -e -i 's/BR2_DL_DIR/BR2_DL_DIR=\"\/local\/downloads\" #/g' $(BUILDROOT_DIR)/.defconfig ;
+ sed -i -e 's/BR2_DL_DIR/BR2_DL_DIR=\"\/local\/downloads\" #/g' $(BUILDROOT_DIR)/.defconfig ;
echo "ey" | $(MAKE) -C $(BUILDROOT_DIR) menuconfig
$(MAKE) -C $(BUILDROOT_DIR)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-28 15:32:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ab7a57c225790a3e7fc988f86297e4b92223e4b1 (commit)
from a736e125f902cda8b16d87ac48130d8cfcbe711a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ab7a57c225790a3e7fc988f86297e4b92223e4b1
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 28 17:31:46 2009 +0200
Remove uneeded blank lines
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Config.in | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/Config.in b/buildroot/target/device/armadeus/Config.in
index 5b11b48..7d4a16a 100644
--- a/buildroot/target/device/armadeus/Config.in
+++ b/buildroot/target/device/armadeus/Config.in
@@ -20,7 +20,6 @@ config BR2_TARGET_ARMADEUS_APF27
bool "apf27"
endchoice
-
config BR2_BOARD_NAME
string
default "apf9328" if BR2_TARGET_ARMADEUS_APF9328
@@ -42,6 +41,4 @@ config BR2_TARGET_ARMADEUS_SDRAM_SIZE
default "128" if BR2_TARGET_ARMADEUS_APF27_SDRAM_128
default "256" if BR2_TARGET_ARMADEUS_APF27_SDRAM_256
-
-
endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-28 10:36:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a736e125f902cda8b16d87ac48130d8cfcbe711a (commit)
from 91f1368bf4a8bcdf1536fcd86e948a7ebda7929d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a736e125f902cda8b16d87ac48130d8cfcbe711a
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 28 12:35:55 2009 +0200
[BUILD] Add target to get BR patched sources only: buildroot-patched-sources + simplify buildauto
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 9f3fb9f..2938bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,8 @@ $(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDRO
perl $(BUILDROOT_PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
touch $@
+buildroot-patched-sources: $(BUILDROOT_DIR)/.unpacked
+
$(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.unpacked
@if [ ! -f $@ ]; then \
$(ECHO_CONFIGURATION_NOT_DEFINED) \
@@ -108,9 +110,8 @@ $(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.unpacked
# To be called only one time if one wants to make an automatic build
buildauto: $(BUILDROOT_DIR)/.unpacked
- # Be sure that /local/downloads exists if you want to use automated build
- sed -e 's/BR2_DL_DIR/BR2_DL_DIR=\"\/local\/downloads\" #/g' $(BUILDROOT_DIR)/.defconfig > $(BUILDROOT_DIR)/.defconfig_new ; \
- mv -f $(BUILDROOT_DIR)/.defconfig_new $(BUILDROOT_DIR)/.defconfig
+ # ! Be sure that /local/downloads exists if you want to use automated build !
+ sed -e -i 's/BR2_DL_DIR/BR2_DL_DIR=\"\/local\/downloads\" #/g' $(BUILDROOT_DIR)/.defconfig ;
echo "ey" | $(MAKE) -C $(BUILDROOT_DIR) menuconfig
$(MAKE) -C $(BUILDROOT_DIR)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-26 12:51:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 91f1368bf4a8bcdf1536fcd86e948a7ebda7929d (commit)
via ff4f5e528be1e844b9c0cb145cba27dc18709041 (commit)
from d578dd6cff8bcd072cd9f540296237ec5d3724bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 91f1368bf4a8bcdf1536fcd86e948a7ebda7929d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 26 14:50:09 2009 +0200
[DEMOS] Adds a small C program to show how to use IOCTL with GPIO driver
commit ff4f5e528be1e844b9c0cb145cba27dc18709041
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 25 19:47:50 2009 +0200
[LINUX] gpio: correct deadlock bug + add an IOCTL for setting port Mode
-----------------------------------------------------------------------
Summary of changes:
target/demos/gpio/Makefile | 31 ++++++++++++
target/demos/gpio/blink_led.c | 98 ++++++++++++++++++++++++++++++++++++++
target/linux/modules/gpio/core.c | 43 +++++++++++------
target/linux/modules/gpio/core.h | 2 +
4 files changed, 159 insertions(+), 15 deletions(-)
create mode 100644 target/demos/gpio/Makefile
create mode 100644 target/demos/gpio/blink_led.c
diff --git a/target/demos/gpio/Makefile b/target/demos/gpio/Makefile
new file mode 100644
index 0000000..0e11c39
--- /dev/null
+++ b/target/demos/gpio/Makefile
@@ -0,0 +1,31 @@
+
+ifneq ($(CC),)
+# Locally compiled:
+ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+DEFINES=-D$(ARMADEUS_BOARD_NAME)
+endif
+
+EXEC_NAME = blink_led
+
+default: $(EXEC_NAME)
+
+all: $(EXEC_NAME)
+
+$(EXEC_NAME): blink_led.c
+ $(CC) $(CFLAGS) $(DEFINES) -Wall -o $@ $^
+
+clean:
+ rm -rf $(EXEC_NAME)
+ rm -rf *.o
+
+install:
+ cp $(EXEC_NAME) $(INSTALL_DIR)/
+
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
+.PHONY: clean install uninstall
diff --git a/target/demos/gpio/blink_led.c b/target/demos/gpio/blink_led.c
new file mode 100644
index 0000000..8281e3b
--- /dev/null
+++ b/target/demos/gpio/blink_led.c
@@ -0,0 +1,98 @@
+/*
+ * Small program to show how to use IOCTL with GPIO driver
+ *
+ * Copyright (C) 2009 Julien Boibessot <jul...@ar...>
+ * Inspired by original example from S. Falck
+ * Armadeus Project / Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <linux/ppdev.h>
+
+#ifdef apf9328
+#define LED_GPIO_PORT "/dev/gpio/portD"
+#define LED_PIN 31
+#elif apf27
+#define LED_GPIO_PORT "/dev/gpio/portF"
+#define LED_PIN 14
+#else
+#error Board not defined
+#endif
+
+#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)
+#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)
+#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
+#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
+#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
+#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
+
+int main(int argc, char **argv)
+{
+ int fd;
+ int i;
+ int portval;
+ unsigned int count = 10;
+
+ if (argc == 2) {
+ count = atoi(argv[1]);
+ }
+
+ printf("Toggling LED %d times \n", count);
+
+ printf("Opening %s\n", LED_GPIO_PORT);
+ if ((fd = open(LED_GPIO_PORT, O_RDWR)) < 0) {
+ perror("Error");
+ exit(1);
+ }
+
+ /* Set LED PIN as GPIO; read/modify/write */
+ ioctl(fd, GPIORDMODE, &portval);
+ portval |= (1 << LED_PIN);
+ ioctl(fd, GPIOWRMODE, &portval);
+
+ /* Set LED GPIO as output; read/modify/write */
+ ioctl(fd, GPIORDDIRECTION, &portval);
+ portval |= (1 << LED_PIN);
+ ioctl(fd, GPIOWRDIRECTION, &portval);
+
+ /* Blink the LED */
+ for (i = 0; i < count; i++) {
+ printf("Led ON\n"); /* pin <- 0 */
+ ioctl(fd, GPIORDDATA, &portval);
+ portval &= ~(1 << LED_PIN);
+ ioctl(fd, GPIOWRDATA, &portval);
+
+ sleep(1);
+
+ printf("Led OFF\n"); /* pin <- 1 */
+ ioctl(fd, GPIORDDATA, &portval);
+ portval |= (1 << LED_PIN);
+ ioctl(fd, GPIOWRDATA, &portval);
+
+ sleep(1);
+ }
+
+ close(fd);
+ exit(0);
+}
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 9e21b25..bc35029 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -381,7 +381,7 @@ static unsigned int getPortDir(unsigned int aPort)
{
unsigned int port_value = 0;
- /* Get the status of the gpio direction registers TBDNICO */
+ /* Get the status of the GPIO direction registers */
port_value = __raw_readl(VA_GPIO_BASE + MXC_DDIR(aPort));
return port_value;
@@ -626,11 +626,10 @@ static int armadeus_gpio_dev_release(struct inode *inode, struct file *file)
}
/* Handling of IOCTL calls */
-int armadeus_gpio_dev_ioctl( struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg )
+int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
+ unsigned int cmd, unsigned long arg)
{
- int err = 0; int ret = 0;
- int value=0;
+ int err = 0, ret = 0, value = 0;
unsigned int minor;
pr_debug(DRIVER_NAME " ## IOCTL received: (0x%x) ##\n", cmd);
@@ -646,7 +645,7 @@ int armadeus_gpio_dev_ioctl( struct inode *inode, struct file *filp,
if (_IOC_DIR(cmd) & _IOC_READ)
err = !access_ok(VERIFY_WRITE, (void *)arg, _IOC_SIZE(cmd));
else if (_IOC_DIR(cmd) & _IOC_WRITE)
- err = !access_ok(VERIFY_READ, (void *)arg, _IOC_SIZE(cmd));
+ err = !access_ok(VERIFY_READ, (void *)arg, _IOC_SIZE(cmd));
if (err)
return -EFAULT;
@@ -654,11 +653,13 @@ int armadeus_gpio_dev_ioctl( struct inode *inode, struct file *filp,
/* Obtain exclusive access */
if (down_interruptible(&gpio_sema))
return -ERESTARTSYS;
+
/* Extract and test minor */
minor = MINOR(inode->i_rdev);
if (minor < FULL_PORTD_MINOR) {
- printk("IOCTLs are only available on minors representing full port access!\n");
- return -EFAULT;
+ printk("IOCTLs are only available on 'full port' minors !\n");
+ ret = -EFAULT;
+ goto out;
}
switch (cmd) {
@@ -666,31 +667,44 @@ int armadeus_gpio_dev_ioctl( struct inode *inode, struct file *filp,
value = getPortDir(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
-
+
case GPIOWRDIRECTION:
ret = __get_user(value, (unsigned int *)arg);
-
if (ret == 0) {
setPortDir(MAX_MINOR - minor, value);
}
break;
-
+
case GPIORDDATA:
value = readFromPort(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
-
+
case GPIOWRDATA:
ret = __get_user(value, (unsigned int *)arg);
if (ret == 0) {
writeOnPort(MAX_MINOR - minor, value);
}
break;
-
+
+ case GPIORDMODE:
+ value = __raw_readl(VA_GPIO_BASE + MXC_GIUS(MAX_MINOR - minor));
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRMODE:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ setPortMode(MAX_MINOR - minor, value);
+ }
+ break;
+
default:
- return -ENOTTY;
+ printk("IOCTL not supported\n");
+ ret = -ENOTTY;
break;
}
+out:
/* Release exclusive access */
up(&gpio_sema);
@@ -727,7 +741,6 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
return -ERESTARTSYS;
switch (settings->type) {
-
case MODE:
port_status = __raw_readl(VA_GPIO_BASE + MXC_GIUS(port_ID));
break;
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/core.h
index 68cbe42..2a243aa 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/core.h
@@ -32,6 +32,8 @@
#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)
#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
+#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
+#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
/* Pretend we're PPDEV for IOCTL */
#include <linux/ppdev.h>
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-24 23:16:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d578dd6cff8bcd072cd9f540296237ec5d3724bd (commit)
via c6e8e0cad50a52b0ca64091746b5ac771ce4790c (commit)
from 64628b619814e078f5f0d4117b618bff3f24e4db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d578dd6cff8bcd072cd9f540296237ec5d3724bd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 24 13:06:58 2009 +0200
[BUILDROOT] Add Quake package (patch)
commit c6e8e0cad50a52b0ca64091746b5ac771ce4790c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 24 12:37:22 2009 +0200
[LINUX] Makes LQ057 LCD works on APF27 (Freescale framebuffer)
-----------------------------------------------------------------------
Summary of changes:
...-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch | 18 +-
...-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch | 10 +-
patches/buildroot/081-adds_quake_package.patch | 157 ++++++++++++++++++++
3 files changed, 171 insertions(+), 14 deletions(-)
create mode 100644 patches/buildroot/081-adds_quake_package.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
index b00d3b4..4395f5e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/mxc/mxcfb_modedb.c 2009-03-31 10:57:25.000000000 +0200
-+++ linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c 2009-03-31 10:57:32.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:02:28.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:17:54.000000000 +0200
@@ -88,6 +88,19 @@
.vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
@@ -11,12 +11,12 @@ Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
+ .refresh = 60,
+ .xres = 320,
+ .yres = 240,
-+ .pixclock = 111111, /* picoS */
-+ .left_margin = 52, .right_margin = 28, /* at least 3 & 1 */
-+ .upper_margin = 2, .lower_margin = 3,
-+ .hsync_len = 0, .vsync_len = 7,
-+ .sync = FB_SYNC_CLK_IDLE_EN,
-+ .vmode = FB_VMODE_NONINTERLACED, /* TO CHECK !! */
++ .pixclock = 158730, /* picoS -> 6,3MHz */
++ .left_margin = 52, .right_margin = 28, /* at least 3 & 1 */ /* 320 + 52 + 28 = 400 */
++ .upper_margin = 3, .lower_margin = 3, /* 240 + 5 + 3 + 3 = 251 */
++ .hsync_len = 96, .vsync_len = 5,
++ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
++ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
index 93d4aaa..e256f83 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
@@ -1,9 +1,9 @@
-Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/mxc/mxcfb_modedb.c 2009-03-31 10:57:25.000000000 +0200
-+++ linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c 2009-03-31 10:57:32.000000000 +0200
-@@ -101,6 +101,19 @@ const struct fb_videomode mxcfb_modedb[]
- .vmode = FB_VMODE_NONINTERLACED, /* TO CHECK !! */
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:17:54.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:27:52.000000000 +0200
+@@ -101,6 +101,19 @@
+ .vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
},
+ [7] = {
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
new file mode 100644
index 0000000..940748d
--- /dev/null
+++ b/patches/buildroot/081-adds_quake_package.patch
@@ -0,0 +1,157 @@
+
+This patch adds Quake packages to buildroot:
+* Quake engine itself (SDL port)
+* a shareware data file (PAK/WAD) to test the engine
+
+It is inspired of OpenEmbedded work.
+
+sdlquake.mk could be simplier if a target FOO_HOOK_POST_INSTALL was
+existing in Makefile.autotools.in.
+
+Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
+EXCEPT x86.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/games/sdlquake/sdlquake.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake.mk 2009-08-16 14:43:40.000000000 +0200
+@@ -0,0 +1,31 @@
++#############################################################
++#
++# Quake 1 (SDL_Port)
++#
++#############################################################
++
++SDLQUAKE_VERSION = 1.0.9
++SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
++SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
++#SDLQUAKE_AUTORECONF = NO
++SDLQUAKE_INSTALL_STAGING = NO
++SDLQUAKE_INSTALL_TARGET = YES
++
++SDLQUAKE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
++
++SDLQUAKE_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
++
++$(eval $(call AUTOTARGETS,package/games,sdlquake))
++
++NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
++$(SDLQUAKE_TARGET_PATCH):
++ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
++ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
++ (cd $(SDLQUAKE_DIR); \
++ touch INSTALL NEWS README AUTHORS ChangeLog; \
++ echo "AC_PROG_CC" >> configure.in; \
++ aclocal; \
++ autoconf; \
++ automake --add-missing;)
++ touch $@
+Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2009-08-16 13:37:00.000000000 +0200
+@@ -0,0 +1,35 @@
++--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
+++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
++@@ -33,7 +33,6 @@
++ crc.h \
++ cvar.c \
++ cvar.h \
++- d_copy.S \
++ d_edge.c \
++ d_fill.c \
++ d_iface.h \
++@@ -48,7 +47,6 @@
++ d_sprite.c \
++ d_surf.c \
++ d_zpoint.c \
++- dosasm.S \
++ dosisms.h \
++ draw.c \
++ draw.h \
++@@ -103,7 +101,6 @@
++ r_sprite.c \
++ r_surf.c \
++ r_vars.c \
++- r_varsa.S \
++ render.h \
++ resource.h \
++ sbar.c \
++@@ -136,7 +133,7 @@
++ world.h \
++ zone.c \
++ zone.h \
++- $(X86_SRCS) $(NONX86_SRCS)
+++ $(NONX86_SRCS)
++
++ X86_SRCS = \
++ snd_mixa.S \
+Index: buildroot/package/games/sdlquake/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/Config.in 2009-08-16 14:51:17.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SDLQUAKE
++ bool "sdlquake"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_MIXER
++ select BR2_PACKAGE_SDL_NET
++ help
++ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
++ (Not supported by ID Software)
++
++ http://www.libsdl.org/projects/quake/
+Index: buildroot/package/games/quake-pak/quake-pak.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/quake-pak.mk 2009-08-16 15:50:54.000000000 +0200
+@@ -0,0 +1,34 @@
++#############################################################
++#
++# Quake shareware data files (PAK/WAD)
++#
++#############################################################
++
++QUAKE_PAK_VERSION = 1.0.6
++QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
++QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
++QUAKE_PAK_CAT = $(ZCAT)
++QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
++
++$(DL_DIR)/$(QUAKE_PAK_SOURCE):
++ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
++
++quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++
++$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++ mkdir -p $(QUAKE_PAK_TARGET_DIR)
++ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
++
++quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
++
++quake-pak-dirclean:
++ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
++TARGETS+=quake-pak
++endif
+Index: buildroot/package/games/quake-pak/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/Config.in 2009-08-16 15:46:54.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_QUAKE_PAK
++ bool "shareware Quake PAK/WAD file"
++ depends on BR2_PACKAGE_SDLQUAKE
++ help
++ This will install the shareware pak/wad data file for the Quake game.
++
++ The file will be placed in the /usr/share/games/quake/ directory.
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-19 09:13:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 64628b619814e078f5f0d4117b618bff3f24e4db (commit)
from 1a4ba59c42d06baadfe2bfdfa77a2398b09f162f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 64628b619814e078f5f0d4117b618bff3f24e4db
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 19 11:12:20 2009 +0200
[LINUX] Converts a message into debug in GPIO driver
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index e885b32..9e21b25 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -544,7 +544,7 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio->nb_pins = 32;
gpio->changed = 1;
gpio->port = FULL_MINOR_TO_PORT(minor);
- printk("Reserving full %s\n", port_name[gpio->port]);
+ pr_debug("Reserving full %s\n", port_name[gpio->port]);
goto success;
break;
}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-18 13:05:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1a4ba59c42d06baadfe2bfdfa77a2398b09f162f (commit)
via da64f58cebaf718913c74acd1ff3f1b2bea9ced2 (commit)
via af5f011aa9e8c81f9789d87f708d1debf9ff5ed4 (commit)
from ebb994f732edc03a9d6e657c4c994ba754a27864 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a4ba59c42d06baadfe2bfdfa77a2398b09f162f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 18 15:04:47 2009 +0200
[LINUX] APF9328: separates module (APF9328) and baseboards (DevFull/Light or others) hardware declaration/init parts
commit da64f58cebaf718913c74acd1ff3f1b2bea9ced2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 18 14:06:59 2009 +0200
[LINUX] ISP1761: Gives correct init value to HW_MODE_REG register
commit af5f011aa9e8c81f9789d87f708d1debf9ff5ed4
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 18 14:00:26 2009 +0200
[BUILD] Renames Buildroot patches and moves them to patches/buildroot/ (Part2)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 +-
buildroot/local/apf9328_test/linux-2.6.29.4.config | 3 +-
.../armadeus/apf9328/apf9328-linux-2.6.29.config | 3 +-
.../2.6.29/021-armadeus-apf9328.patch | 612 +++++++++++---------
...s-apf9328-add_board_to_linux_build_system.patch | 40 +-
target/linux/modules/isp1761/hal/hal_imx.c | 2 +-
6 files changed, 384 insertions(+), 287 deletions(-)
diff --git a/Makefile b/Makefile
index 4696708..9f3fb9f 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,8 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
-PATCH_DIR=patches
+PATCH_DIR = patches
+BUILDROOT_PATCH_DIR = patches/buildroot
TAR_OPTIONS=--exclude=.svn --exclude=.git -xf
ARMADEUS_ENV_FILE=armadeus_env.sh
@@ -79,7 +80,7 @@ help:
@echo ' source-check - check all packages for valid download URLs'
@echo
@echo 'See www.armadeus.org for further armadeus details'
- @echo 'See /buildroot/docs/README and /buildroot/docs/buildroot.html'
+ @echo 'See ./buildroot/docs/README and ./buildroot/docs/buildroot.html'
@echo ' for further buildroot details'
@echo
@@ -91,12 +92,12 @@ $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
mkdir -p $(BUILDROOT_FILE_PATH)
wget --passive-ftp -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
-$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(PATCH_DIR)/*.diff
+$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDROOT_PATCH_DIR)/*.patch
bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
tar -C $(BUILDROOT_DIR)/.. $(TAR_OPTIONS) -
- $(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(PATCH_DIR) \*.diff
+ $(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
# Since patches may add/delete packages, we process extra packages after patching
- perl $(PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
+ perl $(BUILDROOT_PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
touch $@
$(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.unpacked
diff --git a/buildroot/local/apf9328_test/linux-2.6.29.4.config b/buildroot/local/apf9328_test/linux-2.6.29.4.config
index 60c7c43..851d210 100644
--- a/buildroot/local/apf9328_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf9328_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Wed Jul 15 16:24:34 2009
+# Tue Aug 18 11:52:19 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -169,6 +169,7 @@ CONFIG_MACH_APF9328=y
CONFIG_MACH_APF9328_FPGA=y
# CONFIG_IMX_APF9328_FLASH_8MB is not set
CONFIG_IMX_APF9328_FLASH_16MB=y
+CONFIG_MACH_APF9328_DEV=y
#
# Processor Type
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
index 5249054..210606a 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Wed Jul 15 16:24:34 2009
+# Tue Aug 18 11:52:19 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -169,6 +169,7 @@ CONFIG_MACH_APF9328=y
CONFIG_MACH_APF9328_FPGA=y
# CONFIG_IMX_APF9328_FLASH_8MB is not set
CONFIG_IMX_APF9328_FLASH_16MB=y
+CONFIG_MACH_APF9328_DEV=y
#
# Processor Type
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index df3fc35..0afb8fb 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -4,8 +4,8 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328.c 2009-07-15 17:16:18.000000000 +0200
-@@ -0,0 +1,848 @@
++++ linux-2.6.29.4/arch/arm/mach-imx/apf9328.c 2009-08-18 13:53:44.000000000 +0200
+@@ -0,0 +1,635 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -34,8 +34,6 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#include <linux/interrupt.h>
+#include <linux/serial_8250.h>
+#include <linux/spi/spi.h>
-+#include <linux/spi/tsc2102.h>
-+#include "../../../drivers/net/can/mcp251x.h"
+
+#include <asm/system.h>
+#include <mach/hardware.h>
@@ -51,10 +49,9 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#include <mach/usb.h>
+#include <mach/spi_imx.h>
+#include <mach/imx-regs.h> /* imx_gpio_mode() */
-+#include <mach/imx-alsa.h>
+#include <linux/spi/max1027.h>
-+#include <linux/usb/isp116x.h>
+#include <mach/imx_ssi.h>
++#include <mach/dma.h>
+#include "../../../drivers/armadeus/pwm/pwm.h"
+#ifdef CONFIG_DM9000
+#include <linux/dm9000.h>
@@ -62,7 +59,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_MACH_APF9328_FPGA
+#include "../plat-mxc/include/mach/fpga.h" /* To be removed when MX1 arch is fully integrated */
+#endif
-+
++#include <mach/imxfb.h>
+#include "generic.h"
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
@@ -71,81 +68,20 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_SPI_IMX_MODULE
+#define CONFIG_SPI_IMX 1
+#endif
-+#ifdef CONFIG_SPI_TSC2102_MODULE
-+#define CONFIG_SPI_TSC2102 1
-+#endif
-+#ifdef CONFIG_CAN_MCP251X_MODULE
-+#define CONFIG_CAN_MCP251X 1
++#ifdef CONFIG_SND_IMX_PCM_MODULE
++#define CONFIG_SND_IMX_PCM 1
+#endif
+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
+#define CONFIG_IMX_BACKLIGHT 1
+#endif
-+#ifdef CONFIG_ARMADEUS_ISP1761_MODULE
-+#define CONFIG_ARMADEUS_ISP1761 1
-+#endif
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
+#endif
+
+
-+/* --- ISP1761 */
-+#ifdef CONFIG_ARMADEUS_ISP1761
-+
-+static void apf_isp116x_delay(struct device *dev, int delay)
-+{
-+ /* On this platform, we work with 200MHz clock, giving
-+ 5 ns per instruction. The cycle below involves 2
-+ instructions and we lose 2 more instruction times due
-+ to pipeline flush at jump. I.e., we consume 20 ns
-+ per cycle.
-+ */
-+ int cyc = delay / 20;
-+
-+ __asm__ volatile ("0:\n"
-+ " subs %0, %1, #1\n"
-+ " bge 0b\n"
-+ :"=r" (cyc)
-+ :"0"(cyc));
-+}
-+
-+static struct isp116x_platform_data isp116x_pdata = {
-+ .sel15Kres = 1,
-+ .oc_enable = 1,
-+ .int_act_high = 0,
-+ .int_edge_triggered = 1,
-+ .remote_wakeup_enable = 1,
-+ .delay = apf_isp116x_delay,
-+};
-+
-+static struct resource devfull_isp1761_resources[] = {
-+ [0] = {
-+ .name = "isp1761-regs",
-+ .start = ISP1761_BASE + 0x00000000,
-+ .end = ISP1761_BASE + 0x000fffff,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = ISP1761_IRQ,
-+ .end = ISP1761_IRQ,
-+ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-+ },
-+};
-+
-+static struct platform_device devfull_isp1761_device = {
-+ .name = "isp1761",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(devfull_isp1761_resources),
-+ .resource = devfull_isp1761_resources,
-+ .dev = { .platform_data = &isp116x_pdata, },
-+};
-+
-+/*static struct platform_device *devfull_isp1761_devices[] = {
-+ &devfull_isp1761_device,
-+};*/
-+
-+#endif
-+
-+/* --- ETHERNET RESSOURCE --- */
++/*
++ * APF9328 has a DM9000 Ethernet controller
++ */
+#ifdef CONFIG_DM9000
+static struct resource dm9000_resources[] = {
+ [0] = {
@@ -221,9 +157,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .platform_data = &apf9328_pwm_0_data,
+ }
+};
-+
+#endif /* CONFIG_PWM */
+
++
++#ifdef CONFIG_USB_GADGET_IMX
+static int apf9328_udc_0_init(struct device * dev)
+{
+ imx_gpio_mode(PC3_PF_SSI_RXFS);
@@ -248,10 +185,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .init = apf9328_udc_0_init,
+ .exit = apf9328_udc_0_exit,
+};
++#endif /* CONFIG_USB_GADGET_IMX */
+
+
-+
-+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
+int apf9328_ssi_gpio_init(struct platform_device *pdev)
+{
+ /* Activate SSI on PortC */
@@ -325,16 +262,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ }
+};
+
-+static struct imx_sound_platform_data apf9328_alsa_pdata;
-+
-+static struct platform_device tsc2102_alsa_device = {
-+ .name = "tsc210x-alsa",
-+ .id = 0,
-+ .dev = {
-+ .platform_data = &apf9328_alsa_pdata,
-+ }
-+};
-+#endif /* defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE) */
++#endif /* defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE) */
+
+
+/* --- SERIAL RESSOURCE --- */
@@ -463,10 +391,11 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .platform_data = &imx_spi2_master_info,
+ },
+};
-+
+#endif /* CONFIG_SPI_IMX */
+
-+
++/*
++ * APF9328 can have an optionnal MAX1027 ADC
++ */
+#ifdef CONFIG_ARMADEUS_MAX1027
+#define IMX_SPI1_SS_PIN 15
+#define IMX_SPI1_SS (1<<15)
@@ -475,20 +404,21 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+
+static int max1027_init(struct spi_device *spi)
+{
-+ imx_gpio_mode( PC14_PF_SPI1_SCLK );
-+ imx_gpio_mode( PC16_PF_SPI1_MISO );
-+ imx_gpio_mode( PC17_PF_SPI1_MOSI );
++ /* SPI1 GPIOs */
++ imx_gpio_mode(PC14_PF_SPI1_SCLK);
++ imx_gpio_mode(PC16_PF_SPI1_MISO);
++ imx_gpio_mode(PC17_PF_SPI1_MOSI);
+
+ /* configure CNVST */
+ DR(0) |= 1 << MAX1027_CNVST; /* Initializes it High */
-+ imx_gpio_mode( GPIO_PORTA | MAX1027_CNVST | GPIO_OUT | GPIO_GIUS | GPIO_DR );
++ imx_gpio_mode(GPIO_PORTA | MAX1027_CNVST | GPIO_OUT | GPIO_GIUS | GPIO_DR);
+
+ /* configure EOC */
-+ imx_gpio_mode( GPIO_PORTA | MAX1027_EOC_INT | GPIO_IN | GPIO_GIUS );
++ imx_gpio_mode(GPIO_PORTA | MAX1027_EOC_INT | GPIO_IN | GPIO_GIUS);
+
+ /* SPI CSn is used as chip select but in GPIO mode */
+ DR(2) |= IMX_SPI1_SS;
-+ imx_gpio_mode( GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GIUS | GPIO_DR );
++ imx_gpio_mode(GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GIUS | GPIO_DR);
+
+ return 0;
+}
@@ -518,106 +448,9 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .init = max1027_init,
+ .exit = max1027_exit
+};
-+
+#endif /* CONFIG_ARMADEUS_MAX1027 */
+
+
-+#ifdef CONFIG_SPI_TSC2102
-+#define TSC2102_CS_GPIOB 17
-+#define TSC2102_INT_GPIOD 8
-+
-+static int tsc2102_init_gpio(void)
-+{
-+ /* Activate SPI2 port ---- */
-+ /* PortB 17 is used as chip select (in GPIO mode) */
-+ DR(1) |= 1 << TSC2102_CS_GPIOB; /* Initializes it High */
-+ imx_gpio_mode( GPIO_PORTB | TSC2102_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR );
-+ /* Configure SPI2 outputs */
-+ imx_gpio_mode( PD7_AIN_SPI2_SCLK );
-+ imx_gpio_mode( PD10_AIN_SPI2_TXD );
-+ imx_gpio_mode( PD9_AOUT_SPI2_RXD );
-+ FMCR |= SPI2_RXD_SEL; /* RX is AOUT on PORTD */
-+
-+ /* PortD 8 is used as PINTDAV interrupt */
-+ imx_gpio_mode( GPIO_PORTD | TSC2102_INT_GPIOD | GPIO_IN | GPIO_GIUS );
-+ /*imx_gpio_irq_type( IRQ_GPIOD(8), __IRQT_FALEDGE );*/
-+
-+ printk("TSC2102 GPIOs initialized\n");
-+ return 0;
-+}
-+
-+/* Chip select command for TSC2102 */
-+static void tsc2102_cs(u32 command)
-+{
-+ /* PortB 19 is used as chip select */
-+ if( command == SPI_CS_DEASSERT )
-+ DR(1) |= 1<< TSC2102_CS_GPIOB;
-+ else
-+ DR(1) &= ~(1<< TSC2102_CS_GPIOB);
-+}
-+
-+static struct spi_imx_chip tsc2102_hw = {
-+ .cs_control = tsc2102_cs,
-+};
-+
-+static struct tsc210x_config apf9328_tsc2102_config = {
-+ .use_internal = 1, /* -> use internal voltage reference */
-+ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
-+ .init = tsc2102_init_gpio,
-+/* .apm_report = palmte_get_power_status,*/
-+/*#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
-+ .alsa_config = &apf9328_alsa_pdata,
-+#endif*/
-+};
-+
-+#endif /* CONFIG_SPI_TSC2102 */
-+
-+
-+#ifdef CONFIG_CAN_MCP251X
-+#define CAN_MPC251X_CS_GPIOB 19
-+#define CAN_MPC251X_INT_GPIOC 13
-+
-+/* Chip select command for MCP251X */
-+static void mcp251X_cs(u32 command)
-+{
-+ /* PortB 19 is used as chip select */
-+ if (command == SPI_CS_DEASSERT)
-+ DR(1) |= 1<< CAN_MPC251X_CS_GPIOB;
-+ else
-+ DR(1) &= ~(1<< CAN_MPC251X_CS_GPIOB);
-+}
-+
-+static struct spi_imx_chip mcp251X_hw = {
-+ .cs_control = mcp251X_cs,
-+};
-+
-+static void mcp251X_init_gpio(void)
-+{
-+ /* Activate SPI2 port ---- */
-+ /* PortB 19 is used as chip select (in GPIO mode) */
-+ DR(1) |= 1 << CAN_MPC251X_CS_GPIOB; /* Initializes it High */
-+ imx_gpio_mode( GPIO_PORTB | CAN_MPC251X_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR );
-+
-+ /* PortC 13 is used as CAN interrupt */
-+ imx_gpio_mode( GPIO_PORTC | CAN_MPC251X_INT_GPIOC | GPIO_IN | GPIO_GIUS );
-+
-+ /* Configure SPI2 outputs */
-+ imx_gpio_mode( PD7_AIN_SPI2_SCLK );
-+ imx_gpio_mode( PD10_AIN_SPI2_TXD );
-+ imx_gpio_mode( PD9_AOUT_SPI2_RXD );
-+ FMCR |= SPI2_RXD_SEL; /* RX is AOUT on PORTD */
-+}
-+
-+static struct mcp251x_platform_data apf9328_mcp251x_config = {
-+ .oscillator_frequency = 16000000,
-+ .board_specific_setup = NULL,
-+ .device_reset = NULL,
-+ .transceiver_enable = NULL,
-+};
-+
-+#endif /* CONFIG_CAN_MCP251X */
-+
-+
+static struct spi_board_info spi_board_info[] __initdata = {
+#ifdef CONFIG_ARMADEUS_MAX1027
+{
@@ -631,39 +464,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .platform_data = &apf9328_max1027_config,
+},
+#endif
-+#ifdef CONFIG_SPI_TSC2102
-+{
-+ .modalias = "tsc210x",
-+ .controller_data= &tsc2102_hw,
-+ .max_speed_hz = 8000000,
-+ .bus_num = 2, /* SPI2 */
-+ .irq = IRQ_GPIOD(TSC2102_INT_GPIOD),
-+ .chip_select = 0,
-+ .mode = 0,
-+ .platform_data = &apf9328_tsc2102_config,
-+},
-+#endif
-+#ifdef CONFIG_CAN_MCP251X
-+{
-+ .modalias = "mcp251x",
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .controller_data= &mcp251X_hw,
-+ .bus_num = 2,
-+ .mode = SPI_MODE_0,
-+ .chip_select = 1,
-+ .irq = IRQ_GPIOC( CAN_MPC251X_INT_GPIOC ),
-+ .platform_data = &apf9328_mcp251x_config,
-+},
-+#endif
+};
+
-+/* --- LCD RESSOURCE --- */
-+#ifdef CONFIG_FB_IMX
-+/* all custom LCD configuration is deported to this file for clarity purpose: */
-+#include "apf9328_lcd_config.h"
-+#define IMX_FB_PHYS (0x0C000000 - 0x40000)
-+#endif
-+
+#ifdef CONFIG_IMX_BACKLIGHT
+static struct imxbl_machinfo imx_bl_machinfo = {
+ .max_intensity = 0xff,
@@ -683,7 +485,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#endif /* CONFIG_IMX_BACKLIGHT */
+
+/*
-+ * The APF9328 can have up to 32MB NOR
++ * The APF9328 can have up to 32MB NOR Flash
+ */
+static struct resource flash_resource = {
+ .start = IMX_CS0_PHYS,
@@ -705,6 +507,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .num_resources = 1,
+};
+
++/*
++ * The APF9328 can have an optionnal Xilinx's Spartan3 FPGA
++ * directly connected to its address/data busses
++ */
+#ifdef CONFIG_MACH_APF9328_FPGA
+static int apf9328_fpga_irq_init(struct platform_device *pdev)
+{
@@ -750,13 +556,9 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_IMX_BACKLIGHT
+ &imxbl_device,
+#endif
-+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
-+ &tsc2102_alsa_device,
++#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
+ &apf9328_ssi_device,
+#endif
-+#ifdef CONFIG_ARMADEUS_ISP1761
-+ &devfull_isp1761_device,
-+#endif
+ &apf9328_flash_device,
+#ifdef CONFIG_MACH_APF9328_FPGA
+ &apf9328_ocore_irq_mng_device,
@@ -767,34 +569,24 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+{
+ printk("--- Registering APF9328 ressources\n");
+
-+ /* Serial */
++ /* Initializes serial port 1/console GPIOs */
+ imx_gpio_mode(PC9_PF_UART1_CTS);
+ imx_gpio_mode(PC10_PF_UART1_RTS);
+ imx_gpio_mode(PC11_PF_UART1_TXD);
+ imx_gpio_mode(PC12_PF_UART1_RXD);
+
-+ imx_gpio_mode( PB30_PF_UART2_TXD );
-+ imx_gpio_mode( PB31_PF_UART2_RXD );
-+ imx_gpio_mode( PB28_PF_UART2_CTS );
-+ imx_gpio_mode( PB29_PF_UART2_RTS );
-+
-+#ifdef CONFIG_FB_IMX /* LCD */
-+ set_imx_fb_info(&apf9328_fb_info);
-+#endif
-+#ifdef CONFIG_CAN_MCP251X
-+ mcp251X_init_gpio();
-+#endif
-+#ifdef CONFIG_ARMADEUS_ISP1761
-+ imx_gpio_mode( ISP1761_GPIO_IRQ | GPIO_IN | GPIO_GIUS ); /* Set up IRQ line. */
-+#endif
++#ifdef CONFIG_USB_GADGET_IMX
+ set_imx_usb_info(&apf9328_udc_0_data);
++#endif
+
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++#if defined (CONFIG_ARMADEUS_MAX1027)
+ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+#endif
+
++ apf9328_baseboard_init();
++
+ printk("--- APF9328 ressources registered\n");
+}
+
@@ -802,6 +594,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ * Register here the memory addresses we want to access from our drivers and
+ * which are not already registered in generic.c
+ */
++#ifdef CONFIG_FB_IMX
++#define IMX_FB_PHYS (0x0C000000 - 0x40000)
++#endif
++
+static struct map_desc apf9328_io_desc[] __initdata = {
+#ifdef CONFIG_FB_IMX
+ {
@@ -832,15 +628,6 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_DM9000
+ set_irq_type(APF9328_ETH_IRQ, IRQF_TRIGGER_FALLING);
+#endif
-+#ifdef CONFIG_SPI_TSC2102
-+ set_irq_type( IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING );
-+#endif
-+#ifdef CONFIG_CAN_MCP251X
-+ set_irq_type( IRQ_GPIOC(CAN_MPC251X_INT_GPIOC), IRQF_TRIGGER_FALLING );
-+#endif
-+#ifdef CONFIG_ARMADEUS_ISP1761
-+ set_irq_type( ISP1761_IRQ, IRQF_TRIGGER_FALLING );
-+#endif
+}
+
+
@@ -857,7 +644,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h 2009-07-15 16:23:52.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h 2009-08-17 11:04:40.000000000 +0200
@@ -0,0 +1,301 @@
+/*
+ *
@@ -1163,8 +950,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h 2009-07-15 16:23:52.000000000 +0200
-@@ -0,0 +1,63 @@
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h 2009-08-18 13:55:07.000000000 +0200
+@@ -0,0 +1,68 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
+ *
@@ -1193,12 +980,12 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
+/* Memory Map for the APF9328 Board */
+/* ------------------------------------------------------------------------ */
+
-+// Ethernet
++/* Ethernet */
+#define APF9328_ETH_VIRT ( IMX_CS4_VIRT + 0x00C00000 )
+#define APF9328_ETH_PHYS ( IMX_CS4_PHYS + 0x00C00000 )
+#define APF9328_ETH_IRQ ( IRQ_GPIOB(14) )
+
-+// FLASH
++/* FLASH */
+#define APF9328_FLASH_PHYS IMX_CS0_PHYS
+#ifdef CONFIG_IMX_APF9328_FLASH_8MB
+# define APF9328_FLASH_SIZE 0x00800000
@@ -1208,10 +995,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
+#endif
+#define APF9328_FLASH_BASE IMX_CS0_VIRT
+
-+// RAM
-+// Usefull ?
-+
-+// FPGA
++/* 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 )
@@ -1222,9 +1006,303 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
+
+#define CLK32 32768
+
-+// USB HOST ISP1760: option available with APF_devfull
-+#define ISP1761_BASE IMX_CS3_PHYS
-+#define ISP1761_GPIO_IRQ ( GPIO_PORTC | 10 )
-+#define ISP1761_IRQ ( IRQ_GPIOC(10) )
++#ifndef __ASSEMBLY__
++/*
++ * The APF9328 module needs a baseboard to work. After basic initializing
++ * its own devices, it calls baseboard's init function.
++ * TODO: Add your own baseboard init function and call it from
++ * inside apf9328_init().
++ *
++ * This example here is for the DevLight/Full development boards. Refer apf9328-dev.c.
++ */
++
++extern void apf9328_baseboard_init(void);
++#endif
++
++#endif /* __ASM_ARCH_APF9328_H */
+Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328-dev.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/arch/arm/mach-imx/apf9328-dev.c 2009-08-18 13:56:55.000000000 +0200
+@@ -0,0 +1,281 @@
++/*
++ * linux/arch/arm/mach-imx/apf9328-dev.c
++ * Declares hardware present on APF9328_DevLight or DevFull boards
++ *
++ * Copyright (c) 2009 Armadeus systems
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * 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 <linux/device.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/physmap.h>
++#include <linux/init.h>
++#include <linux/interrupt.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/tsc2102.h>
++#include "../../../drivers/net/can/mcp251x.h"
++
++#include <asm/system.h>
++#include <mach/hardware.h>
++#include <linux/irq.h>
++#include <asm/pgtable.h>
++#include <asm/page.h>
++
++#include <asm/mach/map.h>
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <mach/imx-uart.h>
++#include <mach/mmc.h>
++#include <mach/usb.h>
++#include <mach/spi_imx.h>
++#include <mach/imx-regs.h> /* imx_gpio_mode() */
++#include <mach/imx-alsa.h>
++#include <linux/usb/isp116x.h>
++#include <mach/imx_ssi.h>
++
++#include "generic.h"
++
++
++#ifdef CONFIG_SPI_TSC2102_MODULE
++#define CONFIG_SPI_TSC2102 1
++#endif
++#ifdef CONFIG_CAN_MCP251X_MODULE
++#define CONFIG_CAN_MCP251X 1
++#endif
++#ifdef CONFIG_ARMADEUS_ISP1761_MODULE
++#define CONFIG_ARMADEUS_ISP1761 1
++#endif
++
++
++/*
++ * APF9328_DevFull board has an ISP1761 USB Host controller
++ */
++#ifdef CONFIG_ARMADEUS_ISP1761
++#define ISP1761_BASE IMX_CS3_PHYS
++#define ISP1761_GPIO_IRQ (GPIO_PORTC | 10)
++#define ISP1761_IRQ (IRQ_GPIOC(10))
++
++static struct resource devfull_isp1761_resources[] = {
++ [0] = {
++ .name = "isp1761-regs",
++ .start = ISP1761_BASE + 0x00000000,
++ .end = ISP1761_BASE + 0x000fffff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = ISP1761_IRQ,
++ .end = ISP1761_IRQ,
++ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
++ },
++};
++
++static struct platform_device devfull_isp1761_device = {
++ .name = "isp1761",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(devfull_isp1761_resources),
++ .resource = devfull_isp1761_resources,
++};
++#endif /* CONFIG_ARMADEUS_ISP1761 */
++
++
++/*
++ * APF9328_DevFull board has a TSC2102 for touchscreens control
++ * and sound playing
++ */
++#ifdef CONFIG_SPI_TSC2102
++#define TSC2102_CS_GPIOB 17
++#define TSC2102_INT_GPIOD 8
++
++static int tsc2102_init_gpio(void)
++{
++ /* Activate SPI2 port ---- */
++ /* PortB 17 is used as chip select (in GPIO mode) */
++ DR(1) |= 1 << TSC2102_CS_GPIOB; /* Initializes it High */
++ imx_gpio_mode(GPIO_PORTB | TSC2102_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR);
++ /* Configure SPI2 outputs */
++ imx_gpio_mode(PD7_AIN_SPI2_SCLK);
++ imx_gpio_mode(PD10_AIN_SPI2_TXD);
++ imx_gpio_mode(PD9_AOUT_SPI2_RXD);
++ FMCR |= SPI2_RXD_SEL; /* RX is AOUT on PORTD */
++
++ /* PortD 8 is used as PINTDAV interrupt */
++ set_irq_type(IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING);
++ imx_gpio_mode(GPIO_PORTD | TSC2102_INT_GPIOD | GPIO_IN | GPIO_GIUS);
++
++ printk("TSC2102 GPIOs initialized\n");
++ return 0;
++}
++
++/* Chip select command for TSC2102 */
++static void tsc2102_cs(u32 command)
++{
++ /* PortB 19 is used as chip select */
++ if (command == SPI_CS_DEASSERT)
++ DR(1) |= 1<< TSC2102_CS_GPIOB;
++ else
++ DR(1) &= ~(1<< TSC2102_CS_GPIOB);
++}
++
++static struct spi_imx_chip tsc2102_hw = {
++ .cs_control = tsc2102_cs,
++};
++
++static struct tsc210x_config apf9328_tsc2102_config = {
++ .use_internal = 1, /* -> use internal voltage reference */
++ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
++ .init = tsc2102_init_gpio,
++/* .apm_report = palmte_get_power_status,*/
++/*#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++ .alsa_config = &apf9328_alsa_pdata,
++#endif*/
++};
++
++#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++static struct imx_sound_platform_data apf9328_alsa_pdata;
++
++static struct platform_device tsc2102_alsa_device = {
++ .name = "tsc210x-alsa",
++ .id = 0,
++ .dev = {
++ .platform_data = &apf9328_alsa_pdata,
++ }
++};
++#endif /* defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE) */
++
++#endif /* CONFIG_SPI_TSC2102 */
++
++/*
++ * APF9328_DevFull board has a MCP251X CAN bus Host controller
++ */
++#ifdef CONFIG_CAN_MCP251X
++#define CAN_MPC251X_CS_GPIOB 19
++#define CAN_MPC251X_INT_GPIOC 13
++
++/* Chip select command for MCP251X */
++static void mcp251X_cs(u32 command)
++{
++ /* PortB 19 is used as chip select */
++ if (command == SPI_CS_DEASSERT)
++ DR(1) |= 1<< CAN_MPC251X_CS_GPIOB;
++ else
++ DR(1) &= ~(1<< CAN_MPC251X_CS_GPIOB);
++}
++
++static struct spi_imx_chip mcp251X_hw = {
++ .cs_control = mcp251X_cs,
++};
++
++static void mcp251X_init_gpio(void)
++{
++ /* PortB 19 is used as chip select (in GPIO mode) */
++ DR(1) |= 1 << CAN_MPC251X_CS_GPIOB; /* Initializes it High */
++ imx_gpio_mode(GPIO_PORTB | CAN_MPC251X_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR);
++
++ /* PortC 13 is used as CAN interrupt */
++ set_irq_type(IRQ_GPIOC(CAN_MPC251X_INT_GPIOC), IRQF_TRIGGER_FALLING);
++ imx_gpio_mode(GPIO_PORTC | CAN_MPC251X_INT_GPIOC | GPIO_IN | GPIO_GIUS);
++
++ /* Configure SPI2 outputs */
++ imx_gpio_mode(PD7_AIN_SPI2_SCLK);
++ imx_gpio_mode(PD10_AIN_SPI2_TXD);
++ imx_gpio_mode(PD9_AOUT_SPI2_RXD);
++ FMCR |= SPI2_RXD_SEL; /* RX is AOUT on PORTD */
++}
++
++static struct mcp251x_platform_data apf9328_mcp251x_config = {
++ .oscillator_frequency = 16000000,
++ .board_specific_setup = NULL,
++ .device_reset = NULL,
++ .transceiver_enable = NULL,
++};
++
++#endif /* CONFIG_CAN_MCP251X */
++
++
++static struct spi_board_info spi_dev_board_info[] __initdata = {
++#ifdef CONFIG_SPI_TSC2102
++{
++ .modalias = "tsc210x",
++ .controller_data= &tsc2102_hw,
++ .max_speed_hz = 8000000,
++ .bus_num = 2, /* SPI2 */
++ .irq = IRQ_GPIOD(TSC2102_INT_GPIOD),
++ .chip_select = 0,
++ .mode = 0,
++ .platform_data = &apf9328_tsc2102_config,
++},
++#endif
++#ifdef CONFIG_CAN_MCP251X
++{
++ .modalias = "mcp251x",
++ .max_speed_hz = 8000000, /* 8MHz */
++ .controller_data= &mcp251X_hw,
++ .bus_num = 2,
++ .mode = SPI_MODE_0,
++ .chip_select = 1,
++ .irq = IRQ_GPIOC( CAN_MPC251X_INT_GPIOC ),
++ .platform_data = &apf9328_mcp251x_config,
++},
++#endif
++};
++
++/*
++ * You may connect several types of LCD on these boards
++ */
++#ifdef CONFIG_FB_IMX
++/* all custom LCD configuration is deported to this file for clarity purpose: */
++#include "apf9328_lcd_config.h"
++#endif
++
++
++static struct platform_device *devices[] __initdata = {
++#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++ &tsc2102_alsa_device,
++#endif
++#ifdef CONFIG_ARMADEUS_ISP1761
++ &devfull_isp1761_device,
++#endif
++};
++
++void __init apf9328_baseboard_init(void)
++{
++ printk(" Registering APF9328_Dev ressources:");
++
++ /* Initializes serial port 2 GPIOs */
++ imx_gpio_mode(PB30_PF_UART2_TXD);
++ imx_gpio_mode(PB31_PF_UART2_RXD);
++ imx_gpio_mode(PB28_PF_UART2_CTS);
++ imx_gpio_mode(PB29_PF_UART2_RTS);
++
++#ifdef CONFIG_FB_IMX
++ set_imx_fb_info(&apf9328_fb_info);
++#endif
++#ifdef CONFIG_CAN_MCP251X
++ mcp251X_init_gpio();
++#endif
++#ifdef CONFIG_ARMADEUS_ISP1761
++ set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
++ imx_gpio_mode(ISP1761_GPIO_IRQ | GPIO_IN | GPIO_GIUS);
++#endif
++ platform_add_devices(devices, ARRAY_SIZE(devices));
++
++#if defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++ spi_register_board_info(spi_dev_board_info, ARRAY_SIZE(spi_dev_board_info));
++#endif
++
++ printk(" done\n");
++}
+
-+#endif // __ASM_ARCH_APF9328_H
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
index b30c433..9423226 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-06-08 18:45:55.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-08-17 11:42:37.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-08-17 18:12:58.000000000 +0200
@@ -88,4 +88,8 @@
#include "mx1ads.h"
#endif
@@ -13,8 +13,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
#endif
Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-06-08 18:46:34.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-08-17 11:42:37.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-08-17 18:04:06.000000000 +0200
@@ -1,6 +1,10 @@
menu "IMX Implementations"
depends on ARCH_IMX
@@ -26,7 +26,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
config ARCH_MX1ADS
bool "mx1ads"
depends on ARCH_IMX
-@@ -8,4 +12,31 @@
+@@ -8,4 +12,46 @@
help
Say Y here if you are using the Motorola MX1ADS board
@@ -39,13 +39,13 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+endchoice
+
+config MACH_APF9328_FPGA
-+ bool "board has a FPGA"
++ bool "Board has a FPGA"
+ depends on MACH_APF9328
+ help
+ Select this if your APF9328 has an onboard FPGA
+
+choice
-+ prompt "APF9328 Flash available"
++ prompt "Flash available on board"
+ depends on MACH_APF9328
+ default IMX_APF9328_FLASH_16MB
+
@@ -57,23 +57,39 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+
+endchoice
+
++choice
++ prompt "Baseboard"
++ depends on MACH_APF9328
++ default MACH_APF9328_DEV
++
++config MACH_APF9328_DEV
++ prompt "DevLight/DevFull"
++ bool
++ help
++ This selects the APF9328_DevLight/DevFull as baseboard. You have
++ to manually activates the devices you want to use if you have a
++ DevFull.
++
++endchoice
++
endmenu
Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-06-08 18:35:27.000000000 +0200
-@@ -10,6 +10,7 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-08-17 11:42:37.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-08-17 17:48:11.000000000 +0200
+@@ -10,6 +10,8 @@
# Specific board support
obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o
+obj-$(CONFIG_MACH_APF9328) += apf9328.o
++obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
# Support for blinky lights
led-y := leds.o
Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-06-08 18:35:27.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-08-17 11:42:37.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-08-17 15:02:39.000000000 +0200
@@ -1,2 +1,3 @@
zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
+ zreladdr-$(CONFIG_MACH_APF9328) := 0x08008000
diff --git a/target/linux/modules/isp1761/hal/hal_imx.c b/target/linux/modules/isp1761/hal/hal_imx.c
index 53abf6c..754267c 100644
--- a/target/linux/modules/isp1761/hal/hal_imx.c
+++ b/target/linux/modules/isp1761/hal/hal_imx.c
@@ -830,7 +830,7 @@ isp1761_probe (struct platform_device *pdev)
*/
#if 1 // CUSTOM STUFF - 16-bit mode
- isp1761_reg_write32(loc_dev, HC_HW_MODE_REG, 2);
+ isp1761_reg_write32(loc_dev, HC_HW_MODE_REG, 0x82);
#endif
loc_dev = &(isp1761_loc_dev[ISP1761_HC]);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-17 08:50:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ebb994f732edc03a9d6e657c4c994ba754a27864 (commit)
via e3e9f9d22149f22702bc384ac834cf2297228c6b (commit)
from 9f4c2e58a2f501c8e72fefbdfc8f38730535083a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ebb994f732edc03a9d6e657c4c994ba754a27864
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 17 10:41:16 2009 +0200
[BUILD] Renames Buildroot patches and moves them to patches/buildroot/
commit e3e9f9d22149f22702bc384ac834cf2297228c6b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 17 10:04:35 2009 +0200
[BUILD] Preliminary work before buildroot patches moving
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch} | 0
.../005-imxregs.patch} | 0
.../006-lcd4linux.patch} | 0
.../007-qt_opie.patch} | 0
.../008-fpgaregs.patch} | 0
.../010-uclibc.patch} | 0
.../011-sdl-image-ttf-config.patch} | 0
.../012-gdb-arm-corefile-support.patch} | 0
.../013-strace-arm-support.patch} | 0
.../015-sdl-mixer-net-config.patch} | 0
.../016-prboom.patch} | 0
.../017-lmbench.patch} | 0
.../018-allegro.patch} | 0
.../019-lua.patch} | 0
.../020-ipkg.patch} | 0
.../021-sdl-water-config.patch} | 0
.../022-alsa-lib-utils.patch} | 0
.../026-jffs2root.patch} | 0
.../030-gcc.patch} | 0
.../031-max5821-ch7024.patch} | 0
.../034-slideshow.patch} | 0
.../035-tslib-add-ts_test-to-rootfs.patch} | 0
.../036-qtopia-build-demos-and-examples.patch} | 0
.../037-ltp-testsuite.patch} | 0
.../038-fakeroot.patch} | 0
.../039-kernelconfig.patch} | 0
.../040-linux-makefile.patch} | 0
.../040-mplayer-remove-ivtv-output.patch} | 0
.../041-fbgrab.patch} | 0
.../041-lockfile-progs.patch} | 0
.../042-socketcan.patch} | 0
.../043-change-setserial-mirror.patch} | 0
.../044-change-file-package-mirror.patch} | 0
.../045-mpfr.2.3.2.patch} | 0
.../046-alsa-lib-no_version.patch} | 0
.../046-prboom-install_it_only_once.patch} | 0
.../047-madplay-make_it_compile_with_alsa.patch} | 0
.../047-uclibc-config.patch} | 0
..._kernel_version_with_latest_minor_number.patch} | 0
...wnload_minor_patches_from_kernel_org_too.patch} | 0
...-linux-remove_unsupported_kernel_version.patch} | 0
..._building_when_modules_compilation_fails.patch} | 0
.../051-u-boot.patch} | 0
...-adds_linux26-patched_target_to_Makefile.patch} | 0
.../053-libusb.patch} | 0
.../054-ntp-allow_ntpd_selection_or_not.patch} | 0
.../055-pyserial.patch} | 0
.../056-makedevs.patch} | 0
.../057-pymysql.patch} | 0
...sa_work_with_eabi_and_large_file_options.patch} | 0
.../059-add_armadeus_testsuite_package.patch} | 0
..._in_a_standalone_way_after_configuration.patch} | 0
.../061-mysql_client.patch} | 0
.../062-add-uboot-conf-to-saved-project.patch} | 0
...063-add_armadeus_alternate_download_site.patch} | 0
.../064-add_tslib_alternate_site.patch} | 0
.../065-add_mpfr_alternate_site.patch} | 0
.../066-add_autotool_alternate_site.patch} | 0
.../067-libpcap_patch_failure.patch} | 0
.../068-upgrade_to_libcurl.patch} | 0
.../069-setserial_2.17-45.patch} | 0
.../070-add_ad9889ctl_package.patch} | 0
...linux-change_board_specific_patches_name.patch} | 0
.../072-xenomai-package.patch} | 0
.../073-php-fixes_download_site.patch} | 0
.../074-add_2_6_29_kernel_choice.patch} | 0
.../075-dummy-fix-warning.patch} | 0
.../076-ubifs.patch} | 0
...file_to_prevent_bad_library_installation.patch} | 0
...078-sdl-correct_libdir_path_in_libSDL.la.patch} | 0
...9-readline-install_it_on_target_for_real.patch} | 0
...-compiles_tslib_before_sdl_if_applicable.patch} | 0
.../{ => buildroot}/add_packages_config_entry.pl | 0
patches/linux | 1 +
patches/u-boot | 1 +
75 files changed, 2 insertions(+), 0 deletions(-)
delete mode 100644 patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
rename patches/{001-buildroot.diff => buildroot/001-add_armadeus_device.patch} (100%)
rename patches/{005-buildroot-imxregs.diff => buildroot/005-imxregs.patch} (100%)
rename patches/{006-buildroot-lcd4linux.diff => buildroot/006-lcd4linux.patch} (100%)
rename patches/{004-Buildroot-defconfig.diff => buildroot/007-qt_opie.patch} (100%)
rename patches/{008-buildroot-fpgaregs.diff => buildroot/008-fpgaregs.patch} (100%)
rename patches/{007-buildroot-qt_opie.diff => buildroot/010-uclibc.patch} (100%)
rename patches/{010-buildroot-uclibc.diff => buildroot/011-sdl-image-ttf-config.patch} (100%)
rename patches/{011-buildroot-sdl-image-ttf-config.diff => buildroot/012-gdb-arm-corefile-support.patch} (100%)
rename patches/{012-buildroot-gdb-arm-corefile-support.diff => buildroot/013-strace-arm-support.patch} (100%)
rename patches/{013-buildroot-strace-arm-support.diff => buildroot/015-sdl-mixer-net-config.patch} (100%)
rename patches/{015-buildroot-sdl-mixer-net-config.diff => buildroot/016-prboom.patch} (100%)
rename patches/{017-buildroot-lmbench.diff => buildroot/017-lmbench.patch} (100%)
rename patches/{018-buildroot-allegro.diff => buildroot/018-allegro.patch} (100%)
rename patches/{016-buildroot-prboom.diff => buildroot/019-lua.patch} (100%)
rename patches/{019-buildroot-lua.diff => buildroot/020-ipkg.patch} (100%)
rename patches/{021-buildroot-sdl-water-config.diff => buildroot/021-sdl-water-config.patch} (100%)
rename patches/{020-buildroot-ipkg.diff => buildroot/022-alsa-lib-utils.patch} (100%)
rename patches/{026-buildroot-jffs2root.diff => buildroot/026-jffs2root.patch} (100%)
rename patches/{030-buildroot-gcc.diff => buildroot/030-gcc.patch} (100%)
rename patches/{031-buildroot-max5821-ch7024.diff => buildroot/031-max5821-ch7024.patch} (100%)
rename patches/{034-buildroot-slideshow.diff => buildroot/034-slideshow.patch} (100%)
rename patches/{035-buildroot-tslib-add-ts_test-to-rootfs.diff => buildroot/035-tslib-add-ts_test-to-rootfs.patch} (100%)
rename patches/{022-buildroot-alsa-lib-utils.diff => buildroot/036-qtopia-build-demos-and-examples.patch} (100%)
rename patches/{037-buildroot-ltp-testsuite.diff => buildroot/037-ltp-testsuite.patch} (100%)
rename patches/{038-buildroot-fakeroot.diff => buildroot/038-fakeroot.patch} (100%)
rename patches/{036-buildroot-qtopia-build-demos-and-examples.diff => buildroot/039-kernelconfig.patch} (100%)
rename patches/{040-buildroot-linux-makefile.diff => buildroot/040-linux-makefile.patch} (100%)
rename patches/{040-buildroot-mplayer-remove-ivtv-output.diff => buildroot/040-mplayer-remove-ivtv-output.patch} (100%)
rename patches/{041-buildroot-fbgrab.diff => buildroot/041-fbgrab.patch} (100%)
rename patches/{039-buildroot-kernelconfig.diff => buildroot/041-lockfile-progs.patch} (100%)
rename patches/{042-buildroot-socketcan.diff => buildroot/042-socketcan.patch} (100%)
rename patches/{041-buildroot-lockfile-progs.diff => buildroot/043-change-setserial-mirror.patch} (100%)
rename patches/{043-buildroot-change-setserial-mirror.diff => buildroot/044-change-file-package-mirror.patch} (100%)
rename patches/{044-buildroot-change-file-package-mirror.diff => buildroot/045-mpfr.2.3.2.patch} (100%)
rename patches/{046-buildroot-alsa-lib-no_version.diff => buildroot/046-alsa-lib-no_version.patch} (100%)
rename patches/{046-buildroot-prboom-install_it_only_once.diff => buildroot/046-prboom-install_it_only_once.patch} (100%)
rename patches/{045-buildroot-mpfr.2.3.2.diff => buildroot/047-madplay-make_it_compile_with_alsa.patch} (100%)
rename patches/{047-buildroot-uclibc-config.diff => buildroot/047-uclibc-config.patch} (100%)
rename patches/{048-buildroot-linux-correctly_define_kernel_version_with_latest_minor_number.diff => buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch} (100%)
rename patches/{049-buildroot-linux-download_minor_patches_from_kernel_org_too.diff => buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch} (100%)
rename patches/{050-buildroot-linux-remove_unsupported_kernel_version.diff => buildroot/050-linux-remove_unsupported_kernel_version.patch} (100%)
rename patches/{050-buildroot-linux-stops_building_when_modules_compilation_fails.diff => buildroot/050-linux-stops_building_when_modules_compilation_fails.patch} (100%)
rename patches/{051-buildroot-u-boot.diff => buildroot/051-u-boot.patch} (100%)
rename patches/{052-buildroot-linux-adds_linux26-patched_target_to_Makefile.diff => buildroot/052-linux-adds_linux26-patched_target_to_Makefile.patch} (100%)
rename patches/{053-buildroot-libusb.diff => buildroot/053-libusb.patch} (100%)
rename patches/{054-buildroot-ntp-allow_ntpd_selection_or_not.diff => buildroot/054-ntp-allow_ntpd_selection_or_not.patch} (100%)
rename patches/{055-buildroot-pyserial.diff => buildroot/055-pyserial.patch} (100%)
rename patches/{056-buildroot-makedevs.diff => buildroot/056-makedevs.patch} (100%)
rename patches/{057-buildroot-pymysql.diff => buildroot/057-pymysql.patch} (100%)
rename patches/{058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff => buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch} (100%)
rename patches/{059-buildroot-add_armadeus_testsuite_package.diff => buildroot/059-add_armadeus_testsuite_package.patch} (100%)
rename patches/{060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff => buildroot/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch} (100%)
rename patches/{061-buildroot-mysql_client.diff => buildroot/061-mysql_client.patch} (100%)
rename patches/{062-buildroot-add-uboot-conf-to-saved-project.diff => buildroot/062-add-uboot-conf-to-saved-project.patch} (100%)
rename patches/{063-buildroot_add_alternate_download_site.diff => buildroot/063-add_armadeus_alternate_download_site.patch} (100%)
rename patches/{064-buildroot_add_tslib_alternate_site.diff => buildroot/064-add_tslib_alternate_site.patch} (100%)
rename patches/{065-buildroot_add_mpfr_alternate_site.diff => buildroot/065-add_mpfr_alternate_site.patch} (100%)
rename patches/{066-buildroot_add_autotool_alternate_site.diff => buildroot/066-add_autotool_alternate_site.patch} (100%)
rename patches/{067-buildroot_libpcap_patch_failure.diff => buildroot/067-libpcap_patch_failure.patch} (100%)
rename patches/{068-buildroot_upgrade_to_libcurl.diff => buildroot/068-upgrade_to_libcurl.patch} (100%)
rename patches/{069-buidlroot_setserial_2.17-45.diff => buildroot/069-setserial_2.17-45.patch} (100%)
rename patches/{070-buildroot_ad9889ctl.diff => buildroot/070-add_ad9889ctl_package.patch} (100%)
rename patches/{071-buildroot-linux-change_board_specific_patches_name.diff => buildroot/071-linux-change_board_specific_patches_name.patch} (100%)
rename patches/{072-buildroot-xenomai-package.diff => buildroot/072-xenomai-package.patch} (100%)
rename patches/{073-buildroot-php-fixes_download_site.diff => buildroot/073-php-fixes_download_site.patch} (100%)
rename patches/{074-buildroot-add_2_6_29_kernel_choice.diff => buildroot/074-add_2_6_29_kernel_choice.patch} (100%)
rename patches/{075-buildroot-dummy-fix-warning.diff => buildroot/075-dummy-fix-warning.patch} (100%)
rename patches/{076-buildroot-ubifs.diff => buildroot/076-ubifs.patch} (100%)
rename patches/{077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff => buildroot/077-libvorbis-update_makefile_to_prevent_bad_library_installation.patch} (100%)
rename patches/{078-buildroot-sdl-correct_libdir_path_in_libSDL.la.diff => buildroot/078-sdl-correct_libdir_path_in_libSDL.la.patch} (100%)
rename patches/{079-buildroot-readline-install_it_on_target_for_real.diff => buildroot/079-readline-install_it_on_target_for_real.patch} (100%)
rename patches/{080-buildroot-compiles_tslib_before_sdl_if_applicable.diff => buildroot/080-compiles_tslib_before_sdl_if_applicable.patch} (100%)
rename patches/{ => buildroot}/add_packages_config_entry.pl (100%)
create mode 120000 patches/linux
create mode 120000 patches/u-boot
diff --git a/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff b/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/001-buildroot.diff b/patches/buildroot/001-add_armadeus_device.patch
similarity index 100%
rename from patches/001-buildroot.diff
rename to patches/buildroot/001-add_armadeus_device.patch
diff --git a/patches/005-buildroot-imxregs.diff b/patches/buildroot/005-imxregs.patch
similarity index 100%
rename from patches/005-buildroot-imxregs.diff
rename to patches/buildroot/005-imxregs.patch
diff --git a/patches/006-buildroot-lcd4linux.diff b/patches/buildroot/006-lcd4linux.patch
similarity index 100%
rename from patches/006-buildroot-lcd4linux.diff
rename to patches/buildroot/006-lcd4linux.patch
diff --git a/patches/004-Buildroot-defconfig.diff b/patches/buildroot/007-qt_opie.patch
similarity index 100%
rename from patches/004-Buildroot-defconfig.diff
rename to patches/buildroot/007-qt_opie.patch
diff --git a/patches/008-buildroot-fpgaregs.diff b/patches/buildroot/008-fpgaregs.patch
similarity index 100%
rename from patches/008-buildroot-fpgaregs.diff
rename to patches/buildroot/008-fpgaregs.patch
diff --git a/patches/007-buildroot-qt_opie.diff b/patches/buildroot/010-uclibc.patch
similarity index 100%
rename from patches/007-buildroot-qt_opie.diff
rename to patches/buildroot/010-uclibc.patch
diff --git a/patches/010-buildroot-uclibc.diff b/patches/buildroot/011-sdl-image-ttf-config.patch
similarity index 100%
rename from patches/010-buildroot-uclibc.diff
rename to patches/buildroot/011-sdl-image-ttf-config.patch
diff --git a/patches/011-buildroot-sdl-image-ttf-config.diff b/patches/buildroot/012-gdb-arm-corefile-support.patch
similarity index 100%
rename from patches/011-buildroot-sdl-image-ttf-config.diff
rename to patches/buildroot/012-gdb-arm-corefile-support.patch
diff --git a/patches/012-buildroot-gdb-arm-corefile-support.diff b/patches/buildroot/013-strace-arm-support.patch
similarity index 100%
rename from patches/012-buildroot-gdb-arm-corefile-support.diff
rename to patches/buildroot/013-strace-arm-support.patch
diff --git a/patches/013-buildroot-strace-arm-support.diff b/patches/buildroot/015-sdl-mixer-net-config.patch
similarity index 100%
rename from patches/013-buildroot-strace-arm-support.diff
rename to patches/buildroot/015-sdl-mixer-net-config.patch
diff --git a/patches/015-buildroot-sdl-mixer-net-config.diff b/patches/buildroot/016-prboom.patch
similarity index 100%
rename from patches/015-buildroot-sdl-mixer-net-config.diff
rename to patches/buildroot/016-prboom.patch
diff --git a/patches/017-buildroot-lmbench.diff b/patches/buildroot/017-lmbench.patch
similarity index 100%
rename from patches/017-buildroot-lmbench.diff
rename to patches/buildroot/017-lmbench.patch
diff --git a/patches/018-buildroot-allegro.diff b/patches/buildroot/018-allegro.patch
similarity index 100%
rename from patches/018-buildroot-allegro.diff
rename to patches/buildroot/018-allegro.patch
diff --git a/patches/016-buildroot-prboom.diff b/patches/buildroot/019-lua.patch
similarity index 100%
rename from patches/016-buildroot-prboom.diff
rename to patches/buildroot/019-lua.patch
diff --git a/patches/019-buildroot-lua.diff b/patches/buildroot/020-ipkg.patch
similarity index 100%
rename from patches/019-buildroot-lua.diff
rename to patches/buildroot/020-ipkg.patch
diff --git a/patches/021-buildroot-sdl-water-config.diff b/patches/buildroot/021-sdl-water-config.patch
similarity index 100%
rename from patches/021-buildroot-sdl-water-config.diff
rename to patches/buildroot/021-sdl-water-config.patch
diff --git a/patches/020-buildroot-ipkg.diff b/patches/buildroot/022-alsa-lib-utils.patch
similarity index 100%
rename from patches/020-buildroot-ipkg.diff
rename to patches/buildroot/022-alsa-lib-utils.patch
diff --git a/patches/026-buildroot-jffs2root.diff b/patches/buildroot/026-jffs2root.patch
similarity index 100%
rename from patches/026-buildroot-jffs2root.diff
rename to patches/buildroot/026-jffs2root.patch
diff --git a/patches/030-buildroot-gcc.diff b/patches/buildroot/030-gcc.patch
similarity index 100%
rename from patches/030-buildroot-gcc.diff
rename to patches/buildroot/030-gcc.patch
diff --git a/patches/031-buildroot-max5821-ch7024.diff b/patches/buildroot/031-max5821-ch7024.patch
similarity index 100%
rename from patches/031-buildroot-max5821-ch7024.diff
rename to patches/buildroot/031-max5821-ch7024.patch
diff --git a/patches/034-buildroot-slideshow.diff b/patches/buildroot/034-slideshow.patch
similarity index 100%
rename from patches/034-buildroot-slideshow.diff
rename to patches/buildroot/034-slideshow.patch
diff --git a/patches/035-buildroot-tslib-add-ts_test-to-rootfs.diff b/patches/buildroot/035-tslib-add-ts_test-to-rootfs.patch
similarity index 100%
rename from patches/035-buildroot-tslib-add-ts_test-to-rootfs.diff
rename to patches/buildroot/035-tslib-add-ts_test-to-rootfs.patch
diff --git a/patches/022-buildroot-alsa-lib-utils.diff b/patches/buildroot/036-qtopia-build-demos-and-examples.patch
similarity index 100%
rename from patches/022-buildroot-alsa-lib-utils.diff
rename to patches/buildroot/036-qtopia-build-demos-and-examples.patch
diff --git a/patches/037-buildroot-ltp-testsuite.diff b/patches/buildroot/037-ltp-testsuite.patch
similarity index 100%
rename from patches/037-buildroot-ltp-testsuite.diff
rename to patches/buildroot/037-ltp-testsuite.patch
diff --git a/patches/038-buildroot-fakeroot.diff b/patches/buildroot/038-fakeroot.patch
similarity index 100%
rename from patches/038-buildroot-fakeroot.diff
rename to patches/buildroot/038-fakeroot.patch
diff --git a/patches/036-buildroot-qtopia-build-demos-and-examples.diff b/patches/buildroot/039-kernelconfig.patch
similarity index 100%
rename from patches/036-buildroot-qtopia-build-demos-and-examples.diff
rename to patches/buildroot/039-kernelconfig.patch
diff --git a/patches/040-buildroot-linux-makefile.diff b/patches/buildroot/040-linux-makefile.patch
similarity index 100%
rename from patches/040-buildroot-linux-makefile.diff
rename to patches/buildroot/040-linux-makefile.patch
diff --git a/patches/040-buildroot-mplayer-remove-ivtv-output.diff b/patches/buildroot/040-mplayer-remove-ivtv-output.patch
similarity index 100%
rename from patches/040-buildroot-mplayer-remove-ivtv-output.diff
rename to patches/buildroot/040-mplayer-remove-ivtv-output.patch
diff --git a/patches/041-buildroot-fbgrab.diff b/patches/buildroot/041-fbgrab.patch
similarity index 100%
rename from patches/041-buildroot-fbgrab.diff
rename to patches/buildroot/041-fbgrab.patch
diff --git a/patches/039-buildroot-kernelconfig.diff b/patches/buildroot/041-lockfile-progs.patch
similarity index 100%
rename from patches/039-buildroot-kernelconfig.diff
rename to patches/buildroot/041-lockfile-progs.patch
diff --git a/patches/042-buildroot-socketcan.diff b/patches/buildroot/042-socketcan.patch
similarity index 100%
rename from patches/042-buildroot-socketcan.diff
rename to patches/buildroot/042-socketcan.patch
diff --git a/patches/041-buildroot-lockfile-progs.diff b/patches/buildroot/043-change-setserial-mirror.patch
similarity index 100%
rename from patches/041-buildroot-lockfile-progs.diff
rename to patches/buildroot/043-change-setserial-mirror.patch
diff --git a/patches/043-buildroot-change-setserial-mirror.diff b/patches/buildroot/044-change-file-package-mirror.patch
similarity index 100%
rename from patches/043-buildroot-change-setserial-mirror.diff
rename to patches/buildroot/044-change-file-package-mirror.patch
diff --git a/patches/044-buildroot-change-file-package-mirror.diff b/patches/buildroot/045-mpfr.2.3.2.patch
similarity index 100%
rename from patches/044-buildroot-change-file-package-mirror.diff
rename to patches/buildroot/045-mpfr.2.3.2.patch
diff --git a/patches/046-buildroot-alsa-lib-no_version.diff b/patches/buildroot/046-alsa-lib-no_version.patch
similarity index 100%
rename from patches/046-buildroot-alsa-lib-no_version.diff
rename to patches/buildroot/046-alsa-lib-no_version.patch
diff --git a/patches/046-buildroot-prboom-install_it_only_once.diff b/patches/buildroot/046-prboom-install_it_only_once.patch
similarity index 100%
rename from patches/046-buildroot-prboom-install_it_only_once.diff
rename to patches/buildroot/046-prboom-install_it_only_once.patch
diff --git a/patches/045-buildroot-mpfr.2.3.2.diff b/patches/buildroot/047-madplay-make_it_compile_with_alsa.patch
similarity index 100%
rename from patches/045-buildroot-mpfr.2.3.2.diff
rename to patches/buildroot/047-madplay-make_it_compile_with_alsa.patch
diff --git a/patches/047-buildroot-uclibc-config.diff b/patches/buildroot/047-uclibc-config.patch
similarity index 100%
rename from patches/047-buildroot-uclibc-config.diff
rename to patches/buildroot/047-uclibc-config.patch
diff --git a/patches/048-buildroot-linux-correctly_define_kernel_version_with_latest_minor_number.diff b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
similarity index 100%
rename from patches/048-buildroot-linux-correctly_define_kernel_version_with_latest_minor_number.diff
rename to patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
diff --git a/patches/049-buildroot-linux-download_minor_patches_from_kernel_org_too.diff b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
similarity index 100%
rename from patches/049-buildroot-linux-download_minor_patches_from_kernel_org_too.diff
rename to patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
diff --git a/patches/050-buildroot-linux-remove_unsupported_kernel_version.diff b/patches/buildroot/050-linux-remove_unsupported_kernel_version.patch
similarity index 100%
rename from patches/050-buildroot-linux-remove_unsupported_kernel_version.diff
rename to patches/buildroot/050-linux-remove_unsupported_kernel_version.patch
diff --git a/patches/050-buildroot-linux-stops_building_when_modules_compilation_fails.diff b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
similarity index 100%
rename from patches/050-buildroot-linux-stops_building_when_modules_compilation_fails.diff
rename to patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
diff --git a/patches/051-buildroot-u-boot.diff b/patches/buildroot/051-u-boot.patch
similarity index 100%
rename from patches/051-buildroot-u-boot.diff
rename to patches/buildroot/051-u-boot.patch
diff --git a/patches/052-buildroot-linux-adds_linux26-patched_target_to_Makefile.diff b/patches/buildroot/052-linux-adds_linux26-patched_target_to_Makefile.patch
similarity index 100%
rename from patches/052-buildroot-linux-adds_linux26-patched_target_to_Makefile.diff
rename to patches/buildroot/052-linux-adds_linux26-patched_target_to_Makefile.patch
diff --git a/patches/053-buildroot-libusb.diff b/patches/buildroot/053-libusb.patch
similarity index 100%
rename from patches/053-buildroot-libusb.diff
rename to patches/buildroot/053-libusb.patch
diff --git a/patches/054-buildroot-ntp-allow_ntpd_selection_or_not.diff b/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
similarity index 100%
rename from patches/054-buildroot-ntp-allow_ntpd_selection_or_not.diff
rename to patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
diff --git a/patches/055-buildroot-pyserial.diff b/patches/buildroot/055-pyserial.patch
similarity index 100%
rename from patches/055-buildroot-pyserial.diff
rename to patches/buildroot/055-pyserial.patch
diff --git a/patches/056-buildroot-makedevs.diff b/patches/buildroot/056-makedevs.patch
similarity index 100%
rename from patches/056-buildroot-makedevs.diff
rename to patches/buildroot/056-makedevs.patch
diff --git a/patches/057-buildroot-pymysql.diff b/patches/buildroot/057-pymysql.patch
similarity index 100%
rename from patches/057-buildroot-pymysql.diff
rename to patches/buildroot/057-pymysql.patch
diff --git a/patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff b/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
similarity index 100%
rename from patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff
rename to patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
diff --git a/patches/059-buildroot-add_armadeus_testsuite_package.diff b/patches/buildroot/059-add_armadeus_testsuite_package.patch
similarity index 100%
rename from patches/059-buildroot-add_armadeus_testsuite_package.diff
rename to patches/buildroot/059-add_armadeus_testsuite_package.patch
diff --git a/patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff b/patches/buildroot/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
similarity index 100%
rename from patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff
rename to patches/buildroot/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
diff --git a/patches/061-buildroot-mysql_client.diff b/patches/buildroot/061-mysql_client.patch
similarity index 100%
rename from patches/061-buildroot-mysql_client.diff
rename to patches/buildroot/061-mysql_client.patch
diff --git a/patches/062-buildroot-add-uboot-conf-to-saved-project.diff b/patches/buildroot/062-add-uboot-conf-to-saved-project.patch
similarity index 100%
rename from patches/062-buildroot-add-uboot-conf-to-saved-project.diff
rename to patches/buildroot/062-add-uboot-conf-to-saved-project.patch
diff --git a/patches/063-buildroot_add_alternate_download_site.diff b/patches/buildroot/063-add_armadeus_alternate_download_site.patch
similarity index 100%
rename from patches/063-buildroot_add_alternate_download_site.diff
rename to patches/buildroot/063-add_armadeus_alternate_download_site.patch
diff --git a/patches/064-buildroot_add_tslib_alternate_site.diff b/patches/buildroot/064-add_tslib_alternate_site.patch
similarity index 100%
rename from patches/064-buildroot_add_tslib_alternate_site.diff
rename to patches/buildroot/064-add_tslib_alternate_site.patch
diff --git a/patches/065-buildroot_add_mpfr_alternate_site.diff b/patches/buildroot/065-add_mpfr_alternate_site.patch
similarity index 100%
rename from patches/065-buildroot_add_mpfr_alternate_site.diff
rename to patches/buildroot/065-add_mpfr_alternate_site.patch
diff --git a/patches/066-buildroot_add_autotool_alternate_site.diff b/patches/buildroot/066-add_autotool_alternate_site.patch
similarity index 100%
rename from patches/066-buildroot_add_autotool_alternate_site.diff
rename to patches/buildroot/066-add_autotool_alternate_site.patch
diff --git a/patches/067-buildroot_libpcap_patch_failure.diff b/patches/buildroot/067-libpcap_patch_failure.patch
similarity index 100%
rename from patches/067-buildroot_libpcap_patch_failure.diff
rename to patches/buildroot/067-libpcap_patch_failure.patch
diff --git a/patches/068-buildroot_upgrade_to_libcurl.diff b/patches/buildroot/068-upgrade_to_libcurl.patch
similarity index 100%
rename from patches/068-buildroot_upgrade_to_libcurl.diff
rename to patches/buildroot/068-upgrade_to_libcurl.patch
diff --git a/patches/069-buidlroot_setserial_2.17-45.diff b/patches/buildroot/069-setserial_2.17-45.patch
similarity index 100%
rename from patches/069-buidlroot_setserial_2.17-45.diff
rename to patches/buildroot/069-setserial_2.17-45.patch
diff --git a/patches/070-buildroot_ad9889ctl.diff b/patches/buildroot/070-add_ad9889ctl_package.patch
similarity index 100%
rename from patches/070-buildroot_ad9889ctl.diff
rename to patches/buildroot/070-add_ad9889ctl_package.patch
diff --git a/patches/071-buildroot-linux-change_board_specific_patches_name.diff b/patches/buildroot/071-linux-change_board_specific_patches_name.patch
similarity index 100%
rename from patches/071-buildroot-linux-change_board_specific_patches_name.diff
rename to patches/buildroot/071-linux-change_board_specific_patches_name.patch
diff --git a/patches/072-buildroot-xenomai-package.diff b/patches/buildroot/072-xenomai-package.patch
similarity index 100%
rename from patches/072-buildroot-xenomai-package.diff
rename to patches/buildroot/072-xenomai-package.patch
diff --git a/patches/073-buildroot-php-fixes_download_site.diff b/patches/buildroot/073-php-fixes_download_site.patch
similarity index 100%
rename from patches/073-buildroot-php-fixes_download_site.diff
rename to patches/buildroot/073-php-fixes_download_site.patch
diff --git a/patches/074-buildroot-add_2_6_29_kernel_choice.diff b/patches/buildroot/074-add_2_6_29_kernel_choice.patch
similarity index 100%
rename from patches/074-buildroot-add_2_6_29_kernel_choice.diff
rename to patches/buildroot/074-add_2_6_29_kernel_choice.patch
diff --git a/patches/075-buildroot-dummy-fix-warning.diff b/patches/buildroot/075-dummy-fix-warning.patch
similarity index 100%
rename from patches/075-buildroot-dummy-fix-warning.diff
rename to patches/buildroot/075-dummy-fix-warning.patch
diff --git a/patches/076-buildroot-ubifs.diff b/patches/buildroot/076-ubifs.patch
similarity index 100%
rename from patches/076-buildroot-ubifs.diff
rename to patches/buildroot/076-ubifs.patch
diff --git a/patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff b/patches/buildroot/077-libvorbis-update_makefile_to_prevent_bad_library_installation.patch
similarity index 100%
rename from patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff
rename to patches/buildroot/077-libvorbis-update_makefile_to_prevent_bad_library_installation.patch
diff --git a/patches/078-buildroot-sdl-correct_libdir_path_in_libSDL.la.diff b/patches/buildroot/078-sdl-correct_libdir_path_in_libSDL.la.patch
similarity index 100%
rename from patches/078-buildroot-sdl-correct_libdir_path_in_libSDL.la.diff
rename to patches/buildroot/078-sdl-correct_libdir_path_in_libSDL.la.patch
diff --git a/patches/079-buildroot-readline-install_it_on_target_for_real.diff b/patches/buildroot/079-readline-install_it_on_target_for_real.patch
similarity index 100%
rename from patches/079-buildroot-readline-install_it_on_target_for_real.diff
rename to patches/buildroot/079-readline-install_it_on_target_for_real.patch
diff --git a/patches/080-buildroot-compiles_tslib_before_sdl_if_applicable.diff b/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
similarity index 100%
rename from patches/080-buildroot-compiles_tslib_before_sdl_if_applicable.diff
rename to patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
diff --git a/patches/add_packages_config_entry.pl b/patches/buildroot/add_packages_config_entry.pl
similarity index 100%
rename from patches/add_packages_config_entry.pl
rename to patches/buildroot/add_packages_config_entry.pl
diff --git a/patches/linux b/patches/linux
new file mode 120000
index 0000000..4421645
--- /dev/null
+++ b/patches/linux
@@ -0,0 +1 @@
+../buildroot/target/device/armadeus/linux/kernel-patches/
\ No newline at end of file
diff --git a/patches/u-boot b/patches/u-boot
new file mode 120000
index 0000000..e80cd2e
--- /dev/null
+++ b/patches/u-boot
@@ -0,0 +1 @@
+../buildroot/target/u-boot/
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-08-14 09:26:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9f4c2e58a2f501c8e72fefbdfc8f38730535083a (commit)
from 3f353877e1bcaa7d8f532bfcc572e8b950850097 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9f4c2e58a2f501c8e72fefbdfc8f38730535083a
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 14 11:23:01 2009 +0200
[TARGET] Add a directory (target/scripts/) to store useful system scripts that are not in the default rootfs skeleton
-----------------------------------------------------------------------
Summary of changes:
target/scripts/README | 2 ++
target/scripts/S60inetd | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 0 deletions(-)
create mode 100644 target/scripts/README
create mode 100755 target/scripts/S60inetd
diff --git a/target/scripts/README b/target/scripts/README
new file mode 100644
index 0000000..2f86054
--- /dev/null
+++ b/target/scripts/README
@@ -0,0 +1,2 @@
+Scripts useful for everyday usage on APF, but that don't necessarly found
+a place in the default skeleton.
diff --git a/target/scripts/S60inetd b/target/scripts/S60inetd
new file mode 100755
index 0000000..50b5732
--- /dev/null
+++ b/target/scripts/S60inetd
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+[ -f /usr/sbin/inetd ] || exit 0
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+ start)
+ echo -n "Starting INET services: "
+ inetd
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/inet && echo "done"
+ ;;
+ stop)
+ echo -n "Stopping INET services: "
+ killall inetd
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/inet && echo "done"
+ ;;
+ status)
+ echo -n "INET services are: "
+ if [ -f /var/lock/subsys/inet ]; then
+ echo "running"
+ else
+ echo "not running"
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ reload)
+ killall -HUP inetd
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|status|reload|restart}"
+ exit 1
+esac
+
+exit $RETVAL
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-08-14 09:10:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3f353877e1bcaa7d8f532bfcc572e8b950850097 (commit)
via 14803bcb09d4ae6c8b234587c0546c593473409a (commit)
from 6214066ee09f115442ca4a2f99a74a784f404aba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3f353877e1bcaa7d8f532bfcc572e8b950850097
Merge: 14803bcb09d4ae6c8b234587c0546c593473409a 6214066ee09f115442ca4a2f99a74a784f404aba
Author: Fabien Marteau <fabien@fabien-laptop-ubuntu.(none)>
Date: Fri Aug 14 11:07:23 2009 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus
commit 14803bcb09d4ae6c8b234587c0546c593473409a
Author: Fabien Marteau <fabien@fabien-laptop-ubuntu.(none)>
Date: Fri Aug 14 11:03:35 2009 +0200
/*
*
* Configuration settings for the Armadeus Project apf27 board.
*
* Copyright (c) 2008-2009 Eric Jarrige <eri...@ar...>
*
* 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
*
* 2008/08/19 Initial version based on apf9328 configuration file
* 2008/10/09 Release 1.0 support u-boot 1.3.4
* 2008/10/25 Release 1.1 added environment version
* 2008/11/01 Release 1.2 flash size independant
* 2008/11/09 Release 1.3 keep uboot partition locked & source clean-up
*/
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_ENV_VERSION "1.6"
#define CONFIG_IDENT_STRING " apf27 patch 2.1"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_IMX27 1 /* in a Freescale i.MX27 Chip */
#define CONFIG_APF27 1 /* on a Armadeus project APF27 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
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/*
* 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.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DIAG /* Diagnostics */
#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
#define CONFIG_CMD_FAT /* FAT support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_PING /* ping support */
#undef CONFIG_CMD_PORTIO /* Port I/O */
#undef CONFIG_CMD_REGINFO /* Register dump */
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
#define CONFIG_CMD_SNTP /* SNTP support */
#define CONFIG_CMD_IMX_FUSE /* iMX fuse access commands */
#undef CONFIG_DISPLAY_BOARDINFO
#undef CONFIG_DISPLAY_CPUINFO
/*
* 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 */
#define CONFIG_CMDLINE_EDITING 1
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
#define CONFIG_BOOTDELAY 20
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_MTDMAP "mxc_nand.0"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
"384k(U-boot_env),512k(firmware)," \
"5M(kernel)," \
"-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CFG_LOAD_ADDR) "\0" \
"filesize=" MK_STR(CFG_MONITOR_LEN) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,3\0" \
"uboot_offset=" MK_STR(CFG_MONITOR_OFFSET) "\0" \
"uboot_len=" MK_STR(CFG_MONITOR_LEN) "\0" \
"env_offset=" MK_STR(CFG_ENV_OFFSET) "\0" \
"env_len=" MK_STR(CFG_ENV_SIZE) "\0" \
"firmware_offset=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
"firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
"kernel_offset=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
"kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
"rootfs_offset=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
"rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
"board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
"serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
"ntpserverip=217.147.208.1\0" \
"mmcroot=/dev/mmcblk0p1\0" \
"mmcrootfstype=ext2\0" \
"quiet=1\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addjffsargs=setenv bootargs ${bootargs} " \
"root=/dev/mtdblock4 rootfstype=jffs2\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\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; setenv autostart yes;" \
"nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
"jffsboot=setenv bootargs ${console} ${mtdparts};" \
"run addjffsargs addipargs; setenv autostart yes;" \
"nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
"nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
"nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
"firmware_autoload=0\0" \
"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
"nand erase ${uboot_offset} ${uboot_len};" \
"if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; \0" \
"flash_firmware=nand erase ${firmware_offset} ${firmware_len};"\
"if nand write.jffs2 ${fileaddr} ${firmware_offset} ${filesize} ;"\
"then echo Flashing of Firmware succeed;" \
"else echo Flashing of Firmware failed;" \
"fi\0" \
"fpga_config=tftpboot ${fileaddr} $firmware_name;"\
"run flash_firmware;"\
"fpga load 0 ${fileaddr} ${firmware_len};\0"\
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
"if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize} ;"\
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
"flash_rootfs=nand erase clean ${rootfs_offset} ${rootfs_len};" \
"if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
"flash_reset_env=nand unlock ${env_offset} ${env_len};" \
"nand erase ${env_offset} ${env_len};" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-u-boot.bin\0" \
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run download_kernel flash_kernel download_rootfs " \
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
#define CONFIG_BOOTCOMMAND "run jffsboot"
#define CFG_AUTOLOAD "no"
#define CONFIG_MACH_TYPE MACH_TYPE_APF27
#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
#define CONFIG_BOARD_NAME "apf27"
#define CONFIG_HOSTNAME "apf27"
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/apf27-root"
/*
* General options for u-boot. Modify to save memory foot print
*/
#define CFG_LONGHELP
#define CFG_PROMPT "BIOS> " /* prompt string */
#define CFG_CBSIZE 2048 /* 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 0xA0000000 /* memtest test area */
#define CFG_MEMTEST_END 0xA0300000 /*64MiB -1MiB*/
#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 + (256<<10) )
#define CFG_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */
#define CONFIG_STACKSIZE (256<<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
*
* 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
* |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
*/
#define CFG_OSC32 32768 /* 32768 or 32000 Hz crystal */
#undef CFG_OSC26 /* there is no external 26MHz external clock */
/* MPU CLOCK source before PLL */
/* CONFIG_SYS_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
#ifndef CFG_OSC26
#if (CFG_OSC32 == 32000)
#define CFG_MPCTL0_VAL 0x00211803 /* 398.998 MHz */
#define CFG_MPCTL1_VAL 0
#define CONFIG_MPLL_FREQ 399
#else /* CFG_OSC32 == 32768*/
#define CFG_MPCTL0_VAL 0x01EF15D5 /* 399.000 MHz */
#define CFG_MPCTL1_VAL 0
#define CONFIG_MPLL_FREQ 399
#endif /* CFG_OSC32 */
#else /* CFG_OSC26 in use*/
#define CFG_MPCTL0_VAL 0x00331C23 /* 399.000 MHz */
#define CFG_MPCTL1_VAL 0
#define CONFIG_MPLL_FREQ 399
#endif /* CFG_OSC26 */
#define CONFIG_SYS_CLK_FREQ (CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
/* Serial clock source before PLL (should be named CFG_SYSPLL_CLK_FREQ) */
#ifndef CFG_OSC26
/*#define CONFIG_SYSPLL_CLK_FREQ (1024*CFG_OSC32)*/
#if (CFG_OSC32 == 32000)
#define CFG_SPCTL0_VAL 0x04A02419 /* 300.00020 MHz */
#define CFG_SPCTL1_VAL 0
#define CONFIG_SPLL_FREQ 300 /* MHz */
#else /* CFG_OSC32 == 32768*/
#define CFG_SPCTL0_VAL 0x0475206F /* 299.99937 MHz */
#define CFG_SPCTL1_VAL 0
#define CONFIG_SPLL_FREQ 300 /* MHz */
#endif /* CFG_OSC32 */
#else /* CFG_OSC26 in use*/
/*#define CONFIG_SYSPLL_CLK_FREQ CFG_OSC26*/
#define CFG_SPCTL0_VAL 0x040C2C07 /* 300 MHz */
#define CFG_SPCTL1_VAL 0x0
#define CONFIG_SPLL_FREQ 300 /* MHz */
#endif /* CFG_OSC26 */
/* ARM bus frequency (have to be a CONFIG_MPLL_FREQ ratio) */
#define CONFIG_ARM_FREQ 399 /* up to 400 MHz */
/* external bus frequency (have to be a CONFIG_SYS_CLK_FREQ ratio) */
#define CONFIG_HCLK_FREQ 133 /* (CONFIG_SYS_CLK_FREQ/2) */
#define CONFIG_PERIF1_FREQ 16 /* 16.625 MHz UART, GPT, PWM*/
#define CONFIG_PERIF2_FREQ 33 /* 33.25 MHz CSPI and SDHC*/
#define CONFIG_PERIF3_FREQ 33 /* 33.25 MHz LCD*/
#define CONFIG_PERIF4_FREQ 33 /* 33.25 MHz CSI*/
#define CONFIG_SSI1_FREQ 66 /* 66.50 MHz SSI1*/
#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
#define CONFIG_CLK0_DIV 3 /* Divide CLK0 by 4 */
#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
#define CONFIG_NFC_FREQ 44 /* NFC Clock up to 44 MHz wh 133MHz*/
/* external serial bus frequency (have to be a CONFIG_SPLL_FREQ ratio) */
#define CONFIG_USB_FREQ 60 /* 60 MHz */
/*
* SDRAM definition parameter
*/
#define CONFIG_NR_DRAM_BANKS 1
#define CFG_SDRAM_MBYTE_SYZE 64
#if (CFG_SDRAM_MBYTE_SYZE == 8)
/* micron 8MB */
#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x00800000 /* 8 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_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 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x01000000 /* 16 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_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 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x02000000 /* 32 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_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 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 MT46H16M32LF -6 */
/* micron 64MB */
#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x04000000 /* 64 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_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_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 == 128)
/* micron 128MB */
#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_SIZE 0x08000000 /* 128 MB */
#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
#define CFG_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 == 256)
/* micron 256MB */
#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_1_SIZE 0x10000000 /* 256 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_SIZE 0x10000000 /* 256 MB */
#define CFG_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
#define CFG_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
#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 no NOR FLASH memory
*/
#define CFG_NO_FLASH
/*=====================*/
/* Flash & Environment */
/*=====================*/
#define IMX27_NAND_16BITS 1
#define CFG_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CFG_NAND_BASE (0xD8000000)
#define CONFIG_BOOT_TRACE_REG 0xAFFFFFF8 /* Addr to store traces of SPL boot */
//#define NAND_ALLOW_ERASE_ALL
//#define CONFIG_MTD_NAND_VERIFY_WRITE 1
//#define CFG_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
//#define CFG_NFC_DEBUG
//#define CONFIG_MTD_DEBUG
//#define CONFIG_MTD_DEBUG_VERBOSE 3
/*=====================*/
#define CONFIG_JFFS2_NAND 1
#define CONFIG_JFFS2_CMDLINE 1
#define CONFIG_NAND_U_BOOT
#define CFG_NAND_U_BOOT_DST CFG_LOAD_ADDR /* Copy SPL+U-Boot here */
#define CFG_NAND_U_BOOT_SIZE CFG_MONITOR_LEN /* Size is the partion size */
/*
* 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 0xAFF00000
#define CFG_MONITOR_OFFSET 0x00000000
#define CFG_MONITOR_LEN 0x000A0000 /* 640kB ( 5 flash blocks ) */
#undef CFG_ENV_IS_IN_FLASH
#define CFG_ENV_IS_IN_NAND 1
/*#define CFG_ENV_IS_NOWHERE
*/
#define CFG_ENV_OFFSET 0x000A0000 /* NAND offset address for now*/
#define CFG_ENV_SIZE 0x00020000 /* 128kB */
#define CFG_ENV_RANGE 0X00060000 /* 384kB ( 3 flash blocks ) */
#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
#define CONFIG_FIRMWARE_OFFSET 0x00100000
#define CONFIG_FIRMWARE_LEN 0x00080000 /* 512kB ( 4 flash blocks ) */
#define CONFIG_KERNEL_OFFSET 0x00180000
#define CONFIG_KERNEL_LEN 0x00500000 /* 5.0MB */
#define CONFIG_ROOTFS_OFFSET 0x00680000
#define CONFIG_ROOTFS_LEN /* entire flash if not specified ~116MB*/
/*
* Default load address for user programs and kernel
*/
#define CFG_LOAD_ADDR 0xA0000000
#define CONFIG_LOADADDR 0xA0000000
#define CFG_TFTP_LOADADDR 0xA0000000
/*
* Hardware drivers
*/
/* FEC IMX27 ethernet chipset */
#define CONFIG_DRIVER_FEC_IMX27 1
#undef CONFIG_FEC_IMX27_DEBUG
//#define CONFIG_NET_MULTI
#define CONFIG_PHY_ADDR 0x1f
#define CONFIG_MII 1 /* MII PHY management */
/*-----------------------------------------------------------------------
* FPGA stuff
*/
#define CONFIG_FPGA
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
#define CFG_FPGA_WAIT 20000 /* 20 ms */
#define CFG_FPGA_PROG_FEEDBACK
#define CFG_FPGA_CHECK_CTRLC
#define CFG_FPGA_CHECK_ERROR
//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
/* FPGA program pin configuration */
#define CFG_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
#define CFG_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
#define CFG_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
#define CFG_FPGA_RDATA 0xD6000000 /* FPGA data addr */
#define CFG_FPGA_WDATA 0xD6000000 /* FPGA data addr */
#define CFG_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
#define CFG_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
#define CFG_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
#define CFG_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
#define CFG_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
#define CFG_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
/*
* I2C bus
*/
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
#define CFG_I2C_SPEED 100000 /* 100 kHz */
#define CFG_I2C_SLAVE 0x7F
#define CONFIG_I2C_CMD_TREE
#define CONFIG_I2C_MULTI_BUS 2
#define CFG_I2C_NOPROBES { }
# define CFG_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
# define CFG_I2C_EEPROM_ADDR_LEN 1 /* 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 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
#define CONFIG_RTC_DS1374
#define CFG_RTC_BUS_NUM 0
/*#define CONFIG_MMC 1
*/
/*
* External interfaces module
*
* CSCRxU_VAL:
* 31| x | x | x x |x x x x| x x | x | x |x x x x|16
* |SP |WP | BCD | BCS | PSZ |PME|SYNC| DOL |
*
* 15| x x | x x x x x x | x | x x x x | x x x x |0
* | CNC | WSC |EW | WWS | EDC |
*
* CSCRxL_VAL:
* 31| x x x x | x x x x | x x x x | x x x x |16
* | OEA | OEN | EBWA | EBWN |
* 15|x x x x| x |x x x |x x x x| x | x | x | x | 0
* | CSA |EBC| DSZ | CSN |PSR|CRE|WRAP|CSEN|
*
* CSCRxA_VAL:
* 31| x x x x | x x x x | x x x x | x x x x |16
* | EBRA | EBRN | RWA | RWN |
* 15| x | x x |x x x|x x|x x|x x| x | x | x | x | 0
* |MUM| LAH | LBN |LBA|DWW|DCT|WWU|AGE|CNC2|FCE|
*/
/* CS0 configuration for 16 bit nor flash */
#define CFG_CS0U_VAL 0x0000CC03
#define CFG_CS0L_VAL 0xa0330D01
#define CFG_CS0A_VAL 0x00220800
#define CFG_CS1U_VAL 0
#define CFG_CS1L_VAL 0
#define CFG_CS1A_VAL 0
#define CFG_CS2U_VAL 0
#define CFG_CS2L_VAL 0
#define CFG_CS2A_VAL 0
#define CFG_CS3U_VAL 0
#define CFG_CS3L_VAL 0
#define CFG_CS3A_VAL 0
#define CFG_CS4U_VAL 0
#define CFG_CS4L_VAL 0
#define CFG_CS4A_VAL 0
/* FPGA 16 bit data bus */
#define CFG_CS5U_VAL 0x00000600
#define CFG_CS5L_VAL 0x00000D01
#define CFG_CS5A_VAL 0
#define CFG_EIM_VAL 0x00002000
/* FPGA specific settings */
/* CLKO */
#define CFG_CCSR_VAL 0x00000305
/* drive strength CLKO set to 2*/
#define CFG_DSCR10_VAL 0x00020000
/* drive strength A1..A12 set to 2*/
#define CFG_DSCR3_VAL 0x02AAAAA8
/* drive strength ctrl*/
#define CFG_DSCR7_VAL 0x00020880
/* drive strength data*/
#define CFG_DSCR2_VAL 0xAAAAAAAA
/*
* Default configuration for GPIOs and peripherals
*/
#define CFG_DDIR_A_VAL 0x00000000
#define CFG_OCR1_A_VAL 0x00000000
#define CFG_OCR2_A_VAL 0x00000000
#define CFG_ICFA1_A_VAL 0xFFFFFFFF
#define CFG_ICFA2_A_VAL 0xFFFFFFFF
#define CFG_ICFB1_A_VAL 0xFFFFFFFF
#define CFG_ICFB2_A_VAL 0xFFFFFFFF
#define CFG_DR_A_VAL 0x00000000
#define CFG_GIUS_A_VAL 0xFFFFFFFF
#define CFG_ICR1_A_VAL 0x00000000
#define CFG_ICR2_A_VAL 0x00000000
#define CFG_IMR_A_VAL 0x00000000
#define CFG_GPR_A_VAL 0x00000000
#define CFG_PUEN_A_VAL 0xFFFFFFFF
#define CFG_DDIR_B_VAL 0x00000000
#define CFG_OCR1_B_VAL 0x00000000
#define CFG_OCR2_B_VAL 0x00000000
#define CFG_ICFA1_B_VAL 0xFFFFFFFF
#define CFG_ICFA2_B_VAL 0xFFFFFFFF
#define CFG_ICFB1_B_VAL 0xFFFFFFFF
#define CFG_ICFB2_B_VAL 0xFFFFFFFF
#define CFG_DR_B_VAL 0x00000000
#define CFG_GIUS_B_VAL 0xFF3FFFF0
#define CFG_ICR1_B_VAL 0x00000000
#define CFG_ICR2_B_VAL 0x00000000
#define CFG_IMR_B_VAL 0x00000000
#define CFG_GPR_B_VAL 0x00000000
#define CFG_PUEN_B_VAL 0xFFFFFFFF
#define CFG_DDIR_C_VAL 0x00000000
#define CFG_OCR1_C_VAL 0x00000000
#define CFG_OCR2_C_VAL 0x00000000
#define CFG_ICFA1_C_VAL 0xFFFFFFFF
#define CFG_ICFA2_C_VAL 0xFFFFFFFF
#define CFG_ICFB1_C_VAL 0xFFFFFFFF
#define CFG_ICFB2_C_VAL 0xFFFFFFFF
#define CFG_DR_C_VAL 0x00000000
#define CFG_GIUS_C_VAL 0xFFFFFFFF
#define CFG_ICR1_C_VAL 0x00000000
#define CFG_ICR2_C_VAL 0x00000000
#define CFG_IMR_C_VAL 0x00000000
#define CFG_GPR_C_VAL 0x00000000
#define CFG_PUEN_C_VAL 0xFFFFFF87
#define CFG_DDIR_D_VAL 0x00000000
#define CFG_OCR1_D_VAL 0x00000000
#define CFG_OCR2_D_VAL 0x00000000
#define CFG_ICFA1_D_VAL 0xFFFFFFFF
#define CFG_ICFA2_D_VAL 0xFFFFFFFF
#define CFG_ICFB1_D_VAL 0xFFFFFFFF
#define CFG_ICFB2_D_VAL 0xFFFFFFFF
#define CFG_DR_D_VAL 0x00000000
#define CFG_GIUS_D_VAL 0xFFFFFFFF
#define CFG_ICR1_D_VAL 0x00000000
#define CFG_ICR2_D_VAL 0x00000000
#define CFG_IMR_D_VAL 0x00000000
#define CFG_GPR_D_VAL 0x00000000
#define CFG_PUEN_D_VAL 0xFFFFFFFF
#define CFG_DDIR_E_VAL 0x00000000
#define CFG_OCR1_E_VAL 0x00000000
#define CFG_OCR2_E_VAL 0x00000000
#define CFG_ICFA1_E_VAL 0xFFFFFFFF
#define CFG_ICFA2_E_VAL 0xFFFFFFFF
#define CFG_ICFB1_E_VAL 0xFFFFFFFF
#define CFG_ICFB2_E_VAL 0xFFFFFFFF
#define CFG_DR_E_VAL 0x00000000
#define CFG_GIUS_E_VAL 0xFFFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
#define CFG_GPR_E_VAL 0x00000000
#define CFG_PUEN_E_VAL 0xFFFFFFFF
#define CFG_DDIR_F_VAL 0x00000000
#define CFG_OCR1_F_VAL 0x00000000
#define CFG_OCR2_F_VAL 0x00000000
#define CFG_ICFA1_F_VAL 0xFFFFFFFF
#define CFG_ICFA2_F_VAL 0xFFFFFFFF
#define CFG_ICFB1_F_VAL 0xFFFFFFFF
#define CFG_ICFB2_F_VAL 0xFFFFFFFF
#define CFG_DR_F_VAL 0x00000000
#define CFG_GIUS_F_VAL 0xFF7F8000
#define CFG_ICR1_F_VAL 0x00000000
#define CFG_ICR2_F_VAL 0x00000000
#define CFG_IMR_F_VAL 0x00000000
#define CFG_GPR_F_VAL 0x00000000
#define CFG_PUEN_F_VAL 0xFFFFFFFF
/* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
#define CFG_GPCR_VAL 0x0003000F
/* LPDDR enable. latency hiding behavior enabled */
//#define CFG_ESDMISC_VAL ESDMISC_MA10_SHARE+ESDMISC_MDDREN
/*
* safe value in case of erratic crash during boot
* (seen with some prototype boards)*/
#define CFG_ESDMISC_VAL ESDMISC_LHD+ESDMISC_MDDREN
/* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
#if (CONFIG_NR_DRAM_BANKS == 1)
#define CFG_FMCR_VAL 0xFFFFFFF9
#elif (CONFIG_NR_DRAM_BANKS == 2)
#define CFG_FMCR_VAL 0xFFFFFFFB
#endif
#define CFG_AIPI1_PSR0_VAL 0x20040304
#define CFG_AIPI1_PSR1_VAL 0xDFFBFCFB
#define CFG_AIPI2_PSR0_VAL 0x00000000
#define CFG_AIPI2_PSR1_VAL 0xFFFFFFFF
/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
#define CFG_PCCR0_VAL 0x05070400
#define CFG_PCCR1_VAL 0xA14A0408
/* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
#undef CONFIG_SKIP_LOWLEVEL_INIT
/*
* From here, there should not be any user configuration.
* All Equations are automatic
*/
/* fixme none integer value (7.5ns) => 2*hclock = 15ns */
#define CFG_2XHCLK_LGTH (2000/CONFIG_HCLK_FREQ) /* ns */
/* USB 60 MHz ; ARM up to 400; HClK up to 133MHz*/
#ifdef CFG_OSC26
#define CSCR_MASK 0x0303800D
#else
#define CSCR_MASK 0x0300800D
#endif
#define CFG_CSCR_VAL\
(CSCR_MASK \
|((((CONFIG_SPLL_FREQ/CONFIG_USB_FREQ)-1)&0x07)<<28) \
|((((CONFIG_MPLL_FREQ/CONFIG_ARM_FREQ)-1)&0x03)<<12) \
|((((CONFIG_SYS_CLK_FREQ/CONFIG_HCLK_FREQ)-1)&0x03)<<8))
/* SSIx CLKO NFC H264 MSHC */
#define CFG_PCDR0_VAL\
(((((CONFIG_SYS_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0) \
|((((CONFIG_HCLK_FREQ/CONFIG_NFC_FREQ)-1)&0x0F)<<6) \
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_H264_FREQ)-2)*2)&0x3F)<<10)\
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI1_FREQ)-2)*2)&0x3F)<<16)\
|(((CONFIG_CLK0_DIV)&0x07)<<22)\
|(((CONFIG_CLK0_EN)&0x01)<<25)\
|(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI2_FREQ)-2)*2)&0x3F)<<26))
/* PERCLKx */
#define CFG_PCDR1_VAL\
(((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF1_FREQ)-1)&0x3F)<<0) \
|((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF2_FREQ)-1)&0x3F)<<8) \
|((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF3_FREQ)-1)&0x3F)<<16) \
|((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF4_FREQ)-1)&0x3F)<<24))
/* SDRAM controller programming Values */
#if (((2*CFG_SDRAM_CLOCK_CYCLE_CL_1)>(3*CFG_2XHCLK_LGTH))\
||(CFG_SDRAM_CLOCK_CYCLE_CL_1<1))
#define REG_FIELD_SCL_VAL 3
#define REG_FIELD_SCLIMX_VAL 0
#else
#define REG_FIELD_SCL_VAL\
((2*CFG_SDRAM_CLOCK_CYCLE_CL_1+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)
#define REG_FIELD_SCLIMX_VAL REG_FIELD_SCL_VAL
#endif
//#define REG_FIELD_SCL_VAL 3
//#define REG_FIELD_SCLIMX_VAL 3
#if ((2*CFG_SDRAM_RC_DELAY)>(16*CFG_2XHCLK_LGTH))
#define REG_FIELD_SRC_VAL 0
#else
#define REG_FIELD_SRC_VAL\
((2*CFG_SDRAM_RC_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)
#endif
/* TBD Power down timer ; PRCT Bit Field Encoding; burst length 8 ; FP = 0*/
#define REG_ESDCTL_BASE_CONFIG (0x80020485\
| (((CFG_SDRAM_NUM_ROW-11)&0x7)<<24)\
| (((CFG_SDRAM_NUM_COL-8)&0x3)<<20)\
| (((CFG_SDRAM_REFRESH)&0x7)<<13))
#define CFG_NORMAL_RW_CMD ((0x0<<28)+REG_ESDCTL_BASE_CONFIG)
#define CFG_PRECHARGE_CMD ((0x1<<28)+REG_ESDCTL_BASE_CONFIG)
#define CFG_AUTOREFRESH_CMD ((0x2<<28)+REG_ESDCTL_BASE_CONFIG)
#define CFG_SET_MODE_REG_CMD ((0x3<<28)+REG_ESDCTL_BASE_CONFIG)
/* ESDRAMC Configuration Registers : force CL=3 to lpddr */
#define CFG_SDRAM_ESDCFG_REGISTER_VAL (0x0\
| (((((2*CFG_SDRAM_EXIT_PWD+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<21)\
| (((CFG_SDRAM_W2R_DELAY-1)&0x1)<<20)\
| (((((2*CFG_SDRAM_ROW_PRECHARGE_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<18)\
| (((CFG_SDRAM_TMRD_DELAY-1)&0x3)<<16)\
| (((CFG_SDRAM_TWR_DELAY)&0x1)<<15)\
| (((((2*CFG_SDRAM_RAS_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x7)<<12)\
| (((((2*CFG_SDRAM_RRD_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<10)\
| (((REG_FIELD_SCLIMX_VAL)&0x3)<<8)\
| (((((2*CFG_SDRAM_RCD_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x7)<<4)\
| (((REG_FIELD_SRC_VAL)&0x0F)<<0))
/* Issue Mode register Command to SDRAM*/
#define CFG_SDRAM_MODE_REGISTER_VAL\
((((CFG_SDRAM_BURST_LENGTH)&0x7)<<(0))\
| (((REG_FIELD_SCL_VAL)&0x7)<<(4))\
| ((0)<<(3)) /* sequentiql access */ \
/*| (((CFG_SDRAM_SINGLE_ACCESS)&0x1)<<(1))*/)
/* Issue Extended Mode register Command to SDRAM*/
#define CFG_SDRAM_EXT_MODE_REGISTER_VAL\
((CFG_SDRAM_PARTIAL_ARRAY_SR<<0)\
| (CFG_SDRAM_DRIVE_STRENGH<<(5))\
| (1<<(CFG_SDRAM_NUM_COL+CFG_SDRAM_NUM_ROW+1+2)))
/* Issue Precharge all Command to SDRAM*/
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
/* Add a wrapper around the values Buildroot sets. */
#ifndef __BR2_ADDED_CONFIG_H
#define __BR2_ADDED_CONFIG_H
#ifdef CONFIG_HOSTNAME
#undef CONFIG_HOSTNAME
#endif
#define CONFIG_HOSTNAME "apf27"
#ifdef CONFIG_BOARD_NAME
#undef CONFIG_BOARD_NAME
#endif
#define CONFIG_BOARD_NAME apf27
#endif /* __BR2_ADDED_CONFIG_H */
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/apf27/apf27.h | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 76590e8..5b626fb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -333,7 +333,7 @@
#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
-#define CONFIG_CLK0_DIV 0 /* Divide CLK0 by 1 */
+#define CONFIG_CLK0_DIV 3 /* Divide CLK0 by 4 */
#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
@@ -670,7 +670,7 @@
#define CFG_CS4A_VAL 0
/* FPGA 16 bit data bus */
-#define CFG_CS5U_VAL 0x00000500
+#define CFG_CS5U_VAL 0x00000600
#define CFG_CS5L_VAL 0x00000D01
#define CFG_CS5A_VAL 0
@@ -678,7 +678,7 @@
/* FPGA specific settings */
/* CLKO */
-#define CFG_CCSR_VAL 0x00000308
+#define CFG_CCSR_VAL 0x00000305
/* drive strength CLKO set to 2*/
#define CFG_DSCR10_VAL 0x00020000
/* drive strength A1..A12 set to 2*/
@@ -910,3 +910,16 @@
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
+
+/* Add a wrapper around the values Buildroot sets. */
+#ifndef __BR2_ADDED_CONFIG_H
+#define __BR2_ADDED_CONFIG_H
+#ifdef CONFIG_HOSTNAME
+#undef CONFIG_HOSTNAME
+#endif
+#define CONFIG_HOSTNAME "apf27"
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf27
+#endif /* __BR2_ADDED_CONFIG_H */
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2009-08-11 18:05:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6214066ee09f115442ca4a2f99a74a784f404aba (commit)
from 9f38ed15da88743af6c2133b31694568c5764211 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6214066ee09f115442ca4a2f99a74a784f404aba
Author: nicolas colombain <nic...@ar...>
Date: Tue Aug 11 19:59:57 2009 +0200
[TOOLS] fix tickets 43 and 64 concerning ubootrecover bugs
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27-u-boot.bin | Bin 220792 -> 220212 bytes
software/uboot_recover/apf27_recover.py | 3 +++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
index a2fd7f4..50c9b1c 100644
Binary files a/software/uboot_recover/apf27-u-boot.bin and b/software/uboot_recover/apf27-u-boot.bin differ
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index dcc6bcd..f5e0057 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -373,6 +373,9 @@ if __name__ == "__main__":
apfBootloader.initSDRAM1("APF27")
uboot.load()
uboot.waitForPrompt()
+ eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
+ if eraseAll == 'y':
+ uboot.resetenv()
uboot.flash()
print "uBoot successfully recovered !"
hooks/post-receive
--
armadeus
|
