armadeus-commitlog Mailing List for armadeus (Page 114)
Brought to you by:
sszy
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-20 17:11: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 eb136b98483dbc452f997a12f393aec2e35aaad0 (commit)
via d7c160b38937bc010dc5141e6d83c3671e4babc8 (commit)
via b4fe72c9aeb7dbd1f8b25c0015c508b5556b7b32 (commit)
from cfe393fb8913d5ab2c93326cabff9c3f34994abc (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 eb136b98483dbc452f997a12f393aec2e35aaad0
Author: Julien Boibessot <jul...@ar...>
Date: Sun Dec 20 18:09:50 2009 +0100
[BUILD] improve target/linux/.gitignore
commit d7c160b38937bc010dc5141e6d83c3671e4babc8
Author: Julien Boibessot <jul...@ar...>
Date: Sun Dec 20 18:08:29 2009 +0100
[LINUX] Makes MAX9768 driver more verbose when errors occur
commit b4fe72c9aeb7dbd1f8b25c0015c508b5556b7b32
Author: Julien Boibessot <jul...@ar...>
Date: Sun Dec 20 12:35:58 2009 +0100
[LINUX] apf9328: update default config with new LCDs
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-linux-2.6.29.config | 15 ++++--
target/linux/.gitignore | 1 +
target/linux/modules/Makefile.in | 1 +
target/linux/modules/max9768/max9768.c | 44 ++++++++++++-------
target/linux/modules/max9768/max9768.h | 4 +-
5 files changed, 42 insertions(+), 23 deletions(-)
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 ae18428..58967f6 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.6
-# Thu Dec 3 21:58:38 2009
+# Sun Dec 20 12:29:08 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -895,12 +895,15 @@ CONFIG_FB_MODE_HELPERS=y
# Frame buffer hardware drivers
#
CONFIG_FB_IMX=y
-CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
-# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
-# 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_F51900_CSTN is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
+CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
+# CONFIG_FB_IMX_CUSTOM_LCD is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
@@ -909,8 +912,10 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_HX5116 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_P0340WQL is not set
# CONFIG_LCD_PLATFORM is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
diff --git a/target/linux/.gitignore b/target/linux/.gitignore
index b76bac3..5b9e868 100644
--- a/target/linux/.gitignore
+++ b/target/linux/.gitignore
@@ -8,3 +8,4 @@
*~
.tmp_versions
Module.symvers
+Module.markers
diff --git a/target/linux/modules/Makefile.in b/target/linux/modules/Makefile.in
index 00fea76..550db8f 100755
--- a/target/linux/modules/Makefile.in
+++ b/target/linux/modules/Makefile.in
@@ -10,4 +10,5 @@ clean:
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
rm -f modules.order
rm -rf .tmp_versions/
+ rm -f Module.markers
diff --git a/target/linux/modules/max9768/max9768.c b/target/linux/modules/max9768/max9768.c
index 2bc3160..1ec1f54 100644
--- a/target/linux/modules/max9768/max9768.c
+++ b/target/linux/modules/max9768/max9768.c
@@ -1,5 +1,5 @@
/*
- * Max9768 audio amplifier driver
+ * MAX9768 audio amplifier driver
*
* Copyright (C) 2009 Armadeus Project / Armadeus Systems
* Author: Nicolas Colombain
@@ -63,24 +63,28 @@ static void max9768_mute(struct max9768 *max9768, int mute)
max9768->mute_state = mute;
}
-static void max9768_send( struct i2c_client *client, int value )
+static int max9768_send(struct i2c_client *client, int value)
{
char msg = value & 0xff;
- i2c_master_send(client, &msg, 1);
+ return i2c_master_send(client, &msg, 1);
}
-/* sysfs hook functions */
+/* sysfs hook functions */
static ssize_t max9768_set_volume(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
char msg;
+ int err;
msg = (simple_strtol(buf, NULL, 10)) & MAX9768_VOLUME_MASK;
pr_debug("%s: 0x%02x\n", __FUNCTION__, msg);
- max9768_send( client, msg);
+ err = max9768_send(client, msg);
+ if (err) {
+ dev_err(dev, "couldn't set volume\n");
+ }
return count;
}
@@ -122,15 +126,15 @@ static int max9768_create_sys_entries(struct i2c_client *client)
int status = 0;
if ((status = device_create_file(&client->dev, &dev_attr_volume))) {
- printk(KERN_WARNING "Unable to create sysfs attribute for max9768 volume register\n");
+ dev_warn(&client->dev, "Unable to create sysfs attribute for volume register\n");
goto exit;
}
if ((status = device_create_file(&client->dev, &dev_attr_mute))) {
- printk(KERN_WARNING "Unable to create sysfs attribute for max9768 mute register\n");
+ dev_warn(&client->dev, "Unable to create sysfs attribute for mute register\n");
goto exit;
}
if ((status = device_create_file(&client->dev, &dev_attr_shutdown))) {
- printk(KERN_WARNING "Unable to create sysfs attribute for max9768 shutdown register\n");
+ dev_warn(&client->dev, "Unable to create sysfs attribute for shutdown register\n");
goto exit;
}
@@ -169,7 +173,7 @@ static int max9768_probe(struct i2c_client *client,
i2c_set_clientdata(client, max9768);
dev_set_drvdata(&client->dev, max9768);
- /* Create /sys entries */
+ /* create /sys entries */
result = max9768_create_sys_entries(client);
if (result)
goto out_free;
@@ -177,24 +181,31 @@ static int max9768_probe(struct i2c_client *client,
if (platform_data->init) {
result = platform_data->init();
if (result) {
- printk(KERN_WARNING DRIVER_NAME ": can't reserve gpios\n");
+ dev_err(&client->dev, "can't reserve gpios\n");
goto out_sys;
}
}
max9768->mute_pin = platform_data->mute_pin;
max9768->shdn_pin = platform_data->shdn_pin;
- /* shutdown amplifier and activate mute */
+ /* set filter mode */
+ result = max9768_send(client, platform_data->filter_mode);
+ if (result) {
+ dev_err(&client->dev, "can't communicate with chip\n");
+ goto out_gpio;
+ }
+
+ /* shutdown amplifier and activate mute */
max9768_shutdown(max9768, 1);
max9768_mute(max9768, 1);
- /* set filter mode */
- max9768_send(client, platform_data->filter_mode);
-
- printk(DRIVER_NAME " v" DRIVER_VERSION " successfully probed !\n");
+ dev_notice(&client->dev, "successfully probed !\n");
return 0;
+out_gpio:
+ if (platform_data->exit)
+ platform_data->exit();
out_sys:
max9768_remove_sys_entries(client);
out_free:
@@ -268,9 +279,10 @@ static int __init max9768_init(void)
{
int ret;
+ printk(DRIVER_NAME " v" DRIVER_VERSION "\n");
ret = i2c_add_driver(&max9768_driver);
if (ret)
- printk(KERN_ERR "Unable to register max9768 driver\n");
+ printk(KERN_ERR "unable to register to I2C bus !\n");
return ret;
}
diff --git a/target/linux/modules/max9768/max9768.h b/target/linux/modules/max9768/max9768.h
index a92b1ac..3411f60 100644
--- a/target/linux/modules/max9768/max9768.h
+++ b/target/linux/modules/max9768/max9768.h
@@ -28,8 +28,8 @@
struct max9768_platform_data {
u8 filter_mode;
- int mute_pin; /*gpio for mute ctrl */
- int shdn_pin; /*gpio for shutdown ctrl */
+ int mute_pin; /* gpio for mute ctrl */
+ int shdn_pin; /* gpio for shutdown ctrl */
int (*init)(void);
int (*exit)(void);
};
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-19 18:39:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cfe393fb8913d5ab2c93326cabff9c3f34994abc (commit)
via d4fbc437b5ffbaf8f9d8f85fb627de0f2dfef8fa (commit)
via b7fb09812f5fe6bb7f86face8ab3eb80dd38a4e6 (commit)
from 26a5a427520259cbccb2fbb0c719431bc2e7ad00 (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 cfe393fb8913d5ab2c93326cabff9c3f34994abc
Author: Julien Boibessot <jul...@ar...>
Date: Sat Dec 19 19:38:13 2009 +0100
[LINUX] On APF27 I2C1 bus configuration is baseboard specific, so move it from apf27.c to apf27-dev.c
commit d4fbc437b5ffbaf8f9d8f85fb627de0f2dfef8fa
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 18 17:25:40 2009 +0100
[TEST] Rename mmc_perf.sh to media_perf.sh
commit b7fb09812f5fe6bb7f86face8ab3eb80dd38a4e6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 18 16:41:54 2009 +0100
[TEST] Makes mmc_perf.sh usable with USB keys
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 118 +++++++--------
.../2.6.29/344-apf27-spi_configuration.patch | 20 ++--
target/test/mmc/{mmc_perf.sh => media_perf.sh} | 154 ++++++++++++--------
target/test/test_release.sh | 2 +-
4 files changed, 158 insertions(+), 136 deletions(-)
rename target/test/mmc/{mmc_perf.sh => media_perf.sh} (54%)
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 13909e1..16b3f0a 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.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-16 11:43:30.000000000 +0100
-@@ -0,0 +1,745 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-18 17:40:22.000000000 +0100
+@@ -0,0 +1,712 @@
+ /*
+ * apf27.c
+ *
@@ -83,12 +83,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+extern void apf27_lcd_startup(void);
+#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
@@ -117,38 +111,15 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+#endif
+
+
-+/*
-+ * APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width
-+ */
++/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
+static struct mxc_nand_platform_data apf27_nand_board_info = {
+ .width = 2,
+ .hw_ecc = 1,
+};
+
+
++/* APF27 has an I2C EEPROM on I2C2 Bus */
+#ifdef CONFIG_I2C
-+static int mxc_i2c0_pins[] = {
-+ PD17_PF_I2C_DATA,
-+ PD18_PF_I2C_CLK
-+};
-+
-+static int apf27_i2c_0_init(struct platform_device *pdev)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_i2c0_pins, ARRAY_SIZE(mxc_i2c0_pins), "I2C0");
-+}
-+
-+static int apf27_i2c_0_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_i2c0_pins, ARRAY_SIZE(mxc_i2c0_pins));
-+ return 0;
-+}
-+
-+static struct imx_i2c_platform_data apf27_i2c_0_data = {
-+ .max_clk = 400000,
-+ .init = apf27_i2c_0_init,
-+ .exit = apf27_i2c_0_exit,
-+};
-+
+static int mxc_i2c1_pins[] = {
+ PC5_PF_I2C2_SDA,
+ PC6_PF_I2C2_SCL
@@ -156,7 +127,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+
+static int apf27_i2c_1_init(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_i2c1_pins, ARRAY_SIZE(mxc_i2c1_pins), "I2C1");
++ return mxc_gpio_setup_multiple_pins(mxc_i2c1_pins, ARRAY_SIZE(mxc_i2c1_pins),
++ "I2C2");
+}
+
+static int apf27_i2c_1_exit(struct platform_device *pdev)
@@ -171,12 +143,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+ .exit = apf27_i2c_1_exit,
+};
+
-+/* APF27 has an I2C EEPROM */
+static struct i2c_board_info apf27_i2c_devices_bus1[] = {
+ [0] = {
+ .type = "24c02",
-+ .flags = 0, /* FIXME */
-+ .addr = 0x50, /* E0=0, E1=1, E2=0 */
++ .flags = 0,
++ .addr = 0x50,
+ .platform_data = NULL,
+ .irq = 0
+ },
@@ -184,6 +155,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+#endif /* CONFIG_I2C */
+
+
++/* APF27 has an RS232 debug port/console on UART1 with "on module" transceiver */
+static int mxc_uart0_pins[] = {
+ PE12_PF_UART1_TXD,
+ PE13_PF_UART1_RXD
@@ -207,6 +179,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+ .flags = 0,
+};
+
++/* APF27 has an "on module" transceiver for UART3 */
+static int mxc_uart2_pins[] = {
+ PE8_PF_UART3_TXD,
+ PE9_PF_UART3_RXD,
@@ -238,6 +211,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+#endif
+};
+
++
+/* APF27 has an onboard Ethernet PHY */
+#ifdef CONFIG_FEC_OLD
+static int mxc_fec_pins[] = {
@@ -265,11 +239,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+{
+ mxc_gpio_setup_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins), "FEC");
+}
-+
-+/* static void gpio_fec_inactive(void)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins));
-+} */
+#endif /* CONFIG_FEC_OLD */
+
+
@@ -688,7 +657,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+#ifdef CONFIG_FEC_OLD
+ gpio_fec_active();
+#endif
-+ /* UART1 and UART3 have "on module" tranceivers */
++ /* UART1 and UART3 have "on module" transceivers */
+ mxc_register_device(&mxc_uart_device0, &uart0_pdata); /* console */
+ mxc_register_device(&mxc_uart_device2, &uart2_pdata);
+
@@ -704,9 +673,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+ mxc_register_device(&mxc_otg, &ehci0_pdata);
+#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(1, apf27_i2c_devices_bus1,
+ ARRAY_SIZE(apf27_i2c_devices_bus1));
+#endif
@@ -759,8 +726,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 12:07:58.000000000 +0100
-@@ -0,0 +1,1034 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-18 19:29:16.000000000 +0100
+@@ -0,0 +1,1063 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -878,7 +845,32 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+#ifdef CONFIG_I2C
+
-+/* I2C1 devices */
++/* APF27Dev makes I2C1 bus available */
++static int mxc_i2c0_pins[] = {
++ PD17_PF_I2C_DATA,
++ PD18_PF_I2C_CLK
++};
++
++static int apf27_i2c_0_init(struct platform_device *pdev)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_i2c0_pins, ARRAY_SIZE(mxc_i2c0_pins),
++ "I2C1");
++}
++
++static int apf27_i2c_0_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_i2c0_pins, ARRAY_SIZE(mxc_i2c0_pins));
++
++ return 0;
++}
++
++static struct imx_i2c_platform_data apf27_i2c_0_data = {
++ .max_clk = 400000,
++ .init = apf27_i2c_0_init,
++ .exit = apf27_i2c_0_exit,
++};
++
++/* I2C1 devices: RTC & Optionnal Camera */
+static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
+ [0] = {
+ /* APF27Dev has an RTC */
@@ -900,7 +892,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+
-+/* APF27Dev contains an optionnal HDMI video output (I2C controlled) */
++/* APF27Dev has an optionnal HDMI video output (controlled with I2C2) */
+# ifdef CONFIG_VIDEO_AD9889
+#define AD9889_INT 15
+
@@ -910,12 +902,14 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int ad9889_init(void)
+{
-+ return mxc_gpio_setup_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins), "AD9889");
++ 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;
+}
+
@@ -998,7 +992,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+# endif /* CONFIG_VIDEO_AD9889 */
+
-+
+/* I2C2 devices */
+static struct i2c_board_info apf27dev_i2c_devices_bus1[] = {
+# ifdef CONFIG_VIDEO_AD9889
@@ -1188,7 +1181,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_SPI */
+
+
-+/* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI) */
++/* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI1) */
+#ifdef CONFIG_ARMADEUS_MAX1027
+#define MAX1027_EOC_INT 15
+#define MAX1027_CNVST 14
@@ -1253,12 +1246,14 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ /* Initialize CS high */
+ gpio_set_value(TSC2101_CS, 1);
+
-+ return mxc_gpio_setup_multiple_pins(tsc2101_pins, ARRAY_SIZE(tsc2101_pins), "TSC2101");
++ return mxc_gpio_setup_multiple_pins(tsc2101_pins, ARRAY_SIZE(tsc2101_pins),
++ "TSC2101");
+}
+
+static int tsc2101_init_fixed_gpio(void)
+{
-+ return mxc_gpio_setup_multiple_pins(tsc2101_fixed_pins, ARRAY_SIZE(tsc2101_fixed_pins), "TSC2101");
++ return mxc_gpio_setup_multiple_pins(tsc2101_fixed_pins,
++ ARRAY_SIZE(tsc2101_fixed_pins), "TSC2101");
+}
+
+static void tsc2101_release_gpio(void)
@@ -1294,7 +1289,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#define MCP251X_CS (GPIO_PORTD | 20)
+
+static int mcp251x_pins[] = {
-+ (GPIO_PORTD | CAN_MCP251X_INT | GPIO_IN | GPIO_GPIO), /* configure int pin as GPIO */
++ (GPIO_PORTD | CAN_MCP251X_INT | GPIO_IN | GPIO_GPIO), /* IRQ pin as GPIO */
+ (MCP251X_CS | GPIO_OUT | GPIO_GPIO),
+};
+
@@ -1666,10 +1661,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+/* 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)
++#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),
@@ -1758,6 +1753,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
+#endif
+#ifdef CONFIG_I2C
++ mxc_register_device(&imx_i2c_device0, &apf27_i2c_0_data);
+ i2c_register_board_info(0, apf27dev_i2c_devices_bus0,
+ ARRAY_SIZE(apf27dev_i2c_devices_bus0));
+ i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
@@ -1798,7 +1794,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-15 09:32:01.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-18 16:55:09.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2023,7 +2019,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-16 12:07:45.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-18 16:55:09.000000000 +0100
@@ -0,0 +1,159 @@
+ /*
+ * apf27-dev-ext-apw.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
index 34eebf0..d468ee4 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
@@ -1,9 +1,9 @@
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 14:43:11.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 15:07:25.000000000 +0100
-@@ -316,15 +316,17 @@
- #endif /* CONFIG_SERIAL_IMX_UART5 */
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-18 19:33:56.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-18 19:33:57.000000000 +0100
+@@ -397,15 +397,17 @@
+ #endif /* CONFIG_SERIAL_IMX_UART6 */
-/* Both APF27 SPI ports are used on APF27Dev */
@@ -22,7 +22,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
static int mxc_cspi1_pins[] = {
/* PD19_PF_CSPI2_SS2,
PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
-@@ -333,11 +335,25 @@
+@@ -414,11 +416,25 @@
PD23_PF_CSPI2_MISO,
PD24_PF_CSPI2_MOSI
};
@@ -49,7 +49,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
}
static int gpio_spi0_inactive(struct platform_device *pdev)
-@@ -345,11 +361,13 @@
+@@ -426,11 +442,13 @@
mxc_gpio_release_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins));
return 0;
}
@@ -64,7 +64,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
}
static int gpio_spi1_inactive(struct platform_device *pdev)
-@@ -357,21 +375,48 @@
+@@ -438,21 +456,48 @@
mxc_gpio_release_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins));
return 0;
}
@@ -113,8 +113,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
- /* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI) */
-@@ -420,7 +465,6 @@
+ /* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI1) */
+@@ -501,7 +546,6 @@
};
#endif /* CONFIG_ARMADEUS_MAX1027 */
@@ -122,7 +122,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
/* APF27Dev has a SPI Touchscreen controller */
#define TSC2101_INT 17
#define TSC2101_CS (GPIO_PORTD | 21) /* SPI2_SS0 used as GPIO */
-@@ -984,10 +1028,17 @@
+@@ -1077,10 +1121,17 @@
i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
ARRAY_SIZE(apf27dev_i2c_devices_bus1));
#endif
diff --git a/target/test/mmc/mmc_perf.sh b/target/test/mmc/media_perf.sh
similarity index 54%
rename from target/test/mmc/mmc_perf.sh
rename to target/test/mmc/media_perf.sh
index fc1cc38..cedcc4e 100755
--- a/target/test/mmc/mmc_perf.sh
+++ b/target/test/mmc/media_perf.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Script to test Armadeus boards performances to handle MMC/SD cards
+# Script to test Armadeus boards performances to handle removable storage media
#
# Copyright (C) 2007 The Armadeus Project
#
@@ -23,11 +23,15 @@
source ./test_helpers.sh
# Script parameters
+TEMP_FILE_SIZE=16384 # kbytes (ex: 16384 24576)
+NB_ITER=10
+
MMC_MOUNT_DIR="/media/mmc"
MMC_DEVICE="/dev/mmcblk0p1"
+USB_DEVICE="/dev/sda1"
+USB_MOUNT_DIR="/media/usbdisk"
TEMP_DIR="/tmp/perf_mmc/"
TEMP_FILE="/tmp/data.bin"
-TEMP_FILE_SIZE=16384 # kbytes
WRITE_BENCH="/tmp/test_mmc.sh"
WTIME=0
@@ -43,23 +47,24 @@ debug()
get_time_in_ms_from_file()
{
- if [ -f "$1" ]; then
- TIME=`cat $1 | grep real | cut -d m -f 2 | sed 's/s//'`
- STIME=`echo $TIME | cut -d . -f 1`
- STIME=`expr $STIME \* 1000`
- MSTIME=`echo $TIME | cut -d . -f 2`
- MSTIME=`expr $MSTIME \* 10`
- NAME=`echo $1 | grep write`
- if [ "$NAME" != "" ]; then
- WTIME=`expr $STIME + $MSTIME`
- debug "WTIME: $WTIME"
- else
- RTIME=`expr $STIME + $MSTIME`
- debug "RTIME: $RTIME"
- fi
- else
- echo "File doesn't exist"
- fi
+ if [ ! -f "$1" ]; then
+ echo "File doesn't exist"
+ return 1
+ fi
+
+ TIME=`cat $1 | grep real | cut -d m -f 2 | sed 's/s//'`
+ STIME=`echo $TIME | cut -d . -f 1`
+ STIME=`expr $STIME \* 1000`
+ MSTIME=`echo $TIME | cut -d . -f 2`
+ MSTIME=`expr $MSTIME \* 10`
+ NAME=`echo $1 | grep write`
+ if [ "$NAME" != "" ]; then
+ WTIME=`expr $STIME + $MSTIME`
+ debug "WTIME: $WTIME"
+ else
+ RTIME=`expr $STIME + $MSTIME`
+ debug "RTIME: $RTIME"
+ fi
}
test_speed()
@@ -67,41 +72,42 @@ test_speed()
# Create temp bench file
create_random_file $TEMP_FILE $TEMP_FILE_SIZE
- # Create write bench script
- echo "mv $TEMP_FILE $MMC_MOUNT_DIR" > $WRITE_BENCH
- echo "sync" >> $WRITE_BENCH
- echo "exit 0" >> $WRITE_BENCH
-
- for it in 1 2 3 4 5; do
- echo "--- Test iteration n°$it ---"
- echo " Writing"
- time sh $WRITE_BENCH 2>/tmp/writetime
- umount $MMC_MOUNT_DIR && mount $MMC_DEVICE $MMC_MOUNT_DIR
- echo " Reading"
- time mv $MMC_MOUNT_DIR/data.bin /tmp/ 2>/tmp/readtime
- # Update writing mean time
- get_time_in_ms_from_file /tmp/writetime
- if [ $it == "1" ]; then
- WTOTIME=$WTIME
- else
- WTOTIME=`expr $WTIME + $WTOTIME`
- fi
- debug "Total write time: $WTOTIME ms"
- # Update reading mean time
- get_time_in_ms_from_file /tmp/readtime
- if [ $it == "1" ]; then
- RTOTIME=$RTIME
- else
- RTOTIME=`expr $RTIME + $RTOTIME`
- fi
- debug "Total read time: $RTOTIME ms"
- done
+ # Create write bench script
+ echo "mv $TEMP_FILE $MOUNT_DIR" > $WRITE_BENCH
+ echo "sync" >> $WRITE_BENCH
+ echo "exit 0" >> $WRITE_BENCH
+
+ for it in `seq $NB_ITER`; do
+ echo "--- Test iteration n°$it ---"
+ echo " Writing"
+ time sh $WRITE_BENCH 2>/tmp/writetime
+ umount $MOUNT_DIR && mount $REM_DEVICE $MOUNT_DIR
+ echo " Reading"
+ time mv $MOUNT_DIR/data.bin /tmp/ 2>/tmp/readtime
+ # Update writing mean time
+ get_time_in_ms_from_file /tmp/writetime
+ if [ $it == "1" ]; then
+ WTOTIME=$WTIME
+ else
+ WTOTIME=`expr $WTIME + $WTOTIME`
+ fi
+ debug "Total write time: $WTOTIME ms"
+ # Update reading mean time
+ get_time_in_ms_from_file /tmp/readtime
+ if [ $it == "1" ]; then
+ RTOTIME=$RTIME
+ else
+ RTOTIME=`expr $RTIME + $RTOTIME`
+ fi
+ debug "Total read time: $RTOTIME ms"
+ done
WTOTIME=`expr $WTOTIME / $it`
RTOTIME=`expr $RTOTIME / $it`
WSPEED=`expr $TEMP_FILE_SIZE \* 1000 / $WTOTIME`
RSPEED=`expr $TEMP_FILE_SIZE \* 1000 / $RTOTIME`
echo "--- Test result (mean values): read -> $RSPEED kBytes/sec write -> $WSPEED kBytes/sec"
+ umount $MOUNT_DIR
}
usage()
@@ -115,11 +121,6 @@ usage()
# Main
#
-# Check some pre-requisites
-if [ ! -d $MMC_MOUNT_DIR ]; then
- echo "Check that $MMC_MOUNT_DIR directory is existing"
- exit 1
-fi
# Process parameters
if [ "$#" == 0 ]; then
usage
@@ -131,22 +132,47 @@ if [ "$2" != "" ]; then
MMC_DEVICE="$2"
fi
-if [ ! -b $MMC_DEVICE ]; then
+if [ ! -b $MMC_DEVICE ] && [ ! -b $USB_DEVICE ]; then
echo -n "Please insert your MMC/SD/microSD/USB key"
it=0
- while [ ! -b $MMC_DEVICE ] && [ $it -le 20 ]; do
+ while [ ! -b $MMC_DEVICE ] && [ ! -b $USB_DEVICE ] && [ $it -le 20 ]; do
it=$((it+1))
sleep 2
echo -n "."
done
fi
+if [ -b $MMC_DEVICE ]; then
+ echo "Testing MMC/SD/microSD"
+ REM_DEVICE=$MMC_DEVICE
+ MOUNT_DIR=$MMC_MOUNT_DIR
+elif [ -b $USB_DEVICE ]; then
+ echo "Testing USB key"
+ REM_DEVICE=$USB_DEVICE
+ MOUNT_DIR=$USB_MOUNT_DIR
+else
+ echo "No removable device found: exiting..."
+ exit 1
+fi
+
+# Check some pre-requisites
+if [ ! -d $MOUNT_DIR ]; then
+ echo "Create $MOUNT_DIR directory ? (y/N)"
+ read answer
+ if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
+ mkdir -p $MOUNT_DIR
+ else
+ "Exiting..."
+ exit 1
+ fi
+fi
+
# If not mounted, mount it:
-IS_MOUNTED=`mount | grep -c $MMC_MOUNT_DIR`
+IS_MOUNTED=`mount | grep -c $MOUNT_DIR`
if [ "$IS_MOUNTED" != "1" ]; then
- mount $MMC_DEVICE $MMC_MOUNT_DIR
+ mount $REM_DEVICE $MOUNT_DIR
if [ "$?" != 0 ]; then
- echo "Failed to mount device $MMC_DEVICE"
+ echo "Failed to mount device $REM_DEVICE"
exit 1
fi
fi
@@ -172,7 +198,7 @@ dd if=/dev/urandom of=$FILE bs=1024 count=1024 2>/dev/null
md5sum $FILE > $MD5
while [ $it -le $SIZE ]; do
- FILEMMC=$MMC_MOUNT_DIR/test_$it.rnd
+ FILEMMC=$MOUNT_DIR/test_$it.rnd
# MD5=$TEMP_DIR/test_$it.rnd.md5
echo -en "\r Copying: $FILEMMC"
it=$((it+1))
@@ -182,15 +208,15 @@ done
echo ""
-umount $MMC_MOUNT_DIR
-mount $MMC_DEVICE $MMC_MOUNT_DIR
+umount $MOUNT_DIR
+mount $REM_DEVICE $MOUNT_DIR
date
-FILES=`ls $MMC_MOUNT_DIR/*.rnd`
+FILES=`ls $MOUNT_DIR/*.rnd`
for file in $FILES; do
file=`basename $file`
echo -en "\r Checking MD5 for: $file"
- MD5MMC=`md5sum $MMC_MOUNT_DIR/$file | cut -d " " -f 1`
+ MD5MMC=`md5sum $MOUNT_DIR/$file | cut -d " " -f 1`
MD5ORG=`cat $MD5 | cut -d " " -f 1`
if [ "$MD5MMC" != "$MD5ORG" ]; then
echo -e "\nMD5 failed for $file: $MD5MMC $MD5ORG"
@@ -202,6 +228,6 @@ date
echo "Integrity test successful !"
rm -rf $TEMP_DIR
-rm $MMC_MOUNT_DIR/*.rnd
+rm $MOUNT_DIR/*.rnd
exit 0
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index 558af20..72e66f2 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -62,7 +62,7 @@ $THIS_DIR/test_fpga.sh
echo
$THIS_DIR/test_gpio.sh
echo
-$THIS_DIR/mmc_perf.sh speed
+$THIS_DIR/media_perf.sh speed
# Following tests needs Internet access:
ask_user "I will now try to configure Internet access. Press ENTER when ready"
$THIS_DIR/dhcp.sh
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-17 15:27:15
|
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 26a5a427520259cbccb2fbb0c719431bc2e7ad00 (commit)
from c4a5b0b1a0db0bcf298a47a273a853a33126522d (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 26a5a427520259cbccb2fbb0c719431bc2e7ad00
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 17 16:26:46 2009 +0100
[BUILDROOT] mtd-utils GIT archive format has changed: handle the new one.
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/mtd/mtd-utils20090824.git/mtd.mk | 4 ++-
.../094-mtd-git_archive_format_has_changed.patch | 22 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletions(-)
create mode 100644 patches/buildroot/094-mtd-git_archive_format_has_changed.patch
diff --git a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
index 7e95223..5acdfae 100644
--- a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
@@ -4,12 +4,14 @@
#
#############################################################
MTD_VERSION:=a8ce7c2668ef0781326f629eef02cef6c3962b8a
+# gitweb >= 1.6.6-rc1 uses first 7 chars of git SHA1 as dir suffix
+MTD_SHORT_VERSION=$(shell echo $(MTD_VERSION)|cut -c -7)
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
+MTD_NAME:=mtd-utils-$(MTD_SHORT_VERSION)
#############################################################
#
diff --git a/patches/buildroot/094-mtd-git_archive_format_has_changed.patch b/patches/buildroot/094-mtd-git_archive_format_has_changed.patch
new file mode 100644
index 0000000..8269131
--- /dev/null
+++ b/patches/buildroot/094-mtd-git_archive_format_has_changed.patch
@@ -0,0 +1,22 @@
+To be removed when updating to latest Buildroot.
+
+Index: buildroot/package/mtd/mtd-utils.git/mtd.mk
+===================================================================
+--- buildroot.orig/package/mtd/mtd-utils.git/mtd.mk 2009-12-17 15:54:31.000000000 +0100
++++ buildroot/package/mtd/mtd-utils.git/mtd.mk 2009-12-17 15:55:40.000000000 +0100
+@@ -4,12 +4,14 @@
+ #
+ #############################################################
+ MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
++# gitweb >= 1.6.6-rc1 uses first 7 chars of git SHA1 as dir suffix
++MTD_SHORT_VERSION=$(shell echo $(MTD_VERSION)|cut -c -7)
+ 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
++MTD_NAME:=mtd-utils-$(MTD_SHORT_VERSION)
+
+ #############################################################
+ #
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-17 12:48:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c4a5b0b1a0db0bcf298a47a273a853a33126522d (commit)
via 2d77889c0e2eb817e41aedaa00c1bbf28ed499d7 (commit)
from 68b74986d6634dd1162a8c21390e75a00f17aff9 (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 c4a5b0b1a0db0bcf298a47a273a853a33126522d
Merge: 2d77889c0e2eb817e41aedaa00c1bbf28ed499d7 68b74986d6634dd1162a8c21390e75a00f17aff9
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 17 13:47:36 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2d77889c0e2eb817e41aedaa00c1bbf28ed499d7
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 17 10:54:19 2009 +0100
[LINUX] Add debug trace for GPIO allocation
-----------------------------------------------------------------------
Summary of changes:
...isplay_gpio_number_when_reservation_fails.patch | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
new file mode 100644
index 0000000..8e30ef2
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
@@ -0,0 +1,17 @@
+Ease debugging when GPIO allocation fails.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/plat-mxc/iomux-mx1-mx2.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/iomux-mx1-mx2.c 2009-12-17 10:04:43.000000000 +0100
++++ linux-2.6.29.6/arch/arm/plat-mxc/iomux-mx1-mx2.c 2009-12-17 10:49:56.000000000 +0100
+@@ -136,6 +136,8 @@
+ return 0;
+
+ setup_error:
++ printk("*** Failed to reserve GPIO %d (port %d pin %d)\n", gpio,
++ gpio & GPIO_PORT_MASK, gpio & GPIO_PIN_MASK);
+ mxc_gpio_release_multiple_pins(pin_list, i);
+ return ret;
+ }
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-17 12:47:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 68b74986d6634dd1162a8c21390e75a00f17aff9 (commit)
from e7b41f962f4dd628828940cc6e45043d33f97f84 (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 68b74986d6634dd1162a8c21390e75a00f17aff9
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 17 13:46:44 2009 +0100
[BUILDROOT] Updates APF27 default Linux config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index cb33f40..0d79290 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Mon Dec 14 17:52:14 2009
+# Thu Dec 17 12:58:12 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -819,6 +819,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_IMX_UART1=y
# CONFIG_SERIAL_IMX_UART2 is not set
CONFIG_SERIAL_IMX_UART3=y
+# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
# CONFIG_SERIAL_IMX_UART5 is not set
# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-16 14:27:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e7b41f962f4dd628828940cc6e45043d33f97f84 (commit)
via 5325f67e3816f9cadf5c1ce0437ec6288a884bb5 (commit)
via 23f1a0840c0e3c85cd565463b4af10a7e9fc67b2 (commit)
via fd70a026fecd446d7993b0bf726541b4a08a4473 (commit)
via 1daa5f62df7246b34233344b626bbd9c6c480f47 (commit)
via f033d952050646c43cbc9ea9d60bb64d16fd52ff (commit)
from 0bd645c82759005f1222b4544439b049212e4f0a (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 e7b41f962f4dd628828940cc6e45043d33f97f84
Merge: 5325f67e3816f9cadf5c1ce0437ec6288a884bb5 0bd645c82759005f1222b4544439b049212e4f0a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:26:27 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5325f67e3816f9cadf5c1ce0437ec6288a884bb5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:26:00 2009 +0100
[LINUX] Renamed patch 342
commit 23f1a0840c0e3c85cd565463b4af10a7e9fc67b2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:24:16 2009 +0100
[LINUX] Add better serial port configuration (RTS/CTS) + config hiding when options are not available. Add configuration options for Bluetooth and WiFi on wireless extension board (APW). Add preliminary power management for APW.
commit fd70a026fecd446d7993b0bf726541b4a08a4473
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 10:18:01 2009 +0100
[BUILDROOT] Makes Quake visible/selectable in menuconfig
commit 1daa5f62df7246b34233344b626bbd9c6c480f47
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 15 18:39:34 2009 +0100
[TOOLS] Cleanup Buildroot patches in a better way in quiltify.sh
commit f033d952050646c43cbc9ea9d60bb64d16fd52ff
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 15 17:53:13 2009 +0100
[DEMOS] Fixes Config.in
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 8 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 162 ++++++++++++++++++--
...-apf27-armadeus-add_apf27_to_build_system.patch | 43 ++++-
.../2.6.29/339-apf27-armadeus-spidev.patch | 22 ++--
...ial-add_uart_modules_selection_in_kconfig.patch | 30 ++++-
..._are_not_available_on_apf27_based_designs.patch | 35 +++++
...us-serial-uart4_not_available_on_apf27dev.patch | 13 --
patches/buildroot/081-adds_quake_package.patch | 24 +++-
scripts/quiltify.sh | 6 +-
9 files changed, 281 insertions(+), 62 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index d5e13e6..d3f89ad 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -37,8 +37,8 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
bool "Music player"
select BR2_PACKAGE_SDL
- select CONFIG_BR2_PACKAGE_SDL_TTF
- select CONFIG_BR2_PACKAGE_SDL_MIXER
+ select BR2_PACKAGE_SDL_TTF
+ select BR2_PACKAGE_SDL_MIXER
help
SDL based music player.
@@ -49,13 +49,13 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
config BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE
bool "Image viewer"
- select CONFIG_BR2_PACKAGE_SDL_IMAGE
+ select BR2_PACKAGE_SDL_IMAGE
help
SDL based image viewer.
config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
bool "LCD test"
- select CONFIG_BR2_PACKAGE_SDL
+ select BR2_PACKAGE_SDL
help
Test for LCD dead pixels. Needs SDL.
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 87783ae..13909e1 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.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-14 10:35:40.000000000 +0100
-@@ -0,0 +1,737 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-16 11:43:30.000000000 +0100
+@@ -0,0 +1,745 @@
+ /*
+ * apf27.c
+ *
@@ -191,7 +191,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+
+static int uart_mxc_port0_init(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins), "UART0");
++ return mxc_gpio_setup_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins), "UART1");
+}
+
+static int uart_mxc_port0_exit(struct platform_device *pdev)
@@ -210,11 +210,15 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+static int mxc_uart2_pins[] = {
+ PE8_PF_UART3_TXD,
+ PE9_PF_UART3_RXD,
++#ifdef CONFIG_SERIAL_IMX_UART3_USE_RTSCTS
++ PE10_PF_UART3_CTS,
++ PE11_PF_UART3_RTS,
++#endif
+};
+
+static int uart_mxc_port2_init(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart2_pins, ARRAY_SIZE(mxc_uart2_pins), "UART2");
++ return mxc_gpio_setup_multiple_pins(mxc_uart2_pins, ARRAY_SIZE(mxc_uart2_pins), "UART3");
+}
+
+static int uart_mxc_port2_exit(struct platform_device *pdev)
@@ -227,7 +231,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+static struct imxuart_platform_data uart2_pdata = {
+ .init = uart_mxc_port2_init,
+ .exit = uart_mxc_port2_exit,
++#ifdef CONFIG_SERIAL_IMX_UART3_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
+ .flags = 0,
++#endif
+};
+
+/* APF27 has an onboard Ethernet PHY */
@@ -751,8 +759,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:29:06.000000000 +0100
-@@ -0,0 +1,970 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 12:07:58.000000000 +0100
+@@ -0,0 +1,1034 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -838,6 +846,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif
+#ifdef CONFIG_MACH_APF27_DEV_EXT
+extern void apf27dev_extension_init(void);
++extern void apf27dev_extension_resume(void);
++extern void apf27dev_extension_suspend(void);
+#endif
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
@@ -1006,9 +1016,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+/* UART2 signals are available on J8 connector (multiplexed with Keypad) */
+#ifdef CONFIG_SERIAL_IMX_UART2
++
+static int mxc_uart1_pins[] = {
++#ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
+ PE3_PF_UART2_CTS,
+ PE4_PF_UART2_RTS,
++#endif
+ PE6_PF_UART2_TXD,
+ PE7_PF_UART2_RXD,
+};
@@ -1031,7 +1044,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct imxuart_platform_data uart1_pdata = {
+ .init = uart_mxc_port1_init,
+ .exit = uart_mxc_port1_exit,
++#ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
+ .flags = IMXUART_HAVE_RTSCTS,
++#else
++ .flags = 0,
++#endif
+};
+#endif /* CONFIG_SERIAL_IMX_UART2 */
+
@@ -1042,6 +1059,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static int mxc_uart4_pins[] = {
+ PB19_AF_UART5_RXD,
+ PB18_AF_UART5_TXD,
++#ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
++ PB20_AF_UART5_CTS,
++ PB21_AF_UART5_RTS,
++#endif
+};
+
+static int uart_mxc_port4_init(struct platform_device *pdev)
@@ -1062,10 +1083,52 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct imxuart_platform_data uart4_pdata = {
+ .init = uart_mxc_port4_init,
+ .exit = uart_mxc_port4_exit,
++#ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
+ .flags = 0,
++#endif
+};
+#endif /* CONFIG_SERIAL_IMX_UART5 */
+
++/* UART6 signals are available on J9 connector (multiplexed with CSI) */
++#ifdef CONFIG_SERIAL_IMX_UART6
++
++static int mxc_uart5_pins[] = {
++ PB10_AF_UART6_TXD,
++ PB11_AF_UART6_RXD,
++#ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
++ PB12_AF_UART6_CTS,
++ PB13_AF_UART6_RTS,
++#endif
++};
++
++static int uart_mxc_port5_init(struct platform_device *pdev)
++{
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart5_pins,
++ ARRAY_SIZE(mxc_uart5_pins), "UART6");
++
++ return res;
++}
++
++static int uart_mxc_port5_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_uart5_pins, ARRAY_SIZE(mxc_uart5_pins));
++
++ return 0;
++}
++
++static struct imxuart_platform_data uart5_pdata = {
++ .init = uart_mxc_port5_init,
++ .exit = uart_mxc_port5_exit,
++#ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
++ .flags = 0,
++#endif
++};
++#endif /* CONFIG_SERIAL_IMX_UART6 */
++
+
+/* Both APF27 SPI ports are used on APF27Dev */
+#ifdef CONFIG_SPI
@@ -1224,7 +1287,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+
-+/* APF27Dev has a optional CAN Bus controller */
++/* APF27Dev has an optional CAN Bus controller */
+#ifdef CONFIG_CAN_MCP251X
+
+#define CAN_MCP251X_INT 19
@@ -1620,6 +1683,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+void apf27_baseboard_resume(void)
+{
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_resume();
++#endif
+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 0);
@@ -1628,6 +1694,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+void apf27_baseboard_suspend(void)
+{
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_suspend();
++#endif
+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 1);
@@ -1682,6 +1751,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_SERIAL_IMX_UART5
+ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
+#endif
++#ifdef CONFIG_SERIAL_IMX_UART6
++ mxc_register_device(&mxc_uart_device5, &uart5_pdata);
++#endif
+#ifdef CONFIG_USB_EHCI_MXC
+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
+#endif
@@ -1726,7 +1798,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-14 10:35:40.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-15 09:32:01.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -1951,8 +2023,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-14 16:34:11.000000000 +0100
-@@ -0,0 +1,99 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-16 12:07:45.000000000 +0100
+@@ -0,0 +1,159 @@
+ /*
+ * apf27-dev-ext-apw.c
+ * Support for AFP27Dev's wireless extension board.
@@ -1983,7 +2055,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+
+/* An optional GSM module can be added to wireless extension board */
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
-+#define GSM_POK_IN (GPIO_PORTE | 11)
++
++#define GSM_POK_IN (GPIO_PORTE | 11) /* UART3_RTS */
++
+static int apw_gsm_pins[] = {
+ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
+};
@@ -2011,12 +2085,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+
+/* An optionnal GPS module can be added to wireless extension board */
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
-+#define GPS_WAKEUP (GPIO_PORTB | 20)
-+#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++
++#define GPS_WAKEUP (GPIO_PORTB | 20) /* CSI_VSYNC_UART5_CTS */
++#define GPS_TIMEPULSE (GPIO_PORTB | 21) /* CSI_HSYNC_UART5_RTS */
+
+static int apw_gps_pins[] = {
-+ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
-+ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
++ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
++ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
+};
+
+static int apw_gps_init(void)
@@ -2038,6 +2113,60 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS */
+
+
++/* An optionnal Bluetooth + WiFi module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++
++#define BT_RESET (GPIO_PORTB | 14) /* CSI_D4 */
++#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
++
++static int apw_bt_wifi_pins[] = {
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ (BT_RESET | GPIO_OUT | GPIO_GPIO), /* Shared with CSI */
++#endif
++ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
++};
++
++static int apw_bt_wifi_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
++ ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
++
++ return res;
++}
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI */
++
++
++void apf27dev_extension_resume(void)
++{
++#ifdef CONFIG_PM
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ gpio_set_value(BT_RESET, 0);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
++ gpio_set_value(WIFI_PWRDNn, 1);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ gpio_set_value(GPS_WAKEUP, 1);
++# endif
++#endif
++}
++
++void apf27dev_extension_suspend(void)
++{
++#ifdef CONFIG_PM
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ gpio_set_value(BT_RESET, 1);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
++ gpio_set_value(WIFI_PWRDNn, 0);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ gpio_set_value(GPS_WAKEUP, 0);
++# endif
++#endif
++}
++
++
+void __init apf27dev_extension_init(void)
+{
+ printk(" Registering APW ressources:");
@@ -2048,6 +2177,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
+ apw_gps_init();
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ apw_bt_wifi_init();
++#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 657f8a2..1b3ce65 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.6/arch/arm/mach-mx2/Kconfig
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-12-14 16:45:52.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-12-14 16:57:35.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-12-15 19:54:59.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-12-16 10:34:20.000000000 +0100
@@ -10,6 +10,21 @@
comment "MX2 Platforms"
depends on ARCH_MX2
@@ -24,7 +24,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
config MACH_MX27ADS
bool "MX27ADS platform"
depends on MACH_MX27
-@@ -26,15 +41,73 @@
+@@ -26,15 +41,98 @@
choice
prompt "Baseboard"
@@ -51,7 +51,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ activates the devices you want to use if you have the "Full"
+ version.
+
-+endchoice
+ endchoice
+
+config MACH_APF27_DEV_EXT
+ bool
@@ -74,12 +74,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ help
+ Wireless extension board connected to APF27Dev baseboard.
+
- endchoice
++endchoice
+
+config MACH_APF27_DEV_EXT_WIRELESS_GSM
+ bool "GSM/GPRS Modem"
+ depends on MACH_APF27_DEV_EXT_WIRELESS
+ select SERIAL_IMX_UART2
++ select SERIAL_IMX_UART2_USE_RTSCTS
+ default y
+ help
+ Activates support for the GSM modem on the APW extension board.
@@ -87,22 +88,46 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+config MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
+ bool "Bluetooth & WiFi module"
+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ select SERIAL_IMX_UART5
+ help
+ Activates support for the Bluetooth+WiFi module on the APW extension
+ board.
+
++config MACH_APF27_DEV_EXT_WIRELESS_WIFI
++ bool "WiFi"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ default y
++ help
++ Only activates WiFi part of the module.
++
++config MACH_APF27_DEV_EXT_WIRELESS_BT
++ bool "Bluetooth"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ select SERIAL_IMX_UART6
++ select SERIAL_IMX_UART6_USE_RTSCTS
++ help
++ Only activates Bluetooth part of the module
++
++config MACH_APF27_DEV_EXT_WIRELESS_CAMERA
++ bool "CSI (Camera) pass-through"
++ depends on (MACH_APF27_DEV_EXT_WIRELESS) && (!MACH_APF27_DEV_EXT_WIRELESS_GPS) && (!MACH_APF27_DEV_EXT_WIRELESS_BT)
++
++comment "Please check that J3 is unplugged"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_CAMERA
++
+config MACH_APF27_DEV_EXT_WIRELESS_GPS
+ bool "GPS module"
+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ select SERIAL_IMX_UART6
++ select SERIAL_IMX_UART5
+ help
+ Activates support for the GPS module on the APW extension board.
+
++comment "Please check that J3 is plugged in"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_GPS
++
Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-12-14 16:45:51.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-12-14 16:54:50.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-12-15 19:54:59.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-12-16 10:19:31.000000000 +0100
@@ -10,6 +10,10 @@
obj-$(CONFIG_MACH_MX27) += clock_imx27.o
obj-$(CONFIG_CPU_FREQ_IMX27) += cpufreq_imx27.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index 49f5e29..5b47e20 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -6,8 +6,8 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:03.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:25.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 09:41:42.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 17:06:13.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/mtd/physmap.h>
#include <asm/mach/flash.h>
@@ -16,7 +16,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#include <linux/i2c.h>
#include <linux/serial.h>
#include <linux/delay.h>
-@@ -94,6 +95,9 @@
+@@ -96,6 +97,9 @@
#ifdef CONFIG_CAN_MCP251X_MODULE
#define CONFIG_CAN_MCP251X 1
#endif
@@ -26,7 +26,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#ifdef CONFIG_IMX_BACKLIGHT_MODULE
#define CONFIG_IMX_BACKLIGHT
#endif
-@@ -362,7 +366,7 @@
+@@ -417,7 +421,7 @@
};
static struct spi_imx_master imx_spi1_master_info = {
@@ -35,7 +35,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
.enable_dma = 0,
.init = gpio_spi1_active,
.exit = gpio_spi1_inactive,
-@@ -506,6 +510,38 @@
+@@ -561,6 +565,38 @@
};
#endif /* CONFIG_CAN_MCP251X */
@@ -74,7 +74,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
static struct spi_board_info spi_board_info[] __initdata = {
#ifdef CONFIG_ARMADEUS_MAX1027
-@@ -544,6 +580,18 @@
+@@ -599,6 +635,18 @@
.platform_data = &apf27_mcp251x_config,
},
#endif /* CONFIG_CAN_MCP251X */
@@ -93,7 +93,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
};
-@@ -951,7 +999,7 @@
+@@ -1015,7 +1063,7 @@
/* Reserve "fixed" GPIOs */
tsc2101_init_fixed_gpio();
#endif
@@ -104,8 +104,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#endif
Index: linux-2.6.29.6/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-14 16:06:13.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-14 16:08:25.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-15 09:20:35.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-15 17:06:13.000000000 +0100
@@ -558,8 +558,9 @@
static int spidev_probe(struct spi_device *spi)
@@ -130,8 +130,8 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
if (status == 0)
Index: linux-2.6.29.6/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-14 16:06:13.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-14 16:08:25.000000000 +0100
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-15 09:20:35.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-15 17:06:13.000000000 +0100
@@ -101,6 +101,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
index 044a2ea..5b38d71 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
@@ -5,9 +5,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/serial/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 16:10:39.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 16:13:44.000000000 +0100
-@@ -831,6 +831,43 @@
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 20:38:17.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-15 07:51:45.000000000 +0100
+@@ -831,6 +831,67 @@
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
@@ -18,36 +18,60 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ help
+ /dev/ttySMX0
+
++config SERIAL_IMX_UART1_USE_RTSCTS
++ bool "Uses UART1 RTS/CTS lines"
++ depends on SERIAL_IMX_UART1
++
+config SERIAL_IMX_UART2
+ bool "UART2"
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ help
+ /dev/ttySMX1
+
++config SERIAL_IMX_UART2_USE_RTSCTS
++ bool "Uses UART2 RTS/CTS lines"
++ depends on SERIAL_IMX_UART2
++
+config SERIAL_IMX_UART3
+ bool "UART3"
+ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
+ help
+ /dev/ttySMX2
+
++config SERIAL_IMX_UART3_USE_RTSCTS
++ bool "Uses UART3 RTS/CTS lines"
++ depends on SERIAL_IMX_UART3
++
+config SERIAL_IMX_UART4
+ bool "UART4"
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
+ /dev/ttySMX3
+
++config SERIAL_IMX_UART4_USE_RTSCTS
++ bool "Uses UART4 RTS/CTS lines"
++ depends on SERIAL_IMX_UART4
++
+config SERIAL_IMX_UART5
+ bool "UART5"
+ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
+ /dev/ttySMX4
+
++config SERIAL_IMX_UART5_USE_RTSCTS
++ bool "Uses UART5 RTS/CTS lines"
++ depends on SERIAL_IMX_UART5
++
+config SERIAL_IMX_UART6
+ bool "UART6"
+ depends on SERIAL_IMX && (MACH_MX27)
+ help
+ /dev/ttySMX5
+
++config SERIAL_IMX_UART6_USE_RTSCTS
++ bool "Uses UART6 RTS/CTS lines"
++ depends on SERIAL_IMX_UART6
++
config SERIAL_UARTLITE
tristate "Xilinx uartlite serial port support"
depends on PPC32
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
new file mode 100644
index 0000000..291c7cd
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
@@ -0,0 +1,35 @@
+On APF27 based designs some UART pins are missing:
+* UART1 RTS/CTS are not available on APF27Dev (used by MAX1027 and not at the
+ same voltage level as Rx/Tx (console)).
+* UART3 RTS/CTS are not available if an APW with GSM or WiFi is plugged in.
+* UART4 module is not available on APF27Dev (used as USBH1)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
+@@ -840,7 +840,7 @@
+
+ config SERIAL_IMX_UART1_USE_RTSCTS
+ bool "Uses UART1 RTS/CTS lines"
+- depends on SERIAL_IMX_UART1
++ depends on SERIAL_IMX_UART1 && (!MACH_APF27_DEV)
+
+ config SERIAL_IMX_UART2
+ bool "UART2"
+@@ -860,11 +860,11 @@
+
+ config SERIAL_IMX_UART3_USE_RTSCTS
+ bool "Uses UART3 RTS/CTS lines"
+- depends on SERIAL_IMX_UART3
++ depends on SERIAL_IMX_UART3 && (!MACH_APF27_DEV_EXT_WIRELESS_WIFI) && (!MACH_APF27_DEV_EXT_WIRELESS_GSM)
+
+ config SERIAL_IMX_UART4
+ bool "UART4"
+- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
++ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
+ help
+ /dev/ttySMX3
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
deleted file mode 100644
index 595d930..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linux-2.6.29.6/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 17:32:56.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 17:34:13.000000000 +0100
-@@ -852,7 +852,7 @@
-
- config SERIAL_IMX_UART4
- bool "UART4"
-- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
-+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
- help
- /dev/ttySMX3
-
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
index 940748d..cfe32f6 100644
--- a/patches/buildroot/081-adds_quake_package.patch
+++ b/patches/buildroot/081-adds_quake_package.patch
@@ -16,7 +16,7 @@ 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
++++ buildroot/package/games/sdlquake/sdlquake.mk 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,31 @@
+#############################################################
+#
@@ -52,7 +52,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
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
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2009-12-15 17:59:22.000000000 +0100
@@ -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
@@ -92,7 +92,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
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
++++ buildroot/package/games/sdlquake/Config.in 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -107,7 +107,7 @@ Index: buildroot/package/games/sdlquake/Config.in
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
++++ buildroot/package/games/quake-pak/quake-pak.mk 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -146,7 +146,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
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
++++ buildroot/package/games/quake-pak/Config.in 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -155,3 +155,17 @@ Index: buildroot/package/games/quake-pak/Config.in
+ 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.
+Index: buildroot/package/games/Config.in
+===================================================================
+--- buildroot.orig/package/games/Config.in 2009-12-15 18:26:09.000000000 +0100
++++ buildroot/package/games/Config.in 2009-12-15 18:28:19.000000000 +0100
+@@ -11,7 +11,9 @@
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+ source "package/games/prboom/Config.in"
++source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
++source "package/games/sdlquake/Config.in"
+ source "package/games/vice/Config.in"
+ source "package/games/xboard/Config.in"
+ endif
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 058a672..8c0db33 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -84,8 +84,10 @@ if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
mv $QUILT_TARGET_DIR "$QUILT_TARGET_DIR"."$EXT"
fi
else # For Buildroot
- rm $QUILT_TARGET_DIR/.patched
- rm $QUILT_TARGET_DIR/.unpacked
+ rm -f $QUILT_TARGET_DIR/.patched
+ rm -f $QUILT_TARGET_DIR/.unpacked
+ rm -rf $QUILT_TARGET_DIR/patches
+ rm -rf $QUILT_TARGET_DIR/.pc
fi
# Get XXX unpacked sources
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-16 14:11:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0bd645c82759005f1222b4544439b049212e4f0a (commit)
from c2b4d29431a6142edec3e848fe3b4baee86eb4c5 (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 0bd645c82759005f1222b4544439b049212e4f0a
Author: Fabien Marteau <fab...@ar...>
Date: Wed Dec 16 15:10:37 2009 +0100
[LINUX] Adding spi3 in apf27-dev and manage spi with menuconfig
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/344-apf27-spi_configuration.patch | 143 ++++++++++++++++++++
1 files changed, 143 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
new file mode 100644
index 0000000..34eebf0
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
@@ -0,0 +1,143 @@
+Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 14:43:11.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 15:07:25.000000000 +0100
+@@ -316,15 +316,17 @@
+ #endif /* CONFIG_SERIAL_IMX_UART5 */
+
+
+-/* Both APF27 SPI ports are used on APF27Dev */
+-#ifdef CONFIG_SPI
++/* SPI ports declarations */
++#ifdef CONFIG_SPI_MXC_SELECT1
+ static int mxc_cspi0_pins[] = {
+ /* PD28_PF_CSPI1_SS0, Preferably use CS pin as GPIO */
+ PD29_PF_CSPI1_SCLK,
+ PD30_PF_CSPI1_MISO,
+ PD31_PF_CSPI1_MOSI
+ };
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+ static int mxc_cspi1_pins[] = {
+ /* PD19_PF_CSPI2_SS2,
+ PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
+@@ -333,11 +335,25 @@
+ PD23_PF_CSPI2_MISO,
+ PD24_PF_CSPI2_MOSI
+ };
++#endif /* CONFIG_SPI_MXC_SELECT2 */
+
++#ifdef CONFIG_SPI_MXC_SELECT3
++static int mxc_cspi2_pins[] = {
++ /*
++ PE21_AF_CSPI3_SS,
++ Preferably use CS pin as GPIO
++ */
++ PE23_AF_CSPI3_SCLK,
++ PE18_AF_CSPI3_MISO,
++ PE22_AF_CSPI3_MOSI
++};
++#endif /* CONFIG_SPI_MXC_SELECT3 */
++
++#ifdef CONFIG_SPI_MXC_SELECT1
+ static int gpio_spi0_active(struct platform_device *pdev)
+ {
+ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins,
+- ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
++ ARRAY_SIZE(mxc_cspi0_pins), "CSPI1");
+ }
+
+ static int gpio_spi0_inactive(struct platform_device *pdev)
+@@ -345,11 +361,13 @@
+ mxc_gpio_release_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins));
+ return 0;
+ }
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+ static int gpio_spi1_active(struct platform_device *pdev)
+ {
+ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins,
+- ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
++ ARRAY_SIZE(mxc_cspi1_pins), "CSPI2");
+ }
+
+ static int gpio_spi1_inactive(struct platform_device *pdev)
+@@ -357,21 +375,48 @@
+ mxc_gpio_release_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins));
+ return 0;
+ }
++#endif /* CONFIG_SPI_MXC_SELECT2 */
++
++#ifdef CONFIG_SPI_MXC_SELECT3
++static int gpio_spi2_active(struct platform_device *pdev)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins), "CSPI3");
++}
++
++static int gpio_spi2_inactive(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins));
++ return 0;
++}
++#endif /* CONFIG_SPI_MXC_SELECT3 */
+
++#ifdef CONFIG_SPI_MXC_SELECT1
+ static struct spi_imx_master imx_spi0_master_info = {
+ .num_chipselect = 1,
+ .enable_dma = 0,
+ .init = gpio_spi0_active,
+ .exit = gpio_spi0_inactive,
+ };
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+ static struct spi_imx_master imx_spi1_master_info = {
+ .num_chipselect = 3,
+ .enable_dma = 0,
+ .init = gpio_spi1_active,
+ .exit = gpio_spi1_inactive,
+ };
+-#endif /* CONFIG_SPI */
++#endif /* CONFIG_SPI_MXC_SELECT2 */
++
++#ifdef CONFIG_SPI_MXC_SELECT3
++static struct spi_imx_master imx_spi2_master_info = {
++ .num_chipselect = 1,
++ .enable_dma = 0,
++ .init = gpio_spi2_active,
++ .exit = gpio_spi2_inactive,
++};
++#endif /* CONFIG_SPI_MXC_SELECT3 */
++
+
+
+ /* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI) */
+@@ -420,7 +465,6 @@
+ };
+ #endif /* CONFIG_ARMADEUS_MAX1027 */
+
+-
+ /* APF27Dev has a SPI Touchscreen controller */
+ #define TSC2101_INT 17
+ #define TSC2101_CS (GPIO_PORTD | 21) /* SPI2_SS0 used as GPIO */
+@@ -984,10 +1028,17 @@
+ i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
+ ARRAY_SIZE(apf27dev_i2c_devices_bus1));
+ #endif
+-#ifdef CONFIG_SPI
++#ifdef CONFIG_SPI_MXC_SELECT1
+ mxc_register_device(&mxc_spi_device0, &imx_spi0_master_info);
++#endif
++#ifdef CONFIG_SPI_MXC_SELECT2
+ mxc_register_device(&mxc_spi_device1, &imx_spi1_master_info);
+ #endif
++#ifdef CONFIG_SPI_MXC_SELECT3
++ mxc_register_device(&mxc_spi_device2, &imx_spi2_master_info);
++#endif
++
++
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
+ #ifdef CONFIG_SPI_TSC2102
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-16 10:04:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c2b4d29431a6142edec3e848fe3b4baee86eb4c5 (commit)
from 1496f3107da96584626c11c7aa8fc1466673f3ba (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 c2b4d29431a6142edec3e848fe3b4baee86eb4c5
Author: Fabien Marteau <fab...@ar...>
Date: Wed Dec 16 11:03:44 2009 +0100
[LINUX] Adding hx5116 and p0340wql amoled in default config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 43433c6..cb33f40 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
@@ -1182,8 +1182,10 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_HX5116 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_P0340WQL is not set
# CONFIG_LCD_PLATFORM is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-16 09:04:15
|
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 1496f3107da96584626c11c7aa8fc1466673f3ba (commit)
from c0c27c03b7ea3b30d4aec6283a1b495569e6a593 (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 1496f3107da96584626c11c7aa8fc1466673f3ba
Author: Fabien Marteau <fab...@ar...>
Date: Wed Dec 16 10:03:49 2009 +0100
[LINUX] Begin AMOLED p0340wql integration
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/343-apf27-amoled-hx5116.patch | 880 ++++++++++++++++++++
1 files changed, 880 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
new file mode 100644
index 0000000..a11c8a6
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
@@ -0,0 +1,880 @@
+Index: linux-2.6.29.6/include/video/hx5116.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/include/video/hx5116.h 2009-12-15 14:59:12.000000000 +0100
+@@ -0,0 +1,132 @@
++/*
++ *
++ * HX5116 160CH Single Chip Driver for LPTS AMOLED
++ *
++ * Copyright 2009 ARMadeus Systems
++ * Fabien Marteau <fab...@ar...>
++ *
++ * http://www.armadeus.com/
++ *
++ * 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.
++ */
++
++#define HX5116_REG(x) (x)
++
++/***********************/
++/* Standards registers */
++/***********************/
++#define HX5116_INDEX HX5116_REG(0x00)
++
++#define HX5116_CHIP_ID0x HX5116_REG(0x01)
++#define HX5116_OTP_ENABLE HX5116_REG(0x02)
++
++#define HX5116_DISPLAY_MODE1 HX5116_REG(0x03)
++#define HX5116_DISPLAY_MODE2 HX5116_REG(0x04)
++#define HX5116_DISPLAY_MODE3 HX5116_REG(0x05)
++
++#define HX5116_DRIVER_CAPABILITY HX5116_REG(0x07)
++
++#define HX5116_POWER_CTRL1 HX5116_REG(0x06)
++#define HX5116_POWER_CTRL2 HX5116_REG(0x08)
++#define HX5116_POWER_CTRL3 HX5116_REG(0x09)
++#define HX5116_POWER_CTRL4 HX5116_REG(0x0a)
++#define HX5116_POWER_CTRL5 HX5116_REG(0x0b)
++#define HX5116_POWER_CTRL6 HX5116_REG(0x0c)
++
++#define HX5116_POWER_SEQ1 HX5116_REG(0x0d)
++#define HX5116_POWER_SEQ2 HX5116_REG(0x0e)
++
++#define HX5116_R_SLOPE HX5116_REG(0x10)
++#define HX5116_G_SLOPE HX5116_REG(0x11)
++#define HX5116_B_SLOPE HX5116_REG(0x12)
++
++#define HX5116_R_GAMMA0 HX5116_REG(0x13)
++#define HX5116_R_GAMMA10 HX5116_REG(0x14)
++#define HX5116_R_GAMMA36 HX5116_REG(0x15)
++#define HX5116_R_GAMMA80 HX5116_REG(0x16)
++#define HX5116_R_GAMMA124 HX5116_REG(0x17)
++#define HX5116_R_GAMMA168 HX5116_REG(0x18)
++#define HX5116_R_GAMMA212 HX5116_REG(0x19)
++#define HX5116_R_GAMMA255 HX5116_REG(0x1a)
++#define HX5116_G_GAMMA0 HX5116_REG(0x1b)
++#define HX5116_G_GAMMA10 HX5116_REG(0x1c)
++#define HX5116_G_GAMMA36 HX5116_REG(0x1d)
++#define HX5116_G_GAMMA80 HX5116_REG(0x1e)
++#define HX5116_G_GAMMA124 HX5116_REG(0x1f)
++#define HX5116_G_GAMMA168 HX5116_REG(0x20)
++#define HX5116_G_GAMMA212 HX5116_REG(0x21)
++#define HX5116_G_GAMMA255 HX5116_REG(0x22)
++#define HX5116_B_GAMMA0 HX5116_REG(0x23)
++#define HX5116_B_GAMMA10 HX5116_REG(0x24)
++#define HX5116_B_GAMMA36 HX5116_REG(0x25)
++#define HX5116_B_GAMMA80 HX5116_REG(0x26)
++#define HX5116_B_GAMMA124 HX5116_REG(0x27)
++#define HX5116_B_GAMMA168 HX5116_REG(0x28)
++#define HX5116_B_GAMMA212 HX5116_REG(0x29)
++#define HX5116_B_GAMMA255 HX5116_REG(0x2a)
++
++#define HX5116_T3 HX5116_REG(0x34)
++#define HX5116_T4 HX5116_REG(0x35)
++#define HX5116_TF HX5116_REG(0x36)
++#define HX5116_TB HX5116_REG(0x37)
++
++#define HX5116_VSTS HX5116_REG(0x38)
++#define HX5116_HSTS HX5116_REG(0x39)
++
++#define HX5116_RGB_CONTRAST HX5116_REG(0x3a)
++#define HX5116_R_CONTRAST HX5116_REG(0x3b)
++#define HX5116_G_CONTRAST HX5116_REG(0x3c)
++#define HX5116_B_CONTRAST HX5116_REG(0x3d)
++
++#define HX5116_BRIGHT_OFFSET HX5116_REG(0x3e)
++
++/*****************/
++/* OTP registers */
++/*****************/
++#define HX5116_OTP_R_SLOPE HX5116_REG(0x00)
++#define HX5116_OTP_G_SLOPE HX5116_REG(0x01)
++#define HX5116_OTP_B_SLOPE HX5116_REG(0x02)
++
++#define HX5116_OTP_VGAM1_LEVEL HX5116_REG(0x03)
++
++/*****************************/
++/* SPI interface definitions */
++/*****************************/
++#define HX5116_SPI_IDCODE (0x70)
++#define HX5116_SPI_ID(x) ((x) << 2)
++#define HX5116_SPI_READ (0x01)
++#define HX5116_SPI_WRITE (0x00)
++#define HX5116_SPI_DATA (0x02)
++#define HX5116_SPI_INDEX (0x00)
++
++/* platform data to pass configuration from lcd */
++
++enum hx5116_suspend {
++ HX5116_SUSPEND_OFF,
++ HX5116_SUSPEND_DEEP,
++};
++
++struct hx5116_platdata {
++ unsigned short hsize;
++ unsigned short vsize;
++
++ enum hx5116_suspend suspend;
++
++ /* set the reset line, 0 = reset asserted, 1 = normal */
++ void (*reset)(unsigned int val);
++
++ unsigned short entry_mode;
++ unsigned short display2;
++ unsigned short display3;
++ unsigned short display4;
++ unsigned short rgb_if1;
++ unsigned short rgb_if2;
++ unsigned short interface2;
++ unsigned short interface3;
++ unsigned short interface4;
++ unsigned short interface5;
++ unsigned short interface6;
++};
++
+Index: linux-2.6.29.6/drivers/video/backlight/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/video/backlight/Kconfig 2009-12-15 14:58:38.000000000 +0100
++++ linux-2.6.29.6/drivers/video/backlight/Kconfig 2009-12-16 09:58:08.000000000 +0100
+@@ -51,6 +51,14 @@
+ If you have a panel based on the ILI9320 controller chip
+ then say y to include a power driver for it.
+
++config LCD_HX5116
++ tristate "HX5116 Chip AMOLED Driver (Not functional)"
++ depends on LCD_CLASS_DEVICE && BACKLIGHT_LCD_SUPPORT
++ default n
++ help
++ If you have a panel based on the HX5116 controller chip
++ then say y to include a power driver for it.
++
+ config LCD_TDO24M
+ tristate "Toppoly TDO24M and TDO35S LCD Panels support"
+ depends on LCD_CLASS_DEVICE && SPI_MASTER
+@@ -68,6 +76,15 @@
+ If you have a VGG2432A4 panel based on the ILI9320 controller chip
+ then say y to include a power driver for it.
+
++config LCD_P0340WQL
++ tristate "P0340 AMOLED device support (Not functional)"
++ depends on BACKLIGHT_LCD_SUPPORT && LCD_CLASS_DEVICE && SPI_MASTER
++ select LCD_HX5116
++ default n
++ help
++ If you have a P0340WQL panel based on the HX5116 controller chip
++ then say y to include a power driver for it.
++
+ config LCD_PLATFORM
+ tristate "Platform LCD controls"
+ depends on LCD_CLASS_DEVICE
+Index: linux-2.6.29.6/drivers/video/backlight/Makefile
+===================================================================
+--- linux-2.6.29.6.orig/drivers/video/backlight/Makefile 2009-12-15 14:58:39.000000000 +0100
++++ linux-2.6.29.6/drivers/video/backlight/Makefile 2009-12-15 15:22:45.000000000 +0100
+@@ -4,8 +4,10 @@
+ obj-$(CONFIG_LCD_CORGI) += corgi_lcd.o
+ obj-$(CONFIG_LCD_LTV350QV) += ltv350qv.o
+ obj-$(CONFIG_LCD_ILI9320) += ili9320.o
++obj-$(CONFIG_LCD_HX5116) += hx5116.o
+ obj-$(CONFIG_LCD_PLATFORM) += platform_lcd.o
+ obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o
++obj-$(CONFIG_LCD_P0340WQL) += p0340wql.o
+ obj-$(CONFIG_LCD_TDO24M) += tdo24m.o
+ obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o
+
+Index: linux-2.6.29.6/drivers/video/backlight/hx5116.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/drivers/video/backlight/hx5116.c 2009-12-15 18:00:51.000000000 +0100
+@@ -0,0 +1,311 @@
++/* drivers/video/backlight/hx5116.c
++ *
++ * hx5116 160CH Single Chip Driver core for LPTS AMOLED
++ *
++ * Copyright 2009 ARMadeus Systems
++ * http://www.armadeus.com/
++ * Fabien Marteau <fab...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++*/
++
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/fb.h>
++#include <linux/init.h>
++#include <linux/lcd.h>
++#include <linux/module.h>
++
++#include <linux/spi/spi.h>
++
++#include <video/hx5116.h>
++
++#include "hx5116.h"
++
++
++static inline int hx5116_write_spi( struct hx5116 *ili,
++ unsigned int reg,
++ unsigned int value)
++{
++ struct hx5116_spi *spi = &ili->access.spi;
++ unsigned char *data = spi->buffer;
++
++ data[0] = (reg << 1) | HX5116_SPI_WRITE;
++ data[1] = value;
++
++ return spi_sync(spi->dev, &spi->message);
++}
++
++int hx5116_write(struct hx5116 *ili, unsigned int reg, unsigned int value)
++{
++ dev_dbg(ili->dev, "write: reg=%02x, val=%04x\n", reg, value);
++ return ili->write(ili, reg, value);
++}
++
++EXPORT_SYMBOL_GPL(hx5116_write);
++
++int hx5116_write_regs( struct hx5116 *ili,
++ struct hx5116_reg *values,
++ int nr_values)
++{
++ int index;
++ int ret;
++
++ for (index = 0; index < nr_values; index++, values++) {
++ ret = hx5116_write(ili, values->address, values->value);
++ if (ret != 0)
++ return ret;
++ }
++
++ return 0;
++}
++
++EXPORT_SYMBOL_GPL(hx5116_write_regs);
++
++static void hx5116_reset(struct hx5116 *lcd)
++{
++ struct hx5116_platdata *cfg = lcd->platdata;
++
++ cfg->reset(1);
++ mdelay(50);
++
++ cfg->reset(0);
++ mdelay(50);
++
++ cfg->reset(1);
++ mdelay(100);
++}
++
++static inline int hx5116_init_chip(struct hx5116 *lcd)
++{
++ int ret;
++
++ hx5116_reset(lcd);
++
++ ret = lcd->client->init(lcd, lcd->platdata);
++ if (ret != 0) {
++ dev_err(lcd->dev, "failed to initialise display\n");
++ return ret;
++ }
++
++ lcd->initialised = 1;
++ return 0;
++}
++
++static inline int hx5116_power_on(struct hx5116 *lcd)
++{
++ if (!lcd->initialised)
++ hx5116_init_chip(lcd);
++
++// lcd->display1 |= (HX5116_DISPLAY1_D(3) | HX5116_DISPLAY1_BASEE);
++// hx5116_write(lcd, HX5116_DISPLAY1, lcd->display1);
++
++ return 0;
++}
++
++static inline int hx5116_power_off(struct hx5116 *lcd)
++{
++// lcd->display1 &= ~(HX5116_DISPLAY1_D(3) | HX5116_DISPLAY1_BASEE);
++// HX5116_write(lcd, HX5116_DISPLAY1, lcd->display1);
++
++ return 0;
++}
++
++#define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL)
++
++static int hx5116_power(struct hx5116 *lcd, int power)
++{
++ int ret = 0;
++
++ dev_dbg(lcd->dev, "power %d => %d\n", lcd->power, power);
++
++ if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
++ ret = hx5116_power_on(lcd);
++ else if (!POWER_IS_ON(power) && POWER_IS_ON(lcd->power))
++ ret = hx5116_power_off(lcd);
++
++ if (ret == 0)
++ lcd->power = power;
++ else
++ dev_warn(lcd->dev, "failed to set power mode %d\n", power);
++
++ return ret;
++}
++
++static inline struct hx5116 *to_our_lcd(struct lcd_device *lcd)
++{
++ return lcd_get_data(lcd);
++}
++
++static int hx5116_set_power(struct lcd_device *ld, int power)
++{
++ struct hx5116 *lcd = to_our_lcd(ld);
++
++ return hx5116_power(lcd, power);
++}
++
++static int hx5116_get_power(struct lcd_device *ld)
++{
++ struct hx5116 *lcd = to_our_lcd(ld);
++
++ return lcd->power;
++}
++
++static struct lcd_ops hx5116_ops = {
++ .get_power = hx5116_get_power,
++ .set_power = hx5116_set_power,
++};
++
++static void __devinit hx5116_setup_spi(struct hx5116 *ili,
++ struct spi_device *dev)
++{
++ struct hx5116_spi *spi = &ili->access.spi;
++
++ ili->write = hx5116_write_spi;
++ spi->dev = dev;
++
++ spi->xfer[0].tx_buf = spi->buffer;
++ spi->xfer[0].len = 2;
++ spi->xfer[0].bits_per_word = 8;
++ spi->xfer[0].cs_change = 1;
++
++ spi_message_init(&spi->message);
++ spi_message_add_tail(&spi->xfer[0], &spi->message);
++}
++
++int __devinit hx5116_probe_spi(struct spi_device *spi,
++ struct hx5116_client *client)
++{
++ struct hx5116_platdata *cfg = spi->dev.platform_data;
++ struct device *dev = &spi->dev;
++ struct hx5116 *ili;
++ struct lcd_device *lcd;
++ int ret = 0;
++
++ printk("DEBUG: probe hx5116 spi\n");
++
++ /* verify we where given some information */
++
++ if (cfg == NULL) {
++ dev_err(dev, "no platform data supplied\n");
++ return -EINVAL;
++ }
++
++ if (cfg->hsize <= 0 || cfg->vsize <= 0 || cfg->reset == NULL) {
++ dev_err(dev, "invalid platform data supplied\n");
++ return -EINVAL;
++ }
++
++ /* allocate and initialse our state */
++
++ ili = kzalloc(sizeof(struct hx5116), GFP_KERNEL);
++ if (ili == NULL) {
++ dev_err(dev, "no memory for device\n");
++ return -ENOMEM;
++ }
++
++// ili->access.spi.id = HX5116_SPI_IDCODE | HX5116_SPI_ID(1);
++
++ ili->dev = dev;
++ ili->client = client;
++ ili->power = FB_BLANK_POWERDOWN;
++ ili->platdata = cfg;
++
++ dev_set_drvdata(&spi->dev, ili);
++
++ hx5116_setup_spi(ili, spi);
++
++ lcd = lcd_device_register("hx5116", dev, ili, &hx5116_ops);
++ if (IS_ERR(lcd)) {
++ dev_err(dev, "failed to register lcd device\n");
++ ret = PTR_ERR(lcd);
++ goto err_free;
++ }
++
++ ili->lcd = lcd;
++
++ dev_info(dev, "initialising %s\n", client->name);
++
++ ret = hx5116_power(ili, FB_BLANK_UNBLANK);
++ if (ret != 0) {
++ dev_err(dev, "failed to set lcd power state\n");
++ goto err_unregister;
++ }
++
++ return 0;
++
++ err_unregister:
++ lcd_device_unregister(lcd);
++
++ err_free:
++ kfree(ili);
++
++ return ret;
++}
++
++EXPORT_SYMBOL_GPL(hx5116_probe_spi);
++
++int __devexit hx5116_remove(struct hx5116 *ili)
++{
++ hx5116_power(ili, FB_BLANK_POWERDOWN);
++
++ lcd_device_unregister(ili->lcd);
++ kfree(ili);
++
++ return 0;
++}
++
++EXPORT_SYMBOL_GPL(hx5116_remove);
++
++#ifdef CONFIG_PM
++int hx5116_suspend(struct hx5116 *lcd, pm_message_t state)
++{
++ int ret;
++
++ dev_dbg(lcd->dev, "%s: event %d\n", __func__, state.event);
++
++ if (state.event == PM_EVENT_SUSPEND) {
++ ret = hx5116_power(lcd, FB_BLANK_POWERDOWN);
++
++// if (lcd->platdata->suspend == HX5116_SUSPEND_DEEP) {
++// hx5116_write(lcd, HX5116_POWER1, lcd->power1 |
++// HX5116_POWER1_SLP |
++// HX5116_POWER1_DSTB);
++// lcd->initialised = 0;
++// }
++
++ return ret;
++ }
++
++ return 0;
++}
++
++EXPORT_SYMBOL_GPL(hx5116_suspend);
++
++int hx5116_resume(struct hx5116 *lcd)
++{
++ dev_info(lcd->dev, "resuming from power state %d\n", lcd->power);
++
++// if (lcd->platdata->suspend == HX5116_SUSPEND_DEEP) {
++// hx5116_write(lcd, HX5116_POWER1, 0x00);
++// }
++
++ return hx5116_power(lcd, FB_BLANK_UNBLANK);
++}
++
++EXPORT_SYMBOL_GPL(hx5116_resume);
++#endif
++
++/* Power down all displays on reboot, poweroff or halt */
++void hx5116_shutdown(struct hx5116 *lcd)
++{
++ hx5116_power(lcd, FB_BLANK_POWERDOWN);
++}
++
++EXPORT_SYMBOL_GPL(hx5116_shutdown);
++
++MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
++MODULE_DESCRIPTION("hx5116 Amoled Driver");
++MODULE_LICENSE("GPL v2");
+Index: linux-2.6.29.6/drivers/video/backlight/hx5116.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/drivers/video/backlight/hx5116.h 2009-12-15 14:59:12.000000000 +0100
+@@ -0,0 +1,78 @@
++/* drivers/video/backlight/hx5116.h
++ *
++ * hx5116 160CH Single Chip Driver core for LTPS AMOLED
++ *
++ * Copyright 2009 ARMadeus Systems
++ * http://www.armadeus.com/
++ * Fabien Marteau <fab...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++*/
++
++/* Holder for register and value pairs. */
++struct hx5116_reg {
++ unsigned short address;
++ unsigned short value;
++};
++
++struct hx5116;
++
++struct hx5116_client {
++ const char *name;
++ int (*init)(struct hx5116 *ili, struct hx5116_platdata *cfg);
++
++};
++/* Device attached via an SPI bus. */
++struct hx5116_spi {
++ struct spi_device *dev;
++ struct spi_message message;
++ struct spi_transfer xfer[1];
++
++ unsigned char id;
++ unsigned char buffer[2];
++};
++
++/* hx5116 device state. */
++struct hx5116 {
++ union {
++ struct hx5116_spi spi; /* SPI attachged device. */
++ } access; /* Register access method. */
++
++ struct device *dev;
++ struct lcd_device *lcd; /* LCD device we created. */
++ struct hx5116_client *client;
++ struct hx5116_platdata *platdata;
++
++ int power; /* current power state. */
++ int initialised;
++
++ unsigned short display1;
++ unsigned short power1;
++
++ int (*write)(struct hx5116 *ili, unsigned int reg, unsigned int val);
++};
++
++
++/* hx5116 register access routines */
++
++extern int hx5116_write(struct hx5116 *ili,
++ unsigned int reg, unsigned int value);
++
++extern int hx5116_write_regs(struct hx5116 *ili,
++ struct hx5116_reg *values,
++ int nr_values);
++
++/* Device probe */
++
++extern int hx5116_probe_spi(struct spi_device *spi,
++ struct hx5116_client *cli);
++
++extern int hx5116_remove(struct hx5116 *lcd);
++extern void hx5116_shutdown(struct hx5116 *lcd);
++
++/* PM */
++
++extern int hx5116_suspend(struct hx5116 *lcd, pm_message_t state);
++extern int hx5116_resume(struct hx5116 *lcd);
+Index: linux-2.6.29.6/drivers/video/backlight/p0340wql.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/drivers/video/backlight/p0340wql.c 2009-12-15 15:35:03.000000000 +0100
+@@ -0,0 +1,289 @@
++/* drivers/video/backlight/p0340wql.c
++ *
++ * p0340wql (HX5116) AMOLED controller driver.
++ *
++ * Copyright 2009 ARMadeus Systems
++ * http://www.armadeus.com/
++ * Fabien Marteau <fab...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++*/
++
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/fb.h>
++#include <linux/init.h>
++#include <linux/lcd.h>
++#include <linux/module.h>
++
++#include <linux/spi/spi.h>
++
++#include <video/hx5116.h>
++
++#include "hx5116.h"
++
++/* Device initialisation sequences */
++
++static struct hx5116_reg vgg_init1[] = {
++// {
++// .address = HX5116_POWER1,
++// .value = HX5116_POWER1_AP(0) | HX5116_POWER1_BT(0),
++// }, {
++// .address = HX5116_POWER2,
++// .value = (HX5116_POWER2_VC(7) |
++// HX5116_POWER2_DC0(0) | HX5116_POWER2_DC1(0)),
++// }, {
++// .address = HX5116_POWER3,
++// .value = HX5116_POWER3_VRH(0),
++// }, {
++// .address = HX5116_POWER4,
++// .value = HX5116_POWER4_VREOUT(0),
++// },
++};
++
++static struct hx5116_reg vgg_init2[] = {
++// {
++// .address = HX5116_POWER1,
++// .value = (HX5116_POWER1_AP(3) | HX5116_POWER1_APE |
++// HX5116_POWER1_BT(7) | HX5116_POWER1_SAP),
++// }, {
++// .address = HX5116_POWER2,
++// .value = HX5116_POWER2_VC(7) | HX5116_POWER2_DC0(3),
++// }
++};
++
++static struct hx5116_reg vgg_gamma[] = {
++// {
++// .address = HX5116_GAMMA1,
++// .value = 0x0000,
++// }, {
++// .address = HX5116_GAMMA2,
++// .value = 0x0505,
++// }, {
++// .address = HX5116_GAMMA3,
++// .value = 0x0004,
++// }, {
++// .address = HX5116_GAMMA4,
++// .value = 0x0006,
++// }, {
++// .address = HX5116_GAMMA5,
++// .value = 0x0707,
++// }, {
++// .address = HX5116_GAMMA6,
++// .value = 0x0105,
++// }, {
++// .address = HX5116_GAMMA7,
++// .value = 0x0002,
++// }, {
++// .address = HX5116_GAMMA8,
++// .value = 0x0707,
++// }, {
++// .address = HX5116_GAMMA9,
++// .value = 0x0704,
++// }, {
++// .address = HX5116_GAMMA10,
++// .value = 0x807,
++// }
++//
++};
++
++static struct hx5116_reg vgg_init0[] = {
++// [0] = {
++// /* set direction and scan mode gate */
++// .address = HX5116_DRIVER,
++// .value = HX5116_DRIVER_SS,
++// }, {
++// .address = HX5116_DRIVEWAVE,
++// .value = (HX5116_DRIVEWAVE_MUSTSET |
++// HX5116_DRIVEWAVE_EOR | HX5116_DRIVEWAVE_BC),
++// }, {
++// .address = HX5116_ENTRYMODE,
++// .value = HX5116_ENTRYMODE_ID(3) | HX5116_ENTRYMODE_BGR,
++// }, {
++// .address = HX5116_RESIZING,
++// .value = 0x0,
++// },
++};
++
++
++static int p0340wql_lcd_init(struct hx5116 *lcd,
++ struct hx5116_platdata *cfg)
++{
++ unsigned int addr;
++ int ret;
++ printk("DEBUG: p0340wql_lcd_init\n");
++ /* Set VCore before anything else (VGG243237-6UFLWA) */
++ ret = hx5116_write(lcd, 0x00e5, 0x8000);
++ if (ret)
++ goto err_initial;
++
++ /* Start the oscillator up before we can do anything else. */
++// ret = hx5116_write(lcd, HX5116_OSCILATION, HX5116_OSCILATION_OSC);
++ if (ret)
++ goto err_initial;
++
++ /* must wait at-lesat 10ms after starting */
++ mdelay(15);
++
++// ret = hx5116_write_regs(lcd, vgg_init0, ARRAY_SIZE(vgg_init0));
++ if (ret != 0)
++ goto err_initial;
++
++// hx5116_write(lcd, HX5116_DISPLAY2, cfg->display2);
++// hx5116_write(lcd, HX5116_DISPLAY3, cfg->display3);
++// hx5116_write(lcd, HX5116_DISPLAY4, cfg->display4);
++//
++// hx5116_write(lcd, HX5116_RGB_IF1, cfg->rgb_if1);
++// hx5116_write(lcd, HX5116_FRAMEMAKER, 0x0);
++// hx5116_write(lcd, HX5116_RGB_IF2, cfg->rgb_if2);
++//
++// ret = hx5116_write_regs(lcd, vgg_init1, ARRAY_SIZE(vgg_init1));
++// if (ret != 0)
++// goto err_vgg;
++//
++// mdelay(300);
++//
++// ret = hx5116_write_regs(lcd, vgg_init2, ARRAY_SIZE(vgg_init2));
++// if (ret != 0)
++// goto err_vgg2;
++//
++// mdelay(100);
++//
++// hx5116_write(lcd, HX5116_POWER3, 0x13c);
++//
++// mdelay(100);
++//
++// hx5116_write(lcd, HX5116_POWER4, 0x1c00);
++// hx5116_write(lcd, HX5116_POWER7, 0x000e);
++//
++// mdelay(100);
++//
++// hx5116_write(lcd, HX5116_GRAM_HORIZ_ADDR, 0x00);
++// hx5116_write(lcd, HX5116_GRAM_VERT_ADD, 0x00);
++//
++// ret = hx5116_write_regs(lcd, vgg_gamma, ARRAY_SIZE(vgg_gamma));
++// if (ret != 0)
++// goto err_vgg3;
++//
++// hx5116_write(lcd, HX5116_HORIZ_START, 0x0);
++// hx5116_write(lcd, HX5116_HORIZ_END, cfg->hsize - 1);
++// hx5116_write(lcd, HX5116_VERT_START, 0x0);
++// hx5116_write(lcd, HX5116_VERT_END, cfg->vsize - 1);
++//
++// hx5116_write(lcd, HX5116_DRIVER2,
++// HX5116_DRIVER2_NL(((cfg->vsize - 240) / 8) + 0x1D));
++//
++// hx5116_write(lcd, HX5116_BASE_IMAGE, 0x1);
++// hx5116_write(lcd, HX5116_VERT_SCROLL, 0x00);
++//
++// for (addr = HX5116_PARTIAL1_POSITION; addr <= HX5116_PARTIAL2_END;
++// addr++) {
++// hx5116_write(lcd, addr, 0x0);
++// }
++//
++// hx5116_write(lcd, HX5116_INTERFACE1, 0x10);
++// hx5116_write(lcd, HX5116_INTERFACE2, cfg->interface2);
++// hx5116_write(lcd, HX5116_INTERFACE3, cfg->interface3);
++// hx5116_write(lcd, HX5116_INTERFACE4, cfg->interface4);
++// hx5116_write(lcd, HX5116_INTERFACE5, cfg->interface5);
++// hx5116_write(lcd, HX5116_INTERFACE6, cfg->interface6);
++//
++// lcd->display1 = (HX5116_DISPLAY1_D(3) | HX5116_DISPLAY1_DTE |
++// HX5116_DISPLAY1_GON | HX5116_DISPLAY1_BASEE |
++// 0x40);
++//
++// hx5116_write(lcd, HX5116_DISPLAY1, lcd->display1);
++
++ return 0;
++
++ err_vgg3:
++ err_vgg2:
++ err_vgg:
++ err_initial:
++ return ret;
++}
++
++#ifdef CONFIG_PM
++static int p0340wql_suspend(struct spi_device *spi, pm_message_t state)
++{
++ printk("DEBUG: p0340wql_suspend\n");
++ return hx5116_suspend(dev_get_drvdata(&spi->dev), state);
++}
++
++static int p0340wql_resume(struct spi_device *spi)
++{
++ printk("DEBUG: p0340wql_resume\n");
++ return hx5116_resume(dev_get_drvdata(&spi->dev));
++}
++#else
++#define p0340wql_suspend NULL
++#define p0340wql_resume NULL
++#endif
++
++static struct hx5116_client p0340wql_client = {
++ .name = "p0340wql",
++ .init = p0340wql_lcd_init,
++};
++
++/* Device probe */
++
++static int __devinit p0340wql_probe(struct spi_device *spi)
++{
++ int ret;
++
++ printk("DEBUG: probe p0340wql\n");
++
++ ret = hx5116_probe_spi(spi, &p0340wql_client);
++ if (ret != 0) {
++ dev_err(&spi->dev, "failed to initialise hx5116\n");
++ return ret;
++ }
++
++ return 0;
++}
++
++static int __devexit p0340wql_remove(struct spi_device *spi)
++{
++ return hx5116_remove(dev_get_drvdata(&spi->dev));
++}
++
++static void p0340wql_shutdown(struct spi_device *spi)
++{
++ hx5116_shutdown(dev_get_drvdata(&spi->dev));
++}
++
++static struct spi_driver p0340wql_driver = {
++ .driver = {
++ .name = "p0340wql",
++ .owner = THIS_MODULE,
++ },
++ .probe = p0340wql_probe,
++ .remove = __devexit_p(p0340wql_remove),
++ .shutdown = p0340wql_shutdown,
++ .suspend = p0340wql_suspend,
++ .resume = p0340wql_resume,
++};
++
++/* Device driver initialisation */
++
++static int __init p0340wql_init(void)
++{
++ printk("DEBUG: register p0340wql_driver\n");
++ return spi_register_driver(&p0340wql_driver);
++}
++
++static void __exit p0340wql_exit(void)
++{
++ spi_unregister_driver(&p0340wql_driver);
++}
++
++module_init(p0340wql_init);
++module_exit(p0340wql_exit);
++
++MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
++MODULE_DESCRIPTION("P0340WQL AMOLED Driver");
++MODULE_LICENSE("GPL v2");
++
++
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-14 17:38: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 c0c27c03b7ea3b30d4aec6283a1b495569e6a593 (commit)
via d43a4cac21dc164b0465779cd7200a7803831a86 (commit)
via 531b23851188098515720ed20c32c534b735cddc (commit)
from 3222c687ac1d8372a978d2d4cf91e988dc07cedd (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 c0c27c03b7ea3b30d4aec6283a1b495569e6a593
Merge: d43a4cac21dc164b0465779cd7200a7803831a86 3222c687ac1d8372a978d2d4cf91e988dc07cedd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 18:37:39 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d43a4cac21dc164b0465779cd7200a7803831a86
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 18:31:09 2009 +0100
[BUILDROOT] Updates APF27 Linux default configs for wireless extension
commit 531b23851188098515720ed20c32c534b735cddc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 17:50:06 2009 +0100
[LINUX] Move APF27Dev extension board support in a separate file. Ease UART selection for APF27 while we are at it.
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 13 ++-
.../armadeus/apf27/apf27-linux-2.6.29.config | 9 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 172 +++++++++++++++-----
...-apf27-armadeus-add_apf27_to_build_system.patch | 63 +++++++-
.../2.6.29/339-apf27-armadeus-spidev.patch | 24 ++--
...ial-add_uart_modules_selection_in_kconfig.patch | 53 ++++++
...us-serial-uart4_not_available_on_apf27dev.patch | 13 ++
7 files changed, 288 insertions(+), 59 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.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 70a8d91..bfe8814 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.6
-# Mon Dec 7 11:18:48 2009
+# Mon Dec 14 18:25:57 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,12 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
CONFIG_MACH_APF27_DEV=y
+CONFIG_MACH_APF27_DEV_EXT=y
+# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -814,6 +820,11 @@ CONFIG_DEVKMEM=y
#
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+CONFIG_SERIAL_IMX_UART2=y
+CONFIG_SERIAL_IMX_UART3=y
+CONFIG_SERIAL_IMX_UART5=y
+CONFIG_SERIAL_IMX_UART6=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=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 2548908..43433c6 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Mon Dec 7 11:18:48 2009
+# Mon Dec 14 17:52:14 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,8 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
CONFIG_MACH_APF27_DEV=y
+CONFIG_MACH_APF27_DEV_EXT_NONE=y
+# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -814,6 +816,11 @@ CONFIG_DEVKMEM=y
#
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART2 is not set
+CONFIG_SERIAL_IMX_UART3=y
+# CONFIG_SERIAL_IMX_UART5 is not set
+# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
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 a470202..87783ae 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,6 +1,6 @@
-Adds support for Armadeus Systems APF27 module (i.MX27 based) and
-APF27Dev companion baseboard.
+Adds support for Armadeus Systems APF27 module (i.MX27 based), APF27Dev
+companion baseboard and APW extension board.
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-11-13 23:22:19.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-14 10:35:40.000000000 +0100
@@ -0,0 +1,737 @@
+ /*
+ * apf27.c
@@ -751,8 +751,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-11-15 19:50:35.000000000 +0100
-@@ -0,0 +1,978 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:29:06.000000000 +0100
+@@ -0,0 +1,970 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -836,6 +836,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_FB_MXC
+extern void apf27_lcd_init(void);
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++extern void apf27dev_extension_init(void);
++#endif
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
+#define CONFIG_ARMADEUS_MAX1027 1
@@ -862,9 +865,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#define CONFIG_PWM
+#endif
+
-+//#define CONFIG_GPS
-+//#define CONFIG_GSM
-+
+
+#ifdef CONFIG_I2C
+
@@ -1004,23 +1004,19 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_I2C */
+
+
-+/* An optional GSM module can be added to APF27Dev (wireless extension board) */
-+#ifdef CONFIG_GSM
-+#define GSM_POK_IN (GPIO_PORTE | 11)
++/* UART2 signals are available on J8 connector (multiplexed with Keypad) */
++#ifdef CONFIG_SERIAL_IMX_UART2
+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 */
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
++ ARRAY_SIZE(mxc_uart1_pins), "UART2");
+
+ return res;
+}
@@ -1037,25 +1033,21 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .exit = uart_mxc_port1_exit,
+ .flags = IMXUART_HAVE_RTSCTS,
+};
-+#endif /* CONFIG_GSM */
++#endif /* CONFIG_SERIAL_IMX_UART2 */
+
+
-+/* An optionnal GPS module can be added to APF27Dev (wireless extension board) */
-+#ifdef CONFIG_GPS
-+#define GPS_WAKEUP (GPIO_PORTB | 20)
-+#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++/* UART5 signals are available on J9 connector (multiplexed with CSI) */
++#ifdef CONFIG_SERIAL_IMX_UART5
+
+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 */
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart4_pins,
++ ARRAY_SIZE(mxc_uart4_pins), "UART5");
+
+ return res;
+}
@@ -1072,7 +1064,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .exit = uart_mxc_port4_exit,
+ .flags = 0,
+};
-+#endif /* CONFIG_GPS */
++#endif /* CONFIG_SERIAL_IMX_UART5 */
+
+
+/* Both APF27 SPI ports are used on APF27Dev */
@@ -1095,7 +1087,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int gpio_spi0_active(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
++ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins,
++ ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
+}
+
+static int gpio_spi0_inactive(struct platform_device *pdev)
@@ -1106,7 +1099,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int gpio_spi1_active(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
++ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins,
++ ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
+}
+
+static int gpio_spi1_inactive(struct platform_device *pdev)
@@ -1371,8 +1365,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_USB_EHCI_MXC */
+
+
-+#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;
+
@@ -1393,13 +1385,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = &tsc2101_alsa_pdata,
+ }
+};
-+# define ALSA_SOUND &tsc2101_alsa_device,
-+# endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
-+
++# define ALSA_SOUND &tsc2101_alsa_device,
+#else
+# define ALSA_SOUND
-+#endif /* CONFIG_SND || CONFIG_SND_MODULE */
-+
++#endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
+
+static struct platform_device *platform_devices[] __initdata = {
+ ALSA_SOUND
@@ -1687,10 +1676,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+ apf27dev_pwr_ctrl_gpio_active();
+
-+#ifdef CONFIG_GSM
++#ifdef CONFIG_SERIAL_IMX_UART2
+ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
+#endif
-+#ifdef CONFIG_GPS
++#ifdef CONFIG_SERIAL_IMX_UART5
+ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
+#endif
+#ifdef CONFIG_USB_EHCI_MXC
@@ -1727,6 +1716,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_VIDEO_MX27
+ mxc_register_device(&mx27_camera_device, &apf27_camera);
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_init();
++#endif
+
+ printk("done\n");
+}
@@ -1734,7 +1726,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-11-10 15:35:23.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-14 10:35:40.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -1956,3 +1948,107 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
+#endif
+}
+
+Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-14 16:34:11.000000000 +0100
+@@ -0,0 +1,99 @@
++ /*
++ * apf27-dev-ext-apw.c
++ * Support for AFP27Dev's wireless extension board.
++ *
++ * 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/delay.h>
++#include <mach/iomux-mx1-mx2.h>
++#include <mach/gpio.h>
++
++
++/* An optional GSM module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
++#define GSM_POK_IN (GPIO_PORTE | 11)
++static int apw_gsm_pins[] = {
++ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
++};
++
++static int apw_gsm_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_gsm_pins,
++ ARRAY_SIZE(apw_gsm_pins), "GSM");
++ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
++ mdelay(5000);
++ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
++
++ return res;
++}
++#if 0
++static int apw_gsm_exit(void)
++{
++ mxc_gpio_release_multiple_pins(apw_gsm_pins, ARRAY_SIZE(apw_gsm_pins));
++
++ return 0;
++}
++#endif
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM */
++
++
++/* An optionnal GPS module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++#define GPS_WAKEUP (GPIO_PORTB | 20)
++#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++
++static int apw_gps_pins[] = {
++ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
++ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
++};
++
++static int apw_gps_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_gps_pins,
++ ARRAY_SIZE(apw_gps_pins), "GPS");
++ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
++
++ return res;
++}
++#if 0
++static int apw_gps_exit(void)
++{
++ mxc_gpio_release_multiple_pins(apw_gps_pins, ARRAY_SIZE(apw_gps_pins));
++
++ return 0;
++}
++#endif
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS */
++
++
++void __init apf27dev_extension_init(void)
++{
++ printk(" Registering APW ressources:");
++
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
++ apw_gsm_init();
++#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ apw_gps_init();
++#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 06144e1..657f8a2 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,8 +1,8 @@
Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-10-11 15:50:49.000000000 +0200
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-10-11 19:03:44.000000000 +0200
-@@ -10,6 +10,20 @@
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-12-14 16:45:52.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-12-14 16:57:35.000000000 +0100
+@@ -10,6 +10,21 @@
comment "MX2 Platforms"
depends on ARCH_MX2
@@ -10,6 +10,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ bool "Armadeus Systems APF27"
+ depends on MACH_MX27
+ select MXC_ULPI
++ select SERIAL_IMX_UART1
+ help
+ Include support for APF27 platform. This includes specific
+ configurations for the module and its peripherals.
@@ -23,7 +24,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
config MACH_MX27ADS
bool "MX27ADS platform"
depends on MACH_MX27
-@@ -26,15 +40,26 @@
+@@ -26,15 +41,73 @@
choice
prompt "Baseboard"
@@ -44,24 +45,72 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ prompt "Armadeus Systems APF27Dev development board"
+ bool
+ depends on MACH_APF27
++ select SERIAL_IMX_UART3
+ 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
++
++config MACH_APF27_DEV_EXT
++ bool
++
++choice
++ prompt "Extension board"
++ depends on MACH_APF27_DEV
++ default MACH_APF27_DEV_EXT_NONE
++
++config MACH_APF27_DEV_EXT_NONE
++ prompt "No extension"
++ bool
++ help
++ No extension board connected to APF27Dev baseboard.
++
++config MACH_APF27_DEV_EXT_WIRELESS
++ prompt "Wireless (APW)"
++ bool
++ select MACH_APF27_DEV_EXT
++ help
++ Wireless extension board connected to APF27Dev baseboard.
++
endchoice
+
++config MACH_APF27_DEV_EXT_WIRELESS_GSM
++ bool "GSM/GPRS Modem"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART2
++ default y
++ help
++ Activates support for the GSM modem on the APW extension board.
++
++config MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ bool "Bluetooth & WiFi module"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART5
++ help
++ Activates support for the Bluetooth+WiFi module on the APW extension
++ board.
++
++config MACH_APF27_DEV_EXT_WIRELESS_GPS
++ bool "GPS module"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART6
++ help
++ Activates support for the GPS module on the APW extension board.
++
Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-10-11 15:50:49.000000000 +0200
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-10-11 19:04:39.000000000 +0200
-@@ -10,6 +10,9 @@
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-12-14 16:45:51.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-12-14 16:54:50.000000000 +0100
+@@ -10,6 +10,10 @@
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_DEV) += apf27-dev.o
+obj-$(CONFIG_MACH_APF27_DEV) += apf27-lcd.o
++obj-$(CONFIG_MACH_APF27_DEV_EXT_WIRELESS) += apf27-dev-ext-apw.o
obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
obj-$(CONFIG_MACH_PCM038) += pcm038.o
obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index b28a1db..49f5e29 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -6,8 +6,8 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:50:37.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:58:32.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:03.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:25.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/mtd/physmap.h>
#include <asm/mach/flash.h>
@@ -16,7 +16,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#include <linux/i2c.h>
#include <linux/serial.h>
#include <linux/delay.h>
-@@ -91,6 +92,9 @@
+@@ -94,6 +95,9 @@
#ifdef CONFIG_CAN_MCP251X_MODULE
#define CONFIG_CAN_MCP251X 1
#endif
@@ -26,7 +26,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#ifdef CONFIG_IMX_BACKLIGHT_MODULE
#define CONFIG_IMX_BACKLIGHT
#endif
-@@ -368,7 +372,7 @@
+@@ -362,7 +366,7 @@
};
static struct spi_imx_master imx_spi1_master_info = {
@@ -35,7 +35,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
.enable_dma = 0,
.init = gpio_spi1_active,
.exit = gpio_spi1_inactive,
-@@ -512,6 +516,38 @@
+@@ -506,6 +510,38 @@
};
#endif /* CONFIG_CAN_MCP251X */
@@ -74,7 +74,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
static struct spi_board_info spi_board_info[] __initdata = {
#ifdef CONFIG_ARMADEUS_MAX1027
-@@ -550,6 +586,18 @@
+@@ -544,6 +580,18 @@
.platform_data = &apf27_mcp251x_config,
},
#endif /* CONFIG_CAN_MCP251X */
@@ -85,7 +85,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .max_speed_hz = 8000000, /* 8MHz */
+ .bus_num = 1, /* SPI2 */
+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
++ .chip_select = 2,
+ .platform_data = &apf27_spidev_config,
+ },
+#endif /* CONFIG_SPI_SPIDEV */
@@ -93,7 +93,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
};
-@@ -962,7 +1010,7 @@
+@@ -951,7 +999,7 @@
/* Reserve "fixed" GPIOs */
tsc2101_init_fixed_gpio();
#endif
@@ -104,8 +104,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#endif
Index: linux-2.6.29.6/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-04 12:03:08.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-04 12:04:43.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-14 16:06:13.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-14 16:08:25.000000000 +0100
@@ -558,8 +558,9 @@
static int spidev_probe(struct spi_device *spi)
@@ -130,8 +130,8 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
if (status == 0)
Index: linux-2.6.29.6/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-04 12:07:09.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-04 12:07:34.000000000 +0100
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-14 16:06:13.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-14 16:08:25.000000000 +0100
@@ -101,6 +101,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
new file mode 100644
index 0000000..044a2ea
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
@@ -0,0 +1,53 @@
+On i.MX platforms UART controllers pins are multiplexed with other
+functionnalities, so it can be interesting to individually select them or not.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 16:10:39.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 16:13:44.000000000 +0100
+@@ -831,6 +831,43 @@
+ your boot loader (lilo or loadlin) about how to pass options to the
+ kernel at boot time.)
+
++config SERIAL_IMX_UART1
++ bool "UART1"
++ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
++ default y
++ help
++ /dev/ttySMX0
++
++config SERIAL_IMX_UART2
++ bool "UART2"
++ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
++ help
++ /dev/ttySMX1
++
++config SERIAL_IMX_UART3
++ bool "UART3"
++ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
++ help
++ /dev/ttySMX2
++
++config SERIAL_IMX_UART4
++ bool "UART4"
++ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
++ help
++ /dev/ttySMX3
++
++config SERIAL_IMX_UART5
++ bool "UART5"
++ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
++ help
++ /dev/ttySMX4
++
++config SERIAL_IMX_UART6
++ bool "UART6"
++ depends on SERIAL_IMX && (MACH_MX27)
++ help
++ /dev/ttySMX5
++
+ config SERIAL_UARTLITE
+ tristate "Xilinx uartlite serial port support"
+ depends on PPC32
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
new file mode 100644
index 0000000..595d930
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.29.6/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 17:32:56.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 17:34:13.000000000 +0100
+@@ -852,7 +852,7 @@
+
+ config SERIAL_IMX_UART4
+ bool "UART4"
+- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
++ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
+ help
+ /dev/ttySMX3
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-14 16:58: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 3222c687ac1d8372a978d2d4cf91e988dc07cedd (commit)
via 0e1358eea1a87a348e7cf0b88f7f0430b291cb14 (commit)
via 2410b65dbf88b8e48b766f279c46bdb7e3637153 (commit)
from 9468cdd845770e4a855d21fea674b6bf7e2be1f4 (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 3222c687ac1d8372a978d2d4cf91e988dc07cedd
Merge: 0e1358eea1a87a348e7cf0b88f7f0430b291cb14 9468cdd845770e4a855d21fea674b6bf7e2be1f4
Author: Fabien Marteau <fab...@ar...>
Date: Mon Dec 14 17:58:18 2009 +0100
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0e1358eea1a87a348e7cf0b88f7f0430b291cb14
Author: Fabien Marteau <fab...@ar...>
Date: Mon Dec 14 09:27:43 2009 +0100
[TOOL] little bug in ad5258 to be fixed
commit 2410b65dbf88b8e48b766f279c46bdb7e3637153
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 11 18:51:23 2009 +0100
[TOOL] AsDevice refactoring and bug correction in ad5258
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_i2c.h | 7 +--
target/packages/as_devices/cpp/as_ad5258.cpp | 10 ++--
target/packages/as_devices/test_c.h | 67 ++++++++++++++++++++++----
3 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/target/packages/as_devices/c/as_i2c.h b/target/packages/as_devices/c/as_i2c.h
index f0ec945..e6ea0cb 100644
--- a/target/packages/as_devices/c/as_i2c.h
+++ b/target/packages/as_devices/c/as_i2c.h
@@ -18,7 +18,6 @@
*
*/
-
#ifndef AS_I2C_H_
#define AS_I2C_H_
@@ -37,16 +36,14 @@
#ifdef __cplusplus
extern "C" {
-#endif // __cplusplus
+#endif /* __cplusplus */
#include <inttypes.h>
#include <sys/types.h>
-
-/// Number of I2C busses on system
+/* Number of I2C busses on system */
#define AS_I2C_DEV_COUNT 2
-
/** @brief Open an I2C bus.
*
* \e i2c_id is the ID of the I2C bus to open, it should strictly lower than
diff --git a/target/packages/as_devices/cpp/as_ad5258.cpp b/target/packages/as_devices/cpp/as_ad5258.cpp
index 8933075..f8d24b3 100644
--- a/target/packages/as_devices/cpp/as_ad5258.cpp
+++ b/target/packages/as_devices/cpp/as_ad5258.cpp
@@ -60,7 +60,7 @@ AsAd5258::getRdac(void)
void
AsAd5258::setEeprom(int aValue)
{
- mI2c->writeByteData(mI2cAd5258Addr,0x02,aValue);
+ mI2c->writeByteData(mI2cAd5258Addr,0x20,aValue);
}
/*------------------------------------------------------------------------------*/
@@ -71,7 +71,7 @@ int
AsAd5258::getEeprom(void)
{
unsigned char value;
- mI2c->readByteData(mI2cAd5258Addr,0x02,&value);
+ mI2c->readByteData(mI2cAd5258Addr,0x20,&value);
return value;
}
@@ -81,7 +81,8 @@ AsAd5258::getEeprom(void)
void
AsAd5258::store(void)
{
- mI2c->writeByte(mI2cAd5258Addr,0x0c);
+ mI2c->writeByte(mI2cAd5258Addr,0xc0);
+ /* wait for 26ms */
}
/*------------------------------------------------------------------------------*/
@@ -90,7 +91,8 @@ AsAd5258::store(void)
void
AsAd5258::restore(void)
{
- mI2c->writeByte(mI2cAd5258Addr,0x0a);
+ mI2c->writeByte(mI2cAd5258Addr,0xa0);
+ /* wait for 300µs */
}
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index e38a14c..9d18f9f 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -25,6 +25,7 @@
#include "as_apf27_pwm.h"
#include "as_93lcxx.h"
+#include "as_i2c.h"
#define PWM_NUM 0
@@ -35,6 +36,7 @@ void pressEnterToContinue(void)
while( getc(stdin) != '\n') ;
}
+/* pwm test */
void test_pwm(void)
{
int ret;
@@ -130,32 +132,80 @@ void test_pwm(void)
}
}
+/* i2c bus test */
void test_i2c(void)
{
char buffer[20];
+ int value;
+ int initialized = 0;
+
+ int i2c_id = 0;
+ int i2c_bus = -1;
while(buffer[0] != 'q')
{
system("clear");
printf("*********************************\n");
- printf("* Testing i2c menu *\n");
+ printf("* Testing i2c menu *\n");
printf("*********************************\n");
printf("Choose ('q' to quit):\n");
- printf(" 1) read mac address \n");
+ if (initialized == 0)
+ {
+ printf(" 1) Open i2c bus \n");
+ printf(" 2) Change bus number (%d)\n",i2c_id);
+ } else {
+ printf(" 1) Close i2c bus \n");
+ }
printf("> ");
scanf("%s",buffer);
- switch(buffer[0])
+ if (initialized == 0)
{
- case '1' : printf("TODO\n");
- pressEnterToContinue();
- break;
- default : break;
+ switch(buffer[0])
+ {
+ case '1' : printf("Open i2c bus\n");
+ i2c_bus = as_i2c_open( i2c_id);
+ if (i2c_bus < 0)
+ {
+ printf("Error can't open i2c bus\n");
+ } else {
+ printf("Bus %d opened\n", i2c_id);
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ case '2' : printf("Give bus number (max %d): ", AS_I2C_DEV_COUNT-1);
+ scanf("%d",&value);
+ if ((value >= AS_I2C_DEV_COUNT) || (value < 0))
+ {
+ printf(" Wrong value\n");
+ } else {
+ i2c_id = value;
+ }
+ pressEnterToContinue();
+ default : break;
+ }
+ } else {
+ switch(buffer[0])
+ {
+ case '1' : printf("Close i2c bus\n");
+ value = as_i2c_close(i2c_bus);
+ if (value < 0)
+ {
+ printf(" Error, can't close i2c bus num %d\n", i2c_id);
+ } else {
+ initialized = 0;
+ }
+ pressEnterToContinue();
+ printf("plop\n");
+ break;
+ default : break;
+ }
}
}
-
}
+/* spi bus test */
void test_spi(void)
{
printf("TODO\n");
@@ -164,7 +214,6 @@ void test_spi(void)
/* 93LCxx eepromm test */
-
int address_size(int aType, int aWordSize)
{
return (((aType-46)/10) + 6 + 2 - (aWordSize/8));
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-14 09:08: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 9468cdd845770e4a855d21fea674b6bf7e2be1f4 (commit)
via 7fec27d8055f002d833a584accd111aa7a6f4810 (commit)
via 7726a45e81e044daa0eb8819900fa8098777c6e1 (commit)
via 8d0a9d41d75833cf9f33f852ada7175633d5262c (commit)
from cda9b13b63b9d876917ee6fc8f1d573af4a60086 (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 9468cdd845770e4a855d21fea674b6bf7e2be1f4
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 10:06:06 2009 +0100
[TOOLS] Add a small script to ease installation on Debian like systems. Thanks Sebastien.
commit 7fec27d8055f002d833a584accd111aa7a6f4810
Merge: 7726a45e81e044daa0eb8819900fa8098777c6e1 cda9b13b63b9d876917ee6fc8f1d573af4a60086
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 23:16:06 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7726a45e81e044daa0eb8819900fa8098777c6e1
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 22:55:11 2009 +0100
[LINUX] Make Linux 2.6.27 compiles on Ubuntu 9.10 (and probably other recent releases). Thanks Sebastien V.C. for the report.
commit 8d0a9d41d75833cf9f33f852ada7175633d5262c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 18:11:02 2009 +0100
[BUILDROOT] Add 2 new mount points in default rootfs for removable media: /media/mmc and /media/usbdisk.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.27.13.config | 3 +-
.../apf9328/apf9328-linux-2.6.27.13.config | 3 +-
.../324-armadeus-change_getline_in_get_line.patch | 34 ++++++++++++++++
.../target_skeleton/{bin => media/mmc}/.empty | 0
.../target_skeleton/{bin => media/usbdisk}/.empty | 0
scripts/install_on_debian_like.sh | 41 ++++++++++++++++++++
6 files changed, 79 insertions(+), 2 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{bin => media/mmc}/.empty (100%)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{bin => media/usbdisk}/.empty (100%)
create mode 100755 scripts/install_on_debian_like.sh
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
index de6611a..dc42d8d 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Thu Apr 16 18:13:44 2009
+# Fri Dec 11 22:30:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1236,6 +1236,7 @@ CONFIG_ARMADEUS_DRIVERS=y
# CONFIG_ARMADEUS_GPIO_DRIVER is not set
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
index 574fc21..422224b 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Fri Mar 13 14:22:46 2009
+# Fri Dec 11 22:30:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1115,6 +1115,7 @@ CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
new file mode 100644
index 0000000..72590dd
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
@@ -0,0 +1,34 @@
+On recent releases (for ex Ubuntu 9.10) getline is a reserved libc function.
+So rename it like it was done on recent kernels.
+
+Index: linux-2.6.27.13/scripts/unifdef.c
+===================================================================
+--- linux-2.6.27.13.orig/scripts/unifdef.c 2009-12-11 22:42:20.000000000 +0100
++++ linux-2.6.27.13/scripts/unifdef.c 2009-12-11 22:43:43.000000000 +0100
+@@ -206,7 +206,7 @@
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
diff --git a/scripts/install_on_debian_like.sh b/scripts/install_on_debian_like.sh
new file mode 100755
index 0000000..1aa4e89
--- /dev/null
+++ b/scripts/install_on_debian_like.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Script Written by Sebastien Van Cauwenberghe <sv...@gm...>
+# do what you want with this script ;)
+
+echo "Please select the development Board : "
+BOARDOPTIONS="apf9328 apf27"
+select BOARD in $BOARDOPTIONS; do
+ if [ "$BOARD" = "apf9328" ]; then
+ echo "APF9328 selected"
+ break
+ elif [ "$BOARD" = "apf27" ]; then
+ echo "APF27 selected"
+ break
+ else
+ echo "Bad option"
+ fi
+done
+
+VERSION=3.2
+FILE="armadeus-$VERSION.tar.bz2"
+URL=http://downloads.sourceforge.net/project/armadeus/armadeus/armadeus-$VERSION/$FILE
+
+CURSHELL=`ls -al /bin/sh | cut -d " " -f 10`
+BASH_LOCATION=`which bash`
+if [ -L /bin/sh ]; then
+ if [ "$CURSHELL" != "$BASH_LOCATION" ]; then
+ echo "Warning: /bin/sh doesn't point to $BASH_LOCATION... fixing it"
+ sudo rm /bin/sh
+ sudo ln -s $BASH_LOCATION /bin/sh
+ fi
+fi
+
+sudo aptitude -y install build-essential gcc g++ autoconf automake libtool bison flex gettext patch subversion texinfo wget git-core
+sudo aptitude -y install libncurses5 libncurses5-dev zlib1g-dev liblzo2-2 liblzo2-dev libacl1 libacl1-dev uuid-dev libglib2.0-dev libnetpbm10-dev
+
+wget -c $URL
+tar -xjf $FILE
+cd armadeus-$VERSION
+make $BOARD"_defconfig"
+make
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-11 16:02:38
|
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 cda9b13b63b9d876917ee6fc8f1d573af4a60086 (commit)
from 8a4a868e5f4796162d70a8e23cb3916e8c483c1a (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 cda9b13b63b9d876917ee6fc8f1d573af4a60086
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 11 16:12:51 2009 +0100
[TOOLS] Adding eeprom 93lcxx test in AsDevices test program
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/Makefile | 15 +-
target/packages/as_devices/main.c | 10 ++
target/packages/as_devices/test_c.h | 290 ++++++++++++++++++++++++++++++++---
3 files changed, 286 insertions(+), 29 deletions(-)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index e0cab84..e35e20b 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -18,16 +18,17 @@ CPP_INCLUDE=cpp/
.PHONY: all
-all: ${C_BINARY} ${CPP_BINARY}
+all: ${C_BINARY}
+ #${CPP_BINARY}
${C_BINARY}: main.c test_c.h ${C_LIB}
- ${CC} ${CFLAGS} main.c ${C_LIB} -o ${C_BINARY} -I${C_INCLUDE}
+ ${CC} ${CFLAGS} main.c ${C_LIB} -o ${C_BINARY} -I${C_INCLUDE} -lm
-${CPP_BINARY}: main.c test_cpp.h ${CPP_LIB} ${C_LIB}
- ${CXX} ${CFLAGS} main.c ${C_LIB} ${CPP_LIB} -I${C_INCLUDE} -I${CPP_INCLUDE} -o ${CPP_BINARY}
-
-${CPP_LIB}: ${C_LIB}
- cd cpp; make CXX=${CXX}
+#${CPP_BINARY}: main.c test_cpp.h ${CPP_LIB} ${C_LIB}
+# ${CXX} ${CFLAGS} main.c ${C_LIB} ${CPP_LIB} -I${C_INCLUDE} -I${CPP_INCLUDE} -o ${CPP_BINARY}
+#
+#${CPP_LIB}: ${C_LIB}
+# cd cpp; make CXX=${CXX}
${C_LIB}:
cd c; make CC=${CC}
diff --git a/target/packages/as_devices/main.c b/target/packages/as_devices/main.c
index 54c2427..bcb0521 100644
--- a/target/packages/as_devices/main.c
+++ b/target/packages/as_devices/main.c
@@ -38,6 +38,9 @@ int main(int argc, char ** argv)
printf("*******************************************************\n");
printf("Choose a test ('q' to quit):\n");
printf(" 1) Testing pwm\n");
+ printf(" 2) Testing i2c\n");
+ printf(" 3) Testing spi\n");
+ printf(" 4) Testing 93LCxx eprom\n");
printf("> ");
scanf("%s",buffer);
@@ -45,6 +48,13 @@ int main(int argc, char ** argv)
{
case '1' : test_pwm();
break;
+ case '2' : test_i2c();
+ break;
+ case '3' : test_spi();
+ break;
+ case '4' : test_93LC();
+ break;
+
default : break;
}
}
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index b35d7a5..e38a14c 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -1,33 +1,36 @@
/*
-** THE ARMadeus Systems
-**
-** Copyright (C) 2009 The armadeus systems team
-** Fabien Marteau <fab...@ar...>
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-**
-** This library 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
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ ** THE ARMadeus Systems
+ **
+ ** Copyright (C) 2009 The armadeus systems team
+ ** Fabien Marteau <fab...@ar...>
+ **
+ ** This library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public
+ ** License as published by the Free Software Foundation; either
+ ** version 2.1 of the License, or (at your option) any later version.
+ **
+ ** This library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this library; if not, write to the Free Software
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <stdio.h>
#include <stdlib.h>
+#include <math.h>
+
#include "as_apf27_pwm.h"
+#include "as_93lcxx.h"
#define PWM_NUM 0
void pressEnterToContinue(void)
{
- printf("Press enter to continue\n");
+ printf("\nPress enter to continue\n");
getc(stdin);//XXX
while( getc(stdin) != '\n') ;
}
@@ -61,7 +64,7 @@ void test_pwm(void)
printf(" 8) get state\n");
printf("> ");
scanf("%s",buffer);
-
+
switch(buffer[0])
{
case '1' : printf("Give frequency :");
@@ -70,7 +73,7 @@ void test_pwm(void)
pressEnterToContinue();
break;
case '2' : printf("Current pwm frequency is %d\n",
- as_apf27_pwm_getFrequency(PWM_NUM));
+ as_apf27_pwm_getFrequency(PWM_NUM));
pressEnterToContinue();
break;
case '3' : printf("Give period :");
@@ -127,4 +130,247 @@ void test_pwm(void)
}
}
+void test_i2c(void)
+{
+ char buffer[20];
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing i2c menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ printf(" 1) read mac address \n");
+ printf("> ");
+ scanf("%s",buffer);
+
+ switch(buffer[0])
+ {
+ case '1' : printf("TODO\n");
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+
+}
+
+void test_spi(void)
+{
+ printf("TODO\n");
+ pressEnterToContinue();
+}
+
+/* 93LCxx eepromm test */
+
+int address_size(int aType, int aWordSize)
+{
+ return (((aType-46)/10) + 6 + 2 - (aWordSize/8));
+}
+
+int max_address(int aType, int aWordSize)
+{
+ return (pow(2,address_size(aType, aWordSize))-1);
+}
+
+void test_93LC()
+{
+ char buffer[50];
+ int i;
+
+ int type = 46;
+ char spidevpath[50];
+ struct as_93lcxx_device *dev;
+ /* defaults values */
+ int frequency = 1000000;
+ uint8_t word_size = 8;
+ int value, value2;
+ int initialized=0;
+ snprintf(spidevpath, 50, "%s", "/dev/spidev2.0");
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing 93LCxx menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ if (initialized == 0)
+ {
+ printf(" 1) Change word size (%d)\n", word_size);
+ printf(" 2) Change bus frequency (%d)\n", frequency);
+ printf(" 3) Change eeprom type (%d)\n", type);
+ printf(" 4) Change spidev path (%s)\n", spidevpath);
+ printf(" 5) Initialize eeprom\n");
+ } else {
+ printf(" 1) Close eeprom\n");
+ printf(" 2) Read specific address\n");
+ printf(" 3) Erase specific address\n");
+ printf(" 4) Write specific address\n");
+ printf(" 5) Write all\n");
+ printf(" 6) Read all\n");
+ printf(" 7) Erase all\n");
+ printf(" 8) Unlock write\n");
+ printf(" 9) lock write\n");
+ }
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ if (initialized == 0)
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Give new word size (8 or 16) : ");
+ scanf("%d", &value);
+ if ( (value != 8) && (value != 16) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ word_size = value;
+ }
+ break;
+ case '2' : printf("Give bus frequency : ");
+ scanf("%d", &value);
+ frequency = value;
+ printf("Frequency changed to %dHz\n",frequency);
+ break;
+ case '3' : printf("Give new type of eeprom (46, 56 or 66) : ");
+ scanf("%d", &value);
+ if ( (value != 46) && (value != 56) && (value != 66) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ type = value;
+ }
+ break;
+ case '4' : printf("Give new path for spidev : \n");
+ scanf("%s", spidevpath);
+ printf("New path is %s\n",spidevpath);
+ break;
+ case '5' : dev = as_93lcxx_open((unsigned char *)spidevpath,
+ type,
+ frequency,
+ word_size);
+ if (dev == NULL)
+ {
+ printf("Error, can't initialize eeprom. Have you modprobed spidev ?\n");
+ } else {
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ } else {
+ switch(buffer[0])
+ {
+ case '1' : as_93lcxx_close(dev);
+ printf("eeprom closed\n");
+ initialized = 0;
+ pressEnterToContinue();
+ break;
+ case '2' : printf(" Read specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, address wrong\n");
+ } else {
+ value2 = as_93lcxx_read(dev, value);
+ if (value2 < 0)
+ {
+ printf("Error, can't read value\n");
+ } else {
+ printf(" Read %02x at %02X", value2, value );
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Erase specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, address wrong\n");
+ } else {
+ value2 = as_93lcxx_erase(dev, value);
+ if (value2 < 0)
+ {
+ printf("Error, can't erase value\n");
+ } else {
+ printf("Value erased\n");
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '4' : printf("Write specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, address wrong\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Give value in hexadecimal :");
+ scanf("%x",&value2);
+ value2 = as_93lcxx_write(dev, value, value2);
+ if (value2 < 0)
+ {
+ printf("Error, can't write value\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '5' : printf(" Write all\n");
+ printf("Give value in hexadecimal:");
+ scanf("%x",&value);
+ value2 = as_93lcxx_write_all(dev, value);
+ if (value2 < 0)
+ {
+ printf("Error, can't write value\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '6' : printf(" Read all\n");
+ for(i = 0; i <= max_address(type, word_size); i++)
+ {
+ if (word_size == 8)
+ {
+ printf("%03X -> %02X\n",
+ i,as_93lcxx_read(dev, i));
+ } else{
+ printf("%03X -> %04X\n",
+ i,as_93lcxx_read(dev, i));
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '7' : printf(" Erase all\n");
+ value = as_93lcxx_erase_all(dev);
+ if (value < 0)
+ printf(" Error in erasing eeprom\n");
+ pressEnterToContinue();
+ break;
+ case '8' : printf("Unlock write\n");
+ if (as_93lcxx_ewen(dev) < 0)
+ printf("Error can't unlock write\n");
+ pressEnterToContinue();
+ break;
+ case '9' : printf("lock write\n");
+ if (as_93lcxx_ewds(dev) < 0)
+ printf("Error can't lock write\n");
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+ }
+}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-11 10:05:16
|
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 8a4a868e5f4796162d70a8e23cb3916e8c483c1a (commit)
from 942fa6e8d15e96782d0f2b9f7178d4b603e6e061 (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 8a4a868e5f4796162d70a8e23cb3916e8c483c1a
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 10:51:11 2009 +0100
[BUILDROOT] Add missing dependancies to demos
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/demos.mk | 16 +++++++++++++++-
.../093-sdl_ttf-add_freetype_dependancy.patch | 17 +++++++++++++++++
2 files changed, 32 insertions(+), 1 deletions(-)
create mode 100644 patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index dd8edc6..b268d1f 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -13,10 +13,12 @@ ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
ARMADEUS-DEMOS_SUBDIRS+=armanoid
+ARMADEUS-DEMOS_DEPS=sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT),y)
ARMADEUS-DEMOS_SUBDIRS+=backlight_control
+ARMADEUS-DEMOS_DEPS=sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
@@ -29,10 +31,12 @@ endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_INPUT),y)
ARMADEUS-DEMOS_SUBDIRS+=input_test
+ARMADEUS-DEMOS_DEPS=sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
ARMADEUS-DEMOS_SUBDIRS+=music_player
+ARMADEUS-DEMOS_DEPS=sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
@@ -41,10 +45,20 @@ endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
ARMADEUS-DEMOS_SUBDIRS+=show_image
+ARMADEUS-DEMOS_DEPS=sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD),y)
ARMADEUS-DEMOS_SUBDIRS+=test_lcd
+ARMADEUS-DEMOS_DEPS=sdl
+endif
+
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
+ARMADEUS-DEMOS_DEPS+=sdl_ttf sdl_mixer
+endif
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
+ARMADEUS-DEMOS_DEPS+=sdl_image
endif
@@ -74,7 +88,7 @@ $(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
done
touch $@
-armadeus-demos: $(ARMADEUS-DEMOS_DIR)/.installed
+armadeus-demos: $(ARMADEUS-DEMOS_DEPS) $(ARMADEUS-DEMOS_DIR)/.installed
armadeus-demos-clean:
rm -rf $(ARMADEUS-DEMOS_TARGET_DIR)
diff --git a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
new file mode 100644
index 0000000..bd7560c
--- /dev/null
+++ b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
@@ -0,0 +1,17 @@
+SDL_ttf needs freetype to be built and installed first.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/sdl_ttf/sdl_ttf.mk
+===================================================================
+--- buildroot.orig/package/sdl_ttf/sdl_ttf.mk 2009-12-11 10:14:53.000000000 +0100
++++ buildroot/package/sdl_ttf/sdl_ttf.mk 2009-12-11 10:15:09.000000000 +0100
+@@ -60,7 +60,7 @@
+ cp -dpf $(STAGING_DIR)/usr/lib/libSDL_ttf*.so* $(TARGET_DIR)/usr/lib/
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+
+-sdl_ttf: uclibc sdl $(TARGET_DIR)/usr/lib/libSDL_ttf.so
++sdl_ttf: uclibc sdl freetype $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+
+ sdl_ttf-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_TTF_DIR) uninstall
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-10 19:34: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 942fa6e8d15e96782d0f2b9f7178d4b603e6e061 (commit)
via 9ce35f8ba2a06d158c307300ebc9425731d1ba6e (commit)
from f501162576d91f4af422a10edbc6315501d96259 (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 942fa6e8d15e96782d0f2b9f7178d4b603e6e061
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 10 16:20:25 2009 +0100
[DEMOS] Add a new tool to seek LCD's dead pixels
commit 9ce35f8ba2a06d158c307300ebc9425731d1ba6e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 10 15:54:01 2009 +0100
[BUILDROOT] Add a fix for uClibc 0.9.29 to be able to set speed > 115200 on serial terminal/port
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 6 +
buildroot/package/armadeus/demos/demos.mk | 4 +
...-0.9.29-fix-max_baud_rate_setting_for_arm.patch | 22 ++++
target/demos/{show_image => test_lcd}/Makefile | 34 +++---
target/demos/{input_test => test_lcd}/README | 0
target/demos/test_lcd/test_lcd.c | 126 ++++++++++++++++++++
6 files changed, 175 insertions(+), 17 deletions(-)
create mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
copy target/demos/{show_image => test_lcd}/Makefile (62%)
copy target/demos/{input_test => test_lcd}/README (100%)
create mode 100644 target/demos/test_lcd/test_lcd.c
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index 8d9d9d2..d5e13e6 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -53,4 +53,10 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE
help
SDL based image viewer.
+config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
+ bool "LCD test"
+ select CONFIG_BR2_PACKAGE_SDL
+ help
+ Test for LCD dead pixels. Needs SDL.
+
endmenu
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index b95d938..dd8edc6 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -43,6 +43,10 @@ ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
ARMADEUS-DEMOS_SUBDIRS+=show_image
endif
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD),y)
+ARMADEUS-DEMOS_SUBDIRS+=test_lcd
+endif
+
$(ARMADEUS-DEMOS_DIR)/.unpacked:
mkdir -p $(ARMADEUS-DEMOS_DIR)/
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
new file mode 100644
index 0000000..9f5681e
--- /dev/null
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
@@ -0,0 +1,22 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
+===================================================================
+--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2009-12-10 15:05:16.000000000 +0100
++++ uClibc-0.9.29.mod/libc/sysdeps/linux/common/bits/termios.h 2009-12-10 15:05:45.000000000 +0100
+@@ -156,7 +156,6 @@
+ #endif
+ #define B57600 0010001
+ #define B115200 0010002
+-#if 0 /* limited on uClibc, keep in sync w/ cfsetspeed.c */
+ #define B230400 0010003
+ #define B460800 0010004
+ #define B500000 0010005
+@@ -171,9 +170,6 @@
+ #define B3500000 0010016
+ #define B4000000 0010017
+ #define __MAX_BAUD B4000000
+-#else
+-#define __MAX_BAUD B115200
+-#endif
+ #ifdef __USE_MISC
+ # define CIBAUD 002003600000 /* input baud rate (not used) */
+ # define CMSPAR 010000000000 /* mark or space (stick) parity */
diff --git a/target/demos/show_image/Makefile b/target/demos/test_lcd/Makefile
similarity index 62%
copy from target/demos/show_image/Makefile
copy to target/demos/test_lcd/Makefile
index d7e7fa1..fed69b9 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/test_lcd/Makefile
@@ -1,49 +1,49 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+# Default values for local compiling:
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
-INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
SDL_DIR:=$(ARMADEUS_SDL_DIR)
-
-DEFINES=-DTARGET
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
ifeq ($(TARGET),x86)
- INSTALL_DIR:=/usr/local/bin/
- CFLAGS=`/usr/bin/sdl-config --cflags` -g
- LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
- CC=gcc
- STRIP=strip
- DEFINES=-DHOST
+ INSTALL_DIR:=/usr/local/bin
+ INSTALL_DATA_DIR:=/usr/share
+ CFLAGS=`/usr/bin/sdl-config --cflags`
+ LDFLAGS=`/usr/bin/sdl-config --libs`
+ CC=gcc
+ STRIP=strip
endif
-EXEC_NAME=show_image
+EXEC_NAME=test_lcd
default: $(EXEC_NAME)
all: $(EXEC_NAME)
-image.o: image.c
+%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $^
-$(EXEC_NAME): image.o
+$(EXEC_NAME): test_lcd.o
$(CC) $(LDFLAGS) -o $@ $^
install: $(EXEC_NAME)
mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
+ cp $^ $(INSTALL_DIR)
$(STRIP) $(INSTALL_DIR)/$^
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-uninstall:
- rm -f $(INSTALL_DIR)/$(EXEC_NAME)
-
.PHONY: clean install uninstall
diff --git a/target/demos/input_test/README b/target/demos/test_lcd/README
similarity index 100%
copy from target/demos/input_test/README
copy to target/demos/test_lcd/README
diff --git a/target/demos/test_lcd/test_lcd.c b/target/demos/test_lcd/test_lcd.c
new file mode 100644
index 0000000..6e82467
--- /dev/null
+++ b/target/demos/test_lcd/test_lcd.c
@@ -0,0 +1,126 @@
+/*
+ * Small tool to test LCD pixels (and why not one day repair defect one ! ;-))
+ * for the Armadeus project: http://www.armadeus.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h> /* for sleep() */
+
+#include "SDL.h"
+
+#ifdef DEBUG
+#define debug( args...) printf( ## args )
+#else
+#define debug( args...) do {;} while(0);
+#endif
+
+
+SDL_Surface *screen;
+
+
+static void free_ressources()
+{
+ SDL_FreeSurface(screen);
+}
+
+void cleanup(void)
+{
+ free_ressources();
+ SDL_Quit();
+}
+
+static void fill_screen_and_wait_key(Uint8 r, Uint8 g, Uint8 b)
+{
+ Uint32 color;
+
+ color = SDL_MapRGB(screen->format, r, g, b);
+ SDL_FillRect(screen, NULL, color);
+ SDL_Flip(screen);
+ printf("Press ENTER to continue\n");
+ getchar();
+}
+
+
+int main(int argc, char *argv[])
+{
+ Uint8* keys;
+ int cursorPos = 0;
+ const struct SDL_VideoInfo *video_info;
+ SDL_Rect **modes;
+ int i, height, width;
+
+ /* Initialize SDL */
+ if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER /*| SDL_INIT_EVENTTHREAD |SDL_INIT_NOPARACHUTE*/) < 0 )
+ {
+ fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
+ exit(1);
+ }
+ atexit(cleanup);
+
+ /* Get available fullscreen/hardware modes */
+ modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
+
+ /* Check is there are any modes available */
+ if (modes == (SDL_Rect **)0) {
+ printf("No modes available!\n");
+ exit(-1);
+ }
+
+ /* Check if our resolution is restricted */
+ if (modes == (SDL_Rect **)-1) {
+ printf("All resolutions available.\n");
+ } else {
+ /* Print valid modes */
+ printf("Available Modes\n");
+ for (i=0; modes[i]; ++i) {
+ printf(" %d x %d\n", modes[i]->w, modes[i]->h);
+ }
+ }
+ width = modes[0]->w;
+ height = modes[0]->h;
+ printf("Taking greatest one: %d x %d\n\n", width, height);
+
+ /* Get video infos */
+ video_info = SDL_GetVideoInfo();
+ if (!video_info) {
+ printf("Unable to get video infos\n");
+ exit(1);
+ }
+/* printf("Pixel format:\n");
+ printf(" ", video_info->vfmt-> */
+
+ /* Get a screen to display our test */
+ screen = SDL_SetVideoMode(width, height, 16, 0);
+ if (screen == NULL) {
+ fprintf(stderr, "Unable to set %d x %d video mode: %s\n", width, height, SDL_GetError());
+ exit(1);
+ }
+
+ /* Hide mouse */
+ SDL_ShowCursor(0);
+
+ /* Main loop */
+ fill_screen_and_wait_key(0, 0, 0); /* black */
+ fill_screen_and_wait_key(255, 0, 0); /* red */
+ fill_screen_and_wait_key(0, 255, 0); /* green */
+ fill_screen_and_wait_key(0, 0, 255); /* blue */
+ fill_screen_and_wait_key(255, 255, 255); /* white */
+
+ exit(0);
+}
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-10 09:34:39
|
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 f501162576d91f4af422a10edbc6315501d96259 (commit)
via db425aceb62be6f9fdba9cbc1e5b35bdfbf8dbc8 (commit)
via ab8a6eb71019496638411f8ab49c45963f87876f (commit)
via c9cd2ad8d6c1f8aea73eb3e923dc6e03cbe74849 (commit)
via 81d31bbc8374213f3cc2b4b44798106dbed7408e (commit)
via 5801b8a3d4502a249ec67564bc10b650ccf86766 (commit)
via 433a74f1021f1a86e6c2f7a51924f3d51ae6937f (commit)
via 608417142dc23ab48694f92a9eca424701c5ae57 (commit)
from 23b7e0a290b47f92332f62db66ec982ea24ebe27 (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 f501162576d91f4af422a10edbc6315501d96259
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 10 10:33:31 2009 +0100
[TOOLS] quiltify.sh: Check VCS used before launching correspondig status command
commit db425aceb62be6f9fdba9cbc1e5b35bdfbf8dbc8
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 22:42:55 2009 +0100
[BUILDROOT] Fixes snes9x package build
commit ab8a6eb71019496638411f8ab49c45963f87876f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 10:10:16 2009 +0100
[BUILDROOT] Fix 070-add_ad9889ctl_package.patch due to recent moves of packages to armadeus/
commit c9cd2ad8d6c1f8aea73eb3e923dc6e03cbe74849
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:51:38 2009 +0100
[BUILDROOT] Move as_devices to newly created package/armadeus/
commit 81d31bbc8374213f3cc2b4b44798106dbed7408e
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:44:48 2009 +0100
[BUILDROOT] Move imxssi to newly created package/armadeus/
commit 5801b8a3d4502a249ec67564bc10b650ccf86766
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:38:20 2009 +0100
[BUILDROOT] Rename armadeus-tests.mk
commit 433a74f1021f1a86e6c2f7a51924f3d51ae6937f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:36:55 2009 +0100
[BUILDROOT] Move Drivers Helpers to newly created package/armadeus/
commit 608417142dc23ab48694f92a9eca424701c5ae57
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:30:26 2009 +0100
[BUILDROOT] Move TestSuite to newly created package/armadeus/
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 3 +++
.../package/{ => armadeus}/as_devices/Config.in | 0
.../{ => armadeus}/as_devices/as_devices.mk | 0
.../drivers-helpers}/drivers-helpers.mk | 0
buildroot/package/{ => armadeus}/imxssi/Config.in | 0
buildroot/package/{ => armadeus}/imxssi/imxssi.mk | 0
.../testsuite}/Config.in | 0
.../testsuite/testsuite.mk} | 0
...s9x-compile.patch => snes9x-1.39-compile.patch} | 20 ++++++++++++++++++++
buildroot/package/snes9x/snes9x.mk | 15 ++++++---------
.../059-add_armadeus_testsuite_package.patch | 10 ----------
patches/buildroot/070-add_ad9889ctl_package.patch | 2 +-
scripts/quiltify.sh | 8 +++++++-
13 files changed, 37 insertions(+), 21 deletions(-)
rename buildroot/package/{ => armadeus}/as_devices/Config.in (100%)
rename buildroot/package/{ => armadeus}/as_devices/as_devices.mk (100%)
rename buildroot/package/{armadeus-drivers-helpers => armadeus/drivers-helpers}/drivers-helpers.mk (100%)
rename buildroot/package/{ => armadeus}/imxssi/Config.in (100%)
rename buildroot/package/{ => armadeus}/imxssi/imxssi.mk (100%)
rename buildroot/package/{armadeus-testsuite => armadeus/testsuite}/Config.in (100%)
rename buildroot/package/{armadeus-testsuite/armadeus-tests.mk => armadeus/testsuite/testsuite.mk} (100%)
rename buildroot/package/snes9x/{snes9x-compile.patch => snes9x-1.39-compile.patch} (94%)
delete mode 100644 patches/buildroot/059-add_armadeus_testsuite_package.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index ebd0c28..5a277c0 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,5 +1,8 @@
menu "Armadeus specific tools/utilities"
+source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
+source package/armadeus/imxssi/Config.in
+source package/armadeus/testsuite/Config.in
endmenu
diff --git a/buildroot/package/as_devices/Config.in b/buildroot/package/armadeus/as_devices/Config.in
similarity index 100%
rename from buildroot/package/as_devices/Config.in
rename to buildroot/package/armadeus/as_devices/Config.in
diff --git a/buildroot/package/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
similarity index 100%
rename from buildroot/package/as_devices/as_devices.mk
rename to buildroot/package/armadeus/as_devices/as_devices.mk
diff --git a/buildroot/package/armadeus-drivers-helpers/drivers-helpers.mk b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
similarity index 100%
rename from buildroot/package/armadeus-drivers-helpers/drivers-helpers.mk
rename to buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
diff --git a/buildroot/package/imxssi/Config.in b/buildroot/package/armadeus/imxssi/Config.in
similarity index 100%
rename from buildroot/package/imxssi/Config.in
rename to buildroot/package/armadeus/imxssi/Config.in
diff --git a/buildroot/package/imxssi/imxssi.mk b/buildroot/package/armadeus/imxssi/imxssi.mk
similarity index 100%
rename from buildroot/package/imxssi/imxssi.mk
rename to buildroot/package/armadeus/imxssi/imxssi.mk
diff --git a/buildroot/package/armadeus-testsuite/Config.in b/buildroot/package/armadeus/testsuite/Config.in
similarity index 100%
rename from buildroot/package/armadeus-testsuite/Config.in
rename to buildroot/package/armadeus/testsuite/Config.in
diff --git a/buildroot/package/armadeus-testsuite/armadeus-tests.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
similarity index 100%
rename from buildroot/package/armadeus-testsuite/armadeus-tests.mk
rename to buildroot/package/armadeus/testsuite/testsuite.mk
diff --git a/buildroot/package/snes9x/snes9x-compile.patch b/buildroot/package/snes9x/snes9x-1.39-compile.patch
similarity index 94%
rename from buildroot/package/snes9x/snes9x-compile.patch
rename to buildroot/package/snes9x/snes9x-1.39-compile.patch
index b41a30f..aa8dcd1 100644
--- a/buildroot/package/snes9x/snes9x-compile.patch
+++ b/buildroot/package/snes9x/snes9x-1.39-compile.patch
@@ -273,3 +273,23 @@
}
return (SUCCESS);
+--- snes9x-sdl-1.39/globals.cpp 2003-10-27 09:42:22.000000000 +0100
++++ snes9x-sdl-1.39.mod/globals.cpp 2009-12-09 10:33:53.000000000 +0100
+@@ -54,6 +54,8 @@
+ #include "sa1.h"
+ //#include "netplay.h"
+
++struct SDSP1 DSP1;
++
+ START_EXTERN_C
+ char String[513];
+
+@@ -73,8 +75,6 @@
+
+ struct SSettings Settings;
+
+-struct SDSP1 DSP1;
+-
+ struct SRegisters SA1Registers;
+ //struct SSA1Registers SA1Registers;
+
diff --git a/buildroot/package/snes9x/snes9x.mk b/buildroot/package/snes9x/snes9x.mk
index b3a6f84..5a1703d 100644
--- a/buildroot/package/snes9x/snes9x.mk
+++ b/buildroot/package/snes9x/snes9x.mk
@@ -9,6 +9,7 @@ SNES9X_SITE:=http://www.vanille.de/mirror/
# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
SNES9X_CAT:=bzcat
SNES9X_DIR:=$(BUILD_DIR)/snes9x-sdl-$(SNES9X_VERSION)
+SNES9X_TARGET_BIN:=/usr/local/bin/snes9x
#SNES9X_VERSION:=1.43
#SNES9X_SOURCE:=snes9x-$(SNES9X_VERSION)-src.tar.gz
@@ -51,20 +52,16 @@ $(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
$(SNES9X_DIR)/snes9x: $(SNES9X_DIR)/.configured
# $(MAKE) -C $(SNES9X_DIR)/snes9x
$(MAKE) -C $(SNES9X_DIR) \
- CC="$(STAGING_DIR)/bin/arm-linux-gcc" CCC="$(STAGING_DIR)/bin/arm-linux-c++ -fno-rtti -fno-exceptions" \
+ CC=$(TARGET_CC) CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs`"
touch $@
-# $(STAGING_DIR)/usr/lib/libSDL.so: $(SNES9X_DIR)/.compiled
-# $(MAKE) -C $(SNES9X_DIR) install
-# touch -c $(STAGING_DIR)/usr/lib/libSDL.so
-#
-# $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
-# cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libSDL.so
+$(TARGET_DIR)/$(SNES9X_TARGET_BIN): $(SNES9X_DIR)/snes9x
+ cp -f $(SNES9X_DIR)/snes9x $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-SNES9X snes9x: sdl $(SNES9X_DIR)/snes9x
+SNES9X snes9x: sdl $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
snes9x-clean:
# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SNES9X_DIR) uninstall
diff --git a/patches/buildroot/059-add_armadeus_testsuite_package.patch b/patches/buildroot/059-add_armadeus_testsuite_package.patch
deleted file mode 100644
index 392428c..0000000
--- a/patches/buildroot/059-add_armadeus_testsuite_package.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.org 2008-12-11 18:37:45.000000000 +0100
-+++ buildroot/package/Config.in 2008-12-11 18:38:28.000000000 +0100
-@@ -242,6 +242,7 @@
-
- if BR2_BLOCKDEV_SUPPORT
- source "package/acpid/Config.in"
-+source "package/armadeus-testsuite/Config.in"
- source "package/ch7024ctrl/Config.in"
- source "package/dbus/Config.in"
- source "package/dbus-glib/Config.in"
diff --git a/patches/buildroot/070-add_ad9889ctl_package.patch b/patches/buildroot/070-add_ad9889ctl_package.patch
index a016b4d..85e7c8c 100644
--- a/patches/buildroot/070-add_ad9889ctl_package.patch
+++ b/patches/buildroot/070-add_ad9889ctl_package.patch
@@ -1,9 +1,9 @@
--- buildroot/package/Config.in.ori 2009-01-14 18:27:51.000000000 +0100
+++ buildroot/package/Config.in 2009-01-13 11:16:07.000000000 +0100
@@ -243,6 +243,7 @@
+
if BR2_BLOCKDEV_SUPPORT
source "package/acpid/Config.in"
- source "package/armadeus-testsuite/Config.in"
+source "package/ad9889ctrl/Config.in"
source "package/ch7024ctrl/Config.in"
source "package/dbus/Config.in"
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 6048c3a..058a672 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -52,7 +52,13 @@ if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $QUILT_TARGET_DIR/patches/ to $QUILT_TARGET_PATCH_DIR"
cp -f $QUILT_TARGET_DIR/patches/*.patch $QUILT_TARGET_PATCH_DIR
echo -e "\n--- You can now check your work before commiting --> \n"
- git status
+ if [ -d ".git" ]; then
+ git status
+ elif [ -d ".svn" ]; then
+ svn status -q
+ else
+ echo "No VCS found"
+ fi
exit 0
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-08 21:08:38
|
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 23b7e0a290b47f92332f62db66ec982ea24ebe27 (commit)
via 7b395711f69e61f76039c4685358bf8c42f116e2 (commit)
via 9abc287ce11941ac311bec66d00e04c57a783341 (commit)
via b439b23d324aabeb68cea0df8d4bb233eed68c25 (commit)
via 183b456a9153e04606d7bf5af7b373227317292c (commit)
via 8f849a6f95c194d9886f15a10e174b2a4882b98c (commit)
from 465f0e9138bebdd7fa5eb14cd4d86db784571d1a (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 23b7e0a290b47f92332f62db66ec982ea24ebe27
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 17:35:46 2009 +0100
[BUILDROOT] Add an armadeus/ dir in package/ to store all Armadeus specific utilities/tools building. Add it demos stuff to start.
commit 7b395711f69e61f76039c4685358bf8c42f116e2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:38:09 2009 +0100
[BUILD] Updates some more .gitignore files
commit 9abc287ce11941ac311bec66d00e04c57a783341
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:37:34 2009 +0100
[DEMOS] Homogenize demos build & install
commit b439b23d324aabeb68cea0df8d4bb233eed68c25
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:23:32 2009 +0100
[DEMOS] input_test now looks up in /usr/share/images/ too to load its image file
commit 183b456a9153e04606d7bf5af7b373227317292c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 21:37:36 2009 +0100
[BUILD] Add some more .gitignore files
commit 8f849a6f95c194d9886f15a10e174b2a4882b98c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 21:36:33 2009 +0100
[BUILDROOT] Makes Mesa compile again and be better installed (Thanks CimCim)
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 19 ++++-
buildroot/local/apf9328_test/apf9328_test.config | 19 ++++-
buildroot/package/.gitignore | 43 +++++++++
buildroot/package/armadeus/Config.in | 5 +
buildroot/package/armadeus/armadeus.mk | 1 +
buildroot/package/armadeus/demos/Config.in | 56 ++++++++++++
buildroot/package/armadeus/demos/demos.mk | 96 ++++++++++++++++++++
buildroot/package/audio/.gitignore | 3 +
buildroot/package/mesa/mesa.mk | 12 ++-
buildroot/package/mesa/mesa.patch | 4 +-
buildroot/package/mplayer/.gitignore | 4 +
buildroot/package/mtd/.gitignore | 4 +
buildroot/package/openssh/.gitignore | 5 +
buildroot/package/sdl/.gitignore | 2 +
buildroot/package/tslib/.gitignore | 8 ++
.../target/device/armadeus/apf27/apf27_defconfig | 7 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 7 ++-
target/demos/armanoid/.gitignore | 1 +
target/demos/armanoid/Makefile | 48 ++++++-----
target/demos/backlight_control/Makefile | 50 ++++++-----
target/demos/gpio/Makefile | 16 ++--
target/demos/gps/Makefile | 14 ++-
target/demos/input_test/.gitignore | 1 +
target/demos/input_test/Makefile | 43 +++++----
target/demos/input_test/README | 2 +-
target/demos/input_test/main.c | 9 ++-
target/demos/music_player/Makefile | 39 +++++---
target/demos/show_image/Makefile | 48 +++++-----
28 files changed, 442 insertions(+), 124 deletions(-)
create mode 100644 buildroot/package/.gitignore
create mode 100644 buildroot/package/armadeus/Config.in
create mode 100644 buildroot/package/armadeus/armadeus.mk
create mode 100644 buildroot/package/armadeus/demos/Config.in
create mode 100644 buildroot/package/armadeus/demos/demos.mk
create mode 100644 buildroot/package/audio/.gitignore
create mode 100644 buildroot/package/mplayer/.gitignore
create mode 100644 buildroot/package/mtd/.gitignore
create mode 100644 buildroot/package/openssh/.gitignore
create mode 100644 buildroot/package/sdl/.gitignore
create mode 100644 buildroot/package/tslib/.gitignore
create mode 100644 target/demos/armanoid/.gitignore
create mode 100644 target/demos/input_test/.gitignore
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 9be20af..6ccb600 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 1 10:24:20 2009
+# Tue Dec 8 17:28:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -342,6 +342,23 @@ BR2_PACKAGE_FBTEST=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index e4a5008..cb827a1 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 27 09:47:37 2009
+# Tue Dec 8 17:28:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -339,6 +339,23 @@ BR2_PACKAGE_FBTEST=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
new file mode 100644
index 0000000..aedc788
--- /dev/null
+++ b/buildroot/package/.gitignore
@@ -0,0 +1,43 @@
+# All subdirs:
+/*/
+
+/Config.in
+/Config.in.bak
+/Makefile.autotools.in
+/Makefile.in
+/buildroot-libtool.patch
+
+# except:
+!/ad9889ctrl/
+!/allegro/
+!/armadeus/
+!/armadeus-drivers-helpers/
+!/armadeus-testsuite/
+!/as_devices/
+!/audio/
+!/bluez/
+!/ch7024ctrl/
+!/fbgrab/
+!/fbtest/
+!/fpgaregs/
+!/freescale-tools/
+!/imxregs/
+!/imxssi/
+!/lcd4linux/
+!/libcurl/
+!/lmbench/
+!/max5821ctrl/
+!/mesa/
+!/mplayer/
+!/mtd/
+!/openssh/
+!/pymysql/
+!/pyserial/
+!/sdl/
+!/sdlwater/
+!/slideshow/
+!/snes9x/
+!/socketcan/
+!/tslib/
+!/xenomai/
+!/mesa/
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
new file mode 100644
index 0000000..ebd0c28
--- /dev/null
+++ b/buildroot/package/armadeus/Config.in
@@ -0,0 +1,5 @@
+menu "Armadeus specific tools/utilities"
+
+source package/armadeus/demos/Config.in
+
+endmenu
diff --git a/buildroot/package/armadeus/armadeus.mk b/buildroot/package/armadeus/armadeus.mk
new file mode 100644
index 0000000..c833654
--- /dev/null
+++ b/buildroot/package/armadeus/armadeus.mk
@@ -0,0 +1 @@
+include package/armadeus/*/*.mk
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
new file mode 100644
index 0000000..8d9d9d2
--- /dev/null
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -0,0 +1,56 @@
+
+config BR2_PACKAGE_ARMADEUS_DEMOS
+ bool "Armadeus misc demos"
+ default n
+ help
+ Install Armadeus miscallenous demos.
+
+menu "Choose the demos to install"
+ depends on BR2_PACKAGE_ARMADEUS_DEMOS
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID
+ bool "Armanoid"
+ select BR2_PACKAGE_SDL
+ help
+ Small game to show SDL usage.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT
+ bool "Backlight control"
+ select BR2_PACKAGE_SDL
+ help
+ SDL tool to graphically adjust LCD backlight.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_GPIO
+ bool "GPIO test"
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_GPS
+ bool "GPS frame decoding"
+ help
+ Small tool to show how to read and decode NMEA frames
+ coming from a serial GPS.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
+ bool "Input test"
+ select BR2_PACKAGE_SDL
+ help
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
+ bool "Music player"
+ select BR2_PACKAGE_SDL
+ select CONFIG_BR2_PACKAGE_SDL_TTF
+ select CONFIG_BR2_PACKAGE_SDL_MIXER
+ help
+ SDL based music player.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
+ bool "Oscilloscope"
+ help
+ MAX1027 data viewer "Ã la" oscilloscope. (Work in progress).
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE
+ bool "Image viewer"
+ select CONFIG_BR2_PACKAGE_SDL_IMAGE
+ help
+ SDL based image viewer.
+
+endmenu
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
new file mode 100644
index 0000000..b95d938
--- /dev/null
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -0,0 +1,96 @@
+#############################################################
+#
+# Armadeus Demos
+#
+#############################################################
+
+ARMADEUS-DEMOS_VER:=1.0
+ARMADEUS-DEMOS_SOURCE:=$(BUILD_DIR)/../../target/demos
+ARMADEUS-DEMOS_DIR:=$(BUILD_DIR)/armadeus-demos-$(ARMADEUS-DEMOS_VER)
+ARMADEUS-DEMOS_TARGET_DIR:=$(TARGET_DIR)/usr/local/bin
+ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
+
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
+ARMADEUS-DEMOS_SUBDIRS+=armanoid
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT),y)
+ARMADEUS-DEMOS_SUBDIRS+=backlight_control
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
+ARMADEUS-DEMOS_SUBDIRS+=gpio
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
+ARMADEUS-DEMOS_SUBDIRS+=gps
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_INPUT),y)
+ARMADEUS-DEMOS_SUBDIRS+=input_test
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
+ARMADEUS-DEMOS_SUBDIRS+=music_player
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
+ARMADEUS-DEMOS_SUBDIRS+=oscillo
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
+ARMADEUS-DEMOS_SUBDIRS+=show_image
+endif
+
+
+$(ARMADEUS-DEMOS_DIR)/.unpacked:
+ mkdir -p $(ARMADEUS-DEMOS_DIR)/
+ cd $(ARMADEUS-DEMOS_SOURCE); tar ch --exclude=.svn --exclude=.git . | tar x -C $(ARMADEUS-DEMOS_DIR)/
+ touch $@
+
+$(ARMADEUS-DEMOS_DIR)/.compiled: $(ARMADEUS-DEMOS_DIR)/.unpacked
+ @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
+ echo -e "\n >>> Compiling $$dir demo <<<" ; \
+ dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ if [ -d "$$dir" ]; then \
+ (cd $$dir && $(MAKE) CC=$(TARGET_CC) SDL_DIR=$(SDL_DIR) STAGING_DIR=$(STAGING_DIR) ARMADEUS_BOARD_NAME=$(BR2_BOARD_NAME)) || exit 1 ; \
+ fi \
+ done
+ touch $@
+
+$(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
+ @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
+ echo -e "\n >>> Installing $$dir demo <<<" ; \
+ dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) install INSTALL_DIR=$(ARMADEUS-DEMOS_TARGET_DIR) \
+ INSTALL_DATA_DIR=$(ARMADEUS-DEMOS_TARGET_DATA_DIR) STRIP=$(TARGET_STRIP)) || exit 1 ; \
+ fi \
+ done
+ touch $@
+
+armadeus-demos: $(ARMADEUS-DEMOS_DIR)/.installed
+
+armadeus-demos-clean:
+ rm -rf $(ARMADEUS-DEMOS_TARGET_DIR)
+ rm -f $(ARMADEUS-DEMOS_DIR)/.installed
+ rm -f $(ARMADEUS-DEMOS_DIR)/.compiled
+ @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
+ dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) clean) || exit 1 ; \
+ fi \
+ done
+
+armadeus-demos-dirclean:
+ rm -rf $(ARMADEUS-DEMOS_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_DEMOS)),y)
+TARGETS+=armadeus-demos
+endif
diff --git a/buildroot/package/audio/.gitignore b/buildroot/package/audio/.gitignore
new file mode 100644
index 0000000..764b172
--- /dev/null
+++ b/buildroot/package/audio/.gitignore
@@ -0,0 +1,3 @@
+/*/
+/Config.in
+/audio.mk
diff --git a/buildroot/package/mesa/mesa.mk b/buildroot/package/mesa/mesa.mk
index 2996fbd..9931f21 100644
--- a/buildroot/package/mesa/mesa.mk
+++ b/buildroot/package/mesa/mesa.mk
@@ -46,12 +46,16 @@ $(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.configured
#arm-linux-osmesa
touch $@
-MESA mesa: uclibc gpm $(MESALIB_DIR)/.compiled
+$(TARGET_DIR)/usr/lib/libGL.so.7.1.0: $(MESALIB_DIR)/.compiled
+ mkdir -p $(TARGET_DIR)/usr/lib/
+ cp -a $(MESALIB_DIR)/lib/* $(TARGET_DIR)/usr/lib/
+ touch $@
+
+
+MESA mesa: gpm $(TARGET_DIR)/usr/lib/libGL.so.7.1.0
mesa-clean:
- (cd $(MESALIB_DIR); \
- $(MAKE) CC=$(TARGET_CC) clean \
- );
+ $(MAKE) CC=$(TARGET_CC) clean -C $(MESALIB_DIR)
mesa-dirclean:
rm -rf $(MESALIB_DIR)
diff --git a/buildroot/package/mesa/mesa.patch b/buildroot/package/mesa/mesa.patch
index 2abcd74..aea2fc8 100644
--- a/buildroot/package/mesa/mesa.patch
+++ b/buildroot/package/mesa/mesa.patch
@@ -172,7 +172,7 @@ diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
CONFIG_NAME = linux-fbdev
-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-+CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include -Wl,-rpath-link,$(TOP)/../staging_dir/usr/lib
++CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include
SRC_DIRS = mesa glu glut/fbdev
DRIVER_DIRS = fbdev osmesa
@@ -184,5 +184,5 @@ diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
+OSMESA_LIB_DEPS = -lm -lpthread -L$(TOP)/../staging_dir/usr/lib
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm -lstdc++
diff --git a/buildroot/package/mplayer/.gitignore b/buildroot/package/mplayer/.gitignore
new file mode 100644
index 0000000..422d0d5
--- /dev/null
+++ b/buildroot/package/mplayer/.gitignore
@@ -0,0 +1,4 @@
+/Config.in
+/mplayer-1.0rc1-atmel.3.patch
+/mplayer-1.0rc1-index.patch
+/mplayer.mk
diff --git a/buildroot/package/mtd/.gitignore b/buildroot/package/mtd/.gitignore
new file mode 100644
index 0000000..ef6fcc6
--- /dev/null
+++ b/buildroot/package/mtd/.gitignore
@@ -0,0 +1,4 @@
+/*/
+/Config.in
+/mtd.mk
+
diff --git a/buildroot/package/openssh/.gitignore b/buildroot/package/openssh/.gitignore
new file mode 100644
index 0000000..cbd6fce
--- /dev/null
+++ b/buildroot/package/openssh/.gitignore
@@ -0,0 +1,5 @@
+/Config.in
+/S50sshd
+/openssh.002-SUSv-legacy.patch
+/openssh.mk
+/openssh.patch
diff --git a/buildroot/package/sdl/.gitignore b/buildroot/package/sdl/.gitignore
new file mode 100644
index 0000000..2d6cc8b
--- /dev/null
+++ b/buildroot/package/sdl/.gitignore
@@ -0,0 +1,2 @@
+/Config.in
+/sdl.mk
diff --git a/buildroot/package/tslib/.gitignore b/buildroot/package/tslib/.gitignore
new file mode 100644
index 0000000..54b9a42
--- /dev/null
+++ b/buildroot/package/tslib/.gitignore
@@ -0,0 +1,8 @@
+/Config.in
+/ts.conf
+/tslib-1.0-absbit.patch
+/tslib-1.0-remove-bzero.patch
+/tslib-1.0-remove-return-on-error-from-check-df.patch
+/tslib.mk
+/tslib_add_finddef_and_inputattach_utils.patch
+
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 19fd7ec..8a9b562 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Oct 23 18:15:23 2009
+# Tue Dec 8 17:26:00 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -341,6 +341,11 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 9393379..29eec07 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 27 09:47:37 2009
+# Tue Dec 8 17:26:00 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -337,6 +337,11 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/target/demos/armanoid/.gitignore b/target/demos/armanoid/.gitignore
new file mode 100644
index 0000000..d025921
--- /dev/null
+++ b/target/demos/armanoid/.gitignore
@@ -0,0 +1 @@
+/armanoid
diff --git a/target/demos/armanoid/Makefile b/target/demos/armanoid/Makefile
index ecf6935..c459442 100644
--- a/target/demos/armanoid/Makefile
+++ b/target/demos/armanoid/Makefile
@@ -1,35 +1,32 @@
+# Default values for local compiling:
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+
+DEFINES=TARGET
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
ifeq ($(TARGET),x86)
INSTALL_DIR="/usr/games/"
- INSTALL_DATA_DIR="/usr/share/games/armanoid/"
+ INSTALL_DATA_DIR="/usr/share/"
CFLAGS=`/usr/bin/sdl-config --cflags`
LIBS=`/usr/bin/sdl-config --libs`
CC=gcc
- DEFINES="HOST"
-else
- BUILDROOT_DIR:=../../../buildroot/
- BUILD_DIR_EXT:=$(shell ls $(BUILDROOT_DIR) | grep -e "^build_arm*")
- BUILD_DIR:=$(BUILDROOT_DIR)/$(BUILD_DIR_EXT)
-
- SDL_DIR:=$(BUILD_DIR)/SDL-1.2.11/
- STAGING_DIR:=$(BUILD_DIR)/staging_dir/
- ROOT_DIR:=$(BUILDROOT_DIR)/project_$(BUILD_DIR_EXT)/armadeus/root/
- INSTALL_DIR:=$(ROOT_DIR)/usr/games/
- INSTALL_DATA_DIR:=$(ROOT_DIR)/usr/share/games/armanoid/
-
- CC:=$(STAGING_DIR)/bin/arm-linux-gcc
- DEFINES="TARGET"
- CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+ DEFINES=HOST
endif
-CFLAGS+="-g"
default: armanoid
all: armanoid
-
armanoid.o: armanoid.c
$(CC) $(CFLAGS) -c -o $@ $^
@@ -40,15 +37,22 @@ buzzer.o: buzzer.c
$(CC) $(CFLAGS) -D$(DEFINES) -c -o $@ $^
armanoid: armanoid.o collide.o buzzer.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LIBS) -o $@ $^
install: armanoid data/ball.bmp data/block.bmp data/bar.bmp
mkdir -p $(INSTALL_DIR)
- mkdir -p $(INSTALL_DATA_DIR)/data/
- cp data/*.bmp $(INSTALL_DATA_DIR)/data/
+ mkdir -p $(INSTALL_DATA_DIR)/games/armanoid/data/
+ cp data/*.bmp $(INSTALL_DATA_DIR)/games/armanoid/data/
cp armanoid $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/armanoid
+
+uninstall:
+ rm -f $(INSTALL_DIR)/armanoid
+ rm -rf $(INSTALL_DATA_DIR)/games/armanoid/data/
clean:
rm -rf armanoid
rm -rf *.o
+.PHONY: clean install uninstall
+
diff --git a/target/demos/backlight_control/Makefile b/target/demos/backlight_control/Makefile
index ea0e4b4..506f817 100644
--- a/target/demos/backlight_control/Makefile
+++ b/target/demos/backlight_control/Makefile
@@ -1,30 +1,32 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- ROOT_DIR:=$(ARMADEUS_ROOTFS_DIR)
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DTARGET"
- CFLAGS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_image
-else
- ROOT_DIR:="/"
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+# Default values for local compiling:
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+DEFINES=-DTARGET
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+
+ifeq ($(TARGET),x86)
+ INSTALL_DIR:=/usr/local/bin
+ INSTALL_DATA_DIR:=/usr/share
CFLAGS=`/usr/bin/sdl-config --cflags`
- LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
+ LDFLAGS=`/usr/bin/sdl-config --libs` -lSDL_Image
CC=gcc
- DEFINES="-DHOST"
+ STRIP=strip
+ DEFINES=-DHOST
endif
-INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
-INSTALL_DIR_DATA:=$(ROOT_DIR)/usr/share/apps/backlight/data
-
-CFLAGS+="-g"
default: backlight
all: backlight
-
backlight.o: backlight.c
$(CC) $(CFLAGS) -c -o $@ $^
@@ -32,20 +34,26 @@ backlight_sysctl.o: backlight_sysctl.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
backlight: backlight.o backlight_sysctl.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^
install: install_tool install_data
install_tool: backlight
mkdir -p $(INSTALL_DIR)
cp $^ $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$^
install_data: data/cursor.bmp data/empty.bmp data/empty_end.bmp data/full.bmp data/full_end.bmp
- mkdir -p $(INSTALL_DIR_DATA)
- cp $^ $(INSTALL_DIR_DATA)
+ mkdir -p $(INSTALL_DATA_DIR)/apps/backlight/data
+ cp $^ $(INSTALL_DATA_DIR)/apps/backlight/data/
-clean:
+uninstall:
+ rm -f $(INSTALL_DIR)/backlight
+
+clean:
rm -rf backlight
rm -rf *.o
rm -rf active backlight.dat
+.PHONY: clean install uninstall
+
diff --git a/target/demos/gpio/Makefile b/target/demos/gpio/Makefile
index 0e11c39..14a8723 100644
--- a/target/demos/gpio/Makefile
+++ b/target/demos/gpio/Makefile
@@ -1,13 +1,12 @@
-
-ifneq ($(CC),)
-# Locally compiled:
+# Default values for local compiling:
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/
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
-endif
+
EXEC_NAME = blink_led
@@ -22,8 +21,9 @@ clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-install:
+install: $(EXEC_NAME)
cp $(EXEC_NAME) $(INSTALL_DIR)/
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
uninstall:
rm -f $(INSTALL_DIR)/$(EXEC_NAME)
diff --git a/target/demos/gps/Makefile b/target/demos/gps/Makefile
index 4ca5477..58223b4 100644
--- a/target/demos/gps/Makefile
+++ b/target/demos/gps/Makefile
@@ -1,7 +1,10 @@
-INSTALL_DIR="../../../buildroot/project_build_arm/armadeus/root/usr/bin/"
-CC="../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc"
-#CFLAGS+="-g"
-CFLAGS+="-Wall"
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CFLAGS+=-Wall -g
+
default: nmea_decode
@@ -11,7 +14,8 @@ nmea_decode: nmea_decoder.c
$(CC) $(CFLAGS) -o $@ $^
install: nmea_decode
- cp nmea_decode $(INSTALL_DIR)
+ cp nmea_decode $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/nmea_decode
clean:
rm -f nmea_decode
diff --git a/target/demos/input_test/.gitignore b/target/demos/input_test/.gitignore
new file mode 100644
index 0000000..db9aaa5
--- /dev/null
+++ b/target/demos/input_test/.gitignore
@@ -0,0 +1 @@
+/input_test
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index 1c405b3..0513ecb 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -1,31 +1,34 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
- INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
-
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DAPF"
- CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs)
-else
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+# Default values for local compiling:
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+DEFINES=-DAPF
+
+ifeq ($(TARGET),x86)
INSTALL_DIR=./install
+ INSTALL_DATA_DIR=./install/images
CFLAGS=`/usr/bin/sdl-config --cflags`
LIBS=`/usr/bin/sdl-config --libs`
CC=gcc
- DEFINES="-DHOST"
+ STRIP=strip
+ DEFINES=-DHOST
endif
-CFLAGS+="-g"
-EXEC_NAME=input_test
+EXEC_NAME=input_test
default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
main.o: main.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
@@ -34,13 +37,17 @@ $(EXEC_NAME): main.o
install: $(EXEC_NAME)
mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
+ cp $(EXEC_NAME) $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
+ mkdir -p $(INSTALL_DATA_DIR)/images
+ cp sdl.bmp $(INSTALL_DATA_DIR)/images/
uninstall:
- rm -f $(INSTALL_DIR)/input_test
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean uninstall
+.PHONY: clean install uninstall
diff --git a/target/demos/input_test/README b/target/demos/input_test/README
index 5e2358c..6376899 100644
--- a/target/demos/input_test/README
+++ b/target/demos/input_test/README
@@ -2,5 +2,5 @@
* ARM compiling:
$ make clean; make install
* x86 compiling (SDL devt package should be installed on your system)
- $ make TARGET=x86 clean; make TARGET=x86
+ $ make clean; make TARGET=x86
diff --git a/target/demos/input_test/main.c b/target/demos/input_test/main.c
index 82b71b2..f27e064 100644
--- a/target/demos/input_test/main.c
+++ b/target/demos/input_test/main.c
@@ -244,8 +244,12 @@ int main(int argc, char * argv[])
/* Sprite's image loading */
tmp = SDL_LoadBMP("sdl.bmp");
if (!tmp) {
- printf("Unable to load image for test\n");
- exit(1);
+ /* 2nd chance: */
+ tmp = SDL_LoadBMP("/usr/share/images/sdl.bmp");
+ if (!tmp) {
+ printf("Unable to load image for test\n");
+ exit(1);
+ }
}
sprite = SDL_DisplayFormat(tmp);
SDL_FreeSurface(tmp);
@@ -282,3 +286,4 @@ int main(int argc, char * argv[])
printf("\nBye !\n");
return 0;
}
+
diff --git a/target/demos/music_player/Makefile b/target/demos/music_player/Makefile
index 514dfbd..134ba82 100755
--- a/target/demos/music_player/Makefile
+++ b/target/demos/music_player/Makefile
@@ -1,39 +1,50 @@
# Compil ARM
-ifeq ($(TARGET),arm)
ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-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="-DAPF"
-CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags) -g
-LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
-
-else
+STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+DEFINES=-DAPF
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
+
+ifeq ($(TARGET),x86)
# Compil HOST
CC=gcc
+STRIP=strip
CFLAGS=`/usr/bin/sdl-config --cflags`
-LIBS=`/usr/bin/sdl-config --libs` -lSDL_ttf -lSDL_mixer
-DEFINES="-DHOST"
-
+LDFLAGS=`/usr/bin/sdl-config --libs` -lSDL_ttf -lSDL_mixer
+DEFINES=-DHOST
endif
EXEC_NAME=aplayer
+
default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
main.o: player.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
$(EXEC_NAME): player.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^
+
+install:
+ mkdir -p $(INSTALL_DIR)
+ cp -f $(EXEC_NAME) $(INSTALL_DIR)/
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
+
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
-clean:
+clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean uninstall
+.PHONY: clean install uninstall
diff --git a/target/demos/show_image/Makefile b/target/demos/show_image/Makefile
index e1c6d0c..d7e7fa1 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/show_image/Makefile
@@ -1,23 +1,23 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- ROOT_DIR:=$(ARMADEUS_ROOTFS_DIR)
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DTARGET"
- CFLAGS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_image
-else
- ROOT_DIR:="/"
- CFLAGS=`/usr/bin/sdl-config --cflags`
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+
+DEFINES=-DTARGET
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+
+ifeq ($(TARGET),x86)
+ INSTALL_DIR:=/usr/local/bin/
+ CFLAGS=`/usr/bin/sdl-config --cflags` -g
LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
CC=gcc
- DEFINES="-DHOST"
-endif
-
-INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
-ifneq ($(DEBUG),)
-CFLAGS+="-g"
+ STRIP=strip
+ DEFINES=-DHOST
endif
@@ -27,21 +27,23 @@ default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
image.o: image.c
$(CC) $(CFLAGS) -c -o $@ $^
$(EXEC_NAME): image.o
- $(CC) $(LIBS) -o $@ $^
-
+ $(CC) $(LDFLAGS) -o $@ $^
install: $(EXEC_NAME)
mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
+ cp $^ $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$^
-clean:
+clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean install
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
+.PHONY: clean install uninstall
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-07 13:24:21
|
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 465f0e9138bebdd7fa5eb14cd4d86db784571d1a (commit)
via bbc7b198caa4d7522fa31028a080a8b619090139 (commit)
via 9d825d3762aebfcefd5e743ac6744dc9a6920b1b (commit)
from 6bcecb85efaad9ca0a7fb4a4e3221066d06960f7 (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 465f0e9138bebdd7fa5eb14cd4d86db784571d1a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 14:22:57 2009 +0100
[LINUX] Add support for i.MX27 internal keypad controller
commit bbc7b198caa4d7522fa31028a080a8b619090139
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 14:05:50 2009 +0100
[TOOLS] Removes ambiguous message from quiltify.sh
commit 9d825d3762aebfcefd5e743ac6744dc9a6920b1b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 14:03:33 2009 +0100
[BUILD] Updates .gitignore files
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 -
buildroot/.gitignore | 20 +-
buildroot/local/apf27_test/linux-2.6.29.4.config | 4 +-
buildroot/target/.gitignore | 21 +
buildroot/target/device/.gitignore | 15 +
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 +-
...40-apf27-martin-keypad-add_driver_for_mx2.patch | 530 ++++++++++++++++++++
buildroot/target/u-boot/.gitignore | 1 +
buildroot/target/ubifs/.gitignore | 2 +
scripts/quiltify.sh | 5 +-
10 files changed, 591 insertions(+), 11 deletions(-)
create mode 100644 buildroot/target/.gitignore
create mode 100644 buildroot/target/device/.gitignore
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/340-apf27-martin-keypad-add_driver_for_mx2.patch
create mode 100644 buildroot/target/u-boot/.gitignore
create mode 100644 buildroot/target/ubifs/.gitignore
diff --git a/.gitignore b/.gitignore
index 98ce07b..ecceba5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
/downloads
*~
-/buildroot
*.pyc
armadeus_env.sh
diff --git a/buildroot/.gitignore b/buildroot/.gitignore
index 93b53bb..0cf1f5b 100644
--- a/buildroot/.gitignore
+++ b/buildroot/.gitignore
@@ -1,13 +1,21 @@
+
+/binaries
/build_*
+/dl
+/docs/
/project_*
+/project/
/toolchain_*
-/binaries
-/dl
-/.auto.deps
-/.config.cmd
-/.config.old
-/.config
+/toolchain
+/scripts/
+/.*
+!/.gitignore
+/Config.in
+/Makefile
+/TODO
+
*.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 ca649c9..70a8d91 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.6
-# Tue Oct 20 13:32:01 2009
+# Mon Dec 7 11:18:48 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -747,6 +747,7 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_MXC=m
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_GPIO is not set
@@ -1397,6 +1398,7 @@ CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_GPIO_DRIVER=m
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/buildroot/target/.gitignore b/buildroot/target/.gitignore
new file mode 100644
index 0000000..b0582a5
--- /dev/null
+++ b/buildroot/target/.gitignore
@@ -0,0 +1,21 @@
+/cloop/
+/Config.*
+/cpio/
+/cramfs/
+#device
+/ext2/
+/generic/
+/hurd/
+/initramfs/
+/iso9660/
+/jffs2/
+/linux/
+/makedevs
+Makefile.in
+/powerpc/
+/romfs/
+/squashfs/
+/tar/
+#ubifs
+#u-boot
+/x86/
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
new file mode 100644
index 0000000..4b19070
--- /dev/null
+++ b/buildroot/target/device/.gitignore
@@ -0,0 +1,15 @@
+AMD/
+ARM/
+ARMLTD/
+Atmel/
+Config.*
+Hitachi/
+jp/
+KwikByte/
+Makefile.*
+mips/
+Sharp/
+Soekris/
+valka/
+Via/
+x86/
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 4ce03df..2548908 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Dec 3 21:58:38 2009
+# Mon Dec 7 11:18:48 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -747,6 +747,7 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_MXC=m
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_GPIO is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/340-apf27-martin-keypad-add_driver_for_mx2.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/340-apf27-martin-keypad-add_driver_for_mx2.patch
new file mode 100644
index 0000000..4881dfa
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/340-apf27-martin-keypad-add_driver_for_mx2.patch
@@ -0,0 +1,530 @@
+Original patch from Holger Schurig for MX21, modified/enhanced by Martin Fuzzey
+and adapted to MX27/Linux 2.6.29 by Armadeus (no MX21 yet + clock).
+
+
+commit 1f453cde4739ff4348db1580292dfa9685475319
+Author: Martin Fuzzey <mf...@gm...>
+Date: Wed Nov 25 22:03:05 2009 +0100
+
+ Add support for the MXC keypad port (patch from Holger Schurig)
+
+Index: linux-2.6.29.6/arch/arm/mach-mx2/devices.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/devices.c 2009-12-03 15:25:28.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/devices.c 2009-12-04 17:28:04.000000000 +0100
+@@ -35,6 +35,7 @@
+ #include <mach/irqs.h>
+ #include <mach/hardware.h>
+ #include <mach/mmc.h>
++#include <mach/mxc_keypad.h>
+
+ /*
+ * Resource definition for the MXC IrDA
+@@ -657,6 +658,28 @@
+ .resource = mxc_ehci2_resources,
+ };
+
++#if defined(CONFIG_KEYBOARD_MXC) || defined(CONFIG_KEYBOARD_MXC_MODULE)
++static struct resource mxc_resource_keypad[] = {
++ {
++ .start = KPP_BASE_ADDR,
++ .end = KPP_BASE_ADDR + 0x14,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = MXC_INT_KPP,
++ .end = MXC_INT_KPP,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++struct platform_device mxc_keypad_device = {
++ .name = "mxc-keypad",
++ .id = -1,
++ .resource = mxc_resource_keypad,
++ .num_resources = ARRAY_SIZE(mxc_resource_keypad),
++};
++#endif
++
+ static struct resource mxc_pwm_resources[] = {
+ [0] = {
+ .start = (PWM_BASE_ADDR),
+Index: linux-2.6.29.6/arch/arm/mach-mx2/devices.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/devices.h 2009-12-03 15:25:28.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/devices.h 2009-12-04 17:27:17.000000000 +0100
+@@ -31,3 +31,4 @@
+ extern struct platform_device mxc_ehci1;
+ extern struct platform_device mxc_ehci2;
+ extern struct platform_device mxc_pwm_device0;
++extern struct platform_device mxc_keypad_device;
+Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/mxc_keypad.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/mxc_keypad.h 2009-12-04 16:50:15.000000000 +0100
+@@ -0,0 +1,20 @@
++#ifndef __MACH_MXC_KEYPAD_H
++#define __MACH_MXC_KEYPAD_H
++
++#include <linux/input.h>
++
++#define MAX_MATRIX_KEY_ROWS (8)
++#define MAX_MATRIX_KEY_COLS (8)
++
++struct mxc_keypad_platform_data {
++ u16 output_pins;
++ u16 input_pins;
++ void (*init)(struct input_dev *idev, struct platform_device *pdev);
++ void (*exit)(struct platform_device *pdev);
++ void (*handle_key)(struct input_dev *, int col, int row, int down);
++ int (*is_modifier_key)(int col, int row);
++};
++
++extern void mxc_set_keypad_info(struct mxc_keypad_platform_data *info);
++
++#endif
+Index: linux-2.6.29.6/drivers/input/keyboard/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/input/keyboard/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/input/keyboard/Kconfig 2009-12-04 16:50:15.000000000 +0100
+@@ -112,6 +112,16 @@
+ To compile this driver as a module, choose M here: the
+ module will be called xtkbd.
+
++config KEYBOARD_MXC
++ tristate "Freescale MXC/IMX keypad support"
++ depends on ARCH_MXC
++ help
++ Say Y here if you have a keypad connected to your MXC/i.MX
++ SoC. Note that you also need board-support for this.
++
++ To compile this driver as a module, choose M here: the
++ module will be called mxc_keypad.
++
+ config KEYBOARD_NEWTON
+ tristate "Newton keyboard"
+ select SERIO
+Index: linux-2.6.29.6/drivers/input/keyboard/Makefile
+===================================================================
+--- linux-2.6.29.6.orig/drivers/input/keyboard/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/input/keyboard/Makefile 2009-12-04 16:50:15.000000000 +0100
+@@ -18,6 +18,7 @@
+ obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o
+ obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
+ obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
++obj-$(CONFIG_KEYBOARD_MXC) += mxc_keypad.o
+ obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o
+ obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o
+ obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o
+Index: linux-2.6.29.6/drivers/input/keyboard/mxc_keypad.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/drivers/input/keyboard/mxc_keypad.c 2009-12-04 16:55:28.000000000 +0100
+@@ -0,0 +1,407 @@
++/*
++ * Driver for the i.MX/MXC matrix keyboard controller.
++ *
++ * Copyright (c) 2009 by Holger Schurig <hs...@ma...>
++ *
++ * 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 driver is just a "generic" framework, it cannot produce input events on
++it's own. That's because diverse board/devices have very different
++keyboards (numeric, alphanumeric, cell phone like etc).
++
++Therefore, you'll do the actual scancode -> input event code conversion
++in a function that you'll provide in your platform data:
++
++static struct mxc_keypad_platform_data tt8000_keypad_data = {
++ .output_pins = 0x0f00,
++ .input_pins = 0x001f,
++ .init = tt8000_keypad_init,
++ .exit = tt8000_keypad_exit,
++ .handle_key = tt8000_keypad_key,
++};
++
++static void tt8000_keypad_init(struct input_dev *input_dev,
++ struct platform_device *pdev);
++
++This function is called before the input device registers, it can setup
++primary/alternate GPIO functions and modify it, e.g. by setting
++the propriate bits in input_dev->keybit.
++
++static void tt8000_keypad_exit(struct platform_device *pdev);
++
++The opposite function.
++
++static void tt8000_keypad_key(struct input_dev *input_dev,
++ int col, int row, int down);
++
++Called for each key press or release event. Should determine
++the input event code and sent it via input_report_key().
++
++*/
++
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/input.h>
++#include <linux/device.h>
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <linux/err.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/map.h>
++
++#include <mach/hardware.h>
++#include <mach/mxc_keypad.h>
++
++#define KPCR 0x00
++
++#define KPSR 0x02
++#define KPSR_KPP_EN (1 << 10)
++#define KPSR_KRIE (1 << 9)
++#define KPSR_KDIE (1 << 8)
++#define KPSR_KRSS (1 << 3)
++#define KPSR_KDSC (1 << 2)
++#define KPSR_KPKR (1 << 1)
++#define KPSR_KPKD (1 << 0)
++#define KPSR_INT_MASK (KPSR_KRIE|KPSR_KDIE)
++
++#define KDDR 0x04
++
++#define KPDR 0x06
++
++
++#define MAX_INPUTS 8
++#define MAX_OUTPUTS 8
++
++
++//static void mxc_keypad_tasklet(unsigned long);
++
++struct mxc_keypad {
++ struct mxc_keypad_platform_data *pdata;
++ struct resource *res;
++ int irq;
++ void __iomem *base;
++
++ struct clk *clk;
++ struct input_dev *input_dev;
++ struct timer_list timer;
++ struct tasklet_struct tasklet;
++
++ u16 keystate_prev[MAX_INPUTS];
++};
++
++
++static void mxc_keypad_scan(struct mxc_keypad *kp)
++{
++ u16 col_bit, reg;
++ int i, j;
++ int snum = 0;
++ u16 keystate_cur[MAX_INPUTS];
++ u16 keystate_xor[MAX_INPUTS];
++ int modifierkey_held = 0;
++
++ /* write ones to KPDR8:15, setting columns data */
++ __raw_writew(kp->pdata->output_pins, kp->base + KPDR);
++
++ /* Quick-discharge by setting to totem-pole, */
++ /* then turn back to open-drain */
++ __raw_writew(kp->pdata->input_pins, kp->base + KPCR);
++ wmb();
++ udelay(2);
++ __raw_writew(kp->pdata->output_pins |
++ kp->pdata->input_pins, kp->base + KPCR);
++
++ col_bit = 1;
++ while (col_bit) {
++ if (col_bit & kp->pdata->output_pins) {
++ u16 last_reg = 0;
++ int debounce = 0;
++
++ __raw_writew(~col_bit, kp->base + KPDR);
++ wmb();
++
++ while (debounce < 5) {
++ udelay(1);
++ reg = ~__raw_readw(kp->base + KPDR);
++ if (reg == last_reg)
++ debounce++;
++ else
++ debounce = 0;
++ last_reg = reg;
++ }
++ keystate_cur[snum] = reg & kp->pdata->input_pins;
++
++ if (snum++ >= MAX_INPUTS)
++ break;
++ }
++ col_bit <<= 1;
++ }
++ for (i = 0; i < snum; i++) {
++ keystate_xor[i] = kp->keystate_prev[i] ^ keystate_cur[i];
++ for (j = 0; j < MAX_OUTPUTS; j++) {
++ int down = !!(keystate_cur[i] & (1 << j));
++
++ if (down && kp->pdata->is_modifier_key &&
++ kp->pdata->is_modifier_key(i, j))
++ modifierkey_held = 1;
++
++ if (keystate_xor[i] & (1 << j)) {
++ pr_debug("i,j: %d,%d, down %d\n", i, j, down);
++ kp->pdata->handle_key(kp->input_dev,
++ i, j, down);
++ }
++ }
++ kp->keystate_prev[i] = keystate_cur[i];
++ }
++
++ /* set columns back to 0 */
++ __raw_writew(0, kp->base + KPDR);
++
++ /*
++ * Clear KPKD and KPKR status bit(s) by writing to a "1",
++ * set the KPKR synchronizer chain by writing "1" to KRSS register,
++ * clear the KPKD synchronizer chain by writing "1" to KDSC register
++ */
++ reg = __raw_readw(kp->base + KPSR);
++ reg |= KPSR_KPKD | KPSR_KPKR | KPSR_KRSS | KPSR_KDSC;
++
++ if (modifierkey_held) {
++ /* poll by timer to avoid too many interrupts while key held */
++ mod_timer(&kp->timer, jiffies + HZ / 20);
++ //reg |= KPSR_INT_MASK; /* detect presses and releases */
++ }
++ __raw_writew(reg, kp->base + KPSR);
++}
++
++static void mxc_keypad_tasklet(unsigned long data)
++{
++ struct mxc_keypad *kp = (struct mxc_keypad *) data;
++
++ mxc_keypad_scan(kp);
++}
++
++static irqreturn_t mxc_keypad_irq_handler(int irq, void *data)
++{
++ struct mxc_keypad *kp = data;
++ u16 stat;
++
++ stat = __raw_readw(kp->base + KPSR);
++ stat &= ~KPSR_INT_MASK;
++
++ if (stat & KPSR_KPKD)
++ stat |= KPSR_KRIE; /* pressed - interrupt on next release */
++
++ if (stat & KPSR_KPKR)
++ stat |= KPSR_KDIE; /* all released - interrupt on next press */
++
++ /* clear interrupt status */
++ stat |= KPSR_KPKD;
++ stat |= KPSR_KPKR;
++ __raw_writew(stat | KPSR_KPKD | KPSR_KPKR, kp->base + KPSR);
++
++ tasklet_schedule(&kp->tasklet);
++
++ pr_debug("KPCR: %04x (0f1f)\n", readw(kp->base + KPCR));
++ pr_debug("KPSR: %04x (0502)\n", readw(kp->base + KPSR));
++ pr_debug("KDDR: %04x (0f00)\n", readw(kp->base + KDDR));
++ pr_debug("KPDR: %04x (705f)\n", readw(kp->base + KPDR));
++
++ return IRQ_HANDLED;
++}
++
++static void mxc_keypad_timer(unsigned long data)
++{
++ struct mxc_keypad *kp = (struct mxc_keypad *) data;
++
++ tasklet_schedule(&kp->tasklet);
++}
++
++
++static int __devinit mxc_keypad_probe(struct platform_device *pdev)
++{
++ struct mxc_keypad *kp;
++ struct input_dev *input_dev;
++ struct mxc_keypad_platform_data *pdata;
++ struct resource *res;
++ struct clk *clk;
++ int irq, error;
++
++ pdata = pdev->dev.platform_data;
++ if (!pdata || !pdata->handle_key)
++ return -EINVAL;
++
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ irq = platform_get_irq(pdev, 0);
++ if (!res || !irq)
++ return -ENXIO;
++
++ res = request_mem_region(res->start, resource_size(res), pdev->name);
++ if (!res)
++ return -EBUSY;
++
++ kp = kzalloc(sizeof(struct mxc_keypad), GFP_KERNEL);
++ if (!kp) {
++ error = -ENOMEM;
++ goto failed_release;
++ }
++
++ kp->res = res;
++ kp->pdata = pdata;
++
++ /* Create and register the input driver. */
++ input_dev = kp->input_dev = input_allocate_device();
++ if (!input_dev) {
++ dev_err(&pdev->dev, "input_allocate_device\n");
++ error = -ENOMEM;
++ goto failed_put_clk;
++ }
++
++ kp->base = ioremap(res->start, resource_size(res));
++ if (!kp->base) {
++ dev_err(&pdev->dev, "ioremap\n");
++ error = -ENOMEM;
++ goto failed_free_dev;
++ }
++
++ clk = clk_get(&pdev->dev, "kpp_clk");
++ if (IS_ERR(clk)) {
++ error = PTR_ERR(clk);
++ goto failed_unmap;
++ }
++
++ input_dev->name = pdev->name;
++ input_dev->dev.parent = &pdev->dev;
++ input_dev->id.bustype = BUS_HOST;
++ input_dev->id.vendor = 0x0001;
++ input_dev->id.product = 0x0001;
++ input_dev->id.version = 0x0100;
++ input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
++ input_set_drvdata(input_dev, kp);
++
++ platform_set_drvdata(pdev, kp);
++
++ /* should call input_set_capability(input_dev, EV_KEY, code); */
++ if (kp->pdata->init)
++ kp->pdata->init(input_dev, pdev);
++
++ setup_timer(&kp->timer, mxc_keypad_timer, (unsigned long)kp);
++ tasklet_init(&kp->tasklet, mxc_keypad_tasklet, (unsigned long)kp);
++
++ error = request_irq(irq, mxc_keypad_irq_handler,
++ IRQF_DISABLED, pdev->name, kp);
++ if (error) {
++ dev_err(&pdev->dev, "request_irq\n");
++ goto failed_clk_put;
++ }
++
++ kp->irq = irq;
++
++ /* Register the input device */
++ error = input_register_device(input_dev);
++ if (error) {
++ dev_err(&pdev->dev, "failed to register input device\n");
++ goto failed_free_irq;
++ }
++
++ device_init_wakeup(&pdev->dev, 1);
++
++ /* configure keypad */
++ clk_enable(clk);
++ __raw_writew(kp->pdata->output_pins |
++ kp->pdata->input_pins, kp->base + KPCR);
++ __raw_writew(0, kp->base + KPDR);
++ __raw_writew(kp->pdata->output_pins, kp->base + KDDR);
++ __raw_writew(KPSR_KPP_EN | KPSR_KDIE |
++ KPSR_KPKD | KPSR_KRSS | KPSR_KDSC, kp->base + KPSR);
++
++ return 0;
++
++failed_free_irq:
++ free_irq(irq, kp);
++ platform_set_drvdata(pdev, NULL);
++failed_clk_put:
++ clk_disable(clk);
++ clk_put(clk);
++failed_unmap:
++ iounmap(kp->base);
++failed_free_dev:
++ input_free_device(input_dev);
++failed_put_clk:
++ kfree(kp);
++failed_release:
++ release_mem_region(res->start, resource_size(res));
++ return error;
++}
++
++static int __devexit mxc_keypad_remove(struct platform_device *pdev)
++{
++ struct mxc_keypad *kp = platform_get_drvdata(pdev);
++
++ device_init_wakeup(&pdev->dev, 0);
++
++ if (kp) {
++ /* Mask interrupts */
++ u16 stat = __raw_readw(kp->base + KPSR);
++ stat &= ~KPSR_INT_MASK;
++ __raw_writew(stat | KPSR_KPKD | KPSR_KPKR, kp->base + KPSR);
++
++ free_irq(kp->irq, kp);
++ tasklet_disable(&kp->tasklet);
++ del_timer_sync(&kp->timer);
++
++ if (kp->pdata->exit)
++ kp->pdata->exit(pdev);
++
++ if (kp->base)
++ iounmap(kp->base);
++
++ clk_disable(kp->clk);
++ clk_put(kp->clk);
++ tasklet_kill(&kp->tasklet);
++
++ input_unregister_device(kp->input_dev);
++ release_mem_region(kp->res->start, resource_size(kp->res));
++ }
++
++ platform_set_drvdata(pdev, NULL);
++ kfree(kp);
++ return 0;
++}
++
++/* work with hotplug and coldplug */
++MODULE_ALIAS("platform:mxc-keypad");
++
++static struct platform_driver mxc_keypad_driver = {
++ .probe = mxc_keypad_probe,
++ .remove = __devexit_p(mxc_keypad_remove),
++ .driver = {
++ .name = "mxc-keypad",
++ .owner = THIS_MODULE,
++ },
++};
++
++static int __init mxc_keypad_init(void)
++{
++ return platform_driver_register(&mxc_keypad_driver);
++}
++
++static void __exit mxc_keypad_exit(void)
++{
++ platform_driver_unregister(&mxc_keypad_driver);
++}
++
++module_init(mxc_keypad_init);
++module_exit(mxc_keypad_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("i.MX Keypad Driver");
++MODULE_AUTHOR("Holger Schurig <hs4233@@mail.mn-solutions.de>");
diff --git a/buildroot/target/u-boot/.gitignore b/buildroot/target/u-boot/.gitignore
new file mode 100644
index 0000000..6037245
--- /dev/null
+++ b/buildroot/target/u-boot/.gitignore
@@ -0,0 +1 @@
+/Config.in
diff --git a/buildroot/target/ubifs/.gitignore b/buildroot/target/ubifs/.gitignore
new file mode 100644
index 0000000..28329da
--- /dev/null
+++ b/buildroot/target/ubifs/.gitignore
@@ -0,0 +1,2 @@
+/Config.in
+/ubifsroot.mk
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 260c85b..6048c3a 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -45,13 +45,14 @@ else
fi
if [ "$1" != "export" ]; then
- echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
+ echo -e "\nThis script is going to rebuild a quiltified "$QUILT_TARGET_NAME" in the current view..."
fi
if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $QUILT_TARGET_DIR/patches/ to $QUILT_TARGET_PATCH_DIR"
cp -f $QUILT_TARGET_DIR/patches/*.patch $QUILT_TARGET_PATCH_DIR
- echo -e "\n--- You can now check your work before commiting --> $QUILT_TARGET_PATCH_DIR/ \n"
+ echo -e "\n--- You can now check your work before commiting --> \n"
+ git status
exit 0
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2009-12-07 08:12:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6bcecb85efaad9ca0a7fb4a4e3221066d06960f7 (commit)
via dc9bb756e5b4f1a9d20a4aec1dcd21d6c18cdda6 (commit)
via 95c6f562ac61449ca2e3e0f87a8669f91780cf25 (commit)
from f8475442e84c24370ffc8b3155ca667658cdf070 (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 6bcecb85efaad9ca0a7fb4a4e3221066d06960f7
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 09:11:47 2009 +0100
Indentation
commit dc9bb756e5b4f1a9d20a4aec1dcd21d6c18cdda6
Merge: 95c6f562ac61449ca2e3e0f87a8669f91780cf25 f8475442e84c24370ffc8b3155ca667658cdf070
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 08:32:15 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 95c6f562ac61449ca2e3e0f87a8669f91780cf25
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 3 22:05:02 2009 +0100
[LINUX] Add custom driver for MAX9768 audio amplifier
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 +-
.../armadeus/apf9328/apf9328-linux-2.6.29.config | 5 +-
scripts/quiltify.sh | 10 +-
target/linux/modules/Kconfig | 2 +
target/linux/modules/Makefile | 2 +-
target/linux/modules/max9768/Kconfig | 10 +
target/linux/modules/{max1027 => max9768}/Makefile | 4 +-
target/linux/modules/max9768/max9768.c | 288 ++++++++++++++++++++
.../definitions.h => modules/max9768/max9768.h} | 29 +-
9 files changed, 328 insertions(+), 25 deletions(-)
create mode 100644 target/linux/modules/max9768/Kconfig
copy target/linux/modules/{max1027 => max9768}/Makefile (82%)
mode change 100755 => 100644
create mode 100644 target/linux/modules/max9768/max9768.c
copy target/linux/{debug/imxregs/definitions.h => modules/max9768/max9768.h} (60%)
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 f0e9e44..4ce03df 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Tue Oct 20 13:32:01 2009
+# Thu Dec 3 21:58:38 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1395,6 +1395,7 @@ CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_GPIO_DRIVER=m
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
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 210606a..ae18428 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
-# Tue Aug 18 11:52:19 2009
+# Linux kernel version: 2.6.29.6
+# Thu Dec 3 21:58:38 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1191,6 +1191,7 @@ CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index f61d9a8..260c85b 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -26,16 +26,16 @@ make shell_env
. armadeus_env.sh
if [ "$1" != "export" ]; then
- ask_user "What do you want to quiltify today ? ;-)" "Linux (default)" "Buildroot"
+ ask_user "What do you want to quiltify today ? ;-)" "Linux (default)" "Buildroot"
fi
if [ "$1" == "export" ]; then
- ask_user "What kind of quilt patches do you want to export ?" "Linux (default)" "Buildroot"
+ ask_user "What kind of quilt patches do you want to export ?" "Linux (default)" "Buildroot"
fi
if [ "$answer" == "2" ]; then
- QUILT_TARGET_NAME="Buildroot"
+ QUILT_TARGET_NAME="Buildroot"
QUILT_MAKEFILE_TARGET="buildroot-unpacked"
- QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
+ QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
else
QUILT_TARGET_NAME="Linux kernel"
@@ -45,7 +45,7 @@ else
fi
if [ "$1" != "export" ]; then
- echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
+ echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
fi
if [ "$1" == "export" ]; then
diff --git a/target/linux/modules/Kconfig b/target/linux/modules/Kconfig
index c0f24f4..6262ced 100644
--- a/target/linux/modules/Kconfig
+++ b/target/linux/modules/Kconfig
@@ -21,6 +21,8 @@ source "drivers/armadeus/imxlkeypad/Kconfig"
source "drivers/armadeus/max1027/Kconfig"
+source "drivers/armadeus/max9768/Kconfig"
+
comment "FPGA related"
depends on ARMADEUS_DRIVERS
diff --git a/target/linux/modules/Makefile b/target/linux/modules/Makefile
index 9153be7..60e24aa 100755
--- a/target/linux/modules/Makefile
+++ b/target/linux/modules/Makefile
@@ -9,7 +9,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_DRIVERS) += gpio/ pwm/ backlight/ isp1761/ \
- imxlkeypad/ fpga/ max1027/
+ imxlkeypad/ fpga/ max1027/ max9768/
else
diff --git a/target/linux/modules/max9768/Kconfig b/target/linux/modules/max9768/Kconfig
new file mode 100644
index 0000000..f130517
--- /dev/null
+++ b/target/linux/modules/max9768/Kconfig
@@ -0,0 +1,10 @@
+#
+#
+
+config ARMADEUS_MAX9768
+ tristate "MAX9768 Audio amplifier"
+ default n
+ depends on ARMADEUS_DRIVERS
+ ---help---
+ Custom Armadeus driver for MAX9768 Audio amplifier driver.
+ (To wait until we are Asoc compatible)
diff --git a/target/linux/modules/max1027/Makefile b/target/linux/modules/max9768/Makefile
old mode 100755
new mode 100644
similarity index 82%
copy from target/linux/modules/max1027/Makefile
copy to target/linux/modules/max9768/Makefile
index aef647a..d60e4f4
--- a/target/linux/modules/max1027/Makefile
+++ b/target/linux/modules/max9768/Makefile
@@ -1,11 +1,11 @@
#
-# Makefile for the Armadeus Max1027
+# Makefile for the Armadeus MAX9768 custom driver
#
# Part executed when called from kernel build system:
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_ARMADEUS_MAX1027) += max1027.o
+obj-$(CONFIG_ARMADEUS_MAX9768) += max9768.o
# Part executed when called from standard make in this directory:
# (preferably use Makefile in parent directory)
diff --git a/target/linux/modules/max9768/max9768.c b/target/linux/modules/max9768/max9768.c
new file mode 100644
index 0000000..2bc3160
--- /dev/null
+++ b/target/linux/modules/max9768/max9768.c
@@ -0,0 +1,288 @@
+/*
+ * Max9768 audio amplifier driver
+ *
+ * Copyright (C) 2009 Armadeus Project / Armadeus Systems
+ * Author: Nicolas Colombain
+ *
+ * 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 <linux/module.h>
+#include <linux/param.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/sysfs.h>
+#include <mach/gpio.h>
+#include <linux/err.h>
+
+#include "max9768.h"
+
+#define DRIVER_VERSION "0.1"
+#define DRIVER_NAME "max9768"
+#define MAX9768_VOLUME_MASK 0x3F
+
+
+struct max9768 {
+ struct i2c_client *client;
+ int mute_pin;
+ int shdn_pin;
+ int current_volume;
+ int shdn_state;
+ int mute_state;
+};
+
+static void max9768_shutdown(struct max9768 *max9768, int shutdown)
+{
+ if (max9768->shdn_pin) {
+ if (shutdown)
+ gpio_set_value(max9768->shdn_pin, 0);
+ else
+ gpio_set_value(max9768->shdn_pin, 1);
+ }
+ max9768->shdn_state = shutdown;
+}
+
+static void max9768_mute(struct max9768 *max9768, int mute)
+{
+ if (max9768->mute_pin) {
+ gpio_set_value(max9768->mute_pin, mute);
+ }
+ max9768->mute_state = mute;
+}
+
+static void max9768_send( struct i2c_client *client, int value )
+{
+ char msg = value & 0xff;
+
+ i2c_master_send(client, &msg, 1);
+}
+
+/* sysfs hook functions */
+
+static ssize_t max9768_set_volume(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ char msg;
+
+ msg = (simple_strtol(buf, NULL, 10)) & MAX9768_VOLUME_MASK;
+ pr_debug("%s: 0x%02x\n", __FUNCTION__, msg);
+ max9768_send( client, msg);
+
+ return count;
+}
+
+static ssize_t max9768_set_mute(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct max9768 *max9768 = i2c_get_clientdata(client);
+
+ if (simple_strtol(buf, NULL, 10) == 0)
+ max9768_mute(max9768, 0);
+ else
+ max9768_mute(max9768, 1);
+
+ return count;
+}
+
+static ssize_t max9768_set_shutdown(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct max9768 *max9768 = i2c_get_clientdata(client);
+
+ if (simple_strtol(buf, NULL, 10) == 0)
+ max9768_shutdown(max9768, 0);
+ else
+ max9768_shutdown(max9768, 1);
+
+ return count;
+}
+
+static DEVICE_ATTR(shutdown, S_IWUSR, NULL, max9768_set_shutdown);
+static DEVICE_ATTR(mute, S_IWUSR, NULL, max9768_set_mute);
+static DEVICE_ATTR(volume, S_IWUSR, NULL, max9768_set_volume);
+
+static int max9768_create_sys_entries(struct i2c_client *client)
+{
+ int status = 0;
+
+ if ((status = device_create_file(&client->dev, &dev_attr_volume))) {
+ printk(KERN_WARNING "Unable to create sysfs attribute for max9768 volume register\n");
+ goto exit;
+ }
+ if ((status = device_create_file(&client->dev, &dev_attr_mute))) {
+ printk(KERN_WARNING "Unable to create sysfs attribute for max9768 mute register\n");
+ goto exit;
+ }
+ if ((status = device_create_file(&client->dev, &dev_attr_shutdown))) {
+ printk(KERN_WARNING "Unable to create sysfs attribute for max9768 shutdown register\n");
+ goto exit;
+ }
+
+exit:
+ return status;
+}
+
+static void max9768_remove_sys_entries(struct i2c_client *client)
+{
+ device_remove_file(&client->dev, &dev_attr_volume);
+ device_remove_file(&client->dev, &dev_attr_mute);
+ device_remove_file(&client->dev, &dev_attr_shutdown);
+}
+
+
+static int max9768_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct max9768 *max9768;
+ struct max9768_platform_data *platform_data;
+ int result;
+
+ platform_data = (struct max9768_platform_data *)(client->dev.platform_data);
+ if (!platform_data) {
+ dev_err(&client->dev, "can't get the platform data for max9768\n");
+ return -EINVAL;
+ }
+
+ max9768 = kzalloc(sizeof(struct max9768), GFP_KERNEL);
+ if (!max9768) {
+ dev_err(&client->dev, "can't allocate memory\n");
+ return -ENOMEM;
+ }
+
+ max9768->client = client;
+ i2c_set_clientdata(client, max9768);
+ dev_set_drvdata(&client->dev, max9768);
+
+ /* Create /sys entries */
+ result = max9768_create_sys_entries(client);
+ if (result)
+ goto out_free;
+
+ if (platform_data->init) {
+ result = platform_data->init();
+ if (result) {
+ printk(KERN_WARNING DRIVER_NAME ": can't reserve gpios\n");
+ goto out_sys;
+ }
+ }
+ max9768->mute_pin = platform_data->mute_pin;
+ max9768->shdn_pin = platform_data->shdn_pin;
+
+ /* shutdown amplifier and activate mute */
+ max9768_shutdown(max9768, 1);
+ max9768_mute(max9768, 1);
+
+ /* set filter mode */
+ max9768_send(client, platform_data->filter_mode);
+
+ printk(DRIVER_NAME " v" DRIVER_VERSION " successfully probed !\n");
+
+ return 0;
+
+out_sys:
+ max9768_remove_sys_entries(client);
+out_free:
+ i2c_set_clientdata(client, NULL);
+ kfree(max9768);
+
+ return result;
+}
+
+static int max9768_remove(struct i2c_client *client)
+{
+ struct max9768 *max9768 = i2c_get_clientdata(client);
+ struct max9768_platform_data *pdata = client->dev.platform_data;
+
+ max9768_remove_sys_entries(client);
+
+ if (pdata->exit)
+ pdata->exit();
+
+ kfree(i2c_get_clientdata(client));
+ kfree(max9768);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int max9768_suspend(struct i2c_client *client, pm_message_t state)
+{
+ struct max9768 *max9768 = i2c_get_clientdata(client);
+
+ gpio_set_value(max9768->mute_pin, 1);
+ gpio_set_value(max9768->shdn_pin, 0);
+
+ return 0;
+}
+
+static int max9768_resume(struct i2c_client *client)
+{
+ struct max9768 *max9768 = i2c_get_clientdata(client);
+
+ /* reactivate the component just like before suspend */
+ max9768_shutdown(max9768, max9768->shdn_state);
+ max9768_mute(max9768, max9768->mute_state);
+
+ return 0;
+}
+#else
+#define max9768_suspend NULL
+#define max9768_resume NULL
+#endif
+
+
+static const struct i2c_device_id max9768_id[] = {
+ { DRIVER_NAME, 0 },
+ {},
+};
+
+static struct i2c_driver max9768_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = max9768_probe,
+ .remove = max9768_remove,
+ .suspend = max9768_suspend,
+ .resume = max9768_resume,
+ .id_table = max9768_id,
+};
+
+static int __init max9768_init(void)
+{
+ int ret;
+
+ ret = i2c_add_driver(&max9768_driver);
+ if (ret)
+ printk(KERN_ERR "Unable to register max9768 driver\n");
+
+ return ret;
+}
+module_init(max9768_init);
+
+static void __exit max9768_exit(void)
+{
+ i2c_del_driver(&max9768_driver);
+}
+module_exit(max9768_exit);
+
+MODULE_AUTHOR("Nicolas Colombain <nic...@ar...>");
+MODULE_DESCRIPTION("MAX9768 audio amplifier driver");
+MODULE_LICENSE("GPL");
+
diff --git a/target/linux/debug/imxregs/definitions.h b/target/linux/modules/max9768/max9768.h
similarity index 60%
copy from target/linux/debug/imxregs/definitions.h
copy to target/linux/modules/max9768/max9768.h
index ee71db3..a92b1ac 100644
--- a/target/linux/debug/imxregs/definitions.h
+++ b/target/linux/modules/max9768/max9768.h
@@ -1,8 +1,8 @@
/*
- * definitions.h - imxregs common definitions
+ * Max9768 audio amplifier driver
*
- * Copyright (C) 2008 armadeus systems
- * Author: Julien Boibessot
+ * Copyright (C) 2009 Armadeus Project / Armadeus Systems
+ * Author: Nicolas Colombain
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,17 +20,18 @@
*
*/
-typedef unsigned int u32;
+#ifndef __LINUX_MAX9768_H
+#define __LINUX_MAX9768_H
-struct reg_info {
- char *name;
- u32 addr;
- int shift;
- u32 mask;
- char type;
- char *desc;
+#define MAX9768_FILTERLESS_MODE 0xD5
+#define MAX9768_CLASSIC_PWM_MODE 0xD6
+
+struct max9768_platform_data {
+ u8 filter_mode;
+ int mute_pin; /*gpio for mute ctrl */
+ int shdn_pin; /*gpio for shutdown ctrl */
+ int (*init)(void);
+ int (*exit)(void);
};
-// Size of mmapping:
-#define MAP_SIZE 4096
-#define MAP_MASK ( MAP_SIZE - 1 )
+#endif /* __LINUX_MAX9768_H */
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-06 14:06:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f8475442e84c24370ffc8b3155ca667658cdf070 (commit)
via 62750d3901a6baaadb5bf56472ba91ee8275aa27 (commit)
via c4ffd309591c3314894c2eee586cab83c4427342 (commit)
from d7f8d53e731fbc6dda68f3c9339a4eeb3cc48021 (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 f8475442e84c24370ffc8b3155ca667658cdf070
Author: Fabien Marteau <fab...@ar...>
Date: Sun Dec 6 15:05:38 2009 +0100
[LINUX] Add comment to describe patch 339
commit 62750d3901a6baaadb5bf56472ba91ee8275aa27
Author: Fabien Marteau <fab...@ar...>
Date: Sun Dec 6 15:03:03 2009 +0100
[TOOLS] Suppress old named quilt script
commit c4ffd309591c3314894c2eee586cab83c4427342
Author: Fabien Marteau <fab...@ar...>
Date: Sun Dec 6 15:01:52 2009 +0100
[LINUX] Correct patch bug
-----------------------------------------------------------------------
Summary of changes:
.../linux/kernel-patches/{2.6.29.4 => 2.6.29.6} | 0
.../2.6.29.6/339-apf27-armadeus-spidev.patch | 139 --------------------
.../2.6.29/339-apf27-armadeus-spidev.patch | 2 +
scripts/quilt.sh | 118 -----------------
4 files changed, 2 insertions(+), 257 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29.4 => 2.6.29.6} (100%)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
delete mode 100755 scripts/quilt.sh
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4 b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
deleted file mode 100644
index c72305b..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
-===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:50:37.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:58:32.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <linux/mtd/physmap.h>
- #include <asm/mach/flash.h>
- #include <linux/spi/spi.h>
-+#include <linux/spi/spidev.h>
- #include <linux/i2c.h>
- #include <linux/serial.h>
- #include <linux/delay.h>
-@@ -91,6 +92,9 @@
- #ifdef CONFIG_CAN_MCP251X_MODULE
- #define CONFIG_CAN_MCP251X 1
- #endif
-+#ifdef CONFIG_SPI_SPIDEV_MODULE
-+#define CONFIG_SPI_SPIDEV 1
-+#endif
- #ifdef CONFIG_IMX_BACKLIGHT_MODULE
- #define CONFIG_IMX_BACKLIGHT
- #endif
-@@ -368,7 +372,7 @@
- };
-
- static struct spi_imx_master imx_spi1_master_info = {
-- .num_chipselect = 2,
-+ .num_chipselect = 3,
- .enable_dma = 0,
- .init = gpio_spi1_active,
- .exit = gpio_spi1_inactive,
-@@ -512,6 +516,38 @@
- };
- #endif /* CONFIG_CAN_MCP251X */
-
-+#ifdef CONFIG_SPI_SPIDEV
-+
-+#define SPIDEV_CS (GPIO_PORTB | 17)
-+
-+static int spidev_pins[] = {
-+ (SPIDEV_CS | GPIO_OUT | GPIO_GPIO),
-+};
-+
-+static int spidev_init_gpio(void)
-+{
-+ gpio_set_value(SPIDEV_CS, 1);
-+ return mxc_gpio_setup_multiple_pins(spidev_pins, ARRAY_SIZE(spidev_pins), "spidev");
-+}
-+
-+/* Chip select command for spidev */
-+static void spidev_cs(u32 command)
-+{
-+ if (command == SPI_CS_DEASSERT)
-+ gpio_set_value(SPIDEV_CS, 1);
-+ else
-+ gpio_set_value(SPIDEV_CS, 0);
-+}
-+
-+static struct spi_imx_chip spidev_hw = {
-+ .cs_control = spidev_cs,
-+};
-+
-+static struct spidev_platform_data apf27_spidev_config = {
-+ .init = spidev_init_gpio,
-+};
-+
-+#endif /* CONFIG_SPI_SPIDEV */
-
- static struct spi_board_info spi_board_info[] __initdata = {
- #ifdef CONFIG_ARMADEUS_MAX1027
-@@ -550,6 +586,18 @@
- .platform_data = &apf27_mcp251x_config,
- },
- #endif /* CONFIG_CAN_MCP251X */
-+#ifdef CONFIG_SPI_SPIDEV
-+ {
-+ .modalias = "spidev",
-+ .controller_data = &spidev_hw,
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
-+ .platform_data = &apf27_spidev_config,
-+ },
-+#endif /* CONFIG_SPI_SPIDEV */
-+
- };
-
-
-@@ -962,7 +1010,7 @@
- /* Reserve "fixed" GPIOs */
- tsc2101_init_fixed_gpio();
- #endif
--#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
- spi_register_board_info(spi_board_info,
- ARRAY_SIZE(spi_board_info));
- #endif
-Index: linux-2.6.29.6/drivers/spi/spidev.c
-===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-04 12:03:08.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-04 12:04:43.000000000 +0100
-@@ -558,8 +558,9 @@
-
- static int spidev_probe(struct spi_device *spi)
- {
-+ struct spidev_platform_data *pdata = spi->dev.platform_data;
- struct spidev_data *spidev;
-- int status;
-+ int status;
- unsigned long minor;
-
- /* Allocate driver data */
-@@ -595,6 +596,10 @@
- set_bit(minor, minors);
- list_add(&spidev->device_entry, &device_list);
- }
-+ /* allocate GPIO / IRQ if necessary */
-+ if (pdata->init)
-+ pdata->init();
-+
- mutex_unlock(&device_list_lock);
-
- if (status == 0)
-Index: linux-2.6.29.6/include/linux/spi/spidev.h
-===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-04 12:07:09.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-04 12:07:34.000000000 +0100
-@@ -101,6 +101,10 @@
- */
- };
-
-+struct spidev_platform_data {
-+ int (*init)(void);
-+};
-+
- /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
- #define SPI_MSGSIZE(N) \
- ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index 9531530..b28a1db 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -1,3 +1,5 @@
+Correct some bugs in spidev devices, and adjust number of chipselect for apf27Dev spi1
+
Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
---
diff --git a/scripts/quilt.sh b/scripts/quilt.sh
deleted file mode 100755
index f61d9a8..0000000
--- a/scripts/quilt.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#
-# "quiltifies" Linux or Buildroot
-#
-
-answer=""
-
-# $1: thing to ask, $* possibilities. Will fill answer variable.
-ask_user()
-{
- echo
- echo -e "--- "$1
- shift
- n=1
- while [ "$1" != "" ]; do
- echo " $n] "$1
- shift
- let n=n+1
- done
- read -p "> " answer
-}
-
-
-# Get useful envt variables
-make shell_env
-. armadeus_env.sh
-
-if [ "$1" != "export" ]; then
- ask_user "What do you want to quiltify today ? ;-)" "Linux (default)" "Buildroot"
-fi
-if [ "$1" == "export" ]; then
- ask_user "What kind of quilt patches do you want to export ?" "Linux (default)" "Buildroot"
-fi
-
-if [ "$answer" == "2" ]; then
- QUILT_TARGET_NAME="Buildroot"
- QUILT_MAKEFILE_TARGET="buildroot-unpacked"
- QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
-else
- QUILT_TARGET_NAME="Linux kernel"
- QUILT_MAKEFILE_TARGET="linux26-unpacked"
- QUILT_TARGET_DIR=$ARMADEUS_LINUX_DIR
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_LINUX_PATCH_DIR
-fi
-
-if [ "$1" != "export" ]; then
- echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
-fi
-
-if [ "$1" == "export" ]; then
- echo "Exporting your work (patches) from $QUILT_TARGET_DIR/patches/ to $QUILT_TARGET_PATCH_DIR"
- cp -f $QUILT_TARGET_DIR/patches/*.patch $QUILT_TARGET_PATCH_DIR
- echo -e "\n--- You can now check your work before commiting --> $QUILT_TARGET_PATCH_DIR/ \n"
- exit 0
-fi
-
-
-# else import patches:
-
-# Update repository
-ask_user "Update (pull) your local GIT repository (y/N) ?"
-if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
- git pull
-fi
-
-# Move or delete current XXX dir
-if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
- ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
- EXT=`date +%Y_%M_%d_%H%m`
- if [ "$answer" == "d" ]; then
- echo "Deleting current $QUILT_TARGET_NAME dir"
- rm -rf $QUILT_TARGET_DIR
- else
- echo "Renaming $QUILT_TARGET_DIR"
- echo " to " "$QUILT_TARGET_DIR"."$EXT"
- mv $QUILT_TARGET_DIR "$QUILT_TARGET_DIR"."$EXT"
- fi
-else # For Buildroot
- rm $QUILT_TARGET_DIR/.patched
- rm $QUILT_TARGET_DIR/.unpacked
-fi
-
-# Get XXX unpacked sources
-make $QUILT_MAKEFILE_TARGET
-if [ "$?" != 0 ]; then
- echo "Failed to get sources, please check your view !!"
-fi
-
-# Import patches
-pushd $QUILT_TARGET_DIR
-mkdir patches
-PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
-for patch in $PATCHES; do
- quilt import $patch
-done
-quilt push -a
-if [ "$?" != 0 ]; then
- echo "Please correct that"
- exit 1
-fi
-quilt series >> .applied_patches_list
-
-touch .unpacked
-touch .patched
-touch .patched.arch
-touch .patched.board
-popd
-
-echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
-sleep 2
-make
-
-echo -e "\n--- Your can now go to $QUILT_TARGET_DIR\nHappy hacking ! ;-)\n"
-echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
-
-exit 0
-
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-04 17:28:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d7f8d53e731fbc6dda68f3c9339a4eeb3cc48021 (commit)
from a84ed782f99aa15e9e56d6f98c83af7604a6012b (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 d7f8d53e731fbc6dda68f3c9339a4eeb3cc48021
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 4 18:27:37 2009 +0100
[LINUX] sign patch
-----------------------------------------------------------------------
Summary of changes:
.../339-apf27-armadeus-spidev.patch | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29.6 => 2.6.29}/339-apf27-armadeus-spidev.patch (96%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
similarity index 96%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index c72305b..9531530 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -1,3 +1,7 @@
+Signed-off-by: Fabien Marteau <fab...@ar...>
+Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
+---
+
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:50:37.000000000 +0100
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-04 15:59:15
|
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 a84ed782f99aa15e9e56d6f98c83af7604a6012b (commit)
from 03944cea1567d3ad0bed566129feba87bc1f8ee2 (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 a84ed782f99aa15e9e56d6f98c83af7604a6012b
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 4 16:58:41 2009 +0100
[TOOLS] change quiltify script name
-----------------------------------------------------------------------
Summary of changes:
scripts/{quilt.sh => quiltify.sh} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
copy scripts/{quilt.sh => quiltify.sh} (100%)
diff --git a/scripts/quilt.sh b/scripts/quiltify.sh
similarity index 100%
copy from scripts/quilt.sh
copy to scripts/quiltify.sh
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-04 11:19:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 03944cea1567d3ad0bed566129feba87bc1f8ee2 (commit)
from f77c8f1417d474e38a503819b801d74a1019048a (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 03944cea1567d3ad0bed566129feba87bc1f8ee2
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 4 12:18:49 2009 +0100
[LINUX] spidev patch
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/linux/kernel-patches/2.6.29.6 | 1 -
.../2.6.29.6/339-apf27-armadeus-spidev.patch | 139 ++++++++++++++++++++
2 files changed, 139 insertions(+), 1 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6 b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6
deleted file mode 120000
index 237d20f..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6
+++ /dev/null
@@ -1 +0,0 @@
-2.6.29
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
new file mode 100644
index 0000000..c72305b
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.6/339-apf27-armadeus-spidev.patch
@@ -0,0 +1,139 @@
+Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:50:37.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:58:32.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <linux/mtd/physmap.h>
+ #include <asm/mach/flash.h>
+ #include <linux/spi/spi.h>
++#include <linux/spi/spidev.h>
+ #include <linux/i2c.h>
+ #include <linux/serial.h>
+ #include <linux/delay.h>
+@@ -91,6 +92,9 @@
+ #ifdef CONFIG_CAN_MCP251X_MODULE
+ #define CONFIG_CAN_MCP251X 1
+ #endif
++#ifdef CONFIG_SPI_SPIDEV_MODULE
++#define CONFIG_SPI_SPIDEV 1
++#endif
+ #ifdef CONFIG_IMX_BACKLIGHT_MODULE
+ #define CONFIG_IMX_BACKLIGHT
+ #endif
+@@ -368,7 +372,7 @@
+ };
+
+ static struct spi_imx_master imx_spi1_master_info = {
+- .num_chipselect = 2,
++ .num_chipselect = 3,
+ .enable_dma = 0,
+ .init = gpio_spi1_active,
+ .exit = gpio_spi1_inactive,
+@@ -512,6 +516,38 @@
+ };
+ #endif /* CONFIG_CAN_MCP251X */
+
++#ifdef CONFIG_SPI_SPIDEV
++
++#define SPIDEV_CS (GPIO_PORTB | 17)
++
++static int spidev_pins[] = {
++ (SPIDEV_CS | GPIO_OUT | GPIO_GPIO),
++};
++
++static int spidev_init_gpio(void)
++{
++ gpio_set_value(SPIDEV_CS, 1);
++ return mxc_gpio_setup_multiple_pins(spidev_pins, ARRAY_SIZE(spidev_pins), "spidev");
++}
++
++/* Chip select command for spidev */
++static void spidev_cs(u32 command)
++{
++ if (command == SPI_CS_DEASSERT)
++ gpio_set_value(SPIDEV_CS, 1);
++ else
++ gpio_set_value(SPIDEV_CS, 0);
++}
++
++static struct spi_imx_chip spidev_hw = {
++ .cs_control = spidev_cs,
++};
++
++static struct spidev_platform_data apf27_spidev_config = {
++ .init = spidev_init_gpio,
++};
++
++#endif /* CONFIG_SPI_SPIDEV */
+
+ static struct spi_board_info spi_board_info[] __initdata = {
+ #ifdef CONFIG_ARMADEUS_MAX1027
+@@ -550,6 +586,18 @@
+ .platform_data = &apf27_mcp251x_config,
+ },
+ #endif /* CONFIG_CAN_MCP251X */
++#ifdef CONFIG_SPI_SPIDEV
++ {
++ .modalias = "spidev",
++ .controller_data = &spidev_hw,
++ .max_speed_hz = 8000000, /* 8MHz */
++ .bus_num = 1, /* SPI2 */
++ .mode = SPI_MODE_1,
++ .chip_select = 2,
++ .platform_data = &apf27_spidev_config,
++ },
++#endif /* CONFIG_SPI_SPIDEV */
++
+ };
+
+
+@@ -962,7 +1010,7 @@
+ /* Reserve "fixed" GPIOs */
+ tsc2101_init_fixed_gpio();
+ #endif
+-#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
+ spi_register_board_info(spi_board_info,
+ ARRAY_SIZE(spi_board_info));
+ #endif
+Index: linux-2.6.29.6/drivers/spi/spidev.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-04 12:03:08.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-04 12:04:43.000000000 +0100
+@@ -558,8 +558,9 @@
+
+ static int spidev_probe(struct spi_device *spi)
+ {
++ struct spidev_platform_data *pdata = spi->dev.platform_data;
+ struct spidev_data *spidev;
+- int status;
++ int status;
+ unsigned long minor;
+
+ /* Allocate driver data */
+@@ -595,6 +596,10 @@
+ set_bit(minor, minors);
+ list_add(&spidev->device_entry, &device_list);
+ }
++ /* allocate GPIO / IRQ if necessary */
++ if (pdata->init)
++ pdata->init();
++
+ mutex_unlock(&device_list_lock);
+
+ if (status == 0)
+Index: linux-2.6.29.6/include/linux/spi/spidev.h
+===================================================================
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-04 12:07:09.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-04 12:07:34.000000000 +0100
+@@ -101,6 +101,10 @@
+ */
+ };
+
++struct spidev_platform_data {
++ int (*init)(void);
++};
++
+ /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
+ #define SPI_MSGSIZE(N) \
+ ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-04 11:17:38
|
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 f77c8f1417d474e38a503819b801d74a1019048a (commit)
from cd50d2f1669b1fceba7cd4ff4f4240ed251177c2 (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 f77c8f1417d474e38a503819b801d74a1019048a
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 4 12:16:43 2009 +0100
[OTHER] quilt script messages update
-----------------------------------------------------------------------
Summary of changes:
scripts/quilt.sh | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/scripts/quilt.sh b/scripts/quilt.sh
index 89a4e94..f61d9a8 100755
--- a/scripts/quilt.sh
+++ b/scripts/quilt.sh
@@ -25,11 +25,17 @@ ask_user()
make shell_env
. armadeus_env.sh
-ask_user "What do you want to quiltify today ? ;-)" "Linux (default)" "Buildroot"
+if [ "$1" != "export" ]; then
+ ask_user "What do you want to quiltify today ? ;-)" "Linux (default)" "Buildroot"
+fi
+if [ "$1" == "export" ]; then
+ ask_user "What kind of quilt patches do you want to export ?" "Linux (default)" "Buildroot"
+fi
+
if [ "$answer" == "2" ]; then
- QUILT_TARGET_NAME="Buildroot"
+ QUILT_TARGET_NAME="Buildroot"
QUILT_MAKEFILE_TARGET="buildroot-unpacked"
- QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
+ QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
else
QUILT_TARGET_NAME="Linux kernel"
@@ -38,8 +44,9 @@ else
QUILT_TARGET_PATCH_DIR=$ARMADEUS_LINUX_PATCH_DIR
fi
-echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
-
+if [ "$1" != "export" ]; then
+ echo -e "\nThis script is going to rebuilt a quiltified "$QUILT_TARGET_NAME" in the current view..."
+fi
if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $QUILT_TARGET_DIR/patches/ to $QUILT_TARGET_PATCH_DIR"
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2009-12-04 09:23: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 cd50d2f1669b1fceba7cd4ff4f4240ed251177c2 (commit)
from 46244b562c4cfaf4810117db549962b2ff7ea749 (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 cd50d2f1669b1fceba7cd4ff4f4240ed251177c2
Author: Fabien Marteau <fab...@ar...>
Date: Fri Dec 4 10:22:36 2009 +0100
[OTHER] suppress warning and conform codings rules
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_93lcxx.c | 7 ++-
target/packages/as_devices/c/as_93lcxx.h | 40 ++++++++--------
target/packages/as_devices/c/as_spi.c | 32 +++++++-------
target/packages/as_devices/c/as_spi.h | 72 ++++++++++++++++--------------
4 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/target/packages/as_devices/c/as_93lcxx.c b/target/packages/as_devices/c/as_93lcxx.c
index 5f48a1a..86926dc 100644
--- a/target/packages/as_devices/c/as_93lcxx.c
+++ b/target/packages/as_devices/c/as_93lcxx.c
@@ -39,13 +39,14 @@
#define EWDS_ADDR (0)
/* Define timings */
-#define MS (1000)
+#define MS (1000)
+
#define TWC (6*MS)
#define TEC (6*MS)
#define TWL (15*MS)
-
-/** @brief private function to ease making spi instructions
+/** @brief Private functions to ease making spi instructions
+ *
*/
static uint8_t address_len(uint8_t aType, uint8_t aWord_size)
{
diff --git a/target/packages/as_devices/c/as_93lcxx.h b/target/packages/as_devices/c/as_93lcxx.h
index 4e43523..a49a68e 100644
--- a/target/packages/as_devices/c/as_93lcxx.h
+++ b/target/packages/as_devices/c/as_93lcxx.h
@@ -50,29 +50,29 @@ struct as_93lcxx_device {
/** @brief open the device
*
- * @param spidev_filename path to spidev
- * @type type of the eeprom
- * @speed clock speed in Hz
- * @word_size word size for transaction
+ * @param aSpidev_filename path to spidev
+ * @param aType of the eeprom
+ * @param aSpeed clock speed in Hz
+ * @param aWord_size word size for transaction
*
* @return as_93lcxx_device struct pointer on success, NULL on error
*/
struct as_93lcxx_device * as_93lcxx_open(unsigned char *aSpidev_filename,
- uint8_t aType,
- uint32_t aSpeed,
- uint8_t aWord_size);
+ uint8_t aType,
+ uint32_t aSpeed,
+ uint8_t aWord_size);
/** @brief close the device
*
- * @param spidev_filename path to spidev
+ * @param aDev spidev structure
*
*/
void as_93lcxx_close(struct as_93lcxx_device *aDev);
/** @brief read a value in address given
*
- * @param dev 93LCxx structure
- * @param address addresse of register to be read
+ * @param aDev 93LCxx structure
+ * @param aAddress addresse of register to be read
*
* @return positive register value on success, negative value on error.
*/
@@ -81,7 +81,7 @@ int32_t as_93lcxx_read(struct as_93lcxx_device *aDev,
/** @brief enable write on eeprom
*
- * @param dev 93LCxx structure
+ * @param aDev 93LCxx structure
*
* @return positive value on success, negative value on error
*/
@@ -89,8 +89,8 @@ int32_t as_93lcxx_ewen(struct as_93lcxx_device *aDev);
/** @brief Force all data bits of the specified iaddress to 1
*
- * @param dev 93LCxx structure
- * @param address addresse of register to be erased
+ * @param aDev 93LCxx structure
+ * @param aAddress addresse of register to be erased
*
* @return positive register value on success, negative value on error.
*/
@@ -99,7 +99,7 @@ int32_t as_93lcxx_erase(struct as_93lcxx_device *aDev,
/** @brief Force all bits in eeprom to 1
*
- * @param dev 93LCxx structure
+ * @param aDev 93LCxx structure
*
* @return positive register value on success, negative value on error.
*/
@@ -107,9 +107,9 @@ int32_t as_93lcxx_erase_all(struct as_93lcxx_device *aDev);
/** @brief write a value in given address
*
- * @param dev 93LCxx structure
- * @param address addresse of register to be read
- * @param value value to be wrote
+ * @param aDev 93LCxx structure
+ * @param aAddress addresse of register to be read
+ * @param aValue value to be wrote
*
* @return positive register value on success, negative value on error.
*/
@@ -119,8 +119,8 @@ int32_t as_93lcxx_write(struct as_93lcxx_device *aDev,
/** @brief write the entire memory array with value given
*
- * @param dev 93LCxx structure
- * @param value value to be wrote
+ * @param aDev 93LCxx structure
+ * @param aValue value to be wrote
*
* @return positive register value on success, negative value on error.
*/
@@ -129,7 +129,7 @@ int32_t as_93lcxx_write_all(struct as_93lcxx_device *aDev,
/** @brief disable write on eeprom
*
- * @param dev 93LCxx structure
+ * @param aDev 93LCxx structure
*
* @return positive value on success, negative value on error
*/
diff --git a/target/packages/as_devices/c/as_spi.c b/target/packages/as_devices/c/as_spi.c
index 966e0f9..75f6e58 100644
--- a/target/packages/as_devices/c/as_spi.c
+++ b/target/packages/as_devices/c/as_spi.c
@@ -34,11 +34,11 @@
#include "as_spi.h"
-int as_spi_open(const unsigned char *spidev_name)
+int as_spi_open(const unsigned char *aSpidev_name)
{
int fd;
- fd = open((char *)spidev_name, O_RDWR);
+ fd = open((char *)aSpidev_name, O_RDWR);
if (fd < 0) {
perror("open");
return -1;
@@ -47,35 +47,35 @@ int as_spi_open(const unsigned char *spidev_name)
return fd;
}
-int as_spi_set_mode(int fd, uint8_t mode)
+int as_spi_set_mode(int aFd, uint8_t aMode)
{
/* TODO */
return -1;
}
-int as_spi_set_lsb(int fd, uint8_t lsb)
+int as_spi_set_lsb(int aFd, uint8_t aLsb)
{
/* TODO */
return -1;
}
-int as_spi_set_bits_per_word(int fd, uint8_t bits)
+int as_spi_set_bits_per_word(int aFd, uint8_t aBits)
{
/* TODO */
return -1;
}
-int as_spi_set_speed(int fd)
+int as_spi_set_speed(int aFd)
{
/* TODO */
return -1;
}
-int as_spi_get_mode(int fd)
+int as_spi_get_mode(int aFd)
{
uint8_t mode;
- if (ioctl(fd, SPI_IOC_RD_MODE, &mode) < 0) {
+ if (ioctl(aFd, SPI_IOC_RD_MODE, &mode) < 0) {
perror("SPI rd_mode");
return -1;
}
@@ -83,11 +83,11 @@ int as_spi_get_mode(int fd)
return mode;
}
-int as_spi_get_lsb(int fd)
+int as_spi_get_lsb(int aFd)
{
uint8_t lsb;
- if (ioctl(fd, SPI_IOC_RD_LSB_FIRST, &lsb) < 0) {
+ if (ioctl(aFd, SPI_IOC_RD_LSB_FIRST, &lsb) < 0) {
perror("SPI rd_lsb_fist");
return -1;
}
@@ -95,11 +95,11 @@ int as_spi_get_lsb(int fd)
return lsb;
}
-int as_spi_get_bits_per_word(int fd)
+int as_spi_get_bits_per_word(int aFd)
{
uint8_t bits;
- if (ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &bits) < 0) {
+ if (ioctl(aFd, SPI_IOC_RD_BITS_PER_WORD, &bits) < 0) {
perror("SPI bits_per_word");
return -1;
}
@@ -107,11 +107,11 @@ int as_spi_get_bits_per_word(int fd)
return bits;
}
-int as_spi_get_speed(int fd)
+int as_spi_get_speed(int aFd)
{
uint8_t speed;
- if (ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed) < 0) {
+ if (ioctl(aFd, SPI_IOC_RD_MAX_SPEED_HZ, &speed) < 0) {
perror("SPI max_speed_hz");
return -1;
}
@@ -175,9 +175,9 @@ uint32_t as_spi_msg(int aFd,
return msg;
}
-void as_spi_close(int fd)
+void as_spi_close(int aFd)
{
- close(fd);
+ close(aFd);
return;
}
diff --git a/target/packages/as_devices/c/as_spi.h b/target/packages/as_devices/c/as_spi.h
index 78b9365..e0005e1 100644
--- a/target/packages/as_devices/c/as_spi.h
+++ b/target/packages/as_devices/c/as_spi.h
@@ -29,102 +29,108 @@
#ifdef __cplusplus
extern "C" {
-#endif // __cplusplus
+#endif /* __cplusplus */
#include <inttypes.h>
#include <sys/types.h>
/** @brief Open a SPI bus.
*
+ * @param aSpidev_name path name
+ *
* @return the file descriptor of the opened device, -1Â on error
*/
-int as_spi_open(const unsigned char *spidev_name);
+int as_spi_open(const unsigned char *aSpidev_name);
/** @brief Set spi bus mode
*
- * @param fd spidev file handler
- * @param mode
+ * @param aFd spidev file handler
+ * @param aMode
*
* @return mode if positive value, negative value on error
- *
+ * TODO
*/
-int as_spi_set_mode(int fd, uint8_t mode);
+int as_spi_set_mode(int aFd, uint8_t aMode);
/** @brief Set bits order
*
- * @param fd spidev file handler
- * @param lsb if 1 lsb first, else msb first
+ * @param aFd spidev file handler
+ * @param aLsb if 1 lsb first, else msb first
*
* @return lsb first if positive, msb first if 0, negative value on error
+ * TODO
*/
-int as_spi_set_lsb(int fd, uint8_t lsb);
+int as_spi_set_lsb(int aFd, uint8_t aLsb);
/** @brief Set bits per word
*
- * @param fd spidev file handler
- * @param bits number of bits per word
+ * @param aFd spidev file handler
+ * @param aBits number of bits per word
*
* @return bit per word if positive value, negative value on error
+ * TODO
*/
-int as_spi_set_bits_per_word(int fd, uint8_t bits);
+int as_spi_set_bits_per_word(int aFd, uint8_t aBits);
/** @brief Get spi bus mode
*
- * @param fd spidev file handler
+ * @param aFd spidev file handler
*
* @return mode if positive value, negative value on error
- *
+ * TODO
*/
-int as_spi_get_mode(int fd);
+int as_spi_get_mode(int aFd);
/** @brief Get bits order
*
- * @param fd spidev file handler
+ * @param aFd spidev file handler
*
* @return lsb first if positive, msb first if 0, negative value on error
+ *
*/
-int as_spi_get_lsb(int fd);
+int as_spi_get_lsb(int aFd);
/** @brief Get clock bus speed
*
- * @param fd spidev file handler
+ * @param aFd spidev file handler
*
* @return speed in Hz, negative value on error
*/
-int as_spi_get_speed(int fd);
+int as_spi_get_speed(int aFd);
/** @brief Get bits per word
*
- * @param fd spidev file handler
+ * @param aFd spidev file handler
*
* @return bit per word if positive value, negative value on error
*/
-int as_spi_get_bits_per_word(int fd);
+int as_spi_get_bits_per_word(int aFd);
/** @brief Forge arbitrary length message (31bits max) and send it
*
- * @param fd spidev file handler
- * @param msg right adjusted message
- * @param len lenght of the message
- * @param speed clock speed in Hz
+ * @param aFd spidev file handler
+ * @param aMsg right adjusted message
+ * @param aLen lenght of the message
+ * @param aSpeed clock speed in Hz
*
* @return message read
*/
-uint32_t as_spi_msg(int fd,
- uint32_t msg,
- size_t len,
- uint32_t speed);
+uint32_t as_spi_msg(int aFd,
+ uint32_t aMsg,
+ size_t aLen,
+ uint32_t aSpeed);
/** @brief Close a SPI bus.
*
+ * @param aFd file descriptor of SPI bus used
+ *
*/
-void as_spi_close(int fd);
-
+void as_spi_close(int aFd);
#ifdef __cplusplus
}
-#endif // __cplusplus
+#endif /* __cplusplus */
-#endif // AS_SPI_H_
+#endif /* AS_SPI_H_ */
hooks/post-receive
--
armadeus
|