armadeus-commitlog Mailing List for armadeus (Page 134)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jo...@us...> - 2009-01-09 13:17:26
|
Revision: 1006
http://armadeus.svn.sourceforge.net/armadeus/?rev=1006&view=rev
Author: jorasse
Date: 2009-01-09 13:17:21 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
[UBOOT] Reprogram eeprom only when it is needed
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2009-01-08 17:17:59 UTC (rev 1005)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2009-01-09 13:17:21 UTC (rev 1006)
@@ -33,7 +33,7 @@
#define __CONFIG_H
#define CONFIG_ENV_VERSION "3.4"
-#define CONFIG_IDENT_STRING " apf9328 patch 3.5"
+#define CONFIG_IDENT_STRING " apf9328 patch 3.6"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
Modified: trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch 2009-01-08 17:17:59 UTC (rev 1005)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch 2009-01-09 13:17:21 UTC (rev 1006)
@@ -1,104 +1,107 @@
-diff -purN u-boot-1.3.4.ref/drivers/net/dm9000x.c u-boot-1.3.4/drivers/net/dm9000x.c
---- u-boot-1.3.4.ref/drivers/net/dm9000x.c 2008-08-12 16:08:38.000000000 +0200
-+++ u-boot-1.3.4/drivers/net/dm9000x.c 2008-09-13 16:24:20.000000000 +0200
+--- ref/u-boot-1.3.4/drivers/net/dm9000x.c 2008-08-12 16:08:38.000000000 +0200
++++ u-boot-1.3.4/drivers/net/dm9000x.c 2009-01-09 13:55:49.000000000 +0100
@@ -130,6 +130,8 @@ static int dm9000_probe(void);
static u16 phy_read(int);
static void phy_write(int, u16);
u16 read_srom_word(int);
-+static void write_srom_word(int offset, u16 val);
++void write_srom_word(int offset, u16 val);
+static void program_eeprom(char* mac_addr);
static u8 DM9000_ior(int);
static void DM9000_iow(int reg, u8 value);
-@@ -408,8 +410,18 @@ eth_init(bd_t * bd)
+@@ -246,7 +248,7 @@ dm9000_probe(void)
+ id_val |= DM9000_ior(DM9000_PIDL) << 16;
+ id_val |= DM9000_ior(DM9000_PIDH) << 24;
+ if (id_val == DM9000_ID) {
+- printf("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
++ DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
+ id_val);
+ return 0;
+ } else {
+@@ -408,6 +410,9 @@ eth_init(bd_t * bd)
u8 io_mode;
struct board_info *db = &dm9000_info;
-+ unsigned char env_enetaddr[6];
-+ char *tmp = getenv ("ethaddr");
++ unsigned char hw_enetaddr[6] = {0,0,0,0,0,0};
+ char *end;
+
DM9000_DBG("eth_init()\n");
-+ for (i=0; i<6; i++) {
-+ env_enetaddr[i] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
-+ if (tmp)
-+ tmp = (*end) ? end+1 : end;
-+ }
-+
/* RESET device */
- dm9000_reset();
- dm9000_probe();
-@@ -477,10 +489,10 @@ eth_init(bd_t * bd)
- ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i);
+@@ -419,19 +424,19 @@ eth_init(bd_t * bd)
+
+ switch (io_mode) {
+ case 0x0: /* 16-bit mode */
+- printf("DM9000: running in 16 bit mode\n");
++ DM9000_DBG("DM9000: running in 16 bit mode\n");
+ db->outblk = dm9000_outblk_16bit;
+ db->inblk = dm9000_inblk_16bit;
+ db->rx_status = dm9000_rx_status_16bit;
+ break;
+ case 0x01: /* 32-bit mode */
+- printf("DM9000: running in 32 bit mode\n");
++ DM9000_DBG("DM9000: running in 32 bit mode\n");
+ db->outblk = dm9000_outblk_32bit;
+ db->inblk = dm9000_inblk_32bit;
+ db->rx_status = dm9000_rx_status_32bit;
+ break;
+ case 0x02: /* 8 bit mode */
+- printf("DM9000: running in 8 bit mode\n");
++ DM9000_DBG("DM9000: running in 8 bit mode\n");
+ db->outblk = dm9000_outblk_8bit;
+ db->inblk = dm9000_inblk_8bit;
+ db->rx_status = dm9000_rx_status_8bit;
+@@ -473,8 +478,8 @@ eth_init(bd_t * bd)
+
+ /* Set Node address */
+ #ifndef CONFIG_AT91SAM9261EK
+- for (i = 0; i < 6; i++)
+- ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i);
++ for (i = 0; i < 3; i++)
++ ((u16 *)hw_enetaddr)[i] = read_srom_word(i);
#endif
-- if (is_zero_ether_addr(bd->bi_enetaddr) ||
-+/* if (is_zero_ether_addr(bd->bi_enetaddr) ||
- is_multicast_ether_addr(bd->bi_enetaddr)) {
-- /* try reading from environment */
-- u8 i;
-+*/ /* try reading from environment */
-+/* u8 i;
- char *s, *e;
- s = getenv ("ethaddr");
- for (i = 0; i < 6; ++i) {
-@@ -490,10 +502,42 @@ eth_init(bd_t * bd)
- s = (*e) ? e + 1 : e;
+ if (is_zero_ether_addr(bd->bi_enetaddr) ||
+@@ -491,6 +496,38 @@ eth_init(bd_t * bd)
}
}
-+*/
-+ if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6) != 0 &&
-+ memcmp(env_enetaddr, bd->bi_enetaddr, 6) != 0) {
-+ printf ("\nWarning: MAC addresses don't match:\n");
-+ printf ("\tHW MAC address: "
+
++ /* reprogram eeprom if env eneteaddr is defined and eeprom erased
++ or if env enetaddr is set to erase the eeprom (ff:ff:ff:ff:ff:ff)
++ */
++ if (( memcmp(hw_enetaddr, "\xff\xff\xff\xff\xff\xff", 6) == 0
++ && (!is_zero_ether_addr(bd->bi_enetaddr))
++ )
++ || memcmp(bd->bi_enetaddr, "\xff\xff\xff\xff\xff\xff", 6) == 0) {
++ printf ("Warning: MAC addresses reprogramming..\n");
++ DM9000_DBG ("\tcurrent HW MAC address: "
+ "%02X:%02X:%02X:%02X:%02X:%02X\n",
++ hw_enetaddr[0], hw_enetaddr[1],
++ hw_enetaddr[2], hw_enetaddr[3],
++ hw_enetaddr[4], hw_enetaddr[5] );
++ DM9000_DBG ("\tnew HW MAC address: "
++ "%02X:%02X:%02X:%02X:%02X:%02X\n",
+ bd->bi_enetaddr[0], bd->bi_enetaddr[1],
+ bd->bi_enetaddr[2], bd->bi_enetaddr[3],
-+ bd->bi_enetaddr[4], bd->bi_enetaddr[5] );
-+ printf ("\t\"ethaddr\" value: "
-+ "%02X:%02X:%02X:%02X:%02X:%02X\n",
-+ env_enetaddr[0], env_enetaddr[1],
-+ env_enetaddr[2], env_enetaddr[3],
-+ env_enetaddr[4], env_enetaddr[5]) ;
-+ program_eeprom(env_enetaddr);
-+ debug ("### Set MAC addr from environment\n");
-+ memcpy (bd->bi_enetaddr, env_enetaddr, 6);
++ bd->bi_enetaddr[4], bd->bi_enetaddr[5]) ;
++ program_eeprom(bd->bi_enetaddr);
+ }
-+ if (!tmp) {
++
++ if (is_zero_ether_addr(bd->bi_enetaddr)) {
+ char ethaddr[20];
++ memcpy (bd->bi_enetaddr, hw_enetaddr, 6);
+ sprintf (ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X",
+ bd->bi_enetaddr[0], bd->bi_enetaddr[1],
+ bd->bi_enetaddr[2], bd->bi_enetaddr[3],
+ bd->bi_enetaddr[4], bd->bi_enetaddr[5]) ;
-+ debug ("### Set environment from HW MAC addr = \"%s\"\n", ethaddr);
++ DM9000_DBG ("### Set environment from HW MAC addr = \"%s\"\n", ethaddr);
+ setenv ("ethaddr", ethaddr);
+ }
-
++
printf("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", bd->bi_enetaddr[0],
bd->bi_enetaddr[1], bd->bi_enetaddr[2], bd->bi_enetaddr[3],
bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
-+ /*printf("FLASH:");
-+ for (i = 0; i < 8; i++)
-+ printf(" 0x%02X", read_srom_word(i));
-+ printf("\n"); */
-+
- for (i = 0, oft = 0x10; i < 6; i++, oft++)
- DM9000_iow(oft, bd->bi_enetaddr[i]);
- for (i = 0, oft = 0x16; i < 8; i++, oft++)
-@@ -688,7 +732,10 @@ read_srom_word(int offset)
- return (DM9000_ior(DM9000_EPDRL) + (DM9000_ior(DM9000_EPDRH) << 8));
- }
-
--void
-+/*
-+ * Write a word data to SROM
-+ */
-+static void
- write_srom_word(int offset, u16 val)
- {
- DM9000_iow(DM9000_EPAR, offset);
-@@ -699,6 +746,28 @@ write_srom_word(int offset, u16 val)
+@@ -699,6 +736,28 @@ write_srom_word(int offset, u16 val)
DM9000_iow(DM9000_EPCR, 0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-01-08 17:18:03
|
Revision: 1005
http://armadeus.svn.sourceforge.net/armadeus/?rev=1005&view=rev
Author: artemys
Date: 2009-01-08 17:17:59 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[BUILDROOT] Move madplay patch from patches/ to buildroot/package/audio/madplay/
Modified Paths:
--------------
trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
Added Paths:
-----------
trunk/buildroot/package/audio/
trunk/buildroot/package/audio/madplay/
trunk/buildroot/package/audio/madplay/madplay-audio-alsa.patch
Added: trunk/buildroot/package/audio/madplay/madplay-audio-alsa.patch
===================================================================
--- trunk/buildroot/package/audio/madplay/madplay-audio-alsa.patch (rev 0)
+++ trunk/buildroot/package/audio/madplay/madplay-audio-alsa.patch 2009-01-08 17:17:59 UTC (rev 1005)
@@ -0,0 +1,112 @@
+Now this patch is needed for madplay to compile when ALSA is configured with
+ --with-versioned=no option.
+madplay is compiling but still crashes when used... :-(
+cf SF bug: https://sourceforge.net/tracker/index.php?func=detail&aid=2184767&group_id=122057&atid=692259
+
+--- madplay-0.15.2b/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
++++ madplay-0.15.2b-new/audio_alsa.c 2007-12-02 16:40:38.000000000 +0100
+@@ -28,31 +28,28 @@
+
+ #include <errno.h>
+
+-#define ALSA_PCM_OLD_HW_PARAMS_API
+-#define ALSA_PCM_OLD_SW_PARAMS_API
+ #include <alsa/asoundlib.h>
+
+ #include <mad.h>
+
+ #include "audio.h"
+
+-char *buf = NULL;
+-int paused = 0;
++unsigned char *buf = NULL;
++int paused = 0;
+
+-int rate = -1;
+-int channels = -1;
+-int bitdepth = -1;
+-int sample_size = -1;
+-
+-int buffer_time = 500000;
+-int period_time = 100000;
+-char *defaultdev = "plughw:0,0";
++unsigned int rate = 0;
++unsigned int channels = -1;
++unsigned int bitdepth = -1;
++unsigned int sample_size = -1;
++
++unsigned int buffer_time = 500000;
++unsigned int period_time = 100000;
++char *defaultdev = "plughw:0,0";
+
+ snd_pcm_hw_params_t *alsa_hwparams;
+ snd_pcm_sw_params_t *alsa_swparams;
+
+-snd_pcm_sframes_t buffer_size;
+-snd_pcm_sframes_t period_size;
++snd_pcm_uframes_t buffer_size;
+
+ snd_pcm_format_t alsa_format = -1;
+ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+@@ -87,29 +84,28 @@
+ return err;
+ }
+ /* set the stream rate */
+- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
+ if (err < 0) {
+ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
+ return err;
+ }
+- if (err != rate) {
+- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
+- return -EINVAL;
+- }
+ /* set buffer time */
+- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, &dir);
+ if (err < 0) {
+ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
+ return err;
+ }
+- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
++ if (err < 0) {
++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
++ return err;
++ }
+ /* set period time */
+- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, &dir);
+ if (err < 0) {
+ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
+ return err;
+ }
+- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
+ /* write the parameters to device */
+ err = snd_pcm_hw_params(handle, params);
+ if (err < 0) {
+@@ -136,13 +132,7 @@
+ if (err < 0) {
+ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
+ return err;
+- }
+- /* allow transfer when at least period_size samples can be processed */
+- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
+- if (err < 0) {
+- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
+- return err;
+- }
++ }
+ /* align all transfers to 1 samples */
+ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
+ if (err < 0) {
+@@ -279,7 +269,7 @@
+ int play(struct audio_play *play)
+ {
+ int err, len;
+- char *ptr;
++ unsigned char *ptr;
+
+ ptr = buf;
+ len = play->nsamples;
Modified: trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff
===================================================================
--- trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff 2009-01-08 12:55:37 UTC (rev 1004)
+++ trunk/patches/047-buildroot-madplay-make_it_compile_with_alsa.diff 2009-01-08 17:17:59 UTC (rev 1005)
@@ -1,116 +0,0 @@
-Now this patch is needed for madplay to compile when ALSA is configured with
- --with-versioned=no option.
-madplay is compiling but still crashes when used... :-(
-
-Index: package/madplay/madplay-audio-alsa.patch
-===================================================================
---- buildroot.org/package/madplay/madplay-audio-alsa.patch (revision 0)
-+++ buildroot/package/madplay/madplay-audio-alsa.patch (revision 0)
-@@ -0,0 +1,107 @@
-+--- madplay-0.15.2b/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
-++++ madplay-0.15.2b-new/audio_alsa.c 2007-12-02 16:40:38.000000000 +0100
-+@@ -28,31 +28,28 @@
-+
-+ #include <errno.h>
-+
-+-#define ALSA_PCM_OLD_HW_PARAMS_API
-+-#define ALSA_PCM_OLD_SW_PARAMS_API
-+ #include <alsa/asoundlib.h>
-+
-+ #include <mad.h>
-+
-+ #include "audio.h"
-+
-+-char *buf = NULL;
-+-int paused = 0;
-++unsigned char *buf = NULL;
-++int paused = 0;
-+
-+-int rate = -1;
-+-int channels = -1;
-+-int bitdepth = -1;
-+-int sample_size = -1;
-+-
-+-int buffer_time = 500000;
-+-int period_time = 100000;
-+-char *defaultdev = "plughw:0,0";
-++unsigned int rate = 0;
-++unsigned int channels = -1;
-++unsigned int bitdepth = -1;
-++unsigned int sample_size = -1;
-++
-++unsigned int buffer_time = 500000;
-++unsigned int period_time = 100000;
-++char *defaultdev = "plughw:0,0";
-+
-+ snd_pcm_hw_params_t *alsa_hwparams;
-+ snd_pcm_sw_params_t *alsa_swparams;
-+
-+-snd_pcm_sframes_t buffer_size;
-+-snd_pcm_sframes_t period_size;
-++snd_pcm_uframes_t buffer_size;
-+
-+ snd_pcm_format_t alsa_format = -1;
-+ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-+@@ -87,29 +84,28 @@
-+ return err;
-+ }
-+ /* set the stream rate */
-+- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
-++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
-+ if (err < 0) {
-+ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
-+ return err;
-+ }
-+- if (err != rate) {
-+- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
-+- return -EINVAL;
-+- }
-+ /* set buffer time */
-+- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
-++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, &dir);
-+ if (err < 0) {
-+ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
-+ return err;
-+ }
-+- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
-++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-++ if (err < 0) {
-++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
-++ return err;
-++ }
-+ /* set period time */
-+- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
-++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, &dir);
-+ if (err < 0) {
-+ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
-+ return err;
-+ }
-+- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
-+ /* write the parameters to device */
-+ err = snd_pcm_hw_params(handle, params);
-+ if (err < 0) {
-+@@ -136,13 +132,7 @@
-+ if (err < 0) {
-+ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
-+ return err;
-+- }
-+- /* allow transfer when at least period_size samples can be processed */
-+- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
-+- if (err < 0) {
-+- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
-+- return err;
-+- }
-++ }
-+ /* align all transfers to 1 samples */
-+ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
-+ if (err < 0) {
-+@@ -279,7 +269,7 @@
-+ int play(struct audio_play *play)
-+ {
-+ int err, len;
-+- char *ptr;
-++ unsigned char *ptr;
-+
-+ ptr = buf;
-+ len = play->nsamples;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1004
http://armadeus.svn.sourceforge.net/armadeus/?rev=1004&view=rev
Author: thom25
Date: 2009-01-08 12:55:37 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[LINUX] make new tsc driver compatible with tsc2102
Modified Paths:
--------------
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch 2009-01-08 09:12:44 UTC (rev 1003)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch 2009-01-08 12:55:37 UTC (rev 1004)
@@ -521,7 +521,7 @@
+static void tsc_work(struct work_struct *work)
+{
+#define Z2STAT (1<<7)
-+#define AXSTAT (1<<3)
++#define AXSTAT (3<<3)
+#define T1STAT (1<<2)
+
+ int status;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-01-08 09:12:50
|
Revision: 1003
http://armadeus.svn.sourceforge.net/armadeus/?rev=1003&view=rev
Author: artemys
Date: 2009-01-08 09:12:44 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[BRANCH] [LINUX] Add support for tsc2101
Modified Paths:
--------------
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-021-armadeus-apf9328.patch
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-074-armadeus-tsc2102-touchscreen.patch
branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-021-armadeus-apf9328.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-021-armadeus-apf9328.patch 2009-01-08 09:06:52 UTC (rev 1002)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-021-armadeus-apf9328.patch 2009-01-08 09:12:44 UTC (rev 1003)
@@ -199,7 +199,7 @@
+};
+
+static struct platform_device tsc2102_alsa_device = {
-+ .name = "tsc2102-alsa", // Should be the same as the driver name
++ .name = "tsc210x-alsa", // Should be the same as the driver name
+ .id = 0,
+ .num_resources = ARRAY_SIZE(ssi_resources),
+ .resource = ssi_resources,
@@ -207,7 +207,7 @@
+ .platform_data = &tsc2102_alsa_pdata,
+ }
+};
-+#endif // defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
++#endif /* defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE) */
+
+
+// --- SERIAL RESSOURCE ---
@@ -448,7 +448,7 @@
+ .cs_control = tsc2102_cs,
+};
+
-+static struct tsc2102_config apf9328_tsc2102_config = {
++static struct tsc210x_config apf9328_tsc2102_config = {
+ .use_internal = 1, // -> use internal voltage reference
+ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
+ .init = tsc2102_init_gpio
@@ -518,7 +518,7 @@
+#endif // CONFIG_SENSORS_MAX1027
+#ifdef CONFIG_SPI_TSC2102
+{
-+ .modalias = "tsc2102",
++ .modalias = "tsc210x",
+ .controller_data = &tsc2102_hw,
+ .max_speed_hz = 8000000,
+ .bus_num = 2, // SPI2
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch 2009-01-08 09:06:52 UTC (rev 1002)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-073-armadeus-tsc2102.patch 2009-01-08 09:12:44 UTC (rev 1003)
@@ -3,7 +3,7 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/include/linux/spi/tsc2102.h
+++ linux-2.6.27.2.mod/include/linux/spi/tsc2102.h
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,299 @@
+/*
+ * include/linux/spi/tsc2102.h
+ *
@@ -31,7 +31,8 @@
+
+struct apm_power_info;
+
-+struct tsc2102_config {
++struct tsc210x_config {
++ unsigned int mclk; /* Main clock, fixed if TSC is master */
+ int use_internal; /* Use internal reference voltage */
+ uint32_t monitor; /* What inputs are relevant */
+ void (*apm_report)(struct apm_power_info *info, int *battery);
@@ -43,123 +44,174 @@
+
+#define TSC_BAT1 (1 << 0)
+#define TSC_BAT2 (1 << 1)
-+#define TSC_AUX (1 << 2)
++#define TSC_AUX (1 << 2)
++#define TSC_AUX1 (1 << 2) /* TSC2101 has 2 Aux inputs */
++#define TSC_AUX2 (1 << 3)
+#define TSC_TEMP (1 << 4)
+
-+extern u16 tsc2102_read_sync(int page, u8 address);
-+extern void tsc2102_reads_sync(int page, u8 startaddress, u16 *data,
++extern u16 tsc210x_read_sync(int page, u8 address);
++extern void tsc210x_reads_sync(int page, u8 startaddress, u16 *data,
+ int numregs);
-+extern void tsc2102_write_sync(int page, u8 address, u16 data);
++extern void tsc210x_write_sync(int page, u8 address, u16 data);
+
-+typedef void (*tsc2102_touch_t)(int touching);
-+typedef void (*tsc2102_coords_t)(int x, int y, int z1, int z2);
-+typedef void (*tsc2102_ports_t)(int bat1, int bat2, int aux);
-+typedef void (*tsc2102_temp_t)(int temp);
-+extern int tsc2102_touch_cb(tsc2102_touch_t handler);
-+extern int tsc2102_coords_cb(tsc2102_coords_t handler);
-+extern int tsc2102_ports_cb(tsc2102_ports_t handler);
-+extern int tsc2102_temp1_cb(tsc2102_temp_t handler);
++typedef void (*tsc210x_touch_t)(int touching);
++typedef void (*tsc210x_coords_t)(int x, int y, int z1, int z2);
++typedef void (*tsc210x_ports_t)(int bat1, int bat2, int aux);
++typedef void (*tsc210x_temp_t)(int temp);
++extern int tsc210x_touch_cb(tsc210x_touch_t handler);
++extern int tsc210x_coords_cb(tsc210x_coords_t handler);
++extern int tsc210x_ports_cb(tsc210x_ports_t handler);
++extern int tsc210x_temp1_cb(tsc210x_temp_t handler);
+
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
-+extern void tsc2102_set_volume(uint8_t left_ch, uint8_t right_ch);
-+extern void tsc2102_set_mute(int left_ch, int right_ch);
-+extern void tsc2102_get_mute(int *left_ch, int *right_ch);
-+extern void tsc2102_dac_power(int state);
-+extern int tsc2102_set_rate(int rate);
-+extern void tsc2102_set_i2s_master(int state);
-+extern void tsc2102_set_deemphasis(int enable);
-+extern void tsc2102_set_bassboost(int enable);
++extern void tsc210x_set_dac_volume(uint8_t left_ch, uint8_t right_ch);
++extern void tsc210x_set_dac_mute(int left_ch, int right_ch);
++extern void tsc210x_get_dac_mute(int *left_ch, int *right_ch);
++extern void tsc210x_dac_power(int state);
++extern int tsc210x_set_rate(int rate);
++extern void tsc210x_set_i2s_master(int state);
++extern void tsc210x_set_deemphasis(int enable);
++extern void tsc210x_set_bassboost(int enable);
+#endif // CONFIG_SOUND || CONFIG_SOUND_MODULE
+
-+extern void tsc2102_keyclick(int amplitude, int freq, int length);
++extern void tsc210x_keyclick(int amplitude, int freq, int length);
+
-+#define TSC2102_REG(pg, addr) pg, addr
++#define TSC210X_REG(pg, addr) pg, addr
+
+/* Page 0, Touch Screen & Keypad Data registers */
-+#define TSC2102_TS_X TSC2102_REG(0, 0x00)
-+#define TSC2102_TS_Y TSC2102_REG(0, 0x01)
-+#define TSC2102_TS_Z1 TSC2102_REG(0, 0x02)
-+#define TSC2102_TS_Z2 TSC2102_REG(0, 0x03)
-+#define TSC2102_TS_BAT1 TSC2102_REG(0, 0x05)
-+#define TSC2102_TS_BAT2 TSC2102_REG(0, 0x06)
-+#define TSC2102_TS_AUX TSC2102_REG(0, 0x07)
-+#define TSC2102_TS_TEMP1 TSC2102_REG(0, 0x09)
-+#define TSC2102_TS_TEMP2 TSC2102_REG(0, 0x0a)
++#define TSC2102_TS_X TSC210X_REG(0, 0x00)
++#define TSC2102_TS_Y TSC210X_REG(0, 0x01)
++#define TSC2102_TS_Z1 TSC210X_REG(0, 0x02)
++#define TSC2102_TS_Z2 TSC210X_REG(0, 0x03)
++#define TSC2102_TS_BAT1 TSC210X_REG(0, 0x05)
++#define TSC2102_TS_BAT2 TSC210X_REG(0, 0x06)
++#define TSC2102_TS_AUX TSC210X_REG(0, 0x07)
++#define TSC2102_TS_TEMP1 TSC210X_REG(0, 0x09)
++#define TSC2102_TS_TEMP2 TSC210X_REG(0, 0x0a)
+
+/* Page 1, Touch Screen & Keypad Control registers */
-+#define TSC2102_TS_ADC_CTRL TSC2102_REG(1, 0x00)
-+#define TSC2102_TS_STATUS_CTRL TSC2102_REG(1, 0x01)
-+#define TSC2102_TS_REF_CTRL TSC2102_REG(1, 0x03)
-+#define TSC2102_TS_RESET_CTRL TSC2102_REG(1, 0x04)
-+#define TSC2102_TS_CONFIG_CTRL TSC2102_REG(1, 0x05)
++#define TSC2102_TS_ADC_CTRL TSC210X_REG(1, 0x00)
++#define TSC2102_TS_STATUS_CTRL TSC210X_REG(1, 0x01)
++#define TSC2102_TS_REF_CTRL TSC210X_REG(1, 0x03)
++#define TSC2102_TS_RESET_CTRL TSC210X_REG(1, 0x04)
++#define TSC2102_TS_CONFIG_CTRL TSC210X_REG(1, 0x05)
+
+/* Page 2, Audio Control registers */
-+#define TSC2102_AUDIO1_CTRL TSC2102_REG(2, 0x00)
-+#define TSC2102_DAC_GAIN_CTRL TSC2102_REG(2, 0x02)
-+#define TSC2102_AUDIO2_CTRL TSC2102_REG(2, 0x04)
-+#define TSC2102_DAC_POWER_CTRL TSC2102_REG(2, 0x05)
-+#define TSC2102_AUDIO3_CTRL TSC2102_REG(2, 0x06)
-+#define TSC2102_LCH_BASS_BOOST_N0 TSC2102_REG(2, 0x07)
-+#define TSC2102_LCH_BASS_BOOST_N1 TSC2102_REG(2, 0x08)
-+#define TSC2102_LCH_BASS_BOOST_N2 TSC2102_REG(2, 0x09)
-+#define TSC2102_LCH_BASS_BOOST_N3 TSC2102_REG(2, 0x0a)
-+#define TSC2102_LCH_BASS_BOOST_N4 TSC2102_REG(2, 0x0b)
-+#define TSC2102_LCH_BASS_BOOST_N5 TSC2102_REG(2, 0x0c)
-+#define TSC2102_LCH_BASS_BOOST_D1 TSC2102_REG(2, 0x0d)
-+#define TSC2102_LCH_BASS_BOOST_D2 TSC2102_REG(2, 0x0e)
-+#define TSC2102_LCH_BASS_BOOST_D4 TSC2102_REG(2, 0x0f)
-+#define TSC2102_LCH_BASS_BOOST_D5 TSC2102_REG(2, 0x10)
-+#define TSC2102_RCH_BASS_BOOST_N0 TSC2102_REG(2, 0x11)
-+#define TSC2102_RCH_BASS_BOOST_N1 TSC2102_REG(2, 0x12)
-+#define TSC2102_RCH_BASS_BOOST_N2 TSC2102_REG(2, 0x13)
-+#define TSC2102_RCH_BASS_BOOST_N3 TSC2102_REG(2, 0x14)
-+#define TSC2102_RCH_BASS_BOOST_N4 TSC2102_REG(2, 0x15)
-+#define TSC2102_RCH_BASS_BOOST_N5 TSC2102_REG(2, 0x16)
-+#define TSC2102_RCH_BASS_BOOST_D1 TSC2102_REG(2, 0x17)
-+#define TSC2102_RCH_BASS_BOOST_D2 TSC2102_REG(2, 0x18)
-+#define TSC2102_RCH_BASS_BOOST_D4 TSC2102_REG(2, 0x19)
-+#define TSC2102_RCH_BASS_BOOST_D5 TSC2102_REG(2, 0x1a)
-+#define TSC2102_PLL1_CTRL TSC2102_REG(2, 0x1b)
-+#define TSC2102_PLL2_CTRL TSC2102_REG(2, 0x1c)
-+#define TSC2102_AUDIO4_CTRL TSC2102_REG(2, 0x1d)
++#define TSC2102_AUDIO1_CTRL TSC210X_REG(2, 0x00)
++#define TSC210X_DAC_GAIN_CTRL TSC210X_REG(2, 0x02)
++#define TSC2101_HEADSET_GAIN_CTRL TSC210X_REG(2, 0x01) /* TSC2101 only */
++#define TSC2101_MIXER_PGA_CTRL TSC210X_REG(2, 0x03) /* TSC2101 only */
++#define TSC2102_AUDIO2_CTRL TSC210X_REG(2, 0x04)
++#define TSC210X_CODEC_POWER_CTRL TSC210X_REG(2, 0x05)
++#define TSC2102_AUDIO3_CTRL TSC210X_REG(2, 0x06)
++#define TSC2102_LCH_BASS_BOOST_N0 TSC210X_REG(2, 0x07)
++#define TSC2102_LCH_BASS_BOOST_N1 TSC210X_REG(2, 0x08)
++#define TSC2102_LCH_BASS_BOOST_N2 TSC210X_REG(2, 0x09)
++#define TSC2102_LCH_BASS_BOOST_N3 TSC210X_REG(2, 0x0a)
++#define TSC2102_LCH_BASS_BOOST_N4 TSC210X_REG(2, 0x0b)
++#define TSC2102_LCH_BASS_BOOST_N5 TSC210X_REG(2, 0x0c)
++#define TSC2102_LCH_BASS_BOOST_D1 TSC210X_REG(2, 0x0d)
++#define TSC2102_LCH_BASS_BOOST_D2 TSC210X_REG(2, 0x0e)
++#define TSC2102_LCH_BASS_BOOST_D4 TSC210X_REG(2, 0x0f)
++#define TSC2102_LCH_BASS_BOOST_D5 TSC210X_REG(2, 0x10)
++#define TSC2102_RCH_BASS_BOOST_N0 TSC210X_REG(2, 0x11)
++#define TSC2102_RCH_BASS_BOOST_N1 TSC210X_REG(2, 0x12)
++#define TSC2102_RCH_BASS_BOOST_N2 TSC210X_REG(2, 0x13)
++#define TSC2102_RCH_BASS_BOOST_N3 TSC210X_REG(2, 0x14)
++#define TSC2102_RCH_BASS_BOOST_N4 TSC210X_REG(2, 0x15)
++#define TSC2102_RCH_BASS_BOOST_N5 TSC210X_REG(2, 0x16)
++#define TSC2102_RCH_BASS_BOOST_D1 TSC210X_REG(2, 0x17)
++#define TSC2102_RCH_BASS_BOOST_D2 TSC210X_REG(2, 0x18)
++#define TSC2102_RCH_BASS_BOOST_D4 TSC210X_REG(2, 0x19)
++#define TSC2102_RCH_BASS_BOOST_D5 TSC210X_REG(2, 0x1a)
++#define TSC210X_PLL1_CTRL TSC210X_REG(2, 0x1b)
++#define TSC210X_PLL2_CTRL TSC210X_REG(2, 0x1c)
++#define TSC2102_AUDIO4_CTRL TSC210X_REG(2, 0x1d)
++#define TSC2101_HANDSET_PGA_CTRL TSC210X_REG(2, 0x1e)
++#define TSC2101_CELL_BUZZER_PGA_CTRL TSC210X_REG(2, 0x1f)
++#define TSC2101_AUDIO5_CTRL TSC210X_REG(2, 0x20)
++#define TSC2101_AUDIO6_CTRL TSC210X_REG(2, 0x21)
++#define TSC2101_AUDIO7_CTRL TSC210X_REG(2, 0x22)
++#define TSC2101_GPIO_CTRL TSC210X_REG(2, 0x23)
++#define TSC2101_AGP_CPIN_CTRL TSC210X_REG(2, 0x24)
++#define TSC2101_POWERDOWN_STATUS TSC210X_REG(2, 0x25)
++#define TSC2101_MIC_AGC_CTRL TSC210X_REG(2, 0x26)
++#define TSC2101_CELL_PHONE_AGC_CTRL TSC210X_REG(2, 0x27)
+
+/* Field masks for Audio Control 1 */
++#define AC1_ADCHPF(ARG) (((ARG) & 0x03) << 14) /* TSC2101 only */
+#define AC1_WLEN(ARG) (((ARG) & 0x03) << 10)
+#define AC1_DATFM(ARG) (((ARG) & 0x03) << 8)
-+#define AC1_DACFS_MASK (0x3f)
-+#define AC1_DACFS(ARG) ((ARG) & AC1_DACFS_MASK)
++#define AC1_DACFS(ARG) (((ARG) & 0x07) << 3)
++#define AC1_ADCFS(ARG) (((ARG) & 0x07) << 0)
++/* on TSC2102 always set ADCFS = DACFS */
+
++/* Field masks for Gain Control for Headset/Aux Input */
++/* TSC2101 only */
++#define HGC_ADMUT_HED(ARG) (1 << 15)
++#define HGC_ADPGA_HED(ARG) (((ARG) & 0x7f) << 8)
++#define HGC_AGCTG_HED(ARG) (((ARG) & 0x07) << 5)
++#define HGC_AGCTC_HED(ARG) (((ARG) & 0x0f) << 1)
++#define HGC_AGCEN_HED(ARG) (1 << 0)
++
+/* Field masks for TSC2102_DAC_GAIN_CTRL */
+#define DGC_DALMU (1 << 15)
+#define DGC_DALVL(ARG) (((ARG) & 0x7f) << 8)
+#define DGC_DARMU (1 << 7)
+#define DGC_DARVL(ARG) (((ARG) & 0x7f))
+
++/* Field masks for Mixer PGA Control */
++/* TSC2101 only: */
++#define MPC_ASTMU (1 << 15)
++#define MPC_ASTG(ARG) (((ARG) & 0x7f) << 8)
++#define MPC_MICSEL(ARG) (((ARG) & 0x07) << 5)
++#define MPC_MICADC (1 << 4)
++#define MPC_CPADC (1 << 3)
++#define MPC_ASTGF (1 << 0)
++
+/* Field formats for TSC2102_AUDIO2_CTRL */
+#define AC2_KCLEN (1 << 15)
+#define AC2_KCLAC(ARG) (((ARG) & 0x07) << 12)
++#define AC2_APGASS (1 << 11) /* TSC2101 only */
+#define AC2_KCLFRQ(ARG) (((ARG) & 0x07) << 8)
+#define AC2_KCLLN(ARG) (((ARG) & 0x0f) << 4)
+#define AC2_DLGAF (1 << 3)
+#define AC2_DRGAF (1 << 2)
+#define AC2_DASTC (1 << 1)
++#define AC2_ADGAF (1 << 0) /* TSC2101 only */
+
-+/* Field masks for TSC2102_DAC_POWER_CTRL */
++/* Field masks for TSC2102_CODEC_POWER_CTRL */
+#define CPC_PWDNC (1 << 15)
+#define CPC_DAODRC (1 << 12)
+#define CPC_DAPWDN (1 << 10)
+#define CPC_VGPWDN (1 << 8)
+#define CPC_DAPWDF (1 << 6)
+#define CPC_BASSBC (1 << 1)
-+#define CPC_DEEMPF (0x01)
++#define CPC_DEEMPF (1 << 0)
++/* TSC2101 specific bits */
++#define CPC_MBIAS_HND (1 << 15)
++#define CPC_MBIAS_HED (1 << 14)
++#define CPC_ASTPWD (1 << 13)
++#define CPC_SP1PWDN (1 << 12)
++#define CPC_SP2PWDN (1 << 11)
++#define CPC_ADPWDN (1 << 9)
++#define CPC_COPWDN (1 << 7)
++#define CPC_LSPWDN (1 << 6)
++#define CPC_ADPWDF (1 << 5)
++#define CPC_LDAPWDF (1 << 4)
++#define CPC_RDAPWDF (1 << 3)
++#define CPC_ASTPWF (1 << 2)
++#define CPC_EFFCTL (1 << 1)
+
-+/* Field masks for TSC2101_AUDIO_CTRL_3 */
++/* Field masks for TSC210x_AUDIO_CTRL_3 */
+#define AC3_DMSVOL(ARG) (((ARG) & 0x03) << 14)
+#define AC3_REFFS (1 << 13)
+#define AC3_DAXFM (1 << 12)
+#define AC3_SLVMS (1 << 11)
++#define AC3_ADCOVF (1 << 8) /* TSC2101 only */
+#define AC3_DALOVF (1 << 7)
+#define AC3_DAROVF (1 << 6)
++#define AC3_CLPST (1 << 3) /* TSC2101 only */
+#define AC3_REVID(ARG) (((ARG) & 0x07))
+
+/* Field masks for TSC2102_PLL1_CTRL */
@@ -171,10 +223,80 @@
+/* Field masks for TSC2102_PLL2_CTRL */
+#define PLL2_D_VAL(ARG) (((ARG) & 0x3fff) << 2)
+
-+/* Field masks for TSC2101_AUDIO_CTRL_4 */
++/* Field masks for TSC210x_AUDIO_CTRL_4 */
+#define AC4_DASTPD (1 << 14)
++/* TSC2101 only: */
++#define AC4_ADSTPD (1 << 15)
++#define AC4_ASSTPD (1 << 13)
++#define AC4_CISTPD (1 << 12)
++#define AC4_BISTPD (1 << 11)
++#define AC4_AGCHYS(ARG) (((ARG) & 0x03) << 9)
++#define AC4_MB_HED(ARG) (((ARG) & 0x03) << 7)
++#define AC4_MB_HND (1 << 6)
++#define AC4_SCPFL (1 << 1)
+
-+struct tsc2102_rate_info_s {
++/* !! FOLLOWING REGISTERS ARE ONLY AVAILABLE ON TSC2101 !! */
++
++/* Field masks for TSC2101_HANDSET_PGA_CTRL */
++#define HIGC_ADMUT_HND (1 << 15)
++#define HIGC_ADPGA_HND(ARG) (((ARG) & 0x7f) << 8)
++#define HIGC_AGCTG_HND(ARG) (((ARG) & 0x07) << 5)
++#define HIGC_AGCTC_HND(ARG) (((ARG) & 0x0f) << 1)
++#define HIGC_AGCEN_HND(ARG) (1 << 0)
++
++/* Field masks for TSC2101_CELL_BUZZER_PGA_CTRL */
++#define CPBGC_MUT_CP (1 << 15)
++#define CPBGC_CPGA(ARG) (((ARG) & 0x7f) << 8)
++#define CPBGC_CPGF (1 << 7)
++#define CPBGC_MUT_BU (1 << 6)
++#define CPBGC_BPGA(ARG) (((ARG) & 0x0f) << 2)
++#define CPBGC_BUGF (1 << 1)
++
++/* Field masks for TSC2101_AUDIO_CTRL_5 */
++#define AC5_DIFFIN (1 << 15)
++#define AC5_DAC2SPK1(ARG) (((ARG) & 0x03) << 13)
++#define AC5_AST2SPK1 (1 << 12)
++#define AC5_BUZ2SPK1 (1 << 11)
++#define AC5_KCL2SPK1 (1 << 10)
++#define AC5_CPI2SPK1 (1 << 9)
++#define AC5_DAC2SPK2(ARG) (((ARG) & 0x03) << 7)
++#define AC5_AST2SPK2 (1 << 6)
++#define AC5_BUZ2SPK2 (1 << 5)
++#define AC5_KCL2SPK2 (1 << 4)
++#define AC5_CPI2SPK2 (1 << 3)
++#define AC5_MUTSPK1 (1 << 2)
++#define AC5_MUTSPK2 (1 << 1)
++#define AC5_HDSCPTC (1 << 0)
++
++/* Field masks for TSC2101_AUDIO_CTRL_6 */
++#define AC6_SPL2LSK (1 << 15)
++#define AC6_AST2LSK (1 << 14)
++#define AC6_BUZ2LSK (1 << 13)
++#define AC6_KCL2LSK (1 << 12)
++#define AC6_CPI2LSK (1 << 11)
++#define AC6_MIC2CPO (1 << 10)
++#define AC6_SPL2CPO (1 << 9)
++#define AC6_SPR2CPO (1 << 8)
++#define AC6_MUTLSPK (1 << 7)
++#define AC6_MUTSPK2 (1 << 6)
++#define AC6_LDSCPTC (1 << 5)
++#define AC6_VGNDSCPTC (1 << 4)
++#define AC6_CAPINTF (1 << 3)
++
++/* Field masks for TSC2101_AUDIO_CTRL_7 */
++#define AC7_DETECT (1 << 15)
++#define AC7_HESTYPE(ARG) (((ARG) & 0x03) << 13)
++#define AC7_HDDETFL (1 << 12)
++#define AC7_BDETFL (1 << 11)
++#define AC7_HDDEBNPG(ARG) (((ARG) & 0x03) << 9)
++#define AC7_BDEBNPG(ARG) (((ARG) & 0x03) << 6)
++#define AC7_DGPIO2 (1 << 4)
++#define AC7_DGPIO1 (1 << 3)
++#define AC7_CLKGPIO2 (1 << 2)
++#define AC7_ADWSF(ARG) ((ARG) & 0x03)
++
++
++struct tsc210x_rate_info_s {
+ u16 sample_rate;
+ u8 divisor;
+ u8 fs_44k; /* 44.1 kHz Fsref if 1, 48 kHz if 0 */
@@ -186,7 +308,7 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/drivers/spi/tsc2102.c
+++ linux-2.6.27.2.mod/drivers/spi/tsc2102.c
-@@ -0,0 +1,1000 @@
+@@ -0,0 +1,1113 @@
+/*
+ * drivers/spi/tsc2102.c
+ *
@@ -229,17 +351,11 @@
+#include <asm/system.h>
+#include <asm/irq.h>
+#include <asm/io.h>
-+/*#include <asm/mach-types.h>
-+#include <asm/hardware.h>*/
+
+#ifdef CONFIG_APM
+#include <asm/apm.h>
+#endif
+
-+#ifdef CONFIG_MACH_APF9328 // TODO: Put MCLK choice in Kconfig ??
-+#define MCLK_16M 1
-+#endif // CONFIG_MACH_APF9328
-+
+/* #define DEBUG */
+#define DEBUG_AUDIO
+
@@ -263,32 +379,20 @@
+#define TSC2102_PS_DAV 0x0078
+#define TSC2102_T1_DAV 0x0004
+#define TSC2102_T2_DAV 0x0002
++#define TSC2101_DAC_ON 0x0000
++#define TSC2101_DAC_OFF 0xe7fc
+#define TSC2102_DAC_ON 0x3ba0
+#define TSC2102_DAC_OFF 0xafa0
-+#define TSC2102_FS44K (1 << 13)
-+#define TSC2102_PLL1_OFF 0x0000
-+#ifdef MCLK_16M /* 16Mhz master clock */
-+#define TSC2102_PLL1_44K (PLL1_PLLEN | PLL1_Q_VAL(0) | PLL1_P_VAL(1) | PLL1_J_VAL(5))
-+#define TSC2102_PLL1_48K (PLL1_PLLEN | PLL1_Q_VAL(0) | PLL1_P_VAL(1) | PLL1_J_VAL(6))
-+#define TSC2102_PLL2_44K (PLL2_D_VAL(6448))
-+#define TSC2102_PLL2_48K (PLL2_D_VAL(1440))
-+#else
-+#define TSC2102_PLL1_44K 0x811c
-+#define TSC2102_PLL1_48K 0x8120
-+#define TSC2102_PLL2_44K (5462 << 2)
-+#define TSC2102_PLL2_48K (1920 << 2)
-+#endif // MCLK_16M
-+#define TSC2102_SLVMS (1 << 11)
-+#define TSC2102_DEEMPF (1 << 0)
-+#define TSC2102_BASSBC (1 << 1)
-+#define TSC2102_KEYCLICK_OFF 0x0000
++#define TSC210X_PLL1_OFF 0x0000
++#define TSC210x_AUDIO1_INIT_VAL (AC1_WLEN(0) | AC1_DATFM(0) | AC1_DACFS(0) | AC1_ADCFS(0))
++#define TSC210X_KEYCLICK_OFF 0x0000
+
+#define CS_CHANGE(val) 0
+
+#define SM_BAT_AUX 0
+#define SM_TEMP1 1
+
-+struct tsc2102_spi_req {
++struct tsc210x_spi_req {
+ struct spi_device *dev;
+ uint16_t command;
+ uint16_t data;
@@ -296,27 +400,32 @@
+ struct spi_message message;
+};
+
-+struct tsc2102_dev {
-+ struct tsc2102_config *pdata;
++struct tsc210x_dev {
++ enum tsc_type {
++ tsc2101,
++ tsc2102,
++ } kind;
++ struct tsc210x_config *pdata;
+ spinlock_t lock;
+ struct mutex lock_sync;
-+// struct clk *bclk_ck; TODO add clock mechanism to i.MX ???
++ struct clk *mclk_ck;
++ unsigned int mclk;
+
+ int state; /* Scan modes */
+ struct timer_list ts_timer; /* Busy-wait for PEN UP */
+ struct timer_list mode_timer; /* Change .state every some time */
+
+ uint16_t status, adc_status, adc_data[4];
-+ tsc2102_touch_t touch_cb;
-+ tsc2102_coords_t coords_cb;
-+ tsc2102_ports_t ports_cb;
-+ tsc2102_temp_t temp1_cb;
++ tsc210x_touch_t touch_cb;
++ tsc210x_coords_t coords_cb;
++ tsc210x_ports_t ports_cb;
++ tsc210x_temp_t temp1_cb;
+ unsigned int ts_msecs; /* Interval for .ts_timer */
+ unsigned int mode_msecs; /* Interval for .mode_timer */
+
+ struct spi_device *spi;
+
-+ int bat[2], aux[1], temp;
++ int bat[2], aux[2], temp;
+ struct device *hwmondev;
+ struct work_struct work;
+ unsigned long todo;
@@ -324,7 +433,7 @@
+
+};
+
-+static struct tsc2102_dev tsc;
++static struct tsc210x_dev tsc;
+
+module_param_named(touch_check_msecs, tsc.ts_msecs, uint, 0);
+MODULE_PARM_DESC(touch_check_msecs, "Pen-up polling interval in msecs");
@@ -332,9 +441,9 @@
+module_param_named(sensor_scan_msecs, tsc.mode_msecs, uint, 0);
+MODULE_PARM_DESC(sensor_scan_msecs, "Temperature & battery scan interval");
+
-+void tsc2102_write_sync(int page, u8 address, u16 data)
++void tsc210x_write_sync(int page, u8 address, u16 data)
+{
-+ static struct tsc2102_spi_req req;
++ static struct tsc210x_spi_req req;
+ static struct spi_transfer transfer[2];
+ int ret;
+
@@ -364,9 +473,9 @@
+ __FUNCTION__, ret);
+}
+
-+void tsc2102_reads_sync(int page, u8 startaddress, u16 *data, int numregs)
++void tsc210x_reads_sync(int page, u8 startaddress, u16 *data, int numregs)
+{
-+ static struct tsc2102_spi_req req;
++ static struct tsc210x_spi_req req;
+ static struct spi_transfer transfer[6];
+ int ret, i, j;
+
@@ -402,47 +511,53 @@
+ __FUNCTION__, ret);
+}
+
-+u16 tsc2102_read_sync(int page, u8 address)
++u16 tsc210x_read_sync(int page, u8 address)
+{
+ u16 ret;
-+ tsc2102_reads_sync(page, address, &ret, 1);
++ tsc210x_reads_sync(page, address, &ret, 1);
+ return ret;
+}
+
+static void tsc_work(struct work_struct *work)
+{
+#define Z2STAT (1<<7)
-+#define AXSTAT (1<<4)
++#define AXSTAT (1<<3)
+#define T1STAT (1<<2)
+
+ int status;
+
+ mutex_lock(&tsc.lock_sync);
++
+ /* state of SM has to be changed ? */
+ if( test_and_clear_bit( WORK_CHANGE_MODE,&tsc.todo) ){
++ tsc210x_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
+ /* change state of SM */
+ if( tsc.state == SM_TEMP1 ){
+ tsc.state = SM_BAT_AUX;
-+ tsc2102_write_sync(TSC2102_TS_STATUS_CTRL,
++ tsc210x_write_sync(TSC2102_TS_STATUS_CTRL,
+ TSC2102_ADC_DAV);
-+ tsc2102_write_sync(TSC2102_TS_ADC_CTRL,
++ tsc210x_write_sync(TSC2102_TS_ADC_CTRL,
+ TSC2102_ADC_SCAN_CONTROL);
+ }
+ else{
+ tsc.state = SM_TEMP1;
-+ tsc2102_write_sync(TSC2102_TS_STATUS_CTRL,
++ tsc210x_write_sync(TSC2102_TS_STATUS_CTRL,
+ TSC2102_ADC_DAV);
-+ tsc2102_write_sync(TSC2102_TS_ADC_CTRL,
++ tsc210x_write_sync(TSC2102_TS_ADC_CTRL,
+ TSC2102_ADC_T1_CONTROL);
+ }
++ /* restart mode timer */
++ mod_timer(&tsc.mode_timer, jiffies +
++ msecs_to_jiffies(tsc.mode_msecs));
+ }
-+
-+ status = tsc2102_read_sync(TSC2102_TS_STATUS_CTRL);
++ status = tsc210x_read_sync(TSC2102_TS_STATUS_CTRL);
+
-+ if( status & Z2STAT){
-+ int pendown;
-+ tsc2102_reads_sync( TSC2102_TS_X, tsc.adc_data, 4);
-+ pendown = tsc2102_read_sync(TSC2102_TS_ADC_CTRL) & TSC2102_ADC_PSTCM;
++ if (status & Z2STAT) {
++ /* get pendown status */
++ int pendown = tsc210x_read_sync(TSC2102_TS_ADC_CTRL) & TSC2102_ADC_PSTCM;
++ /* postponed next interrupt to avoid processor overload */
++ msleep(3);
++ tsc210x_reads_sync( TSC2102_TS_X, tsc.adc_data, 4);
+ /* avoid sending data if pen is up*/
+ if (tsc.coords_cb && pendown){
+ tsc.coords_cb(tsc.adc_data[0], tsc.adc_data[1],
@@ -450,34 +565,35 @@
+ }
+ }
+
-+ if( status & AXSTAT ){
-+ tsc2102_reads_sync( TSC2102_TS_BAT1, tsc.adc_data, 3);
++ if (status & AXSTAT) {
++ tsc210x_reads_sync(TSC2102_TS_BAT1, tsc.adc_data, 4);
+ if (tsc.ports_cb)
+ tsc.ports_cb(tsc.adc_data[0], tsc.adc_data[1],
+ tsc.adc_data[2]);
+ tsc.bat[0] = tsc.adc_data[0];
+ tsc.bat[1] = tsc.adc_data[1];
+ tsc.aux[0] = tsc.adc_data[2];
++ tsc.aux[1] = tsc.adc_data[3];
+ /* switch to pintdav and TS control */
-+ tsc2102_write_sync( TSC2102_TS_ADC_CTRL,
++ tsc210x_write_sync(TSC2102_TS_ADC_CTRL,
+ TSC2102_ADC_TS_CONTROL);
-+ tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_PINTDAV);
++ tsc210x_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_PINTDAV);
+ }
-+ else if( status & T1STAT) {
-+ tsc.temp = tsc2102_read_sync(TSC2102_TS_TEMP1);
++ else if (status & T1STAT) {
++ tsc.temp = tsc210x_read_sync(TSC2102_TS_TEMP1);
+ if (tsc.temp1_cb)
+ tsc.temp1_cb(tsc.temp);
+ /* switch to pintdav and TS control */
-+ tsc2102_write_sync( TSC2102_TS_ADC_CTRL,
++ tsc210x_write_sync( TSC2102_TS_ADC_CTRL,
+ TSC2102_ADC_TS_CONTROL);
-+ tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_PINTDAV);
++ tsc210x_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_PINTDAV);
+ }
+
+ mutex_unlock(&tsc.lock_sync);
+}
+
-+#define tsc2102_cb_register_func(cb, cb_t) \
-+int tsc2102_ ## cb(cb_t handler) \
++#define tsc210x_cb_register_func(cb, cb_t) \
++int tsc210x_ ## cb(cb_t handler) \
+{ \
+ spin_lock(&tsc.lock); \
+ \
@@ -496,17 +612,17 @@
+}
+
+
-+tsc2102_cb_register_func(touch_cb, tsc2102_touch_t)
-+EXPORT_SYMBOL(tsc2102_touch_cb);
-+tsc2102_cb_register_func(coords_cb, tsc2102_coords_t)
-+EXPORT_SYMBOL(tsc2102_coords_cb);
-+tsc2102_cb_register_func(ports_cb, tsc2102_ports_t)
-+tsc2102_cb_register_func(temp1_cb, tsc2102_temp_t)
++tsc210x_cb_register_func(touch_cb, tsc210x_touch_t)
++EXPORT_SYMBOL(tsc210x_touch_cb);
++tsc210x_cb_register_func(coords_cb, tsc210x_coords_t)
++EXPORT_SYMBOL(tsc210x_coords_cb);
++tsc210x_cb_register_func(ports_cb, tsc210x_ports_t)
++tsc210x_cb_register_func(temp1_cb, tsc210x_temp_t)
+
+#ifdef DEBUG
+static void tsc2102_print_dav(void)
+{
-+ u16 status = tsc2102_read_sync(TSC2102_TS_STATUS_CTRL);
++ u16 status = tsc210x_read_sync(TSC2102_TS_STATUS_CTRL);
+ if (status & 0x0fff)
+ printk("TSC2102: data in");
+ if (status & 0x0400)
@@ -538,19 +654,18 @@
+
+static void tsc2102_mode(unsigned long data)
+{
-+ struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
-+ /* request change of SM state */
-+ set_bit(WORK_CHANGE_MODE, &dev->todo);
-+ schedule_work(&dev->work);
-+ /* restart mode timer */
-+ mod_timer(&dev->mode_timer, jiffies +
-+ msecs_to_jiffies(dev->mode_msecs));
++ struct tsc210x_dev *dev = (struct tsc210x_dev *) data;
++// if(!test_bit( PENDOWN,&dev->todo)){
++ /* request change of SM state */
++ set_bit(WORK_CHANGE_MODE, &dev->todo);
++ schedule_work(&dev->work);
++// }
+}
+
+/* TSC has new data for us available. */
+static irqreturn_t tsc2102_handler(int irq, void *dev_id)
+{
-+ struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
++ struct tsc210x_dev *dev = (struct tsc210x_dev *) dev_id;
+ /* restart pen up timer */
+ mod_timer(&tsc.ts_timer, jiffies +
+ msecs_to_jiffies(tsc.ts_msecs));
@@ -561,7 +676,9 @@
+
+static void tsc2102_pressure(unsigned long data)
+{
-+ struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
++ struct tsc210x_dev *dev = (struct tsc210x_dev *) data;
++ //printk("pen up\n");
++ //clear_bit(PENDOWN, &dev->todo);
+ if (dev->touch_cb)
+ dev->touch_cb(0);
+}
@@ -572,238 +689,322 @@
+ * Volume level values should be in the range [0, 127].
+ * Higher values mean lower volume.
+ */
-+void tsc2102_set_volume(uint8_t left_ch, uint8_t right_ch)
++void tsc210x_set_dac_volume(uint8_t left_ch, uint8_t right_ch)
+{
+ u16 val;
-+ if (left_ch == 0x00 || left_ch == 0x7f) /* All 0's or all 1's */
-+ left_ch ^= 0x7f;
-+ if (right_ch == 0x00 || right_ch == 0x7f)
-+ right_ch ^= 0x7f;
+
++ if (tsc.kind == tsc2102) {
++ /* On TSC2102, 127 means 0dB and 0 -63,5 dB */
++ if (left_ch == 0x00 || left_ch == 0x7f)
++ left_ch ^= 0x7f;
++ if (right_ch == 0x00 || right_ch == 0x7f)
++ right_ch ^= 0x7f;
++ }
+ mutex_lock(&tsc.lock_sync);
-+ val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
++ val = tsc210x_read_sync(TSC210X_DAC_GAIN_CTRL);
++ /* ?? No check ?? */
+
-+ val &= 0x8080; /* Preserve mute-bits */
-+ val |= (left_ch << 8) | right_ch;
++ val &= (DGC_DALMU | DGC_DARMU); /* Preserve mute-bits */
++ val |= DGC_DALVL(left_ch) | DGC_DARVL(right_ch);
+
-+ tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
++ tsc210x_write_sync(TSC210X_DAC_GAIN_CTRL, val);
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_set_volume);
++EXPORT_SYMBOL(tsc210x_set_dac_volume);
+
-+void tsc2102_set_mute(int left_ch, int right_ch)
++void tsc210x_set_dac_mute(int left_ch, int right_ch)
+{
+ u16 val;
+ mutex_lock(&tsc.lock_sync);
+
-+ val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
++ val = tsc210x_read_sync(TSC210X_DAC_GAIN_CTRL);
++ /* ?? No check ?? */
+
-+ val &= 0x7f7f; /* Preserve volume settings */
-+ val |= (left_ch << 15) | (right_ch << 7);
++ val &= DGC_DALVL(0x7f) | DGC_DARVL(0x7f); /* Preserve volume settings */
++ if (left_ch)
++ val |= DGC_DALMU;
++ if (right_ch)
++ val |= DGC_DARMU;
+
-+ tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
++ tsc210x_write_sync(TSC210X_DAC_GAIN_CTRL, val);
+
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_set_mute);
++EXPORT_SYMBOL(tsc210x_set_dac_mute);
+
-+void tsc2102_get_mute(int *left_ch, int *right_ch)
++void tsc210x_get_dac_mute(int *left_ch, int *right_ch)
+{
+ u16 val;
+ mutex_lock(&tsc.lock_sync);
+
-+ val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
++ val = tsc210x_read_sync(TSC210X_DAC_GAIN_CTRL);
+
+ mutex_unlock(&tsc.lock_sync);
+
-+ *left_ch = !!(val & (1 << 15));
-+ *right_ch = !!(val & (1 << 7));
++ *left_ch = !!(val & DGC_DALMU);
++ *right_ch = !!(val & DGC_DARMU);
+}
-+EXPORT_SYMBOL(tsc2102_get_mute);
++EXPORT_SYMBOL(tsc210x_get_dac_mute);
+
-+void tsc2102_set_deemphasis(int enable)
++void tsc210x_set_deemphasis(int enable)
+{
+ u16 val;
+ mutex_lock(&tsc.lock_sync);
-+ val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
++ val = tsc210x_read_sync(TSC210X_CODEC_POWER_CTRL);
+
+ if (enable)
-+ val &= ~TSC2102_DEEMPF;
++ val &= ~CPC_DEEMPF;
+ else
-+ val |= TSC2102_DEEMPF;
++ val |= CPC_DEEMPF;
+
-+ tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
++ tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL, val);
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_set_deemphasis);
++EXPORT_SYMBOL(tsc210x_set_deemphasis);
+
-+void tsc2102_set_bassboost(int enable)
++void tsc210x_set_bassboost(int enable)
+{
+ u16 val;
++
+ mutex_lock(&tsc.lock_sync);
-+ val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
++ val = tsc210x_read_sync(TSC210X_CODEC_POWER_CTRL);
+
+ if (enable)
-+ val &= ~TSC2102_BASSBC;
++ val &= ~CPC_BASSBC;
+ else
-+ val |= TSC2102_BASSBC;
++ val |= CPC_BASSBC;
+
-+ tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
++ tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL, val);
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_set_bassboost);
++EXPORT_SYMBOL(tsc210x_set_bassboost);
+
-+/* {rate, divisor, fsref?=44,1k} */
-+static const struct tsc2102_rate_info_s tsc2102_rates[] = {
++/* {rate, divisor (for AC1), fsref} */
++static const struct tsc210x_rate_info_s tsc210x_rates[] = {
+ /* Fsref / 6.0 */
-+ {7350, 63, 1},
-+ {8000, 63, 0},
-+ /* Fsref / 6.0 */
-+ {7350, 54, 1},
-+ {8000, 54, 0},
++ {7350, 7, 1},
++ {8000, 7, 0},
++ /* Fsref / 5.5 */
++ {7350, 6, 1},
++ {8000, 6, 0},
+ /* Fsref / 5.0 */
-+ {8820, 45, 1},
-+ {9600, 45, 0},
++ {8820, 5, 1},
++ {9600, 5, 0},
+ /* Fsref / 4.0 */
-+ {11025, 36, 1},
-+ {12000, 36, 0},
++ {11025, 4, 1},
++ {12000, 4, 0},
+ /* Fsref / 3.0 */
-+ {14700, 27, 1},
-+ {16000, 27, 0},
++ {14700, 3, 1},
++ {16000, 3, 0},
+ /* Fsref / 2.0 */
-+ {22050, 18, 1},
-+ {24000, 18, 0},
++ {22050, 2, 1},
++ {24000, 2, 0},
+ /* Fsref / 1.5 */
-+ {29400, 9, 1},
-+ {32000, 9, 0},
++ {29400, 1, 1},
++ {32000, 1, 0},
+ /* Fsref */
+ {44100, 0, 1},
+ {48000, 0, 0},
-+
+ /* end of struct */
+ {0, 0, 0},
+};
+
-+int tsc2102_set_rate(int rate)
++struct pll_values {
++ u16 pll1;
++ u16 pll2;
++};
++
++static void tsc210x_calculate_pll(struct pll_values* pll, unsigned int mclk, unsigned int fsref)
+{
++ if (fsref == 44100) {
++ switch(mclk)
++ {
++ case 12288000:
++ pll->pll1 = (PLL1_PLLEN | PLL1_Q_VAL(0) | PLL1_P_VAL(1) | PLL1_J_VAL(7));
++ pll->pll2 = (PLL2_D_VAL(3500));
++ break;
++
++ case 16000000:
++ pll->pll1 = (PLL1_PLLEN | PLL1_Q_VAL(0) | PLL1_P_VAL(1) | PLL1_J_VAL(5));
++ pll->pll2 = (PLL2_D_VAL(6448));
++ break;
++
++ default:
++ pll->pll1 = 0x811c;
++ pll->pll2 = (PLL2_D_VAL(5462));
++ break;
++ }
++ } else { /* 48000 */
++ switch(mclk)
++ {
++ case 12288000:
++ pll->pll1 = (PLL1_Q_VAL(2));
++ pll->pll2 = (PLL2_D_VAL(0));
++ break;
++
++ case 16000000:
++ pll->pll1 = (PLL1_PLLEN | PLL1_Q_VAL(0) | PLL1_P_VAL(1) | PLL1_J_VAL(6));
++ pll->pll2 = (PLL2_D_VAL(1440));
++ break;
++
++ default:
++ pll->pll1 = 0x8120;
++ pll->pll2 = (PLL2_D_VAL(1920));
++ break;
++ }
++ }
++}
++
++static void tsc210x_set_fsref(unsigned int fsref)
++{
++ struct pll_values pll;
++
++ tsc210x_calculate_pll(&pll, tsc.mclk, fsref);
++ /* Enable Phase-locked-loop & set up clock dividers */
++ tsc210x_write_sync(TSC210X_PLL1_CTRL, pll.pll1);
++ tsc210x_write_sync(TSC210X_PLL2_CTRL, pll.pll2);
++}
++
++int tsc210x_set_rate(int rate)
++{
+ int i;
-+ uint16_t val;
++ int val;
++ const struct tsc210x_rate_info_s *rates;
+
-+ for (i = 0; tsc2102_rates[i].sample_rate; i ++)
-+ if (tsc2102_rates[i].sample_rate == rate)
++ rates = tsc210x_rates;
++
++ for (i = 0; rates[i].sample_rate; i ++)
++ if (rates[i].sample_rate == rate)
+ break;
-+ if (tsc2102_rates[i].sample_rate == 0) {
++ if (rates[i].sample_rate == 0) {
+ printk(KERN_ERR "Unknown sampling rate %i.0 Hz\n", rate);
+ return -EINVAL;
+ }
+
+ mutex_lock(&tsc.lock_sync);
+
-+ val = tsc2102_read_sync(TSC2102_AUDIO1_CTRL) & ~AC1_DACFS_MASK;
-+ tsc2102_write_sync(TSC2102_AUDIO1_CTRL, val | AC1_DACFS(tsc2102_rates[i].divisor) );
++ val = tsc210x_read_sync(TSC2102_AUDIO1_CTRL);
++ if (val < 0) {
++ printk(KERN_ERR "%s, err %d\n", __FUNCTION__, val);
++ return val;
++ }
+
-+ val = tsc2102_read_sync(TSC2102_AUDIO3_CTRL);
++ val &= ~AC1_DACFS(0xff) & ~AC1_ADCFS(0xff);
++ val |= AC1_DACFS(rates[i].divisor);
++ val |= AC1_ADCFS(rates[i].divisor);
++ tsc210x_write_sync(TSC2102_AUDIO1_CTRL, val );
+
-+ if (tsc2102_rates[i].fs_44k) {
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val | TSC2102_FS44K);
-+ /* Enable Phase-locked-loop, set up clock dividers */
-+ tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_44K);
-+ tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_44K);
++ val = tsc210x_read_sync(TSC2102_AUDIO3_CTRL);
++
++ if (rates[i].fs_44k) {
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, val | AC3_REFFS);
++ tsc210x_set_fsref(44100);
+ } else {
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val & ~TSC2102_FS44K);
-+ /* Enable Phase-locked-loop, set up clock dividers */
-+ tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_48K);
-+ tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_48K);
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, val & ~AC3_REFFS);
++ tsc210x_set_fsref(48000);
+ }
+
+ mutex_unlock(&tsc.lock_sync);
+ return 0;
+}
-+EXPORT_SYMBOL(tsc2102_set_rate);
++EXPORT_SYMBOL(tsc210x_set_rate);
+
+/*
+ * Perform basic set-up with default values and power the DAC on.
+ */
-+void tsc2102_dac_power(int state)
++void tsc210x_dac_power(int state)
+{
+ mutex_lock(&tsc.lock_sync);
+
+ if (state) {
+ /* 16-bit words, I2S mode, sample at Fsref */
-+ tsc2102_write_sync(TSC2102_AUDIO1_CTRL, AC1_WLEN(0) | AC1_DATFM(0) | AC1_DACFS(0) );
++ tsc210x_write_sync(TSC2102_AUDIO1_CTRL, AC1_WLEN(0) | AC1_DATFM(0) | AC1_DACFS(0) );
+ /* Keyclicks off, soft-stepping at normal rate */
-+ tsc2102_write_sync(TSC2102_AUDIO2_CTRL, TSC2102_KEYCLICK_OFF);
++ tsc210x_write_sync(TSC2102_AUDIO2_CTRL, TSC210X_KEYCLICK_OFF);
+ /* 44.1 kHz Fsref, continuous transfer mode, master DAC */
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, 0x2800);
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, 0x2800);
+ /* Soft-stepping enabled */
-+ tsc2102_write_sync(TSC2102_AUDIO4_CTRL, 0x0000);
-+
++ tsc210x_write_sync(TSC2102_AUDIO4_CTRL, 0x0000);
+ /* PLL generates 44.1 kHz */
-+ tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_44K);
-+ tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_44K);
-+
++ tsc210x_set_fsref(44100);
+ /* Codec & DAC power up, virtual ground disabled */
-+ tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, TSC2102_DAC_ON);
++ tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL,
++ (tsc.kind == tsc2101) ? TSC2101_DAC_ON : TSC2102_DAC_ON);
+ } else {
+ /* All off */
-+ tsc2102_write_sync(TSC2102_AUDIO4_CTRL, TSC2102_KEYCLICK_OFF);
-+ tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_OFF);
++ tsc210x_write_sync(TSC2102_AUDIO2_CTRL, TSC210X_KEYCLICK_OFF);
++ tsc210x_write_sync(TSC210X_PLL1_CTRL, TSC210X_PLL1_OFF);
+ }
+
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_dac_power);
++EXPORT_SYMBOL(tsc210x_dac_power);
+
-+void tsc2102_set_i2s_master(int state)
++void tsc210x_set_i2s_master(int state)
+{
+ uint16_t val;
+ mutex_lock(&tsc.lock_sync);
+
-+ val = tsc2102_read_sync(TSC2102_AUDIO3_CTRL);
++ val = tsc210x_read_sync(TSC2102_AUDIO3_CTRL);
++ /* if (val < 0) { ?? no check ??
++ printk(KERN_ERR "%s, err %d\n", __FUNCTION__, val);
++ return;
++ }*/
+
+ if (state)
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val | TSC2102_SLVMS);
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, val | AC3_SLVMS);
+ else
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val & ~TSC2102_SLVMS);
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, val & ~AC3_SLVMS);
+
+ mutex_unlock(&tsc.lock_sync);
+}
-+EXPORT_SYMBOL(tsc2102_set_i2s_master);
++EXPORT_SYMBOL(tsc210x_set_i2s_master);
+#endif /* CONFIG_SOUND || CONFIG_SOUND_MODULE */
+
-+static int tsc2102_configure(struct tsc2102_dev *dev)
++static int tsc2102_configure(struct tsc210x_dev *dev)
+{
+ /* Reset the chip */
-+ tsc2102_write_sync(TSC2102_TS_RESET_CTRL, TSC2102_RESET);
++ tsc210x_write_sync(TSC2102_TS_RESET_CTRL, TSC2102_RESET);
+
+ /* Reference mode, 100 usec delay, 2.5V reference */
+ if (dev->pdata->use_internal)
-+ tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_REF);
++ tsc210x_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_REF);
+ else
-+ tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_EXT_REF);
++ tsc210x_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_EXT_REF);
+
+ /* 84 usec precharge time, 32 usec sense time */
-+ tsc2102_write_sync(TSC2102_TS_CONFIG_CTRL, TSC2102_CONFIG_TIMES);
++ tsc210x_write_sync(TSC2102_TS_CONFIG_CTRL, TSC2102_CONFIG_TIMES);
+
+ /* PINT/DAV acts as PINT */
-+ tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_DAV);
++ tsc210x_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_DAV);
+
-+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
++#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+ /* 16-bit words, I2S mode, sample at Fsref */
-+ tsc2102_write_sync(TSC2102_AUDIO1_CTRL, AC1_WLEN(0) | AC1_DATFM(0) | AC1_DACFS(0) );
++ tsc210x_write_sync(TSC2102_AUDIO1_CTRL, TSC210x_AUDIO1_INIT_VAL );
+ /* Keyclicks off, soft-stepping at normal rate */
-+ tsc2102_write_sync(TSC2102_AUDIO2_CTRL, TSC2102_KEYCLICK_OFF);
++ tsc210x_write_sync(TSC2102_AUDIO2_CTRL, TSC210X_KEYCLICK_OFF);
+ /* 48 kHz Fsref, continuous transfer mode, master DAC */
-+ tsc2102_write_sync(TSC2102_AUDIO3_CTRL, 0x0800);
++ tsc210x_write_sync(TSC2102_AUDIO3_CTRL, 0x0800);
+ /* Soft-stepping enabled */
-+ tsc2102_write_sync(TSC2102_AUDIO4_CTRL, 0x0000);
++ tsc210x_write_sync(TSC2102_AUDIO4_CTRL, 0x0000);
+ /* FSRef = 44,1k */
-+ tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_44K);
-+ tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_44K);
++ tsc210x_set_fsref(44100);
+
-+ tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, 0xA0A0);
-+ tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, 0x3BA0);
-+ tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, 0x7F7F);
++ if (tsc.kind == tsc2101) {
++ tsc210x_write_sync(TSC2101_AUDIO5_CTRL, /*AC5_AST2SPK1 |*/ AC5_DAC2SPK1(1) | AC5_DAC2SPK2(2));
++ tsc210x_write_sync(TSC2101_MIXER_PGA_CTRL, /*0x7f00*/ 0xc500 /* reset value */ | MPC_MICSEL(1) | MPC_MICADC);
++ tsc210x_write_sync(TSC2101_HEADSET_GAIN_CTRL, HGC_ADPGA_HED(0));
++ tsc210x_write_sync(TSC2101_HANDSET_PGA_CTRL, 0x0000);
++// tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL, 0x00fc);
++ tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL, 0xe2fc);
++ }
++ else
++ tsc210x_write_sync(TSC210X_CODEC_POWER_CTRL, TSC2102_DAC_ON);
++ /* Un-mute + volume max */
++ if (tsc.kind == tsc2101)
++ tsc210x_write_sync(TSC210X_DAC_GAIN_CTRL, 0x0000);
++ else
++ tsc210x_write_sync(TSC210X_DAC_GAIN_CTRL, 0x7F7F);
+#endif /* CONFIG_SOUND || CONFIG_SOUND_MODULE */
+
+ /* Init mode state machine */
@@ -816,11 +1017,11 @@
+}
+
+/*
-+ * Retrieves chip revision. Should be always 1.
++ * Retrieves chip revision. Should be 1 for TSC2102 and 4 for TSC2101
+ */
+int tsc2102_get_revision(void)
+{
-+ return tsc2102_read_sync(TSC2102_AUDIO3_CTRL) & 7;
++ return AC3_REVID(tsc210x_read_sync(TSC2102_AUDIO3_CTRL));
+}
+
+/*
@@ -834,42 +1035,44 @@
+ * This function sleeps but doesn't sleep until the sound has
+ * finished.
+ */
-+void tsc2102_keyclick(int amplitude, int freq, int length)
++void tsc210x_keyclick(int amplitude, int freq, int length)
+{
+ u16 val;
++
+ mutex_lock(&tsc.lock_sync);
-+ val = tsc2102_read_sync(TSC2102_AUDIO2_CTRL);
-+ val &= 0x800f;
++ val = tsc210x_read_sync(TSC2102_AUDIO2_CTRL);
++ /* Keeps current control values: */
++ val &= AC2_KCLEN | AC2_APGASS | AC2_DLGAF | AC2_DRGAF | AC2_DASTC | AC2_ADGAF;
+
+ /* Set amplitude */
+ switch (amplitude) {
+ case 1:
-+ val |= 4 << 12;
++ val |= AC2_KCLAC(4);
+ break;
+ case 2:
-+ val |= 7 << 12;
++ val |= AC2_KCLAC(7);
+ break;
+ default:
+ break;
+ }
+
+ /* Frequency */
-+ val |= (freq & 0x7) << 8;
++ val |= AC2_KCLFRQ(0x7);
+
+ /* Round to nearest supported length */
-+ if (length > 20)
-+ val |= 4 << 4;
++ if (length > 8)
++ val |= AC2_KCLLN(4);
+ else if (length > 6)
-+ val |= 3 << 4;
++ val |= AC2_KCLLN(3);
+ else if (length > 4)
-+ val |= 2 << 4;
++ val |= AC2_KCLLN(2);
+ else if (length > 2)
-+ val |= 1 << 4;
++ val |= AC2_KCLLN(1);
+
+ /* Enable keyclick */
-+ val |= 0x8000;
++ val |= AC2_KCLEN;
+
-+ tsc2102_write_sync(TSC2102_AUDIO2_CTRL, val);
++ tsc210x_write_sync(TSC2102_AUDIO2_CTRL, val);
+ mutex_unlock(&tsc.lock_sync);
+}
+
@@ -878,7 +1081,7 @@
+static ssize_t show_ ## devname(struct device *dev, \
+ struct device_attribute *devattr, char *buf) \
+{ \
-+ struct tsc2102_dev *devhwmon = dev_get_drvdata(dev); \
++ struct tsc210x_dev *devhwmon = dev_get_drvdata(dev); \
+ int value = devhwmon->field; \
+ return sprintf(buf, "%i\n", value); \
+} \
@@ -887,12 +1090,13 @@
+TSC2102_INPUT(in0, bat[0])
+TSC2102_INPUT(in1, bat[1])
+TSC2102_INPUT(in2, aux[0])
-+TSC2102_INPUT(in3, temp)
++TSC2102_INPUT(in3, aux[1])
++TSC2102_INPUT(in4, temp)
+
+static ssize_t show_temp1(struct device *dev,
+ struct device_attribute *devattr, char *buf)
+{
-+ struct tsc2102_dev *devhwmon = dev_get_drvdata(dev);
++ struct tsc210x_dev *devhwmon = dev_get_drvdata(dev);
+ int value;
+
+ value = (-devhwmon->temp*7 + 8400)*50 ; /* Celcius millidegree */
@@ -914,9 +1118,9 @@
+ * Suspend the chip.
+ */
+static int
-+tsc2102_suspend(struct spi_device *spi, pm_message_t state)
++tsc210x_suspend(struct spi_device *spi, pm_message_t state)
+{
-+ struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
++ struct tsc210x_dev *dev = dev_get_drvdata(&spi->dev);
+
+ if (!dev)
+ return 0;
@@ -931,7 +1135,7 @@
+ dev->touch_cb(0);
+
+ /* Abort current conversion and power down the ADC */
-+ tsc2102_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
++ tsc210x_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
+
+ dev->spi->dev.power.power_state = state;
+ mutex_unlock(&dev->lock_sync);
@@ -942,9 +1146,9 @@
+/*
+ * Resume chip operation.
+ */
-+static int tsc2102_resume(struct spi_device *spi)
++static int tsc210x_resume(struct spi_device *spi)
+{
-+ struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
++ struct tsc210x_dev *dev = dev_get_drvdata(&spi->dev);
+ int err;
+
+ if (!dev)
@@ -960,39 +1164,49 @@
+ return err;
+}
+#else
-+#define tsc2102_suspend NULL
-+#define tsc2102_resume NULL
++#define tsc210x_suspend NULL
++#define tsc210x_resume NULL
+#endif
+
-+static struct platform_device tsc2102_ts_device = {
-+ .name = "tsc2102-ts",
++/* REVISIT don't make these static */
++static struct platform_device tsc210x_ts_device = {
++ .name = "tsc210x-ts",
+ .id = -1,
+};
+
-+static struct platform_device tsc2102_alsa_device = {
-+ .name = "tsc2102-alsa",
++/* TODO
++static struct platform_device tsc210x_hwmon_device = {
++ .name = "tsc210x-hwmon",
++ .id = -1,
++};
++*/
++
++static struct platform_device tsc210x_alsa_device = {
++ .name = "tsc210x-alsa",
+ .id = -1,
+};
+
-+static int tsc2102_probe(struct spi_device *spi)
++static int tsc210x_probe(struct spi_device *spi)
+{
-+ struct tsc2102_config *pdata = spi->dev.platform_data;
++ struct tsc210x_config *pdata = spi->dev.platform_data;
+ struct spi_transfer *spi_buffer;
+ int err = -EINVAL;
++ u16 rev_id = 0;
+
+ if (!pdata) {
-+ printk(KERN_ERR "TSC2102: Platform data not supplied\n");
++ printk(KERN_ERR "TSC210x: Platform data not supplied\n");
+ return -ENOENT;
+ }
+
+ if (!spi->irq) {
-+ printk(KERN_ERR "TSC2102: Invalid irq value\n");
++ printk(KERN_ERR "TSC210x: Invalid irq value\n");
+ return -ENOENT;
+ }
+
+ tsc.pdata = pdata;
+ tsc.ts_msecs = 30;
+ tsc.mode_msecs = 500;
++ tsc.todo = 0;
+ tsc.spi = spi;
+ INIT_WORK(&tsc.work, tsc_work);
+
@@ -1011,7 +1225,7 @@
+ if (pdata->init)
+ pdata->init();
+
-+#ifdef IMX_CLOCK_CONFIG
++#ifdef CONFIG_TSC_SLAVE
+ tsc.bclk_ck = clk_get(0, "bclk"); TODO add clock mechanism to i.MX ???
+ if (!tsc.bclk_ck) {
+ printk(KERN_ERR "Unable to get the clock BCLK\n");
@@ -1020,7 +1234,13 @@
+ }
+
+ clk_enable(tsc.bclk_ck);
-+#endif //IMX_CLOCK_CONFIG
++#else
++ /* Retrieve Master Clock from platform data */
++ if (pdata->mclk)
++ tsc.mclk = pdata->mclk;
++ else
++ tsc.mclk = 16000000; /* 16 MHz by default */
++#endif /* CONFIG_TSC_SLAVE */
+
+ if (request_irq(spi->irq, tsc2102_handler, IRQF_DISABLED | IRQF_SHARED | IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
+ printk(KERN_ERR "Could not allocate touchscreen IRQ (n %d)\n", spi->irq);
@@ -1043,8 +1263,15 @@
+ goto err_timer;
+
+ /* Now try to detect the chip, make first contact */
-+ if (tsc2102_get_revision() != 0x1) {
-+ printk(KERN_ERR "No TI TSC2102 chip found! Bad revision: %x\n", tsc2102_get_revision());
++ rev_id = tsc2102_get_revision();
++ if (rev_id == 0x01) {
++ printk("TSC2102 detected\n");
++ tsc.kind = tsc2102;
++ } else if (rev_id == 0x04) {
++ printk("TSC2101 detected\n");
++ tsc.kind = tsc2101;
++ } else {
++ printk(KERN_ERR "No TI TSC210x chip found! Bad revision: %x\n", rev_id);
+ goto err_timer;
+ }
+
@@ -1052,16 +1279,16 @@
+ if (err)
+ goto err_timer;
+
-+ /* Register devices controlled by TSC 2102 */
-+ tsc2102_ts_device.dev.platform_data = pdata;
-+ tsc2102_ts_device.dev.parent = &spi->dev;
-+ err = platform_device_register(&tsc2102_ts_device);
++ /* Register devices controlled by TSC2101 / TSC2102 */
++ tsc210x_ts_device.dev.platform_data = pdata;
++ tsc210x_ts_device.dev.parent = &spi->dev;
++ err = platform_device_register(&tsc210x_ts_device);
+ if (err)
+ goto err_timer;
+
-+ tsc2102_alsa_device.dev.platform_data = pdata->alsa_config;
-+ tsc2102_alsa_device.dev.parent = &spi->dev;
-+ err = platform_device_register(&tsc2102_alsa_device);
++ tsc210x_alsa_device.dev.platform_data = pdata->alsa_config;
++ tsc210x_alsa_device.dev.parent = &spi->dev;
++ err = platform_device_register(&tsc210x_alsa_device);
+ if (err)
+ goto err_ts;
+
@@ -1077,11 +1304,13 @@
+ err |= device_create_file(&spi->dev, &dev_attr_in0_input);
+ if (pdata->monitor & TSC_BAT2)
+ err |= device_create_file(&spi->dev, &dev_attr_in1_input);
-+ if (pdata->monitor & TSC_AUX)
++ if (pdata->monitor & TSC_AUX1)
+ err |= device_create_file(&spi->dev, &dev_attr_in2_input);
++ if (pdata->monitor & TSC_AUX2)
++ err |= device_create_file(&spi->dev, &dev_attr_in3_input);
+ if (pdata->monitor & TSC_TEMP) {
+ err |= device_create_file(&spi->dev, &dev_attr_temp1_input);
-+ err |= device_create_file(&spi->dev, &dev_attr_in3_input);
++ err |= device_create_file(&spi->dev, &dev_attr_in4_input);
+ }
+
+ if (err)
@@ -1099,9 +1328,9 @@
+ goto done;
+
+err_alsa:
-+ platform_device_unregister(&tsc2102_alsa_device);
++ platform_device_unregister(&tsc210x_alsa_device);
+err_ts:
-+ platform_device_unregister(&tsc2102_ts_device);
++ platform_device_unregister(&tsc210x_ts_device);
+err_timer:
+ del_timer(&tsc.ts_timer);
+ del_timer(&tsc.mode_timer);
@@ -1116,13 +1345,13 @@
+ return err;
+}
+
-+static int tsc2102_remove(struct spi_device *spi)
++static int tsc210x_remove(struct spi_device *spi)
+{
-+ struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
++ struct tsc210x_dev *dev = dev_get_drvdata(&spi->dev);
+ mutex_lock(&dev->lock_sync);
+
-+ platform_device_unregister(&tsc2102_ts_device);
-+ platform_device_unregister(&tsc2102_alsa_device);
++ platform_device_unregister(&tsc210x_ts_device);
++ platform_device_unregister(&tsc210x_alsa_device);
+
+ dev_set_drvdata(&spi->dev, NULL);
+
@@ -1130,9 +1359,11 @@
+ if (dev->pdata->exit)
+ dev->pdata->exit();
+
++#ifdef CONFIG_TSC_SLAVE
+ /* Release the BCLK */
-+/* clk_disable(dev->bclk_ck); TODO add clock mechanism to i.MX ???
-+ clk_put(dev->bclk_ck); */
++ clk_disable(dev->bclk_ck);
++ clk_put(dev->bclk_ck);
++#endif
+
+ del_timer(&tsc.mode_timer);
+ del_timer(&tsc.ts_timer);
@@ -1151,39 +1382,43 @@
+ return 0;
+}
+
-+static struct spi_driver tsc2102_driver = {
-+ .probe = tsc2102_probe,
-+ .remove = tsc2102_remove,
-+ .suspend = tsc2102_suspend,
-+ .resume = tsc2102_resume,
++static struct spi_driver tsc210x_driver = {
++ .probe = tsc210x_probe,
++ .remove = tsc210x_remove,
++ .suspend = tsc210x_suspend,
++ .resume = tsc210x_resume,
+ .driver = {
-+ .name = "tsc2102",
++ .name = "tsc210x",
+ .owner = THIS_MODULE,
+ .bus = &spi_bus_type,
+ },
+};
+
-+static char __initdata banner[] = KERN_INFO "TI TSC2102 driver initializing\n";
++static char __initdata banner[] = KERN_INFO "TI TSC210x driver initializing\n";
+
-+static int __init tsc2102_init(void)
++static int __init tsc210x_init(void)
+{
++ int err;
+ printk(banner);
-+ return spi_register_driver(&tsc2102_driver);
++
++ err = spi_register_driver(&tsc210x_driver);
++
++ return err;
+}
+
-+static void __exit tsc2102_exit(void)
++static void __exit tsc210x_exit(void)
+{
-+ spi_unregister_driver(&tsc2102_driver);
++ spi_unregister_driver(&tsc210x_driver);
+}
+
-+module_init(tsc2102_init);
-+module_exit(tsc2102_exit);
++module_init(tsc210x_init);
++module_exit(tsc210x_exit);
+
-+EXPORT_SYMBOL(tsc2102_read_sync);
-+EXPORT_SYMBOL(tsc2102_reads_sync);
-+EXPORT_SYMBOL(tsc2102_write_sync);
-+EXPORT_SYMBOL(tsc2102_keyclick);
++EXPORT_SYMBOL(tsc210x_read_sync);
++EXPORT_SYMBOL(tsc210x_reads_sync);
++EXPORT_SYMBOL(tsc210x_write_sync);
++EXPORT_SYMBOL(tsc210x_keyclick);
+
-+MODULE_AUTHOR("Andrzej Zaborowski");
-+MODULE_DESCRIPTION("Interface driver for TI TSC2102 chips.");
++MODULE_AUTHOR("Andrzej Zaborowski, Nicolas Colombain, Julien Boibessot");
++MODULE_DESCRIPTION("Interface driver for TI TSC210x chips.");
+MODULE_LICENSE("GPL");
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-074-armadeus-tsc2102-touchscreen.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-074-armadeus-tsc2102-touchscreen.patch 2009-01-08 09:06:52 UTC (rev 1002)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-074-armadeus-tsc2102-touchscreen.patch 2009-01-08 09:12:44 UTC (rev 1003)
@@ -3,7 +3,7 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/drivers/input/touchscreen/tsc2102_ts.c
+++ linux-2.6.27.2.mod/drivers/input/touchscreen/tsc2102_ts.c
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,156 @@
+/*
+ * input/touchscreen/tsc2102_ts.c
+ *
@@ -36,9 +36,11 @@
+
+#include <linux/spi/tsc2102.h>
+
++#define DRIVER_NAME "TSC210x Touchscreen"
++
+struct input_dev *dev;
+
-+static void tsc2102_touch(int touching)
++static void tsc210x_touch(int touching)
+{
+ if (!touching) {
+ input_report_abs(dev, ABS_X, 0);
@@ -52,7 +54,7 @@
+ //do_poke_blanked_console = 1;
+}
+
-+static void tsc2102_coords(int x, int y, int z1, int z2)
++static void tsc210x_coords(int x, int y, int z1, int z2)
+{
+ int p;
+
@@ -68,7 +70,7 @@
+ input_sync(dev);
+}
+
-+static int tsc2102_ts_probe(struct platform_device *pdev)
++static int tsc210x_ts_probe(struct platform_device *pdev)
+{
+ int status;
+
@@ -76,28 +78,28 @@
+ if (!dev)
+ return -ENOMEM;
+
-+ status = tsc2102_touch_cb(tsc2102_touch);
++ status = tsc210x_touch_cb(tsc210x_touch);
+ if (status) {
+ goto error;
+ }
+
-+ status = tsc2102_coords_cb(tsc2102_coords);
++ status = tsc210x_coords_cb(tsc210x_coords);
+ if (status) {
+ goto error;
+ }
+
-+ dev->name = "TSC2102 Touchscreen";
++ dev->name = DRIVER_NAME;
+ dev->dev.parent = &pdev->dev;
+ dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
+ dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) | BIT_MASK(ABS_PRESSURE);
+ status = input_register_device(dev);
+ if (status) {
-+ printk(KERN_INFO "Unable to register TSC2102 as input device !\n");
++ printk(KERN_INFO "Unable to register TSC210x as input device !\n");
+ goto error;
+ }
+
-+ printk("TSC2102 touchscreen driver initialized\n");
++ printk(DRIVER_NAME " driver initialized\n");
+ return 0;
+
+error:
@@ -105,56 +107,56 @@
+ return status;
+}
+
-+static int tsc2102_ts_remove(struct platform_device *pdev)
++static int tsc210x_ts_remove(struct platform_device *pdev)
+{
-+ tsc2102_touch_cb(0);
-+ tsc2102_coords_cb(0);
++ tsc210x_touch_cb(0);
++ tsc210x_coords_cb(0);
+ input_unregister_device(dev);
+ return 0;
+}
+
+static int
-+tsc2102_ts_suspend(struct platform_device *pdev, pm_message_t state)
++tsc210x_ts_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ /* Nothing yet */
+ return 0;
+}
+
-+static int tsc2102_ts_resume(struct platform_device *pdev)
++static int tsc210x_ts_resume(struct platform_device *pdev)
+{
+ /* Nothing either */
+ return 0;
+}
+
-+static struct platform_driver tsc2102_ts_driver = {
-+ .probe = tsc2102_ts_probe,
-+ .remove = tsc2102_ts_remove,
-+ .suspend = tsc2102_ts_suspend,
-+ .resume = tsc2102_ts_resume,
++static struct platform_driver tsc210x_ts_driver = {
++ .probe = tsc210x_ts_probe,
++ .remove = tsc210x_ts_remove,
++ .suspend = tsc210x_ts_suspend,
++ .resume = tsc210x_ts_resume,
+ .driver = {
-+ .name = "tsc2102-ts",
++ .name = "tsc210x-ts",
+ },
+};
+
-+static int __init tsc2102_ts_init(void)
++static int __init tsc210x_ts_init(void)
+{
+ int ret;
+
-+ ret = platform_driver_register(&tsc2102_ts_driver);
++ ret = platform_driver_register(&tsc210x_ts_driver);
+ if (ret)
+ return -ENODEV;
+
+ return 0;
+}
+
-+static void __exit tsc2102_ts_exit(void)
++static void __exit tsc210x_ts_exit(void)
+{
-+ platform_driver_unregister(&tsc2102_ts_driver);
++ platform_driver_unregister(&tsc210x_ts_driver);
+}
+
-+module_init(tsc2102_ts_init);
-+module_exit(tsc2102_ts_exit);
++module_init(tsc210x_ts_init);
++module_exit(tsc210x_ts_exit);
+
+MODULE_AUTHOR("Andrzej Zaborowski");
-+MODULE_DESCRIPTION("Touchscreen input driver for TI TSC2102.");
++MODULE_DESCRIPTION("Touchscreen input driver for TI TSC210x.");
+MODULE_LICENSE("GPL");
Modified: branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
===================================================================
--- branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch 2009-01-08 09:06:52 UTC (rev 1002)
+++ branches/tsc210x/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.2/linux-2.6.27.2-091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch 2009-01-08 09:12:44 UTC (rev 1003)
@@ -748,11 +748,11 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/sound/arm/imx-alsa-tsc2102.c
+++ linux-2.6.27.2.mod/sound/arm/imx-alsa-tsc2102.c
-@@ -0,0 +1,347 @@
+@@ -0,0 +1,378 @@
+/*
+ * sound/arm/imx-alsa-tsc2102.c
+ *
-+ * Alsa codec driver for TSC2102 chip for iMXL platforms.
++ * Alsa codec driver for TSC210x chip for i.MX platforms.
+ *
+ * Copyright (c) 2008 Jorasse <jo...@ar...>
+ * Code based on the TSC2101 ALSA driver for omap platforms.
@@ -776,7 +776,6 @@
+#include <linux/spi/tsc2102.h>
+
+#include <mach/hardware.h>
-+#include <mach/imx-regs.h>
+#include <mach/imx-alsa.h>
+
+#include "imx-alsa-tsc2102.h"
@@ -825,65 +824,96 @@
+
+#define DUMP_TSC2102_AUDIO_REGISTERS 1
+#ifdef DUMP_TSC2102_AUDIO_REGISTERS
-+static void dump_tsc2102_audio_regs(void) {
++static void dump_tsc2102_audio_regs(int show_coef)
++{
+ printk("TSC2102_AUDIO1_CTRL = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_AUDIO1_CTRL));
-+ printk("TSC2102_DAC_GAIN_CTRL = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL));
++ tsc210x_read_sync(TSC2102_AUDIO1_CTRL));
++ printk("TSC210X_DAC_GAIN_CTRL = 0x%04x\n",
++ tsc210x_read_sync(TSC210X_DAC_GAIN_CTRL));
++// #ifdef CONFIG_TSC2101
++ printk("TSC2101_HEADSET_GAIN_CTRL = 0x%04x\n",
++ tsc210x_read_sync(TSC2101_HEADSET_GAIN_CTRL));
++ printk("TSC2101_MIXER_PGA_CTRL = 0x%04x\n",
++ tsc210x_read_sync(TSC2101_MIXER_PGA_CTRL));
++// #endif
+ printk("TSC2102_AUDIO2_CTRL = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_AUDIO2_CTRL));
-+ printk("TSC2102_DAC_POWER_CTRL = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_DAC_POWER_CTRL));
++ tsc210x_read_sync(TSC2102_AUDIO2_CTRL));
++ printk("TSC210X_CODEC_POWER_CTRL = 0x%04x\n",
++ tsc210x_read_sync(TSC210X_CODEC_POWER_CTRL));
+ printk("TSC2102_AUDIO3_CTRL = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_AUDIO3_CTRL));
++ tsc210x_read_sync(TSC2102_AUDIO3_CTRL));
++ if (show_coef) {
+ printk("TSC2102_LCH_BASS_BOOST_N0 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N0));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N0));
+ printk("TSC2102_LCH_BASS_BOOST_N1 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N1));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N1));
+ printk("TSC2102_LCH_BASS_BOOST_N2 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N2));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N2));
+ printk("TSC2102_LCH_BASS_BOOST_N3 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N3));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N3));
+ printk("TSC2102_LCH_BASS_BOOST_N4 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N4));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N4));
+ printk("TSC2102_LCH_BASS_BOOST_N5 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N5));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_N5));
+ printk("TSC2102_LCH_BASS_BOOST_D1 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D1));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_D1));
+ printk("TSC2102_LCH_BASS_BOOST_D2 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D2));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_D2));
+ printk("TSC2102_LCH_BASS_BOOST_D4 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D4));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_D4));
+ printk("TSC2102_LCH_BASS_BOOST_D5 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D5));
++ tsc210x_read_sync(TSC2102_LCH_BASS_BOOST_D5));
+ printk("TSC2102_RCH_BASS_BOOST_N0 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N0));
++ tsc210x_read_sync(TSC2102_RCH_BASS_BOOST_N0));
+ printk("TSC2102_RCH_BASS_BOOST_N1 = 0x%04x\n",
-+ tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N1));
++ tsc210x_read_sync(TSC2102_RCH_BASS_BOOST_N1));
+ printk("TSC2102_...
[truncated message content] |
|
From: <ar...@us...> - 2009-01-08 09:06:56
|
Revision: 1002
http://armadeus.svn.sourceforge.net/armadeus/?rev=1002&view=rev
Author: artemys
Date: 2009-01-08 09:06:52 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
Branch for tsc2101 integration
Added Paths:
-----------
branches/tsc210x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-01-08 08:54:49
|
Revision: 1001
http://armadeus.svn.sourceforge.net/armadeus/?rev=1001&view=rev
Author: artemys
Date: 2009-01-08 08:54:42 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[DEBUG] New version of imxssi
Modified Paths:
--------------
trunk/buildroot/package/imxssi/imxssi.mk
trunk/target/linux/debug/imxssi/imxssi.c
Added Paths:
-----------
trunk/target/linux/debug/imxssi/AUTHORS
trunk/target/linux/debug/imxssi/COPYING
trunk/target/linux/debug/imxssi/ChangeLog
trunk/target/linux/debug/imxssi/INSTALL
trunk/target/linux/debug/imxssi/Makefile.am
trunk/target/linux/debug/imxssi/Makefile.in
trunk/target/linux/debug/imxssi/NEWS
trunk/target/linux/debug/imxssi/README
trunk/target/linux/debug/imxssi/aclocal.m4
trunk/target/linux/debug/imxssi/configure
trunk/target/linux/debug/imxssi/configure.ac
trunk/target/linux/debug/imxssi/definitions.h
trunk/target/linux/debug/imxssi/depcomp
trunk/target/linux/debug/imxssi/imx27regs.h
trunk/target/linux/debug/imxssi/imxregs.h
trunk/target/linux/debug/imxssi/install-sh
trunk/target/linux/debug/imxssi/missing
trunk/target/linux/debug/imxssi/mkinstalldirs
Removed Paths:
-------------
trunk/target/linux/debug/imxssi/Makefile
Modified: trunk/buildroot/package/imxssi/imxssi.mk
===================================================================
--- trunk/buildroot/package/imxssi/imxssi.mk 2009-01-08 00:58:47 UTC (rev 1000)
+++ trunk/buildroot/package/imxssi/imxssi.mk 2009-01-08 08:54:42 UTC (rev 1001)
@@ -11,13 +11,35 @@
IMXSSI_BINARY:=imxssi
IMXSSI_TARGET_BINARY:=usr/bin/imxssi
+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
+IMXSSI_DEFINES += -DIMX27
+endif
+ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
+IMXSSI_DEFINES += -DIMXL
+endif
+
$(IMXSSI_DIR)/imxssi.c:
mkdir -p $(IMXSSI_DIR)/
- cp $(IMXSSI_SOURCE)/* $(IMXSSI_DIR)/
+ cp -Lr $(IMXSSI_SOURCE)/* $(IMXSSI_DIR)/
-$(IMXSSI_DIR)/$(IMXSSI_BINARY): $(IMXSSI_DIR)/imxssi.c
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(IMXSSI_DIR)
+$(IMXSSI_DIR)/.configured: $(IMXSSI_DIR)/imxssi.c
+ (cd $(IMXSSI_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) $(IMXSSI_DEFINES)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ )
+ touch $@
+$(IMXSSI_DIR)/$(IMXSSI_BINARY): $(IMXSSI_DIR)/.configured
+ $(MAKE) -C $(IMXSSI_DIR)
+
$(TARGET_DIR)/$(IMXSSI_TARGET_BINARY): $(IMXSSI_DIR)/$(IMXSSI_BINARY)
install -D $< $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(IMXSSI_TARGET_BINARY)
Added: trunk/target/linux/debug/imxssi/AUTHORS
===================================================================
--- trunk/target/linux/debug/imxssi/AUTHORS (rev 0)
+++ trunk/target/linux/debug/imxssi/AUTHORS 2009-01-08 08:54:42 UTC (rev 1001)
@@ -0,0 +1,2 @@
+Jorasse - Armadeus Project
+Julien Boibessot - Armadeus Systems
Added: trunk/target/linux/debug/imxssi/COPYING
===================================================================
--- trunk/target/linux/debug/imxssi/COPYING (rev 0)
+++ trunk/target/linux/debug/imxssi/COPYING 2009-01-08 08:54:42 UTC (rev 1001)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Deleted: trunk/target/linux/debug/imxssi/Makefile
===================================================================
--- trunk/target/linux/debug/imxssi/Makefile 2009-01-08 00:58:47 UTC (rev 1000)
+++ trunk/target/linux/debug/imxssi/Makefile 2009-01-08 08:54:42 UTC (rev 1001)
@@ -1,9 +0,0 @@
-
-all: imxssi
-
-imxssi: imxssi.c ../imxregs/imxregs.h
- arm-linux-gcc imxssi.c -O2 -lm -o $@
-
-clean:
- rm -f *.o
- rm -f imxssi
Added: trunk/target/linux/debug/imxssi/Makefile.am
===================================================================
--- trunk/target/linux/debug/imxssi/Makefile.am (rev 0)
+++ trunk/target/linux/debug/imxssi/Makefile.am 2009-01-08 08:54:42 UTC (rev 1001)
@@ -0,0 +1,6 @@
+bin_PROGRAMS=imxssi
+
+imxssi_SOURCES= \
+ imxssi.c \
+ imxregs.h \
+ definitions.h
Added: trunk/target/linux/debug/imxssi/Makefile.in
===================================================================
--- trunk/target/linux/debug/imxssi/Makefile.in (rev 0)
+++ trunk/target/linux/debug/imxssi/Makefile.in 2009-01-08 08:54:42 UTC (rev 1001)
@@ -0,0 +1,482 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+bin_PROGRAMS = imxssi
+
+imxssi_SOURCES = \
+ imxssi.c \
+ imxregs.h \
+ definitions.h
+
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = imxssi$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_imxssi_OBJECTS = imxssi.$(OBJEXT)
+imxssi_OBJECTS = $(am_imxssi_OBJECTS)
+imxssi_LDADD = $(LDADD)
+imxssi_DEPENDENCIES =
+imxssi_LDFLAGS =
+
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/imxssi.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(imxssi_SOURCES)
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 configure \
+ configure.ac depcomp install-sh missing mkinstalldirs
+SOURCES = $(imxssi_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): configure.ac
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+imxssi$(EXEEXT): $(imxssi_OBJECTS) $(imxssi_DEPENDENCIES)
+ @rm -f imxssi$(EXEEXT)
+ $(LINK) $(imxssi_LDFLAGS) $(imxssi_OBJECTS) $(imxssi_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imxssi.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags dist dist-all dist-gzip distcheck distclean \
+ distclean-compile distclean-generic distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/target/linux/debug/imxssi/aclocal.m4
===================================================================
--- trunk/target/linux/debug/imxssi/aclocal.m4 (rev 0)
+++ trunk/target/linux/debug/imxssi/aclocal.m4 2009-01-08 08:54:42 UTC (rev 1001)
@@ -0,0 +1,835 @@
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Do all the work for Automake. -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 10
+
+AC_PREREQ([2.54])
+
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+ [AM_AUTOMAKE_VERSION([1.7.9])])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright 2001, 2002 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# AM_AUX_DIR_EXPAND
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# -*- Autoconf -*-
+# Copyright (C) 2003 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5 -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's c...
[truncated message content] |
|
From: <jo...@us...> - 2009-01-08 00:58:51
|
Revision: 1000
http://armadeus.svn.sourceforge.net/armadeus/?rev=1000&view=rev
Author: jorasse
Date: 2009-01-08 00:58:47 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[buildroot] upgrade and fix setserial 2.17-45
Added Paths:
-----------
trunk/patches/069-buidlroot_setserial_2.17-45.diff
Added: trunk/patches/069-buidlroot_setserial_2.17-45.diff
===================================================================
--- trunk/patches/069-buidlroot_setserial_2.17-45.diff (rev 0)
+++ trunk/patches/069-buidlroot_setserial_2.17-45.diff 2009-01-08 00:58:47 UTC (rev 1000)
@@ -0,0 +1,17 @@
+--- buildroot/package/setserial/setserial.mk.ori 2008-11-03 09:15:29.000000000 +0100
++++ buildroot/package/setserial/setserial.mk 2009-01-08 01:49:45.000000000 +0100
+@@ -4,10 +4,11 @@
+ #
+ #############################################################
+ SETSERIAL_VERSION:=2.17
+-SETSERIAL_PATCH_VERSION:=-44
++SETSERIAL_PATCH_VERSION:=-45
+ #SETSERIAL_PATCH_FILE:=
+-SETSERIAL_SOURCE:=setserial_$(SETSERIAL_VERSION)$(SETSERIAL_PATCH_VERSION).tar.gz
+-SETSERIAL_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/s/setserial/
++SETSERIAL_SOURCE:=setserial_$(SETSERIAL_VERSION).orig.tar.gz
++SETSERIAL_PATCH_FILE:=setserial_$(SETSERIAL_VERSION)$(SETSERIAL_PATCH_VERSION).diff.gz
++SETSERIAL_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/s/setserial
+ SETSERIAL_DIR:=$(BUILD_DIR)/setserial-$(SETSERIAL_VERSION)
+ SETSERIAL_BINARY:=setserial
+ SETSERIAL_TARGET_BINARY:=usr/bin/setserial
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-08 00:13:13
|
Revision: 999
http://armadeus.svn.sourceforge.net/armadeus/?rev=999&view=rev
Author: jorasse
Date: 2009-01-08 00:13:08 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
[buildroot] cleanup
Removed Paths:
-------------
trunk/patches/002-buildroot-linuxdep.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-07 23:42:11
|
Revision: 998
http://armadeus.svn.sourceforge.net/armadeus/?rev=998&view=rev
Author: jorasse
Date: 2009-01-07 23:42:08 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
[mplayer] armv4 does not support pld instruction
Added Paths:
-----------
trunk/buildroot/package/mplayer/
trunk/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
Added: trunk/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
===================================================================
--- trunk/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch (rev 0)
+++ trunk/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch 2009-01-07 23:42:08 UTC (rev 998)
@@ -0,0 +1,14 @@
+--- MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S.ori 2006-10-23 00:32:33.000000000 +0200
++++ MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S 2009-01-08 00:26:45.000000000 +0100
+@@ -19,6 +19,11 @@
+ @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ @
+
++#if !defined(HAVE_ARMV5TE) && !defined(HAVE_IWMMXT)
++.macro pld arg
++ @
++.endm
++#endif
+ .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
+ mov \Rd0, \Rn0, lsr #(\shift * 8)
+ mov \Rd1, \Rn1, lsr #(\shift * 8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-07 21:27:59
|
Revision: 997
http://armadeus.svn.sourceforge.net/armadeus/?rev=997&view=rev
Author: jorasse
Date: 2009-01-07 21:27:55 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
[buildroot] delete deprecated cygwin patchs
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.12/cygwin/
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.17/cygwin/
trunk/buildroot/toolchain/uClibc/002-cygwin-uclibc.patch
trunk/host/patches/
Deleted: trunk/buildroot/toolchain/uClibc/002-cygwin-uclibc.patch
===================================================================
--- trunk/buildroot/toolchain/uClibc/002-cygwin-uclibc.patch 2009-01-07 17:57:03 UTC (rev 996)
+++ trunk/buildroot/toolchain/uClibc/002-cygwin-uclibc.patch 2009-01-07 21:27:55 UTC (rev 997)
@@ -1,11 +0,0 @@
---- uClibc-0.9.28/Makefile 2005-08-18 00:49:50.000000000 +0200
-+++ uClibc-0.9.28/Makefile 2006-08-28 23:01:24.546875000 +0200
-@@ -163,7 +163,7 @@ install_dev:
- else \
- extra_exclude="" ; \
- fi ; \
-- tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \
-+ tar --exclude .svn --exclude CVS $$extra_exclude -chf - include \
- | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
- ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
- # Remove floating point related headers since float support is disabled.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-01-07 17:57:07
|
Revision: 996
http://armadeus.svn.sourceforge.net/armadeus/?rev=996&view=rev
Author: artemys
Date: 2009-01-07 17:57:03 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
[DEBUG] imxregs: makes the distinguish between the two SSI register sets on i.MX27
Modified Paths:
--------------
trunk/target/linux/debug/imxregs/imx27regs.h
Modified: trunk/target/linux/debug/imxregs/imx27regs.h
===================================================================
--- trunk/target/linux/debug/imxregs/imx27regs.h 2009-01-06 00:19:40 UTC (rev 995)
+++ trunk/target/linux/debug/imxregs/imx27regs.h 2009-01-07 17:57:03 UTC (rev 996)
@@ -334,53 +334,53 @@
{ "CSPI_DMA2", 0x1000F018, 0, 0xffffffff, 'x', "CSPI DMA Register 2" },
{ "CSPI_RESET2", 0x1000F01C, 0, 0xffffffff, 'x', "CSPI 2 Soft Reset Register" },
// SSI1
-{ "STX0", 0x10010000, 0, 0xffffffff, 'x', "SSI Transmit Data Register 0" },
-{ "STX1", 0x10010004, 0, 0xffffffff, 'x', "SSI Transmit Data Register 1" },
-{ "SRX0", 0x10010008, 0, 0xffffffff, 'x', "SSI Receive Data Register 0" },
-{ "SRX1", 0x1001000C, 0, 0xffffffff, 'x', "SSI Receive Data Register 1" },
-{ "SCR", 0x10010010, 0, 0xffffffff, 'x', "SSI Control Register" },
-{ "SISR", 0x10010014, 0, 0xffffffff, 'x', "SSI Interrupt Status Register" },
-{ "SIER", 0x10010018, 0, 0xffffffff, 'x', "SSI Interrupt Enable Register" },
-{ "STCR", 0x1001001C, 0, 0xffffffff, 'x', "SSI Transmit Configuration Register" },
-{ "SRCR", 0x10010020, 0, 0xffffffff, 'x', "SSI Receive Configuration Register" },
-{ "STCCR", 0x10010024, 0, 0xffffffff, 'x', "SSI Transmit Clock Control Register" },
-{ "SRCCR", 0x10010028, 0, 0xffffffff, 'x', "SSI Receive Clock Control Register" },
-{ "SFCSR", 0x1001002C, 0, 0xffffffff, 'x', "SSI FIFO Control/Status Register" },
-{ "STR", 0x10010030, 0, 0xffffffff, 'x', "SSI Test Register" },
-{ "SOR", 0x10010034, 0, 0xffffffff, 'x', "SSI Option Register" },
-{ "SACNT", 0x10010038, 0, 0xffffffff, 'x', "SSI AC97 Control Register" },
-{ "SACADD", 0x1001003C, 0, 0xffffffff, 'x', "SSI AC97 Command Address Register" },
-{ "SACDAT", 0x10010040, 0, 0xffffffff, 'x', "SSI AC97 Command Data Register" },
-{ "SATAG", 0x10010044, 0, 0xffffffff, 'x', "SSI AC97 Tag Register" },
-{ "STMSK", 0x10010048, 0, 0xffffffff, 'x', "SSI Transmit Time Slot Mask Register" },
-{ "SRMSK", 0x1001004C, 0, 0xffffffff, 'x', "SSI Receive Time Slot Mask Register" },
-{ "SACCST", 0x10010050, 0, 0xffffffff, 'x', "SSI AC97 Channel Status Register" },
-{ "SACCEN", 0x10010054, 0, 0xffffffff, 'x', "SSI AC97 Channel Enable Register" },
-{ "SACCDIS", 0x10010058, 0, 0xffffffff, 'x', "SSI AC97 Channel Disable Register" },
+{ "STX0_1", 0x10010000, 0, 0xffffffff, 'x', "SSI_1 Transmit Data Register 0" },
+{ "STX1_1", 0x10010004, 0, 0xffffffff, 'x', "SSI_1 Transmit Data Register 1" },
+{ "SRX0_1", 0x10010008, 0, 0xffffffff, 'x', "SSI_1 Receive Data Register 0" },
+{ "SRX1_1", 0x1001000C, 0, 0xffffffff, 'x', "SSI_1 Receive Data Register 1" },
+{ "SCR_1", 0x10010010, 0, 0xffffffff, 'x', "SSI_1 Control Register" },
+{ "SISR_1", 0x10010014, 0, 0xffffffff, 'x', "SSI_1 Interrupt Status Register" },
+{ "SIER_1", 0x10010018, 0, 0xffffffff, 'x', "SSI_1 Interrupt Enable Register" },
+{ "STCR_1", 0x1001001C, 0, 0xffffffff, 'x', "SSI_1 Transmit Configuration Register" },
+{ "SRCR_1", 0x10010020, 0, 0xffffffff, 'x', "SSI_1 Receive Configuration Register" },
+{ "STCCR_1", 0x10010024, 0, 0xffffffff, 'x', "SSI_1 Transmit Clock Control Register" },
+{ "SRCCR_1", 0x10010028, 0, 0xffffffff, 'x', "SSI_1 Receive Clock Control Register" },
+{ "SFCSR_1", 0x1001002C, 0, 0xffffffff, 'x', "SSI_1 FIFO Control/Status Register" },
+{ "STR_1", 0x10010030, 0, 0xffffffff, 'x', "SSI_1 Test Register" },
+{ "SOR_1", 0x10010034, 0, 0xffffffff, 'x', "SSI_1 Option Register" },
+{ "SACNT_1", 0x10010038, 0, 0xffffffff, 'x', "SSI_1 AC97 Control Register" },
+{ "SACADD_1", 0x1001003C, 0, 0xffffffff, 'x', "SSI_1 AC97 Command Address Register" },
+{ "SACDAT_1", 0x10010040, 0, 0xffffffff, 'x', "SSI_1 AC97 Command Data Register" },
+{ "SATAG_1", 0x10010044, 0, 0xffffffff, 'x', "SSI_1 AC97 Tag Register" },
+{ "STMSK_1", 0x10010048, 0, 0xffffffff, 'x', "SSI_1 Transmit Time Slot Mask Register" },
+{ "SRMSK_1", 0x1001004C, 0, 0xffffffff, 'x', "SSI_1 Receive Time Slot Mask Register" },
+{ "SACCST_1", 0x10010050, 0, 0xffffffff, 'x', "SSI_1 AC97 Channel Status Register" },
+{ "SACCEN_1", 0x10010054, 0, 0xffffffff, 'x', "SSI_1 AC97 Channel Enable Register" },
+{ "SACCDIS_1", 0x10010058, 0, 0xffffffff, 'x', "SSI_1 AC97 Channel Disable Register" },
// SSI2
-{ "STX0", 0x10011000, 0, 0xffffffff, 'x', "SSI Transmit Data Register 0" },
-{ "STX1", 0x10011004, 0, 0xffffffff, 'x', "SSI Transmit Data Register 1" },
-{ "SRX0", 0x10011008, 0, 0xffffffff, 'x', "SSI Receive Data Register 0" },
-{ "SRX1", 0x1001100C, 0, 0xffffffff, 'x', "SSI Receive Data Register 1" },
-{ "SCR", 0x10011010, 0, 0xffffffff, 'x', "SSI Control Register" },
-{ "SISR", 0x10011014, 0, 0xffffffff, 'x', "SSI Interrupt Status Register" },
-{ "SIER", 0x10011018, 0, 0xffffffff, 'x', "SSI Interrupt Enable Register" },
-{ "STCR", 0x1001101C, 0, 0xffffffff, 'x', "SSI Transmit Configuration Register" },
-{ "SRCR", 0x10011020, 0, 0xffffffff, 'x', "SSI Receive Configuration Register" },
-{ "STCCR", 0x10011024, 0, 0xffffffff, 'x', "SSI Transmit Clock Control Register" },
-{ "SRCCR", 0x10011028, 0, 0xffffffff, 'x', "SSI Receive Clock Control Register" },
-{ "SFCSR", 0x1001102C, 0, 0xffffffff, 'x', "SSI FIFO Control/Status Register" },
-{ "STR", 0x10011030, 0, 0xffffffff, 'x', "SSI Test Register" },
-{ "SOR", 0x10011034, 0, 0xffffffff, 'x', "SSI Option Register" },
-{ "SACNT", 0x10011038, 0, 0xffffffff, 'x', "SSI AC97 Control Register" },
-{ "SACADD", 0x1001103C, 0, 0xffffffff, 'x', "SSI AC97 Command Address Register" },
-{ "SACDAT", 0x10011040, 0, 0xffffffff, 'x', "SSI AC97 Command Data Register" },
-{ "SATAG", 0x10011044, 0, 0xffffffff, 'x', "SSI AC97 Tag Register" },
-{ "STMSK", 0x10011048, 0, 0xffffffff, 'x', "SSI Transmit Time Slot Mask Register" },
-{ "SRMSK", 0x1001104C, 0, 0xffffffff, 'x', "SSI Receive Time Slot Mask Register" },
-{ "SACCST", 0x10011050, 0, 0xffffffff, 'x', "SSI AC97 Channel Status Register" },
-{ "SACCEN", 0x10011054, 0, 0xffffffff, 'x', "SSI AC97 Channel Enable Register" },
-{ "SACCDIS", 0x10011058, 0, 0xffffffff, 'x', "SSI AC97 Channel Disable Register" },
+{ "STX0_2", 0x10011000, 0, 0xffffffff, 'x', "SSI_2 Transmit Data Register 0" },
+{ "STX1_2", 0x10011004, 0, 0xffffffff, 'x', "SSI_2 Transmit Data Register 1" },
+{ "SRX0_2", 0x10011008, 0, 0xffffffff, 'x', "SSI_2 Receive Data Register 0" },
+{ "SRX1_2", 0x1001100C, 0, 0xffffffff, 'x', "SSI_2 Receive Data Register 1" },
+{ "SCR_2", 0x10011010, 0, 0xffffffff, 'x', "SSI_2 Control Register" },
+{ "SISR_2", 0x10011014, 0, 0xffffffff, 'x', "SSI_2 Interrupt Status Register" },
+{ "SIER_2", 0x10011018, 0, 0xffffffff, 'x', "SSI_2 Interrupt Enable Register" },
+{ "STCR_2", 0x1001101C, 0, 0xffffffff, 'x', "SSI_2 Transmit Configuration Register" },
+{ "SRCR_2", 0x10011020, 0, 0xffffffff, 'x', "SSI_2 Receive Configuration Register" },
+{ "STCCR_2", 0x10011024, 0, 0xffffffff, 'x', "SSI_2 Transmit Clock Control Register" },
+{ "SRCCR_2", 0x10011028, 0, 0xffffffff, 'x', "SSI_2 Receive Clock Control Register" },
+{ "SFCSR_2", 0x1001102C, 0, 0xffffffff, 'x', "SSI_2 FIFO Control/Status Register" },
+{ "STR_2", 0x10011030, 0, 0xffffffff, 'x', "SSI_2 Test Register" },
+{ "SOR_2", 0x10011034, 0, 0xffffffff, 'x', "SSI_2 Option Register" },
+{ "SACNT_2", 0x10011038, 0, 0xffffffff, 'x', "SSI_2 AC97 Control Register" },
+{ "SACADD_2", 0x1001103C, 0, 0xffffffff, 'x', "SSI_2 AC97 Command Address Register" },
+{ "SACDAT_2", 0x10011040, 0, 0xffffffff, 'x', "SSI_2 AC97 Command Data Register" },
+{ "SATAG_2", 0x10011044, 0, 0xffffffff, 'x', "SSI_2 AC97 Tag Register" },
+{ "STMSK_2", 0x10011048, 0, 0xffffffff, 'x', "SSI_2 Transmit Time Slot Mask Register" },
+{ "SRMSK_2", 0x1001104C, 0, 0xffffffff, 'x', "SSI_2 Receive Time Slot Mask Register" },
+{ "SACCST_2", 0x10011050, 0, 0xffffffff, 'x', "SSI_2 AC97 Channel Status Register" },
+{ "SACCEN_2", 0x10011054, 0, 0xffffffff, 'x', "SSI_2 AC97 Channel Enable Register" },
+{ "SACCDIS_2", 0x10011058, 0, 0xffffffff, 'x', "SSI_2 AC97 Channel Disable Register" },
// I2C1
{ "IADR", 0x10012000, 0, 0xffffffff, 'x', "I2C Address Register" },
{ "IFDR", 0x10012004, 0, 0xffffffff, 'x', "I2C Frequency Divider Register" },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-06 00:19:46
|
Revision: 995
http://armadeus.svn.sourceforge.net/armadeus/?rev=995&view=rev
Author: jorasse
Date: 2009-01-06 00:19:40 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
[buildroot] remove deprecated cygwin patchs
Removed Paths:
-------------
trunk/patches/cygwin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-05 23:56:32
|
Revision: 994
http://armadeus.svn.sourceforge.net/armadeus/?rev=994&view=rev
Author: jorasse
Date: 2009-01-05 23:56:30 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] upgrade curl to buildroot libcurl
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Added Paths:
-----------
trunk/buildroot/package/libcurl/
trunk/buildroot/package/libcurl/Config.in
trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
trunk/buildroot/package/libcurl/libcurl.mk
trunk/patches/068-buildroot_upgrade_to_libcurl.diff
Added: trunk/buildroot/package/libcurl/Config.in
===================================================================
--- trunk/buildroot/package/libcurl/Config.in (rev 0)
+++ trunk/buildroot/package/libcurl/Config.in 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBCURL
+ bool "libcurl"
+ help
+ cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+ and Dict servers, using any of the supported protocols.
+
+ http://curl.haxx.nu/
+
+config BR2_PACKAGE_CURL
+ bool "curl binary"
+ depends on BR2_PACKAGE_LIBCURL
+ help
+ Install curl binary as well
Added: trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
===================================================================
--- trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch (rev 0)
+++ trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,25 @@
+ssluse.c: fix build breakage with --with-ssl --disable-verbose
+
+Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
+but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+ lib/ssluse.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: curl-7.19.2/lib/ssluse.c
+===================================================================
+--- curl-7.19.2.orig/lib/ssluse.c
++++ curl-7.19.2/lib/ssluse.c
+@@ -923,10 +923,6 @@
+ int i;
+ int year=0,month=0,day=0,hour=0,minute=0,second=0;
+
+-#ifdef CURL_DISABLE_VERBOSE_STRINGS
+- (void)prefix;
+-#endif
+-
+ i=tm->length;
+ asn1_string=(const char *)tm->data;
+
Added: trunk/buildroot/package/libcurl/libcurl.mk
===================================================================
--- trunk/buildroot/package/libcurl/libcurl.mk (rev 0)
+++ trunk/buildroot/package/libcurl/libcurl.mk 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,29 @@
+#############################################################
+#
+# libcurl
+#
+#############################################################
+LIBCURL_VERSION = 7.19.2
+LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
+LIBCURL_SITE = http://curl.haxx.se/download/
+LIBCURL_INSTALL_STAGING = YES
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
+ $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBCURL_DEPENDENCIES += openssl
+LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
+endif
+
+$(eval $(call AUTOTARGETS,package,libcurl))
+
+$(LIBCURL_HOOK_POST_INSTALL):
+ rm -rf $(TARGET_DIR)/usr/bin/curl-config \
+ $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
+ touch $@
+
+curl: libcurl
+curl-clean: libcurl-clean
+curl-dirclean: libcurl-dirclean
+curl-source: libcurl-source
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-05 22:03:04 UTC (rev 993)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-05 23:56:30 UTC (rev 994)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sat Jan 3 20:06:58 2009
+# Tue Jan 6 00:45:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -370,8 +370,6 @@
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CURL is not set
-# BR2_PACKAGE_LIBCURL is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_ETHTOOL is not set
@@ -389,6 +387,7 @@
# BR2_PACKAGE_L2TP is not set
# BR2_PACKAGE_LIBCGI is not set
# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBPCAP is not set
Added: trunk/patches/068-buildroot_upgrade_to_libcurl.diff
===================================================================
--- trunk/patches/068-buildroot_upgrade_to_libcurl.diff (rev 0)
+++ trunk/patches/068-buildroot_upgrade_to_libcurl.diff 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,275 @@
+--- buildroot/package/Config.in.ref 2009-01-05 22:57:30.000000000 +0100
++++ buildroot/package/Config.in 2009-01-06 00:11:31.000000000 +0100
+@@ -145,7 +145,6 @@
+ source "package/boa/Config.in"
+ source "package/bind/Config.in"
+ source "package/bridge-utils/Config.in"
+-source "package/curl/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/dhcp/Config.in"
+ endif
+@@ -164,6 +163,7 @@
+ source "package/l2tp/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
++source "package/libcurl/Config.in"
+ source "package/libeXosip2/Config.in"
+ source "package/libosip2/Config.in"
+ source "package/libpcap/Config.in"
+diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
+--- buildroot/package/curl.ori/Config.in 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/Config.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,15 +0,0 @@
+-config BR2_PACKAGE_CURL
+- bool "curl"
+- help
+- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+- and Dict servers, using any of the supported protocols.
+-
+- http://curl.haxx.nu/
+-
+-config BR2_PACKAGE_LIBCURL
+- bool "libcurl"
+- help
+- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+- and Dict servers, using any of the supported protocols.
+-
+- http://curl.haxx.nu/
+diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/curl/curl-7.10.4-path.patch
+--- buildroot/package/curl.ori/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.10.4-path.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,13 +0,0 @@
+---- curl-7.10.4/lib/Makefile.am
+-+++ curl-7.10.4/lib/Makefile.am
+-@@ -78,8 +78,8 @@
+-
+- install-data-hook:
+- @if test -n "@CURL_CA_BUNDLE@"; then \
+-- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+-- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+-+ $(mkinstalldirs) `dirname $(prefix)/../@CURL_CA_BUNDLE@`; \
+-+ @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(prefix)/../@CURL_CA_BUNDLE@; \
+- fi
+-
+- # this hook is mainly for non-unix systems to build even if configure
+diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/curl/curl-7.12.0-nousr.patch
+--- buildroot/package/curl.ori/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.12.0-nousr.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+---- curl-7.12.0/configure.ac.orig 2004-05-25 23:43:39.000000000 +0200
+-+++ curl-7.12.0/configure.ac 2004-07-26 15:12:03.029071072 +0200
+-@@ -742,5 +742,5 @@
+- dnl check the given spot right away!
+- EXTRA_SSL=$OPT_SSL
+-- LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
+-+ #LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
+- CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+- ;;
+-@@ -750,5 +750,5 @@
+- HAVECRYPTO="yes"
+- ],[
+-- LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff"
+-+ LDFLAGS="$CLEANLDFLAGS"
+- CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+- AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
+diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/package/curl/curl-7.13.1-2005-3185.patch
+--- buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-2005-3185.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+---- curl-7.13.1/lib/http_ntlm.c.2005-3185 2005-02-22 13:10:30.000000000 +0100
+-+++ curl-7.13.1/lib/http_ntlm.c 2005-10-19 15:18:42.165859528 +0200
+-@@ -534,6 +534,13 @@
+- size=64;
+- ntlmbuf[62]=ntlmbuf[63]=0;
+-
+-+ /* Make sure that the user and domain strings fit in the target buffer
+-+ before we copy them there. */
+-+ if(size + userlen + domlen >= sizeof(ntlmbuf)) {
+-+ failf(conn->data, "user + domain name too big");
+-+ return CURLE_OUT_OF_MEMORY;
+-+ }
+-+
+- memcpy(&ntlmbuf[size], domain, domlen);
+- size += domlen;
+-
+diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/curl/curl-7.13.1-auth.patch
+--- buildroot/package/curl.ori/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-auth.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,48 +0,0 @@
+---- curl-7.13.1/lib/http.c.pom 2005-02-19 00:53:07.000000000 +0100
+-+++ curl-7.13.1/lib/http.c 2005-04-27 11:48:40.000000000 +0200
+-@@ -455,6 +455,7 @@
+- /* To prevent the user+password to get sent to other than the original
+- host due to a location-follow, we do some weirdo checks here */
+- if(!data->state.this_is_a_follow ||
+-+ conn->bits.netrc ||
+- !data->state.first_host ||
+- curl_strequal(data->state.first_host, conn->host.name) ||
+- data->set.http_disable_hostname_check_before_authentication) {
+---- curl-7.13.1/lib/url.c.pom 2005-02-09 23:47:57.000000000 +0100
+-+++ curl-7.13.1/lib/url.c 2005-04-27 11:45:59.000000000 +0200
+-@@ -3131,15 +3131,23 @@
+- user, passwd);
+- }
+-
+-+ conn->bits.netrc = FALSE;
+- if (data->set.use_netrc != CURL_NETRC_IGNORED) {
+- if(Curl_parsenetrc(conn->host.name,
+- user, passwd,
+- data->set.netrc_file)) {
+-- infof(data, "Couldn't find host %s in the " DOT_CHAR "netrc file, using defaults\n",
+-+ infof(data, "Couldn't find host %s in the " DOT_CHAR
+-+ "netrc file, using defaults\n",
+- conn->host.name);
+- }
+-- else
+-+ else {
+-+ /* set bits.netrc TRUE to remember that we got the name from a .netrc
+-+ file, so that it is safe to use even if we followed a Location: to a
+-+ different host or similar. */
+-+ conn->bits.netrc = TRUE;
+-+
+- conn->bits.user_passwd = 1; /* enable user+password */
+-+ }
+- }
+-
+- /* If our protocol needs a password and we have none, use the defaults */
+---- curl-7.13.1/lib/urldata.h.pom 2005-02-09 14:06:56.000000000 +0100
+-+++ curl-7.13.1/lib/urldata.h 2005-04-27 11:50:31.000000000 +0200
+-@@ -388,6 +388,7 @@
+- bool ftp_use_lprt; /* As set with CURLOPT_FTP_USE_EPRT, but if we find out
+- LPRT doesn't work we disable it for the forthcoming
+- requests */
+-+ bool netrc; /* name+password provided by netrc */
+- };
+-
+- struct hostname {
+diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
+--- buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,23 +0,0 @@
+---- curl-7.13.1/lib/url.c.cve-2005-4077 2005-12-08 13:08:03.000000000 +0100
+-+++ curl-7.13.1/lib/url.c 2005-12-08 13:15:56.565790336 +0100
+-@@ -2313,12 +2313,18 @@
+- if(urllen < LEAST_PATH_ALLOC)
+- urllen=LEAST_PATH_ALLOC;
+-
+-- conn->pathbuffer=(char *)malloc(urllen);
+-+ /*
+-+ * We malloc() the buffers below urllen+2 to make room for to possibilities:
+-+ * 1 - an extra terminating zero
+-+ * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
+-+ */
+-+
+-+ conn->pathbuffer=(char *)malloc(urllen+3);
+- if(NULL == conn->pathbuffer)
+- return CURLE_OUT_OF_MEMORY; /* really bad error */
+- conn->path = conn->pathbuffer;
+-
+-- conn->host.rawalloc=(char *)malloc(urllen);
+-+ conn->host.rawalloc=(char *)malloc(urllen+3);
+- if(NULL == conn->host.rawalloc)
+- return CURLE_OUT_OF_MEMORY;
+- conn->host.name = conn->host.rawalloc;
+diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
+--- buildroot/package/curl.ori/curl.mk 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl.mk 1970-01-01 01:00:00.000000000 +0100
+@@ -1,97 +0,0 @@
+-#############################################################
+-#
+-# curl
+-#
+-#############################################################
+-CURL_VERSION:=7.17.1
+-LIBCURL_VERSION:=4.0.1
+-CURL_SOURCE:=curl-$(CURL_VERSION).tar.bz2
+-CURL_SITE:=http://curl.haxx.se/download/
+-CURL_CAT:=$(BZCAT)
+-CURL_DIR:=$(BUILD_DIR)/curl-$(CURL_VERSION)
+-CURL_BINARY:=curl
+-CURL_DESTDIR:=$(STAGING_DIR)/usr
+-
+-$(DL_DIR)/$(CURL_SOURCE):
+- $(WGET) -P $(DL_DIR) $(CURL_SITE)/$(CURL_SOURCE)
+-
+-curl-source: $(DL_DIR)/$(CURL_SOURCE)
+-
+-$(CURL_DIR)/.unpacked: $(DL_DIR)/$(CURL_SOURCE)
+- $(CURL_CAT) $(DL_DIR)/$(CURL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- toolchain/patch-kernel.sh $(CURL_DIR) package/curl/ curl-$(CURL_VERSION)-\*.patch*
+- touch $(CURL_DIR)/.unpacked
+-
+-$(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked
+- (cd $(CURL_DIR); rm -rf config.cache; \
+- aclocal; \
+- libtoolize --force; \
+- ./reconf; )
+- $(CONFIG_UPDATE) $(CURL_DIR)
+- (cd $(CURL_DIR); \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --exec-prefix=/usr \
+- --bindir=/usr/bin \
+- --sbindir=/usr/sbin \
+- --libdir=/usr/lib \
+- --libexecdir=/usr/lib \
+- --sysconfdir=/etc \
+- --datadir=/usr/share \
+- --localstatedir=/var \
+- --includedir=/usr/include \
+- --mandir=/usr/share/man \
+- --infodir=/usr/share/info \
+- )
+- touch $(CURL_DIR)/.configured
+-
+-$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
+- $(MAKE) -C $(CURL_DIR)
+-
+-$(CURL_DESTDIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
+- -mkdir $(CURL_DESTDIR)/bin
+- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CURL_DIR) install
+- $(SED) "s,^libdir=.*,libdir=\'$(CURL_DESTDIR)/lib\',g" $(CURL_DESTDIR)/lib/libcurl.la
+- touch $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+-
+-$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+- -mkdir $(TARGET_DIR)/usr/lib
+- -mkdir $(TARGET_DIR)/usr/bin
+- cp -a $(CURL_DESTDIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
+-
+-$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
+- cp -a $(CURL_DESTDIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
+-
+-curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
+-
+-libcurl: $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+-
+-curl-clean:
+- rm -f $(TARGET_DIR)/usr/lib/libcurl.so*
+- rm -f $(TARGET_DIR)/usr/bin/curl
+- rm -f $(CURL_DESTDIR)/bin/curl*
+- rm -f $(CURL_DESTDIR)/lib/libcurl.so*
+- rm -rf $(CURL_DESTDIR)/include/curl
+- -$(MAKE) -C $(CURL_DIR) clean
+-
+-curl-dirclean:
+- rm -rf $(CURL_DIR)
+-
+-#############################################################
+-#
+-# Toplevel Makefile options
+-#
+-#############################################################
+-ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
+-TARGETS+=curl
+-endif
+-ifeq ($(strip $(BR2_PACKAGE_LIBCURL)),y)
+-TARGETS+=libcurl
+-endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-05 22:03:06
|
Revision: 993
http://armadeus.svn.sourceforge.net/armadeus/?rev=993&view=rev
Author: jorasse
Date: 2009-01-05 22:03:04 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] upgrade package libpcap fixing patch failure
Added Paths:
-----------
trunk/patches/067-buildroot_libpcap_patch_failure.diff
Added: trunk/patches/067-buildroot_libpcap_patch_failure.diff
===================================================================
--- trunk/patches/067-buildroot_libpcap_patch_failure.diff (rev 0)
+++ trunk/patches/067-buildroot_libpcap_patch_failure.diff 2009-01-05 22:03:04 UTC (rev 993)
@@ -0,0 +1,20 @@
+diff -urN buildroot/package.ori/libpcap/libpcap.mk buildroot/package/libpcap/libpcap.mk
+--- buildroot/package.ori/libpcap/libpcap.mk 2008-11-03 09:15:26.000000000 +0100
++++ buildroot/package/libpcap/libpcap.mk 2009-01-05 22:42:26.000000000 +0100
+@@ -34,6 +34,7 @@
+
+ $(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
+ $(LIBPCAP_CAT) $(DL_DIR)/$(LIBPCAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ rm -f $(LIBPCAP_DIR)/gencode.c.rej
+ toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ \*.patch
+ $(CONFIG_UPDATE) $(LIBPCAP_DIR)
+ touch $@
+@@ -79,6 +80,6 @@
+ # Toplevel Makefile options
+ #
+ #############################################################
+-ifeq ($(strip $(BR2_PACKAGE_LIBPCAP)),y)
++ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+ TARGETS+=libpcap
+ endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-05 21:24:03
|
Revision: 992
http://armadeus.svn.sourceforge.net/armadeus/?rev=992&view=rev
Author: jorasse
Date: 2009-01-05 21:23:59 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] undo change committed in r988 and r989
Modified Paths:
--------------
trunk/target/linux/modules/fpga/POD/Makefile
Added Paths:
-----------
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Removed Paths:
-------------
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Deleted: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:23:59 UTC (rev 992)
@@ -1,18 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- boolean "Drivers generated by POD"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
-
-
-source "drivers/armadeus/fpga/POD/void/Kconfig"
-
Copied: trunk/target/linux/modules/fpga/POD/Kconfig (from rev 987, trunk/target/linux/modules/fpga/POD/Kconfig)
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig (rev 0)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:23:59 UTC (rev 992)
@@ -0,0 +1,18 @@
+
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config POD_DRIVERS
+ boolean "Drivers generated by POD"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All drivers for FPGA components
+
+
+
+source "drivers/armadeus/fpga/POD/void/Kconfig"
+
Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 21:23:59 UTC (rev 992)
@@ -14,12 +14,11 @@
# Part executed when called from standard make in this directory:
-BASE_DIR:=../../../../buildroot/
-REL:=$(shell grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/"//g')
-#
-ARMADEUS_KERNEL_DIR:=$(BASE_DIR)build_arm/linux-$(REL)
+ARMADEUS_BASE_DIR=../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_KERNEL_DIR)
+LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
endif
PWD:= $(shell pwd)
Deleted: trunk/target/linux/modules/fpga/podscript.sh
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:23:59 UTC (rev 992)
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-FPGADIR="target/linux/modules/fpga"
-PODDIR="/POD"
-
-echo "***********************"
-echo "*Generating POD config*"
-echo "***********************"
-
-echo """
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- boolean \"Drivers generated by POD\"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
-""" > $FPGADIR$PODDIR/Kconfig
-
-
-line=""
-for i in `ls $FPGADIR$PODDIR`
-do
- if [ -d $FPGADIR$PODDIR/$i ]
- then
- echo $i
- name=$i
-
- echo """
-source \"drivers/armadeus/fpga/POD/$name/Kconfig\"
-""" >> "${FPGADIR}${PODDIR}/Kconfig"
-
- line="${line} $name/"
- fi;
-done;
-
-# fill Makefile
-echo """
-#
-# Main Makefile for the Armadeus FPGA related drivers
-#
-# Add your subdirectories to obj- target
-#
-
-ifneq (\$(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-obj-\$(CONFIG_POD_DRIVERS) += ${line}
-
-else
-
-# Part executed when called from standard make in this directory:
-
-BASE_DIR:=../../../../buildroot/
-REL:=\$(shell grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
- sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/\"//g')
-#`grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
-# sed \"s/BR2_PACKAGE_LINUX_VERSION=\\\"//\" | sed \"s/\\\"//\"`
-ARMADEUS_KERNEL_DIR:=\$(BASE_DIR)build_arm/linux-\$(REL)
-ifeq (\$(LINUX_DIR),)
-LINUX_DIR:=\$(ARMADEUS_KERNEL_DIR)
-endif
-PWD:= \$(shell pwd)
-
-default:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) zImage modules
-
-clean:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) clean
-
-install:
- echo \"Installing Armadeus drivers...\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) INSTALL_MOD_PATH=\$(TARGET_DIR) modules_install
-
-endif
-
-""" > "${FPGADIR}${PODDIR}/Makefile";
-# ok config generated
-touch "$FPGADIR$PODDIR/.pod"
-echo "ok"
Copied: trunk/target/linux/modules/fpga/podscript.sh (from rev 987, trunk/target/linux/modules/fpga/podscript.sh)
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh (rev 0)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:23:59 UTC (rev 992)
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+FPGADIR="target/linux/modules/fpga"
+PODDIR="/POD"
+
+echo "***********************"
+echo "*Generating POD config*"
+echo "***********************"
+
+echo """
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config POD_DRIVERS
+ boolean \"Drivers generated by POD\"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All drivers for FPGA components
+
+""" > $FPGADIR$PODDIR/Kconfig
+
+
+line=""
+for i in `ls $FPGADIR$PODDIR`
+do
+ if [ -d $FPGADIR$PODDIR/$i ]
+ then
+ echo $i
+ name=$i
+
+ echo """
+source \"drivers/armadeus/fpga/POD/$name/Kconfig\"
+""" >> "${FPGADIR}${PODDIR}/Kconfig"
+
+ line="${line} $name/"
+ fi;
+done;
+
+# fill Makefile
+echo """
+#
+# Main Makefile for the Armadeus FPGA related drivers
+#
+# Add your subdirectories to obj- target
+#
+
+ifneq (\$(KERNELRELEASE),)
+
+# Part executed when called from kernel build system:
+obj-\$(CONFIG_POD_DRIVERS) += ${line}
+
+else
+
+# Part executed when called from standard make in this directory:
+
+BASE_DIR:=../../../../buildroot/
+REL:=\$(shell grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
+ sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/\"//g')
+#`grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
+# sed \"s/BR2_PACKAGE_LINUX_VERSION=\\\"//\" | sed \"s/\\\"//\"`
+ARMADEUS_KERNEL_DIR:=\$(BASE_DIR)build_arm/linux-\$(REL)
+ifeq (\$(LINUX_DIR),)
+LINUX_DIR:=\$(ARMADEUS_KERNEL_DIR)
+endif
+PWD:= \$(shell pwd)
+
+default:
+ echo \"Your Linux source dir is: \$(LINUX_DIR)\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) zImage modules
+
+clean:
+ echo \"Your Linux source dir is: \$(LINUX_DIR)\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) clean
+
+install:
+ echo \"Installing Armadeus drivers...\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) INSTALL_MOD_PATH=\$(TARGET_DIR) modules_install
+
+endif
+
+""" > "${FPGADIR}${PODDIR}/Makefile";
+# ok config generated
+touch "$FPGADIR$PODDIR/.pod"
+echo "ok"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-05 21:11:14
|
Revision: 991
http://armadeus.svn.sourceforge.net/armadeus/?rev=991&view=rev
Author: jorasse
Date: 2009-01-05 21:11:09 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] undo change committed in r988 and r989
Modified Paths:
--------------
trunk/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-05 20:49:48 UTC (rev 990)
+++ trunk/Makefile 2009-01-05 21:11:09 UTC (rev 991)
@@ -26,12 +26,15 @@
BUILDROOT_NAME=buildroot
BUILDROOT_FILE_PATH:=downloads
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-#http://downloads.sourceforge.net/armadeus
+#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
-include $(BUILDROOT_DIR)/.config
+LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
+BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
@@ -39,7 +42,8 @@
PATCH_DIR=patches
TAR_OPTIONS=--exclude=.svn -xf
-LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(BR2_GCC_TARGET_ARCH)/$(BR2_BOARD_NAME)/linux-$(BR2_LINUX26_VERSION)
+LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
+BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
@@ -66,8 +70,13 @@
@echo ' <Package> - a single package (ex: u-boot linux or buildroot'
@echo
@echo 'Configuration:'
+ @echo ' Global:'
@echo ' menuconfig - interactive curses-based configurator'
@echo ' oldconfig - resolve any unresolved symbols in .config'
+ @echo ' Specific:'
+ @echo ' linux-menuconfig - configure linux parameters'
+ @echo ' uclibc-menuconfig - configure uclibc library parameters'
+ @echo ' busybox-menuconfig - configure busybox shell parameters'
@echo
@echo 'Miscellaneous:'
@echo ' source - download all sources needed for offline-build'
@@ -157,6 +166,8 @@
buildroot-dirclean:
rm -rf $(BUILDROOT_DIR)
-
-.PHONY: dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean menuconfig $(BUILDROOT_DIR)/.config
+PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
+PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config
+.PHONY: $(PHONY_TARGETS)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-05 20:49:53
|
Revision: 990
http://armadeus.svn.sourceforge.net/armadeus/?rev=990&view=rev
Author: jorasse
Date: 2009-01-05 20:49:48 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] Fixed download failure
Modified Paths:
--------------
trunk/buildroot/package/allegro/allegro.mk
Modified: trunk/buildroot/package/allegro/allegro.mk
===================================================================
--- trunk/buildroot/package/allegro/allegro.mk 2009-01-05 17:05:22 UTC (rev 989)
+++ trunk/buildroot/package/allegro/allegro.mk 2009-01-05 20:49:48 UTC (rev 990)
@@ -5,7 +5,7 @@
#############################################################
ALLEGRO_VERSION:=4.2.1
ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-ALLEGRO_SITE:=http://dfn.dl.sourceforge.net/sourceforge/alleg/
+ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
ALLEGRO_CAT:=zcat
ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-01-05 17:05:26
|
Revision: 989
http://armadeus.svn.sourceforge.net/armadeus/?rev=989&view=rev
Author: FabM
Date: 2009-01-05 17:05:22 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
reverse
Modified Paths:
--------------
trunk/Makefile
trunk/target/linux/modules/fpga/POD/Makefile
Added Paths:
-----------
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Removed Paths:
-------------
trunk/target/linux/modules/fpga/POD/Kconfig
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-05 12:35:14 UTC (rev 988)
+++ trunk/Makefile 2009-01-05 17:05:22 UTC (rev 989)
@@ -26,15 +26,12 @@
BUILDROOT_NAME=buildroot
BUILDROOT_FILE_PATH:=downloads
-#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+#http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
-include $(BUILDROOT_DIR)/.config
-LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
-BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
-ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
@@ -42,8 +39,7 @@
PATCH_DIR=patches
TAR_OPTIONS=--exclude=.svn -xf
-LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
-BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
+LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(BR2_GCC_TARGET_ARCH)/$(BR2_BOARD_NAME)/linux-$(BR2_LINUX26_VERSION)
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
@@ -70,13 +66,8 @@
@echo ' <Package> - a single package (ex: u-boot linux or buildroot'
@echo
@echo 'Configuration:'
- @echo ' Global:'
@echo ' menuconfig - interactive curses-based configurator'
@echo ' oldconfig - resolve any unresolved symbols in .config'
- @echo ' Specific:'
- @echo ' linux-menuconfig - configure linux parameters'
- @echo ' uclibc-menuconfig - configure uclibc library parameters'
- @echo ' busybox-menuconfig - configure busybox shell parameters'
@echo
@echo 'Miscellaneous:'
@echo ' source - download all sources needed for offline-build'
@@ -116,11 +107,16 @@
$(MAKE) -C $(BUILDROOT_DIR)
linux-menuconfig:
+ @if [ ! -e "target/linux/modules/fpga/POD/.pod" ] ; then \
+ if [ -x target/linux/modules/fpga/podscript.sh ]; then \
+ target/linux/modules/fpga/podscript.sh ; \
+ fi \
+ fi;
@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
$(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
fi;
-linux26: $(BUILDROOT_DIR)/.configured
+linux26: $(BUILDROOT_DIR)/.configured
@-touch $(LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) linux26
@@ -161,8 +157,6 @@
buildroot-dirclean:
rm -rf $(BUILDROOT_DIR)
+
+.PHONY: dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean menuconfig $(BUILDROOT_DIR)/.config
-PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config
-.PHONY: $(PHONY_TARGETS)
-
Deleted: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 12:35:14 UTC (rev 988)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 17:05:22 UTC (rev 989)
@@ -1,13 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- tristate "Drivers generated by POD"
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
Added: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig (rev 0)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 17:05:22 UTC (rev 989)
@@ -0,0 +1,18 @@
+
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config POD_DRIVERS
+ boolean "Drivers generated by POD"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All drivers for FPGA components
+
+
+
+source "drivers/armadeus/fpga/POD/void/Kconfig"
+
Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 12:35:14 UTC (rev 988)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 17:05:22 UTC (rev 989)
@@ -8,7 +8,7 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_POD_DRIVERS) += $(find -maxdepth 1 -type d | grep -v .svn |grep -v "^.$" | sed 's/.//' | sed 's/\///' | sed 's/$/\//')
+obj-$(CONFIG_POD_DRIVERS) += void/
else
@@ -37,3 +37,4 @@
endif
+
Added: trunk/target/linux/modules/fpga/podscript.sh
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh (rev 0)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 17:05:22 UTC (rev 989)
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+FPGADIR="target/linux/modules/fpga"
+PODDIR="/POD"
+
+echo "***********************"
+echo "*Generating POD config*"
+echo "***********************"
+
+echo """
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config POD_DRIVERS
+ boolean \"Drivers generated by POD\"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All drivers for FPGA components
+
+""" > $FPGADIR$PODDIR/Kconfig
+
+
+line=""
+for i in `ls $FPGADIR$PODDIR`
+do
+ if [ -d $FPGADIR$PODDIR/$i ]
+ then
+ echo $i
+ name=$i
+
+ echo """
+source \"drivers/armadeus/fpga/POD/$name/Kconfig\"
+""" >> "${FPGADIR}${PODDIR}/Kconfig"
+
+ line="${line} $name/"
+ fi;
+done;
+
+# fill Makefile
+echo """
+#
+# Main Makefile for the Armadeus FPGA related drivers
+#
+# Add your subdirectories to obj- target
+#
+
+ifneq (\$(KERNELRELEASE),)
+
+# Part executed when called from kernel build system:
+obj-\$(CONFIG_POD_DRIVERS) += ${line}
+
+else
+
+# Part executed when called from standard make in this directory:
+
+BASE_DIR:=../../../../buildroot/
+REL:=\$(shell grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
+ sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/\"//g')
+#`grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
+# sed \"s/BR2_PACKAGE_LINUX_VERSION=\\\"//\" | sed \"s/\\\"//\"`
+ARMADEUS_KERNEL_DIR:=\$(BASE_DIR)build_arm/linux-\$(REL)
+ifeq (\$(LINUX_DIR),)
+LINUX_DIR:=\$(ARMADEUS_KERNEL_DIR)
+endif
+PWD:= \$(shell pwd)
+
+default:
+ echo \"Your Linux source dir is: \$(LINUX_DIR)\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) zImage modules
+
+clean:
+ echo \"Your Linux source dir is: \$(LINUX_DIR)\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) clean
+
+install:
+ echo \"Installing Armadeus drivers...\"
+ \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) INSTALL_MOD_PATH=\$(TARGET_DIR) modules_install
+
+endif
+
+""" > "${FPGADIR}${PODDIR}/Makefile";
+# ok config generated
+touch "$FPGADIR$PODDIR/.pod"
+echo "ok"
Property changes on: trunk/target/linux/modules/fpga/podscript.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-01-05 12:35:21
|
Revision: 988
http://armadeus.svn.sourceforge.net/armadeus/?rev=988&view=rev
Author: FabM
Date: 2009-01-05 12:35:14 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[BUILDROOT] Compiling pod drivers cleaned
Modified Paths:
--------------
trunk/Makefile
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/POD/Makefile
Removed Paths:
-------------
trunk/target/linux/modules/fpga/podscript.sh
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-04 22:07:10 UTC (rev 987)
+++ trunk/Makefile 2009-01-05 12:35:14 UTC (rev 988)
@@ -116,16 +116,11 @@
$(MAKE) -C $(BUILDROOT_DIR)
linux-menuconfig:
- @if [ ! -e "target/linux/modules/fpga/POD/.pod" ] ; then \
- if [ -x target/linux/modules/fpga/podscript.sh ]; then \
- target/linux/modules/fpga/podscript.sh ; \
- fi \
- fi;
@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
$(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
fi;
-linux26: $(BUILDROOT_DIR)/.configured
+linux26: $(BUILDROOT_DIR)/.configured
@-touch $(LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) linux26
Modified: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-04 22:07:10 UTC (rev 987)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 12:35:14 UTC (rev 988)
@@ -6,13 +6,8 @@
#
config POD_DRIVERS
- boolean "Drivers generated by POD"
- default n
+ tristate "Drivers generated by POD"
depends on ARMADEUS_FPGA_DRIVERS
---help---
All drivers for FPGA components
-
-
-source "drivers/armadeus/fpga/POD/void/Kconfig"
-
Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile 2009-01-04 22:07:10 UTC (rev 987)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 12:35:14 UTC (rev 988)
@@ -8,17 +8,18 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_POD_DRIVERS) += void/
+obj-$(CONFIG_POD_DRIVERS) += $(find -maxdepth 1 -type d | grep -v .svn |grep -v "^.$" | sed 's/.//' | sed 's/\///' | sed 's/$/\//')
else
# Part executed when called from standard make in this directory:
-ARMADEUS_BASE_DIR=../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
+BASE_DIR:=../../../../buildroot/
+REL:=$(shell grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/"//g')
+#
+ARMADEUS_KERNEL_DIR:=$(BASE_DIR)build_arm/linux-$(REL)
ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
+LINUX_DIR:=$(ARMADEUS_KERNEL_DIR)
endif
PWD:= $(shell pwd)
@@ -36,4 +37,3 @@
endif
-
Deleted: trunk/target/linux/modules/fpga/podscript.sh
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh 2009-01-04 22:07:10 UTC (rev 987)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 12:35:14 UTC (rev 988)
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-FPGADIR="target/linux/modules/fpga"
-PODDIR="/POD"
-
-echo "***********************"
-echo "*Generating POD config*"
-echo "***********************"
-
-echo """
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- boolean \"Drivers generated by POD\"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
-""" > $FPGADIR$PODDIR/Kconfig
-
-
-line=""
-for i in `ls $FPGADIR$PODDIR`
-do
- if [ -d $FPGADIR$PODDIR/$i ]
- then
- echo $i
- name=$i
-
- echo """
-source \"drivers/armadeus/fpga/POD/$name/Kconfig\"
-""" >> "${FPGADIR}${PODDIR}/Kconfig"
-
- line="${line} $name/"
- fi;
-done;
-
-# fill Makefile
-echo """
-#
-# Main Makefile for the Armadeus FPGA related drivers
-#
-# Add your subdirectories to obj- target
-#
-
-ifneq (\$(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-obj-\$(CONFIG_POD_DRIVERS) += ${line}
-
-else
-
-# Part executed when called from standard make in this directory:
-
-BASE_DIR:=../../../../buildroot/
-REL:=\$(shell grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
- sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/\"//g')
-#`grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
-# sed \"s/BR2_PACKAGE_LINUX_VERSION=\\\"//\" | sed \"s/\\\"//\"`
-ARMADEUS_KERNEL_DIR:=\$(BASE_DIR)build_arm/linux-\$(REL)
-ifeq (\$(LINUX_DIR),)
-LINUX_DIR:=\$(ARMADEUS_KERNEL_DIR)
-endif
-PWD:= \$(shell pwd)
-
-default:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) zImage modules
-
-clean:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) clean
-
-install:
- echo \"Installing Armadeus drivers...\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) INSTALL_MOD_PATH=\$(TARGET_DIR) modules_install
-
-endif
-
-""" > "${FPGADIR}${PODDIR}/Makefile";
-# ok config generated
-touch "$FPGADIR$PODDIR/.pod"
-echo "ok"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-04 22:14:06
|
Revision: 987
http://armadeus.svn.sourceforge.net/armadeus/?rev=987&view=rev
Author: jorasse
Date: 2009-01-04 22:07:10 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
[buildroot] upgrade to lcd4linux 0.10.1-RC2 and fix compilation failure
Modified Paths:
--------------
trunk/buildroot/package/lcd4linux/lcd4linux.mk
trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch
Modified: trunk/buildroot/package/lcd4linux/lcd4linux.mk
===================================================================
--- trunk/buildroot/package/lcd4linux/lcd4linux.mk 2009-01-04 19:30:08 UTC (rev 986)
+++ trunk/buildroot/package/lcd4linux/lcd4linux.mk 2009-01-04 22:07:10 UTC (rev 987)
@@ -4,9 +4,9 @@
#
#############################################################
-LCD4LINUX_VER:=0.10.0
+LCD4LINUX_VER:=0.10.1-RC2
LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
-LCD4LINUX_SITE:=http://puzzle.dl.sourceforge.net/lcd4linux/
+LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
LCD4LINUX_CAT:=zcat
LCD4LINUX_BINARY:=lcd4linux
Modified: trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch
===================================================================
--- trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch 2009-01-04 19:30:08 UTC (rev 986)
+++ trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch 2009-01-04 22:07:10 UTC (rev 987)
@@ -1,15 +1,15 @@
diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
+++ lcd4linux-0.10.0.armadeus/configure 2005-09-11 20:39:47.000000000 +0200
-@@ -5893,7 +5893,7 @@ for driver in $drivers; do
- NULL="yes"
+@@ -7242,7 +7242,7 @@ for driver in $drivers; do
+ picoLCD="yes"
PNG="yes"
PPM="yes"
-- ROUTERBOARD="yes"
-+ ROUTERBOARD="no"
+- ROUTERBOARD="yes"
++ ROUTERBOARD="no"
+ SAMPLE="yes"
SERDISPLIB="yes"
SIMPLELCD="yes"
- T6963="yes"
diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
--- lcd4linux-0.10.0/drv_generic_parport.c 2005-05-08 06:32:44.000000000 +0200
+++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c 2005-09-11 20:46:27.000000000 +0200
@@ -177,26 +177,5 @@
#ifdef USE_OLD_UDELAY
-@@ -158,7 +159,7 @@
- #include "udelay.h"
- #ifdef USE_OLD_UDELAY
--
-+coucou
- unsigned long loops_per_usec;
- void ndelay(const unsigned long nsec)
-diff -uprN lcd4linux-0.10.0/udelay.h lcd4linux-0.10.0.armadeus/udelay.h
---- lcd4linux-0.10.0/udelay.h 2005-05-08 06:32:45.000000000 +0200
-+++ lcd4linux-0.10.0.armadeus/udelay.h 2005-09-11 20:03:25.000000000 +0200
-@@ -76,7 +76,10 @@
- /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
- static inline void rep_nop(void)
- {
-+/*
- __asm__ __volatile__("rep; nop");
-+*/
-+ __asm__ __volatile__("nop");
- }
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-04 19:30:14
|
Revision: 986
http://armadeus.svn.sourceforge.net/armadeus/?rev=986&view=rev
Author: jorasse
Date: 2009-01-04 19:30:08 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
[buildroot] Delete deprecated cygwin patch
Removed Paths:
-------------
trunk/buildroot/package/zlib/zlib-1.2.3-cygwin_configure.patch
Deleted: trunk/buildroot/package/zlib/zlib-1.2.3-cygwin_configure.patch
===================================================================
--- trunk/buildroot/package/zlib/zlib-1.2.3-cygwin_configure.patch 2009-01-03 19:36:06 UTC (rev 985)
+++ trunk/buildroot/package/zlib/zlib-1.2.3-cygwin_configure.patch 2009-01-04 19:30:08 UTC (rev 986)
@@ -1,10 +0,0 @@
---- zlib/configure 2005-07-11 22:11:58.000000000 +0200
-+++ zlib/configure 2006-08-29 21:56:42.752175600 +0200
-@@ -78,6 +78,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags
- case `(uname -s || echo unknown) 2>/dev/null` in
- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
- CYGWIN* | Cygwin* | cygwin* | OS/2* )
-+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
- EXE='.exe';;
- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
- # (ala...@ic...)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-03 19:36:09
|
Revision: 985
http://armadeus.svn.sourceforge.net/armadeus/?rev=985&view=rev
Author: jorasse
Date: 2009-01-03 19:36:06 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
[buildroot] Added alternate download site capabilities to autotool based package + mprf and tslib.
- This alternate download apply after 20 primary download failed.
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Added Paths:
-----------
trunk/patches/063-buildroot_add_alternate_download_site.diff
trunk/patches/064-buildroot_add_tslib_alternate_site.diff
trunk/patches/065-buildroot_add_mpfr_alternate_site.diff
trunk/patches/066-buildroot_add_autotool_alternate_site.diff
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-03 12:47:43 UTC (rev 984)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-03 19:36:06 UTC (rev 985)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Dec 11 21:20:25 2008
+# Sat Jan 3 20:06:58 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -96,6 +96,7 @@
# Build options
#
BR2_PRIMARY_SITE=""
+BR2_ALTERNATE_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_WGET="wget --passive-ftp"
BR2_SVN_CO="svn co"
BR2_SVN_UP="svn up"
Added: trunk/patches/063-buildroot_add_alternate_download_site.diff
===================================================================
--- trunk/patches/063-buildroot_add_alternate_download_site.diff (rev 0)
+++ trunk/patches/063-buildroot_add_alternate_download_site.diff 2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,30 @@
+--- buildroot/Config.in.ori 2009-01-03 16:55:05.000000000 +0100
++++ buildroot/Config.in 2009-01-03 16:50:34.000000000 +0100
+@@ -24,6 +24,15 @@
+ default if the file is not found.
+ NOTE: This only works for packages using the Makefile.autotools.in
+
++config BR2_ALTERNATE_SITE
++ string "Alternate download site"
++ default "ftp://ftp2.armadeus.com/armadeusw/download"
++ help
++ Alternate site to download from. If this option is set then buildroot
++ will try to download package source from this site if the file is not
++ found on the default server.
++ NOTE: This only works for packages using the Makefile.autotools.in
++
+ config BR2_WGET
+ string "Wget command"
+ default "wget --passive-ftp -nd"
+--- buildroot/project/Makefile.in.ori 2009-01-01 17:19:33.000000000 +0100
++++ buildroot/project/Makefile.in 2009-01-03 19:51:41.000000000 +0100
+@@ -55,6 +55,9 @@
+ TOPDIR_SUFFIX:=
+ endif
+
++ALTERNATE_SITE=$(strip $(subst ",, $(BR2_ALTERNATE_SITE)))
++#"))
++
+ DL_DIR=$(strip $(subst ",, $(BR2_DL_DIR)))
+ #"))
+ ifeq ($(DL_DIR),)
Added: trunk/patches/064-buildroot_add_tslib_alternate_site.diff
===================================================================
--- trunk/patches/064-buildroot_add_tslib_alternate_site.diff (rev 0)
+++ trunk/patches/064-buildroot_add_tslib_alternate_site.diff 2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,12 @@
+--- buildroot/package/tslib/tslib.mk.ref 2009-01-01 17:19:34.000000000 +0100
++++ buildroot/package/tslib/tslib.mk 2009-01-03 18:56:28.000000000 +0100
+@@ -10,7 +10,8 @@
+ TSLIB_DIR:=$(BUILD_DIR)/tslib-$(TSLIB_VERSION)
+
+ $(DL_DIR)/$(TSLIB_SOURCE):
+- $(WGET) -P $(DL_DIR) $(TSLIB_SITE)/$(TSLIB_SOURCE)
++ -$(WGET) -P $(DL_DIR) $(TSLIB_SITE)/$(TSLIB_SOURCE)
++ $(Q)test -e $@ || $(WGET) -O $@ $(ALTERNATE_SITE)/$(TSLIB_SOURCE)
+
+ tslib-source: $(DL_DIR)/$(TSLIB_SOURCE)
+
Added: trunk/patches/065-buildroot_add_mpfr_alternate_site.diff
===================================================================
--- trunk/patches/065-buildroot_add_mpfr_alternate_site.diff (rev 0)
+++ trunk/patches/065-buildroot_add_mpfr_alternate_site.diff 2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,18 @@
+--- buildroot/package/mpfr/mpfr.mk.ori 2008-11-03 09:15:26.000000000 +0100
++++ buildroot/package/mpfr/mpfr.mk 2009-01-03 17:47:34.000000000 +0100
+@@ -21,11 +21,13 @@
+ MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE)
+
+ $(MPFR_PATCH_SOURCE):
+- $(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH)
++ -$(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH)
++ $(Q)test -e $@ || $(WGET) -O $@ $(ALTERNATE_SITE)/$(MPFR_PATCH)
+ endif
+
+ $(DL_DIR)/$(MPFR_SOURCE):
+- $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
++ -$(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
++ $(Q)test -e $@ || $(WGET) -O $@ $(BR2_ALTERNATE_SITE)/$(MPFR_SOURCE)
+
+ $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
+ $(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
Added: trunk/patches/066-buildroot_add_autotool_alternate_site.diff
===================================================================
--- trunk/patches/066-buildroot_add_autotool_alternate_site.diff (rev 0)
+++ trunk/patches/066-buildroot_add_autotool_alternate_site.diff 2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,27 @@
+--- buildroot/package/Makefile.autotools.in.ori 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/Makefile.autotools.in 2009-01-03 20:17:03.000000000 +0100
+@@ -135,16 +135,20 @@
+ $(BUILD_DIR)/%/.stamp_downloaded:
+ # support make source-check/external-deps
+ ifneq ($(SPIDER),)
+- $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
+- $(if $($(PKG)_PATCH),$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++ -$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
++ $(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_SOURCE)
++ -$(if $($(PKG)_PATCH),$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++ $(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_PATCH))
+ else
+ $(call MESSAGE,"Downloading")
+ ifneq ($(strip $(subst ",,$(BR2_PRIMARY_SITE))),)
+ #"))
+ -$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(BR2_PRIMARY_SITE)/$($(PKG)_SOURCE)
+ endif
+- $(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
+- $(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++ -$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
++ $(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_SOURCE)
++ -$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++ $(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_PATCH))
+ $(Q)mkdir -p $(@D)
+ $(Q)touch $@
+ endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-03 12:47:47
|
Revision: 984
http://armadeus.svn.sourceforge.net/armadeus/?rev=984&view=rev
Author: jorasse
Date: 2009-01-03 12:47:43 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
[buildroot] Fixed busybox default configuration file.
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-02 06:08:56 UTC (rev 983)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-03 12:47:43 UTC (rev 984)
@@ -284,7 +284,7 @@
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
BR2_BUSYBOX_VERSION="1.12.1"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
-BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
+BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox.config"
BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
# BR2_PACKAGE_BUSYBOX_SKELETON is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-02 06:08:58
|
Revision: 983
http://armadeus.svn.sourceforge.net/armadeus/?rev=983&view=rev
Author: jorasse
Date: 2009-01-02 06:08:56 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
[buildroot] still Fixed compilation failure - 1 runtime issue still open
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-01 23:29:51 UTC (rev 982)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-02 06:08:56 UTC (rev 983)
@@ -186,7 +186,7 @@
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
BR2_UCLIBC_VERSION_0_9_29=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="$(BOARD_PATH)/uClibc.config.arm"
+BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc.config.arm"
# BR2_ENABLE_LOCALE is not set
# BR2_PTHREADS_NONE is not set
# BR2_PTHREADS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-01-01 23:29:54
|
Revision: 982
http://armadeus.svn.sourceforge.net/armadeus/?rev=982&view=rev
Author: jorasse
Date: 2009-01-01 23:29:51 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
[buildroot] Fixed some path issue in default configuration
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-01 16:15:24 UTC (rev 981)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-01 23:29:51 UTC (rev 982)
@@ -186,7 +186,7 @@
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
BR2_UCLIBC_VERSION_0_9_29=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="$(BOARD_PATH)/uClibc.config.$(ARCH)"
+BR2_UCLIBC_CONFIG="$(BOARD_PATH)/uClibc.config.arm"
# BR2_ENABLE_LOCALE is not set
# BR2_PTHREADS_NONE is not set
# BR2_PTHREADS is not set
@@ -729,7 +729,7 @@
# bootloader for target device
#
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_PATH)"
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
BR2_TARGET_UBOOT_SERVERIP=""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
