armadeus-commitlog Mailing List for armadeus (Page 136)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ar...@us...> - 2008-12-15 10:26:48
|
Revision: 956
http://armadeus.svn.sourceforge.net/armadeus/?rev=956&view=rev
Author: artemys
Date: 2008-12-15 10:26:41 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
[BUILD] Add helper to compile armadeus sub-systems (custom drivers for example)
Added Paths:
-----------
trunk/Makefile.in
Added: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in (rev 0)
+++ trunk/Makefile.in 2008-12-15 10:26:41 UTC (rev 956)
@@ -0,0 +1,19 @@
+#
+# Defines all important paths to ease sub-systems compilation.
+# !! Don't forget to define ARMADEUS_BASE_DIR relatively to your
+# calling directory before including this file !!
+#
+
+BUILDROOT_DIR=$(ARMADEUS_BASE_DIR)/buildroot
+-include $(BUILDROOT_DIR)/.config
+
+ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
+ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
+ARMADEUS_UCLIBC_VERSION:=0.9.29
+
+ARMADEUS_PATCH_DIR=patches
+ARMADEUS_LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/linux-$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
+ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-15 10:21:38
|
Revision: 955
http://armadeus.svn.sourceforge.net/armadeus/?rev=955&view=rev
Author: artemys
Date: 2008-12-15 10:21:34 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
[LINUX] Max1027: now handles conversion results from all scanning modes (10 is still perfectible)
Modified Paths:
--------------
trunk/target/linux/modules/max1027/max1027.c
Modified: trunk/target/linux/modules/max1027/max1027.c
===================================================================
--- trunk/target/linux/modules/max1027/max1027.c 2008-12-14 20:20:08 UTC (rev 954)
+++ trunk/target/linux/modules/max1027/max1027.c 2008-12-15 10:21:34 UTC (rev 955)
@@ -20,6 +20,8 @@
*
*/
+// #define DEBUG 1
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/fs.h>
@@ -47,7 +49,7 @@
#define DRIVER_NAME "max1027"
-#define DRIVER_VERSION "0.3"
+#define DRIVER_VERSION "0.4"
/* Internal registers prefixes */
@@ -119,7 +121,7 @@
u8 reset_reg;
u8 uni_reg;
u8 bi_reg;
- int cnvst; /* conversion start pin */
+ int cnvst; /* conversion start pin */
wait_queue_head_t conversion_wq;
struct tasklet_struct tasklet;
@@ -161,13 +163,24 @@
u8 msb, lsb;
u16 value;
int i=0, values_to_read=0, start=0;
+ unsigned int scan_mode, selected_channel;
pr_debug("%s", __FUNCTION__);
+ selected_channel = GET_SELECTED_CHANNEL(max1027->conv_reg);
+ if (selected_channel >= NB_CHANNELS)
+ selected_channel = NB_CHANNELS - 1;
+ scan_mode = GET_SCAN_MODE(max1027->conv_reg);
+ if (scan_mode == SCAN_MODE_00) {
+ values_to_read = selected_channel + 1;
+ } else if (scan_mode == SCAN_MODE_01) {
+ values_to_read = NB_CHANNELS - selected_channel + 1;
+ } else {
+ values_to_read = 1;
+ }
+
if( max1027->conv_reg & MAX1027_CONV_TEMP )
- values_to_read = NB_CHANNELS+1;
- else
- values_to_read = NB_CHANNELS;
+ values_to_read += 1;
#ifdef DEBUG
for( i=0; i<values_to_read*2; i++ ) {
@@ -191,10 +204,10 @@
msb = buffer[i*2] & 0x0f;
lsb = buffer[(i*2)+1];
value = ((msb << 8) | lsb) >> 2;
- if( GET_SCAN_MODE(max1027->conv_reg) == SCAN_MODE_00 )
- {
- //size = GET_SELECTED_CHANNEL(max1027->conv_reg) + 1;
+ if( scan_mode == SCAN_MODE_00 ) {
max1027->results.ain[i-start] = value;
+ } else {
+ max1027->results.ain[selected_channel++] = value;
}
pr_debug("0x%04x ", value);
}
@@ -206,8 +219,8 @@
channel = max1027->channels[i];
if (channel != NULL) {
if ( channel->running ) {
- channel->running = 0;
- pr_debug(" %d", i);
+ channel->running = 0;
+ pr_debug(" %d", i);
wake_up_interruptible( &(channel->change_wq) );
// if (channel->async_queue)
// kill_fasync(&channel->async_queue, SIGIO, POLL_IN);
@@ -215,7 +228,7 @@
}
}
max1027->conversion_running = 0;
- wake_up_interruptible( &(max1027->conversion_wq) );
+ wake_up_interruptible( &(max1027->conversion_wq) );
pr_debug("\n");
}
@@ -259,27 +272,27 @@
pr_debug("- %s %d byte(s) on minor %d -> channel %d\n", __FUNCTION__, count, minor, channel->id);
/* Launch conversion */
-
+
mutex_lock(&max1027->update_lock);
while ( max1027->conversion_running )
- {
+ {
if (file->f_flags & O_NONBLOCK)
return -EAGAIN;
- if (wait_event_interruptible(max1027->conversion_wq, !max1027->conversion_running))
- return -ERESTARTSYS;
- }
+ if (wait_event_interruptible(max1027->conversion_wq, !max1027->conversion_running))
+ return -ERESTARTSYS;
+ }
max1027->conversion_running = 1;
- /* if no convst pin */
- if( max1027->cnvst < 0 ) {
- max1027_send_cmd( current_spi, max1027->conv_reg );
- }
- else {
- gpio_set_value(max1027->cnvst, 0);
- udelay(2); /* must satisfy worst case clock mode 01 */
- gpio_set_value(max1027->cnvst, 1);
- }
+ /* if no convst pin */
+ if( max1027->cnvst < 0 ) {
+ max1027_send_cmd( current_spi, max1027->conv_reg );
+ }
+ else {
+ gpio_set_value(max1027->cnvst, 0);
+ udelay(2); /* must satisfy worst case clock mode 01 */
+ gpio_set_value(max1027->cnvst, 1);
+ }
mutex_unlock(&max1027->update_lock);
spin_lock_irq(&channel->lock);
@@ -615,7 +628,7 @@
}
if ((status = device_create_file(&spi->dev, &dev_attr_temp1_input))){
- printk(KERN_WARNING SYSFS_ERROR_STRING " temp1\n");
+ printk(KERN_WARNING SYSFS_ERROR_STRING " temp1\n");
goto end;
}
@@ -654,7 +667,7 @@
struct max1027_config *platform_info;
int i, result;
- pr_debug("%s", __FUNCTION__);
+ pr_debug("%s\n", __FUNCTION__);
platform_info = (struct max1027_config *)(spi->dev.platform_data);
if (!platform_info) {
@@ -681,22 +694,21 @@
init_waitqueue_head(&max1027->conversion_wq);
-
/* Setup any GPIO active */
- result = platform_info->init(spi);
+ result = platform_info->init(spi);
if( result )
- {
+ {
printk(KERN_WARNING DRIVER_NAME ": can't reserve gpios\n");
goto err_irq;
- }
- max1027->cnvst = platform_info->cnvst_pin;
- if( max1027->cnvst >= 0 )
- gpio_set_value(max1027->cnvst, 1);
+ }
+ max1027->cnvst = platform_info->cnvst_pin;
+ if( max1027->cnvst >= 0 )
+ gpio_set_value(max1027->cnvst, 1);
/* Create /sys entries */
/* sysfs hook */
dev_set_drvdata(&spi->dev, max1027);
- current_spi = spi;
+ current_spi = spi;
#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
/* register to hwmon */
@@ -765,7 +777,7 @@
unregister_chrdev(max1027_major, DRIVER_NAME);
free_irq(spi->irq, max1027);
- /* free IOs*/
+ /* free IOs*/
platform_info->exit(spi);
dev_set_drvdata(&spi->dev, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-14 20:20:11
|
Revision: 954
http://armadeus.svn.sourceforge.net/armadeus/?rev=954&view=rev
Author: artemys
Date: 2008-12-14 20:20:08 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
[BUILDROOT] Remove too specific target to main Makefile
Modified Paths:
--------------
trunk/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-12-12 22:28:42 UTC (rev 953)
+++ trunk/Makefile 2008-12-14 20:20:08 UTC (rev 954)
@@ -35,7 +35,6 @@
LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
-UCLIBC_VERSION:=0.9.29
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
@@ -44,7 +43,6 @@
TAR_OPTIONS=--exclude=.svn -xf
LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
-UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARCH)/uClibc-$(UCLIBC_VERSION)
BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
@@ -169,12 +167,7 @@
buildroot-dirclean:
rm -rf $(BUILDROOT_DIR)
-config-merge:
- kompare $(BUILDROOT_DIR)/.config $(BOARD_DIR)/$(BOARD_NAME)_defconfig
- kompare $(LINUX_DIR)/.config $(BOARD_DIR)/$(BOARD_NAME)-linux-$(LINUX_VERSION).config
- kompare $(UCLIBC_DIR)/.config $(BOARD_DIR)/uClibc.config.arm
-
PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config config-merge
+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: <ar...@us...> - 2008-12-12 22:28:47
|
Revision: 953
http://armadeus.svn.sourceforge.net/armadeus/?rev=953&view=rev
Author: artemys
Date: 2008-12-12 22:28:42 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
[BUILDROOT] Now Linux is (again) compilable in a simple way (make in LINUX_DIR)
Added Paths:
-----------
trunk/patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff
Added: trunk/patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff
===================================================================
--- trunk/patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff (rev 0)
+++ trunk/patches/060-buildroot-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.diff 2008-12-12 22:28:42 UTC (rev 953)
@@ -0,0 +1,11 @@
+--- buildroot/target/linux/Makefile.in.advanced.org 2008-12-12 21:55:37.000000000 +0100
++++ buildroot/target/linux/Makefile.in.advanced 2008-12-12 22:25:20.000000000 +0100
+@@ -378,6 +378,8 @@
+ echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+ endif
+ ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
++ $(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(LINUX_DIR)/Makefile
++ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
+ (cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
+ endif
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-12-12 16:06:56
|
Revision: 952
http://armadeus.svn.sourceforge.net/armadeus/?rev=952&view=rev
Author: FabM
Date: 2008-12-12 16:06:51 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
[SOFTWARE]
Removed Paths:
-------------
trunk/software/orchesta/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 21:14:27
|
Revision: 951
http://armadeus.svn.sourceforge.net/armadeus/?rev=951&view=rev
Author: artemys
Date: 2008-12-11 21:14:21 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[TEST] Add sound test to global launcher
Modified Paths:
--------------
trunk/target/test/test_env.sh
trunk/target/test/test_release.sh
Modified: trunk/target/test/test_env.sh
===================================================================
--- trunk/target/test/test_env.sh 2008-12-11 20:42:16 UTC (rev 950)
+++ trunk/target/test/test_env.sh 2008-12-11 21:14:21 UTC (rev 951)
@@ -27,3 +27,6 @@
TEMP_FILE_SIZE=6144 # kbytes
WRITE_BENCH="/tmp/test_mmc.sh"
SERVER_IP="192.168.0.17"
+
+mkdir -p $TEMP_DIR
+
Modified: trunk/target/test/test_release.sh
===================================================================
--- trunk/target/test/test_release.sh 2008-12-11 20:42:16 UTC (rev 950)
+++ trunk/target/test/test_release.sh 2008-12-11 21:14:21 UTC (rev 951)
@@ -41,5 +41,7 @@
echo
./test_imxregs.sh
echo
+./test_sound.sh
+echo
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 20:42:20
|
Revision: 950
http://armadeus.svn.sourceforge.net/armadeus/?rev=950&view=rev
Author: artemys
Date: 2008-12-11 20:42:16 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[BUILDROOT] Change install dir of testsuite as /usr/bin/test is already used...
Modified Paths:
--------------
trunk/buildroot/package/armadeus-testsuite/Config.in
trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Modified: trunk/buildroot/package/armadeus-testsuite/Config.in
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/Config.in 2008-12-11 20:33:39 UTC (rev 949)
+++ trunk/buildroot/package/armadeus-testsuite/Config.in 2008-12-11 20:42:16 UTC (rev 950)
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_ARMADEUS_TESTS
+config BR2_PACKAGE_ARMADEUS_TESTSUITE
bool "Armadeus Test Suite"
default n
help
Modified: trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2008-12-11 20:33:39 UTC (rev 949)
+++ trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2008-12-11 20:42:16 UTC (rev 950)
@@ -9,8 +9,8 @@
ARMADEUS-TESTSUITE_DIR:=$(BUILD_DIR)/armadeus-testsuite-$(ARMADEUS-TESTSUITE_VER)
ARMADEUS-TESTSUITE_CAT:=zcat
ARMADEUS-TESTSUITE_BINARY:=test_env.sh
-ARMADEUS-TESTSUITE_TARGET_DIR:=/usr/bin/test
-ARMADEUS-TESTSUITE_TARGET_BINARY:=usr/bin/test/$(ARMADEUS-TESTSUITE_BINARY)
+ARMADEUS-TESTSUITE_TARGET_DIR:=/usr/bin/testsuite
+ARMADEUS-TESTSUITE_TARGET_BINARY:=$(ARMADEUS-TESTSUITE_TARGET_DIR)/$(ARMADEUS-TESTSUITE_BINARY)
$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
@@ -35,6 +35,6 @@
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS-TESTSUITE)),y)
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_TESTSUITE)),y)
TARGETS+=armadeus-testsuite
endif
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2008-12-11 20:33:39 UTC (rev 949)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2008-12-11 20:42:16 UTC (rev 950)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Dec 11 18:38:56 2008
+# Thu Dec 11 21:20:25 2008
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -450,7 +450,7 @@
# BR2_PACKAGE_WEBIF is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
BR2_BLOCKDEV_SUPPORT=y
-# BR2_PACKAGE_ARMADEUS_TESTS is not set
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
BR2_PACKAGE_CH7024CTRL=y
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 20:33:43
|
Revision: 949
http://armadeus.svn.sourceforge.net/armadeus/?rev=949&view=rev
Author: artemys
Date: 2008-12-11 20:33:39 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[TEST] Add script to test ALSA/sound
Added Paths:
-----------
trunk/target/test/test_sound.sh
Added: trunk/target/test/test_sound.sh
===================================================================
--- trunk/target/test/test_sound.sh (rev 0)
+++ trunk/target/test/test_sound.sh 2008-12-11 20:33:39 UTC (rev 949)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+#
+# Script to test Armadeus Software release
+#
+# Copyright (C) 2008 The Armadeus Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+
+source ./test_helpers.sh
+source ./test_env.sh
+
+
+test_sound()
+{
+ show_test_banner "Sound / ALSA"
+
+ modprobe spi_imx
+ modprobe snd-imx-alsa-tsc2102
+ if [ "$?" != 0 ]; then
+ exit_failed
+ fi
+
+ cat /proc/asound/version
+ cat /proc/asound/cards
+ aplay -lL
+ if [ "$?" != 0 ]; then
+ exit_failed
+ fi
+
+ aplay /usr/share/sounds/alsa/Side_Left.wav
+ if [ "$?" == 0 ]; then
+ ask_user "Did you hear something ? (y/n)"
+ if [ "$response" == "y" ]; then
+ echo_test_ok
+ fi
+ fi
+}
+
+test_sound
Property changes on: trunk/target/test/test_sound.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 17:44:17
|
Revision: 948
http://armadeus.svn.sourceforge.net/armadeus/?rev=948&view=rev
Author: artemys
Date: 2008-12-11 17:44:14 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[BUILDROOT] Add a package to automatically install Armadeus validation testsuite
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Added Paths:
-----------
trunk/buildroot/package/armadeus-testsuite/
trunk/buildroot/package/armadeus-testsuite/Config.in
trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
trunk/patches/059-buildroot-add_armadeus_testsuite_package.diff
Added: trunk/buildroot/package/armadeus-testsuite/Config.in
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/Config.in (rev 0)
+++ trunk/buildroot/package/armadeus-testsuite/Config.in 2008-12-11 17:44:14 UTC (rev 948)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ARMADEUS_TESTS
+ bool "Armadeus Test Suite"
+ default n
+ help
+ Install Armadeus "Test Suite" to allow automatic release validation.
+ Test scripts will be installed on the APF in /usr/bin/test/ .
+
Added: trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk (rev 0)
+++ trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2008-12-11 17:44:14 UTC (rev 948)
@@ -0,0 +1,40 @@
+#############################################################
+#
+# Armadeus Test Suite
+#
+#############################################################
+
+ARMADEUS-TESTSUITE_VER:=1.0
+ARMADEUS-TESTSUITE_SOURCE:=$(BUILD_DIR)/../../target/test/
+ARMADEUS-TESTSUITE_DIR:=$(BUILD_DIR)/armadeus-testsuite-$(ARMADEUS-TESTSUITE_VER)
+ARMADEUS-TESTSUITE_CAT:=zcat
+ARMADEUS-TESTSUITE_BINARY:=test_env.sh
+ARMADEUS-TESTSUITE_TARGET_DIR:=/usr/bin/test
+ARMADEUS-TESTSUITE_TARGET_BINARY:=usr/bin/test/$(ARMADEUS-TESTSUITE_BINARY)
+
+$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
+ mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
+ cp -r $(ARMADEUS-TESTSUITE_SOURCE)/* $(ARMADEUS-TESTSUITE_DIR)/
+ touch $@
+
+$(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
+ mkdir -p $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR)
+ install -D $(ARMADEUS-TESTSUITE_DIR)/*.sh $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR)
+ touch $@
+
+armadeus-testsuite: $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_BINARY)
+
+armadeus-testsuite-clean:
+ rm -rf $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR)
+
+armadeus-testsuite-dirclean:
+ rm -rf $(ARMADEUS-TESTSUITE_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS-TESTSUITE)),y)
+TARGETS+=armadeus-testsuite
+endif
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2008-12-11 17:03:02 UTC (rev 947)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2008-12-11 17:44:14 UTC (rev 948)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sun Nov 23 23:42:00 2008
+# Thu Dec 11 18:38:56 2008
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -450,6 +450,7 @@
# BR2_PACKAGE_WEBIF is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
BR2_BLOCKDEV_SUPPORT=y
+# BR2_PACKAGE_ARMADEUS_TESTS is not set
BR2_PACKAGE_CH7024CTRL=y
#
Added: trunk/patches/059-buildroot-add_armadeus_testsuite_package.diff
===================================================================
--- trunk/patches/059-buildroot-add_armadeus_testsuite_package.diff (rev 0)
+++ trunk/patches/059-buildroot-add_armadeus_testsuite_package.diff 2008-12-11 17:44:14 UTC (rev 948)
@@ -0,0 +1,10 @@
+--- buildroot/package/Config.in.org 2008-12-11 18:37:45.000000000 +0100
++++ buildroot/package/Config.in 2008-12-11 18:38:28.000000000 +0100
+@@ -242,6 +242,7 @@
+
+ if BR2_BLOCKDEV_SUPPORT
+ source "package/acpid/Config.in"
++source "package/armadeus-testsuite/Config.in"
+ source "package/ch7024ctrl/Config.in"
+ source "package/dbus/Config.in"
+ source "package/dbus-glib/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 17:03:07
|
Revision: 947
http://armadeus.svn.sourceforge.net/armadeus/?rev=947&view=rev
Author: artemys
Date: 2008-12-11 17:03:02 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[LINUX] ALSA/TSC : imx_dma_request_by_prio() returns an available channel not an error.
Modified Paths:
--------------
trunk/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
trunk/target/linux/sound/arm/imx-alsa.c
Added Paths:
-----------
trunk/target/linux/drivers/input/
trunk/target/linux/drivers/input/touchscreen/
Modified: trunk/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
===================================================================
--- trunk/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 2008-12-11 15:37:15 UTC (rev 946)
+++ trunk/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 2008-12-11 17:03:02 UTC (rev 947)
@@ -3,7 +3,7 @@
(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.2.original/sound/arm/imx-alsa.c
+++ linux-2.6.27.2.mod/sound/arm/imx-alsa.c
-@@ -0,0 +1,682 @@
+@@ -0,0 +1,683 @@
+/*
+ * sound/arm/imx-alsa.c
+ *
@@ -135,13 +135,14 @@
+static int audio_dma_request(struct audio_stream *s,
+ void (*callback) (int, void *))
+{
-+ int err=0;
++ int err=0, chan=0;
+ ADEBUG();
+
-+ err = imx_dma_request_by_prio(s->id, DMA_PRIO_HIGH);
-+ if (err < 0) {
++ chan = imx_dma_request_by_prio(s->id, DMA_PRIO_HIGH);
++ if (chan < 0) {
+ printk(KERN_ERR "Unable to grab dma channel: %d\n", s->dma_dev);
+ } else {
++ s->dma_dev = chan;
+ err = imx_dma_setup_handlers(s->dma_dev,
+ snd_imx_alsa_dma_interrupt,
+ dma_err_handler,
Modified: trunk/target/linux/sound/arm/imx-alsa.c
===================================================================
--- trunk/target/linux/sound/arm/imx-alsa.c 2008-12-11 15:37:15 UTC (rev 946)
+++ trunk/target/linux/sound/arm/imx-alsa.c 2008-12-11 17:03:02 UTC (rev 947)
@@ -34,13 +34,12 @@
#ifdef CONFIG_PM
#include <linux/pm.h>
#endif
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
-#include <asm/arch/imx-alsa.h>
+#include <mach/imx-alsa.h>
#include <linux/dma-mapping.h>
-#include <asm/arch/imx-dma.h>
+#include <mach/imx-dma.h>
#define TSC_MASTER
@@ -130,13 +129,14 @@
static int audio_dma_request(struct audio_stream *s,
void (*callback) (int, void *))
{
- int err=0;
+ int err=0, chan=0;
ADEBUG();
- err = imx_dma_request_by_prio(&(s->dma_dev), s->id, DMA_PRIO_HIGH);
- if (err < 0) {
+ chan = imx_dma_request_by_prio(s->id, DMA_PRIO_HIGH);
+ if (chan < 0) {
printk(KERN_ERR "Unable to grab dma channel: %d\n", s->dma_dev);
} else {
+ s->dma_dev = chan;
err = imx_dma_setup_handlers(s->dma_dev,
snd_imx_alsa_dma_interrupt,
dma_err_handler,
@@ -239,7 +239,7 @@
runtime->dma_area + offset,
dma_size,
DMA_TO_DEVICE);
- if (dma_mapping_error(source)) {
+ if (dma_mapping_error((struct device*)NULL, source)) {
printk("Unable to map DMA buffer\n");
return;
}
@@ -382,7 +382,7 @@
int stream_id = substream->pstr->stream;
int err;
- printk ("snd_card_imx_alsa_open substream 0x%x\n", substream);
+ printk ("%s substream @: 0x%x\n", __func__, (unsigned int)substream);
chip->s[stream_id].stream = substream;
alsa_codec_config->codec_clock_on();
if (stream_id == SNDRV_PCM_STREAM_PLAYBACK) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 15:37:19
|
Revision: 946
http://armadeus.svn.sourceforge.net/armadeus/?rev=946&view=rev
Author: artemys
Date: 2008-12-11 15:37:15 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[BUILDROOT] ALSA: Veni, vidi, VICI...
Modified Paths:
--------------
trunk/patches/046-buildroot-alsa-lib-no_version.diff
Added Paths:
-----------
trunk/patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff
Modified: trunk/patches/046-buildroot-alsa-lib-no_version.diff
===================================================================
--- trunk/patches/046-buildroot-alsa-lib-no_version.diff 2008-12-11 13:28:04 UTC (rev 945)
+++ trunk/patches/046-buildroot-alsa-lib-no_version.diff 2008-12-11 15:37:15 UTC (rev 946)
@@ -0,0 +1,13 @@
+
+This patch corrects "aplay: set_params:1012: unable to install sw params:" bug.
+
+--- buildroot/package/audio/alsa-lib/alsa-lib.mk.org 2008-12-11 14:35:36.000000000 +0100
++++ buildroot/package/audio/alsa-lib/alsa-lib.mk 2008-12-11 14:43:07.000000000 +0100
+@@ -45,6 +45,7 @@
+ --enable-shared \
+ --enable-static \
+ --disable-docs \
++ --with-versioned=no \
+ $(SOFT_FLOAT) \
+ $(DISABLE_NLS) \
+ )
Added: trunk/patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff
===================================================================
--- trunk/patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff (rev 0)
+++ trunk/patches/058-buildroot-makes_alsa_work_with_eabi_and_large_file_options.diff 2008-12-11 15:37:15 UTC (rev 946)
@@ -0,0 +1,40 @@
+
+Deals with following points:
+* pb when compiled with EABI
+* pb when compiled with -D_FILE_OFFSET_BITS=64 flag
+
+--- buildroot/package/audio/alsa-lib/alsa-lib.mk.org 2008-12-11 14:35:36.000000000 +0100
++++ buildroot/package/audio/alsa-lib/alsa-lib.mk 2008-12-11 14:43:07.000000000 +0100
+@@ -11,14 +11,16 @@
+ ALSA_LIB_BINARY:=libasound.so.2.0.0
+ ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
+
+-ifeq ($(BR2_arm),y)
+-ALSA_LIB_ABI:=-mabi=aapcs-linux
+-else
+-ALSA_LIB_ABI:=
++ALSA_LIB_CFLAGS=-U_FILE_OFFSET_BITS
++ALSA_LIB_LDFLAGS=-U_FILE_OFFSET_BITS
++
++ifeq ($(BR2_ARM_EABI),y)
++ALSA_LIB_CFLAGS += -mabi=aapcs-linux
+ endif
+
+ ifeq ($(BR2_SOFT_FLOAT),y)
+- SOFT_FLOAT=--with-softfloat
++SOFT_FLOAT=--with-softfloat
++ALSA_LIB_LDFLAGS += -lm
+ endif
+
+ $(DL_DIR)/$(ALSA_LIB_SOURCE):
+@@ -34,8 +36,8 @@
+ (cd $(ALSA_LIB_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_OPTS) \
+- CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_ABI)" \
+- LDFLAGS="$(TARGET_LDFLAGS) -lm" \
++ CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS) $(ALSA_LIB_LDFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 13:28:08
|
Revision: 945
http://armadeus.svn.sourceforge.net/armadeus/?rev=945&view=rev
Author: artemys
Date: 2008-12-11 13:28:04 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[LINUX] Activate EABI for 2.6.23 kernel (APF9328)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-11 12:47:33 UTC (rev 944)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-11 13:28:04 UTC (rev 945)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23.1
-# Mon Dec 8 13:53:53 2008
+# Thu Dec 11 10:38:04 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -196,7 +196,8 @@
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_PREEMPT=y
CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-11 12:47:44
|
Revision: 944
http://armadeus.svn.sourceforge.net/armadeus/?rev=944&view=rev
Author: artemys
Date: 2008-12-11 12:47:33 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
[BUILD] Add config-merge target to main Makefile. This will help merging important config files (buildroot, linux, uclibc)
Modified Paths:
--------------
trunk/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-12-10 16:45:23 UTC (rev 943)
+++ trunk/Makefile 2008-12-11 12:47:33 UTC (rev 944)
@@ -32,6 +32,10 @@
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))
+UCLIBC_VERSION:=0.9.29
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
@@ -39,7 +43,9 @@
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)
+UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARCH)/uClibc-$(UCLIBC_VERSION)
+BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
@@ -162,6 +168,13 @@
buildroot-dirclean:
rm -rf $(BUILDROOT_DIR)
-
-.PHONY: dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean menuconfig $(BUILDROOT_DIR)/.config
+config-merge:
+ kompare $(BUILDROOT_DIR)/.config $(BOARD_DIR)/$(BOARD_NAME)_defconfig
+ kompare $(LINUX_DIR)/.config $(BOARD_DIR)/$(BOARD_NAME)-linux-$(LINUX_VERSION).config
+ kompare $(UCLIBC_DIR)/.config $(BOARD_DIR)/uClibc.config.arm
+
+PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
+PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config config-merge
+.PHONY: $(PHONY_TARGETS)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-12-10 16:45:26
|
Revision: 943
http://armadeus.svn.sourceforge.net/armadeus/?rev=943&view=rev
Author: FabM
Date: 2008-12-10 16:45:23 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
[BUILDROOT] Adding some help on general makefile
Modified Paths:
--------------
trunk/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-12-10 14:41:05 UTC (rev 942)
+++ trunk/Makefile 2008-12-10 16:45:23 UTC (rev 943)
@@ -66,8 +66,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'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-12-10 14:41:10
|
Revision: 942
http://armadeus.svn.sourceforge.net/armadeus/?rev=942&view=rev
Author: FabM
Date: 2008-12-10 14:41:05 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
[FIRMWARE] Updating and cleaning
Modified Paths:
--------------
trunk/firmware/sram_test/sram_test.vhd
trunk/firmware/wishbone_example/testbench/Wb_top_tb.vhd
Removed Paths:
-------------
trunk/firmware/bus_led/
trunk/firmware/led/clock_divider_tbw.ant
trunk/firmware/led/clock_divider_tbw.jhd
trunk/firmware/led/clock_divider_tbw.tbw
trunk/firmware/led/clock_divider_tbw.vhw
trunk/firmware/led/clock_divider_tbw.xwv
trunk/firmware/led/clock_divider_tbw_beh.prj
trunk/firmware/led/clock_divider_tbw_bencher.prj
trunk/firmware/led/clock_divider_tbw_par.prj
trunk/firmware/led/debouncer_tbw.ant
trunk/firmware/led/debouncer_tbw.jhd
trunk/firmware/led/debouncer_tbw.tbw
trunk/firmware/led/debouncer_tbw.xwv
trunk/firmware/led/debouncer_tbw_beh.prj
trunk/firmware/led/flip_flop_tbw.ant
trunk/firmware/led/flip_flop_tbw.jhd
trunk/firmware/led/flip_flop_tbw.tbw
trunk/firmware/led/flip_flop_tbw.xwv
trunk/firmware/led/flip_flop_tbw_beh.prj
trunk/firmware/led/flip_flop_tbw_bencher.prj
trunk/firmware/led/led.ise
trunk/firmware/led/led_top_tbw.ant
trunk/firmware/led/led_top_tbw.jhd
trunk/firmware/led/led_top_tbw.tbw
trunk/firmware/led/led_top_tbw.xwv
trunk/firmware/led/led_top_tbw_beh.prj
trunk/firmware/led/led_top_tbw_bencher.prj
trunk/firmware/led/led_top_tbw_gen.prj
trunk/firmware/led/led_top_tbw_par.prj
trunk/firmware/led/led_top_tbw_selfcheck.ant
trunk/firmware/led/led_top_tbw_selfcheck.vhw
trunk/firmware/led/led_top_tbw_selfcheck_beh_beh.prj
trunk/firmware/led/schema
Deleted: trunk/firmware/led/clock_divider_tbw.ant
===================================================================
--- trunk/firmware/led/clock_divider_tbw.ant 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw.ant 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,113 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : clock_divider_tbw.ant
--- /___/ /\ Timestamp : Fri Apr 13 23:07:43 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: clock_divider_tbw
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY clock_divider_tbw IS
-END clock_divider_tbw;
-
-ARCHITECTURE testbench_arch OF clock_divider_tbw IS
- FILE RESULTS: TEXT OPEN WRITE_MODE IS "/home/benoit/armadeus/trunk/firmware/led/clock_divider_tbw.ano";
-
- COMPONENT clock_divider
- PORT (
- clk_in : In std_logic;
- clk_out : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL clk_in : std_logic := '0';
- SIGNAL clk_out : std_logic := '0';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 20 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : clock_divider
- PORT MAP (
- clk_in => clk_in,
- clk_out => clk_out
- );
-
- PROCESS -- clock process for clk_in
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk_in <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk_in <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS -- Annotation process for clk_in
- VARIABLE TX_TIME : INTEGER := 0;
-
- PROCEDURE ANNOTATE_clk_out(
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- STD.TEXTIO.write(TX_LOC, string'("Annotate["));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'(", clk_out, "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, clk_out);
- STD.TEXTIO.write(TX_LOC, string'("]"));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.writeline(RESULTS, TX_LOC);
- STD.TEXTIO.Deallocate(TX_LOC);
- END;
- BEGIN
- WAIT for 1 fs;
- ANNOTATE_clk_out(0);
- WAIT for OFFSET;
- TX_TIME := TX_TIME + 100;
- ANNO_LOOP : LOOP
- --Rising Edge
- WAIT for 11 ns;
- TX_TIME := TX_TIME + 11;
- ANNOTATE_clk_out(TX_TIME);
- WAIT for 9 ns;
- TX_TIME := TX_TIME + 9;
- END LOOP ANNO_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- WAIT FOR 1020 ns;
-
- STD.TEXTIO.write(TX_OUT, string'("Total[]"));
- STD.TEXTIO.writeline(RESULTS, TX_OUT);
- ASSERT (FALSE) REPORT
- "Success! Simulation for annotation completed"
- SEVERITY FAILURE;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/clock_divider_tbw.jhd
===================================================================
--- trunk/firmware/led/clock_divider_tbw.jhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw.jhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,3 +0,0 @@
-MODULE clock_divider_tbw
-SUBMODULE clock_divider
-INSTANCE UUT
Deleted: trunk/firmware/led/clock_divider_tbw.tbw
===================================================================
--- trunk/firmware/led/clock_divider_tbw.tbw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw.tbw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,42 +0,0 @@
-version 3
-/home/benoit/armadeus/trunk/firmware/led/clock_divider.vhd
-clock_divider
-VHDL
-VHDL
-/home/benoit/armadeus/trunk/firmware/led/clock_divider_tbw.xwv
-Clocked
--
--
-1000000000
-ns
-GSR:true
-PRLD:false
-100000000
-CLOCK_LIST_BEGIN
-clk_in
-10000000
-10000000
-1000000
-1000000
-100000000
-RISING
-CLOCK_LIST_END
-SIGNAL_LIST_BEGIN
-clk_out
-clk_in
-SIGNAL_LIST_END
-SIGNALS_NOT_ON_DISPLAY
-clk_out_DIFF
-SIGNALS_NOT_ON_DISPLAY_END
-MARKER_LIST_BEGIN
-MARKER_LIST_END
-MEASURE_LIST_BEGIN
-MEASURE_LIST_END
-SIGNAL_ORDER_BEGIN
-clk_in
-clk_out
-SIGNAL_ORDER_END
-DIFFERENTIAL_CLKS_BEGIN
-DIFFERENTIAL_CLKS_END
-DIVIDERS_BEGIN
-DIVIDERS_END
Deleted: trunk/firmware/led/clock_divider_tbw.vhw
===================================================================
--- trunk/firmware/led/clock_divider_tbw.vhw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw.vhw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,70 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : clock_divider_tbw.vhw
--- /___/ /\ Timestamp : Fri Apr 13 23:07:43 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: clock_divider_tbw
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY clock_divider_tbw IS
-END clock_divider_tbw;
-
-ARCHITECTURE testbench_arch OF clock_divider_tbw IS
- COMPONENT clock_divider
- PORT (
- clk_in : In std_logic;
- clk_out : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL clk_in : std_logic := '0';
- SIGNAL clk_out : std_logic := '0';
-
- constant PERIOD : time := 20 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : clock_divider
- PORT MAP (
- clk_in => clk_in,
- clk_out => clk_out
- );
-
- PROCESS -- clock process for clk_in
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk_in <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk_in <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- WAIT FOR 1020 ns;
-
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/clock_divider_tbw.xwv
===================================================================
(Binary files differ)
Deleted: trunk/firmware/led/clock_divider_tbw_beh.prj
===================================================================
--- trunk/firmware/led/clock_divider_tbw_beh.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw_beh.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,2 +0,0 @@
-vhdl work "clock_divider.vhd"
-vhdl work "clock_divider_tbw.vhw"
Deleted: trunk/firmware/led/clock_divider_tbw_bencher.prj
===================================================================
--- trunk/firmware/led/clock_divider_tbw_bencher.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw_bencher.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1 +0,0 @@
-vhdl work "clock_divider.vhd"
Deleted: trunk/firmware/led/clock_divider_tbw_par.prj
===================================================================
--- trunk/firmware/led/clock_divider_tbw_par.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/clock_divider_tbw_par.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1 +0,0 @@
-vhdl work "clock_divider_tbw.vhw"
Deleted: trunk/firmware/led/debouncer_tbw.ant
===================================================================
--- trunk/firmware/led/debouncer_tbw.ant 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/debouncer_tbw.ant 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,172 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : debouncer_tbw.ant
--- /___/ /\ Timestamp : Fri Apr 13 22:26:03 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: debouncer_tbw
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY debouncer_tbw IS
-END debouncer_tbw;
-
-ARCHITECTURE testbench_arch OF debouncer_tbw IS
- FILE RESULTS: TEXT OPEN WRITE_MODE IS "/home/benoit/armadeus/trunk/firmware/led/debouncer_tbw.ano";
-
- COMPONENT debouncer
- PORT (
- clk_100hz : In std_logic;
- button_in : In std_logic;
- button_debounced_out : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL clk_100hz : std_logic := '0';
- SIGNAL button_in : std_logic := '0';
- SIGNAL button_debounced_out : std_logic := '0';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 200 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : debouncer
- PORT MAP (
- clk_100hz => clk_100hz,
- button_in => button_in,
- button_debounced_out => button_debounced_out
- );
-
- PROCESS -- clock process for clk_100hz
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk_100hz <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk_100hz <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS -- Annotation process for clk_100hz
- VARIABLE TX_TIME : INTEGER := 0;
-
- PROCEDURE ANNOTATE_button_debounced_out(
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- STD.TEXTIO.write(TX_LOC, string'("Annotate["));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'(", button_debounced_out, "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, button_debounced_out);
- STD.TEXTIO.write(TX_LOC, string'("]"));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.writeline(RESULTS, TX_LOC);
- STD.TEXTIO.Deallocate(TX_LOC);
- END;
- BEGIN
- WAIT for 1 fs;
- ANNOTATE_button_debounced_out(0);
- WAIT for OFFSET;
- TX_TIME := TX_TIME + 100;
- ANNO_LOOP : LOOP
- --Rising Edge
- WAIT for 115 ns;
- TX_TIME := TX_TIME + 115;
- ANNOTATE_button_debounced_out(TX_TIME);
- WAIT for 85 ns;
- TX_TIME := TX_TIME + 85;
- END LOOP ANNO_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- -- ------------- Current Time: 100ns
- WAIT FOR 100 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 385ns
- WAIT FOR 285 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 585ns
- WAIT FOR 200 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 785ns
- WAIT FOR 200 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 985ns
- WAIT FOR 200 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 1785ns
- WAIT FOR 800 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 3185ns
- WAIT FOR 1400 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 4585ns
- WAIT FOR 1400 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4785ns
- WAIT FOR 200 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 5385ns
- WAIT FOR 600 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 5585ns
- WAIT FOR 200 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 5785ns
- WAIT FOR 200 ns;
- button_in <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 7385ns
- WAIT FOR 1600 ns;
- button_in <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 8185ns
- WAIT FOR 800 ns;
- button_in <= '0';
- -- -------------------------------------
- WAIT FOR 2015 ns;
-
- STD.TEXTIO.write(TX_OUT, string'("Total[]"));
- STD.TEXTIO.writeline(RESULTS, TX_OUT);
- ASSERT (FALSE) REPORT
- "Success! Simulation for annotation completed"
- SEVERITY FAILURE;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/debouncer_tbw.jhd
===================================================================
--- trunk/firmware/led/debouncer_tbw.jhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/debouncer_tbw.jhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,3 +0,0 @@
-MODULE debouncer_tbw
-SUBMODULE debouncer
-INSTANCE UUT
Deleted: trunk/firmware/led/debouncer_tbw.tbw
===================================================================
--- trunk/firmware/led/debouncer_tbw.tbw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/debouncer_tbw.tbw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,45 +0,0 @@
-version 3
-/home/benoit/armadeus/trunk/firmware/led/debouncer.vhd
-debouncer
-VHDL
-VHDL
-/home/benoit/armadeus/trunk/firmware/led/debouncer_tbw.xwv
-Clocked
--
--
-10000000000
-ns
-GSR:true
-PRLD:false
-100000000
-CLOCK_LIST_BEGIN
-clk_100hz
-100000000
-100000000
-15000000
-15000000
-100000000
-RISING
-CLOCK_LIST_END
-SIGNAL_LIST_BEGIN
-button_debounced_out
-clk_100hz
-button_in
-clk_100hz
-SIGNAL_LIST_END
-SIGNALS_NOT_ON_DISPLAY
-button_debounced_out_DIFF
-SIGNALS_NOT_ON_DISPLAY_END
-MARKER_LIST_BEGIN
-MARKER_LIST_END
-MEASURE_LIST_BEGIN
-MEASURE_LIST_END
-SIGNAL_ORDER_BEGIN
-clk_100hz
-button_in
-button_debounced_out
-SIGNAL_ORDER_END
-DIFFERENTIAL_CLKS_BEGIN
-DIFFERENTIAL_CLKS_END
-DIVIDERS_BEGIN
-DIVIDERS_END
Deleted: trunk/firmware/led/debouncer_tbw.xwv
===================================================================
(Binary files differ)
Deleted: trunk/firmware/led/debouncer_tbw_beh.prj
===================================================================
--- trunk/firmware/led/debouncer_tbw_beh.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/debouncer_tbw_beh.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,2 +0,0 @@
-vhdl work "debouncer.vhd"
-vhdl work "debouncer_tbw.vhw"
Deleted: trunk/firmware/led/flip_flop_tbw.ant
===================================================================
--- trunk/firmware/led/flip_flop_tbw.ant 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/flip_flop_tbw.ant 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,132 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : flip_flop_tbw.ant
--- /___/ /\ Timestamp : Fri Apr 13 22:13:11 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: flip_flop_tbw
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY flip_flop_tbw IS
-END flip_flop_tbw;
-
-ARCHITECTURE testbench_arch OF flip_flop_tbw IS
- FILE RESULTS: TEXT OPEN WRITE_MODE IS "/home/benoit/armadeus/trunk/firmware/led/flip_flop_tbw.ano";
-
- COMPONENT flip_flop
- PORT (
- clk_100hz : In std_logic;
- switch_in_n : In std_logic;
- led_out : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL clk_100hz : std_logic := '0';
- SIGNAL switch_in_n : std_logic := '0';
- SIGNAL led_out : std_logic := '0';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 200 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : flip_flop
- PORT MAP (
- clk_100hz => clk_100hz,
- switch_in_n => switch_in_n,
- led_out => led_out
- );
-
- PROCESS -- clock process for clk_100hz
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk_100hz <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk_100hz <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS -- Annotation process for clk_100hz
- VARIABLE TX_TIME : INTEGER := 0;
-
- PROCEDURE ANNOTATE_led_out(
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- STD.TEXTIO.write(TX_LOC, string'("Annotate["));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'(", led_out, "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, led_out);
- STD.TEXTIO.write(TX_LOC, string'("]"));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.writeline(RESULTS, TX_LOC);
- STD.TEXTIO.Deallocate(TX_LOC);
- END;
- BEGIN
- WAIT for 1 fs;
- ANNOTATE_led_out(0);
- WAIT for OFFSET;
- TX_TIME := TX_TIME + 100;
- ANNO_LOOP : LOOP
- --Rising Edge
- WAIT for 115 ns;
- TX_TIME := TX_TIME + 115;
- ANNOTATE_led_out(TX_TIME);
- WAIT for 85 ns;
- TX_TIME := TX_TIME + 85;
- END LOOP ANNO_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- -- ------------- Current Time: 185ns
- WAIT FOR 185 ns;
- switch_in_n <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 385ns
- WAIT FOR 200 ns;
- switch_in_n <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 585ns
- WAIT FOR 200 ns;
- switch_in_n <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 785ns
- WAIT FOR 200 ns;
- switch_in_n <= '0';
- -- -------------------------------------
- WAIT FOR 415 ns;
-
- STD.TEXTIO.write(TX_OUT, string'("Total[]"));
- STD.TEXTIO.writeline(RESULTS, TX_OUT);
- ASSERT (FALSE) REPORT
- "Success! Simulation for annotation completed"
- SEVERITY FAILURE;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/flip_flop_tbw.jhd
===================================================================
--- trunk/firmware/led/flip_flop_tbw.jhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/flip_flop_tbw.jhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,3 +0,0 @@
-MODULE flip_flop_tbw
-SUBMODULE flip_flop
-INSTANCE UUT
Deleted: trunk/firmware/led/flip_flop_tbw.tbw
===================================================================
--- trunk/firmware/led/flip_flop_tbw.tbw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/flip_flop_tbw.tbw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,45 +0,0 @@
-version 3
-/home/benoit/armadeus/trunk/firmware/led/flip_flop.vhd
-flip_flop
-VHDL
-VHDL
-/home/benoit/armadeus/trunk/firmware/led/flip_flop_tbw.xwv
-Clocked
--
--
-1000000000
-ns
-GSR:true
-PRLD:false
-100000000
-CLOCK_LIST_BEGIN
-clk_100hz
-100000000
-100000000
-15000000
-15000000
-100000000
-RISING
-CLOCK_LIST_END
-SIGNAL_LIST_BEGIN
-led_out
-clk_100hz
-switch_in_n
-clk_100hz
-SIGNAL_LIST_END
-SIGNALS_NOT_ON_DISPLAY
-led_out_DIFF
-SIGNALS_NOT_ON_DISPLAY_END
-MARKER_LIST_BEGIN
-MARKER_LIST_END
-MEASURE_LIST_BEGIN
-MEASURE_LIST_END
-SIGNAL_ORDER_BEGIN
-clk_100hz
-switch_in_n
-led_out
-SIGNAL_ORDER_END
-DIFFERENTIAL_CLKS_BEGIN
-DIFFERENTIAL_CLKS_END
-DIVIDERS_BEGIN
-DIVIDERS_END
Deleted: trunk/firmware/led/flip_flop_tbw.xwv
===================================================================
(Binary files differ)
Deleted: trunk/firmware/led/flip_flop_tbw_beh.prj
===================================================================
--- trunk/firmware/led/flip_flop_tbw_beh.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/flip_flop_tbw_beh.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,2 +0,0 @@
-vhdl work "flip_flop.vhd"
-vhdl work "flip_flop_tbw.vhw"
Deleted: trunk/firmware/led/flip_flop_tbw_bencher.prj
===================================================================
--- trunk/firmware/led/flip_flop_tbw_bencher.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/flip_flop_tbw_bencher.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1 +0,0 @@
-vhdl work "flip_flop.vhd"
Deleted: trunk/firmware/led/led.ise
===================================================================
(Binary files differ)
Deleted: trunk/firmware/led/led_top_tbw.ant
===================================================================
--- trunk/firmware/led/led_top_tbw.ant 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw.ant 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,211 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : led_top_tbw.ant
--- /___/ /\ Timestamp : Fri Apr 13 22:51:37 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: led_top_tbw
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY led_top_tbw IS
-END led_top_tbw;
-
-ARCHITECTURE testbench_arch OF led_top_tbw IS
- FILE RESULTS: TEXT OPEN WRITE_MODE IS "/home/benoit/armadeus/trunk/firmware/led/led_top_tbw.ano";
-
- COMPONENT led_top
- PORT (
- DataxD : InOut std_logic_vector (15 DownTo 0);
- AddrxDI : In std_logic_vector (12 DownTo 0);
- WRxBI : In std_logic;
- RDxBI : In std_logic;
- CSxBI : In std_logic;
- clk : In std_logic;
- button : In std_logic;
- led : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL DataxD : std_logic_vector (15 DownTo 0) := "0000000000000000";
- SIGNAL AddrxDI : std_logic_vector (12 DownTo 0) := "0000000000000";
- SIGNAL WRxBI : std_logic := '0';
- SIGNAL RDxBI : std_logic := '0';
- SIGNAL CSxBI : std_logic := '0';
- SIGNAL clk : std_logic := '0';
- SIGNAL button : std_logic := '0';
- SIGNAL led : std_logic := '0';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 20 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : led_top
- PORT MAP (
- DataxD => DataxD,
- AddrxDI => AddrxDI,
- WRxBI => WRxBI,
- RDxBI => RDxBI,
- CSxBI => CSxBI,
- clk => clk,
- button => button,
- led => led
- );
-
- PROCESS -- clock process for clk
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS -- Annotation process for clk
- VARIABLE TX_TIME : INTEGER := 0;
-
- PROCEDURE ANNOTATE_led(
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- STD.TEXTIO.write(TX_LOC, string'("Annotate["));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'(", led, "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, led);
- STD.TEXTIO.write(TX_LOC, string'("]"));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.writeline(RESULTS, TX_LOC);
- STD.TEXTIO.Deallocate(TX_LOC);
- END;
- BEGIN
- WAIT for 1 fs;
- ANNOTATE_led(0);
- WAIT for OFFSET;
- TX_TIME := TX_TIME + 100;
- ANNO_LOOP : LOOP
- --Rising Edge
- WAIT for 11 ns;
- TX_TIME := TX_TIME + 11;
- ANNOTATE_led(TX_TIME);
- WAIT for 9 ns;
- TX_TIME := TX_TIME + 9;
- END LOOP ANNO_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- -- ------------- Current Time: 129ns
- WAIT FOR 129 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 169ns
- WAIT FOR 40 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 189ns
- WAIT FOR 20 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 209ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 249ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 269ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 309ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 369ns
- WAIT FOR 60 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 549ns
- WAIT FOR 180 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 669ns
- WAIT FOR 120 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 809ns
- WAIT FOR 140 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 1029ns
- WAIT FOR 220 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 1409ns
- WAIT FOR 380 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 2709ns
- WAIT FOR 1300 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4269ns
- WAIT FOR 1560 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 4309ns
- WAIT FOR 40 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4769ns
- WAIT FOR 460 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 5429ns
- WAIT FOR 660 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 6629ns
- WAIT FOR 1200 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 8269ns
- WAIT FOR 1640 ns;
- button <= '0';
- -- -------------------------------------
- WAIT FOR 1751 ns;
-
- STD.TEXTIO.write(TX_OUT, string'("Total[]"));
- STD.TEXTIO.writeline(RESULTS, TX_OUT);
- ASSERT (FALSE) REPORT
- "Success! Simulation for annotation completed"
- SEVERITY FAILURE;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/led_top_tbw.jhd
===================================================================
--- trunk/firmware/led/led_top_tbw.jhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw.jhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,3 +0,0 @@
-MODULE led_top_tbw
-SUBMODULE led_top
-INSTANCE UUT
Deleted: trunk/firmware/led/led_top_tbw.tbw
===================================================================
--- trunk/firmware/led/led_top_tbw.tbw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw.tbw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,60 +0,0 @@
-version 3
-/home/benoit/armadeus/trunk/firmware/led/led_top.vhd
-led_top
-VHDL
-VHDL
-/home/benoit/armadeus/trunk/firmware/led/led_top_tbw.xwv
-Clocked
--
--
-10000000000
-ns
-GSR:true
-PRLD:false
-100000000
-CLOCK_LIST_BEGIN
-clk
-10000000
-10000000
-1000000
-1000000
-100000000
-RISING
-CLOCK_LIST_END
-SIGNAL_LIST_BEGIN
-AddrxDI
-clk
-CSxBI
-clk
-DataxD
-clk
-RDxBI
-clk
-WRxBI
-clk
-button
-clk
-led
-clk
-SIGNAL_LIST_END
-SIGNALS_NOT_ON_DISPLAY
-led_DIFF
-SIGNALS_NOT_ON_DISPLAY_END
-MARKER_LIST_BEGIN
-MARKER_LIST_END
-MEASURE_LIST_BEGIN
-MEASURE_LIST_END
-SIGNAL_ORDER_BEGIN
-clk
-button
-led
-AddrxDI
-CSxBI
-DataxD
-RDxBI
-WRxBI
-SIGNAL_ORDER_END
-DIFFERENTIAL_CLKS_BEGIN
-DIFFERENTIAL_CLKS_END
-DIVIDERS_BEGIN
-DIVIDERS_END
Deleted: trunk/firmware/led/led_top_tbw.xwv
===================================================================
(Binary files differ)
Deleted: trunk/firmware/led/led_top_tbw_beh.prj
===================================================================
--- trunk/firmware/led/led_top_tbw_beh.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_beh.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,5 +0,0 @@
-vhdl work "flip_flop.vhd"
-vhdl work "debouncer.vhd"
-vhdl work "clock_divider.vhd"
-vhdl work "led_top.vhd"
-vhdl work "led_top_tbw.vhw"
Deleted: trunk/firmware/led/led_top_tbw_bencher.prj
===================================================================
--- trunk/firmware/led/led_top_tbw_bencher.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_bencher.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,4 +0,0 @@
-vhdl work "flip_flop.vhd"
-vhdl work "debouncer.vhd"
-vhdl work "clock_divider.vhd"
-vhdl work "led_top.vhd"
Deleted: trunk/firmware/led/led_top_tbw_gen.prj
===================================================================
--- trunk/firmware/led/led_top_tbw_gen.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_gen.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,5 +0,0 @@
-vhdl work "flip_flop.vhd"
-vhdl work "debouncer.vhd"
-vhdl work "clock_divider.vhd"
-vhdl work "led_top.vhd"
-vhdl work "led_top_tbw.ant"
Deleted: trunk/firmware/led/led_top_tbw_par.prj
===================================================================
--- trunk/firmware/led/led_top_tbw_par.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_par.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,2 +0,0 @@
-vhdl work "netgen/par/led_top_timesim.vhd"
-vhdl work "led_top_tbw.vhw"
Deleted: trunk/firmware/led/led_top_tbw_selfcheck.ant
===================================================================
--- trunk/firmware/led/led_top_tbw_selfcheck.ant 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_selfcheck.ant 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,211 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : led_top_tbw_selfcheck.ant
--- /___/ /\ Timestamp : Fri Apr 13 22:51:44 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: led_top_tbw_selfcheck
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY led_top_tbw_selfcheck IS
-END led_top_tbw_selfcheck;
-
-ARCHITECTURE testbench_arch OF led_top_tbw_selfcheck IS
- FILE RESULTS: TEXT OPEN WRITE_MODE IS "/home/benoit/armadeus/trunk/firmware/led/led_top_tbw_selfcheck.ano";
-
- COMPONENT led_top
- PORT (
- DataxD : InOut std_logic_vector (15 DownTo 0);
- AddrxDI : In std_logic_vector (12 DownTo 0);
- WRxBI : In std_logic;
- RDxBI : In std_logic;
- CSxBI : In std_logic;
- clk : In std_logic;
- button : In std_logic;
- led : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL DataxD : std_logic_vector (15 DownTo 0) := "0000000000000000";
- SIGNAL AddrxDI : std_logic_vector (12 DownTo 0) := "0000000000000";
- SIGNAL WRxBI : std_logic := '0';
- SIGNAL RDxBI : std_logic := '0';
- SIGNAL CSxBI : std_logic := '0';
- SIGNAL clk : std_logic := '0';
- SIGNAL button : std_logic := '0';
- SIGNAL led : std_logic := 'U';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 20 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : led_top
- PORT MAP (
- DataxD => DataxD,
- AddrxDI => AddrxDI,
- WRxBI => WRxBI,
- RDxBI => RDxBI,
- CSxBI => CSxBI,
- clk => clk,
- button => button,
- led => led
- );
-
- PROCESS -- clock process for clk
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS -- Annotation process for clk
- VARIABLE TX_TIME : INTEGER := 0;
-
- PROCEDURE ANNOTATE_led(
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- STD.TEXTIO.write(TX_LOC, string'("Annotate["));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'(", led, "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, led);
- STD.TEXTIO.write(TX_LOC, string'("]"));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.writeline(RESULTS, TX_LOC);
- STD.TEXTIO.Deallocate(TX_LOC);
- END;
- BEGIN
- WAIT for 1 fs;
- ANNOTATE_led(0);
- WAIT for OFFSET;
- TX_TIME := TX_TIME + 100;
- ANNO_LOOP : LOOP
- --Rising Edge
- WAIT for 11 ns;
- TX_TIME := TX_TIME + 11;
- ANNOTATE_led(TX_TIME);
- WAIT for 9 ns;
- TX_TIME := TX_TIME + 9;
- END LOOP ANNO_LOOP;
- END PROCESS;
-
- PROCESS
- BEGIN
- -- ------------- Current Time: 129ns
- WAIT FOR 129 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 169ns
- WAIT FOR 40 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 189ns
- WAIT FOR 20 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 209ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 249ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 269ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 309ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 369ns
- WAIT FOR 60 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 549ns
- WAIT FOR 180 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 669ns
- WAIT FOR 120 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 809ns
- WAIT FOR 140 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 1029ns
- WAIT FOR 220 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 1409ns
- WAIT FOR 380 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 2709ns
- WAIT FOR 1300 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4269ns
- WAIT FOR 1560 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 4309ns
- WAIT FOR 40 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4769ns
- WAIT FOR 460 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 5429ns
- WAIT FOR 660 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 6629ns
- WAIT FOR 1200 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 8269ns
- WAIT FOR 1640 ns;
- button <= '0';
- -- -------------------------------------
- WAIT FOR 1751 ns;
-
- STD.TEXTIO.write(TX_OUT, string'("Total[]"));
- STD.TEXTIO.writeline(RESULTS, TX_OUT);
- ASSERT (FALSE) REPORT
- "Success! Simulation for annotation completed"
- SEVERITY FAILURE;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/led_top_tbw_selfcheck.vhw
===================================================================
--- trunk/firmware/led/led_top_tbw_selfcheck.vhw 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_selfcheck.vhw 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,228 +0,0 @@
---------------------------------------------------------------------------------
--- Copyright (c) 1995-2003 Xilinx, Inc.
--- All Right Reserved.
---------------------------------------------------------------------------------
--- ____ ____
--- / /\/ /
--- /___/ \ / Vendor: Xilinx
--- \ \ \/ Version : 9.1i
--- \ \ Application : ISE
--- / / Filename : led_top_tbw_selfcheck.vhw
--- /___/ /\ Timestamp : Fri Apr 13 22:51:44 2007
--- \ \ / \
--- \___\/\___\
---
---Command:
---Design Name: led_top_tbw_selfcheck
---Device: Xilinx
---
-
-library IEEE;
-use IEEE.STD_LOGIC_1164.ALL;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use IEEE.STD_LOGIC_UNSIGNED.ALL;
-USE IEEE.STD_LOGIC_TEXTIO.ALL;
-USE STD.TEXTIO.ALL;
-
-ENTITY led_top_tbw_selfcheck IS
-END led_top_tbw_selfcheck;
-
-ARCHITECTURE testbench_arch OF led_top_tbw_selfcheck IS
- COMPONENT led_top
- PORT (
- DataxD : InOut std_logic_vector (15 DownTo 0);
- AddrxDI : In std_logic_vector (12 DownTo 0);
- WRxBI : In std_logic;
- RDxBI : In std_logic;
- CSxBI : In std_logic;
- clk : In std_logic;
- button : In std_logic;
- led : Out std_logic
- );
- END COMPONENT;
-
- SIGNAL DataxD : std_logic_vector (15 DownTo 0) := "0000000000000000";
- SIGNAL AddrxDI : std_logic_vector (12 DownTo 0) := "0000000000000";
- SIGNAL WRxBI : std_logic := '0';
- SIGNAL RDxBI : std_logic := '0';
- SIGNAL CSxBI : std_logic := '0';
- SIGNAL clk : std_logic := '0';
- SIGNAL button : std_logic := '0';
- SIGNAL led : std_logic := 'U';
-
- SHARED VARIABLE TX_ERROR : INTEGER := 0;
- SHARED VARIABLE TX_OUT : LINE;
-
- constant PERIOD : time := 20 ns;
- constant DUTY_CYCLE : real := 0.5;
- constant OFFSET : time := 100 ns;
-
- BEGIN
- UUT : led_top
- PORT MAP (
- DataxD => DataxD,
- AddrxDI => AddrxDI,
- WRxBI => WRxBI,
- RDxBI => RDxBI,
- CSxBI => CSxBI,
- clk => clk,
- button => button,
- led => led
- );
-
- PROCESS -- clock process for clk
- BEGIN
- WAIT for OFFSET;
- CLOCK_LOOP : LOOP
- clk <= '0';
- WAIT FOR (PERIOD - (PERIOD * DUTY_CYCLE));
- clk <= '1';
- WAIT FOR (PERIOD * DUTY_CYCLE);
- END LOOP CLOCK_LOOP;
- END PROCESS;
-
- PROCESS
- PROCEDURE CHECK_led(
- next_led : std_logic;
- TX_TIME : INTEGER
- ) IS
- VARIABLE TX_STR : String(1 to 4096);
- VARIABLE TX_LOC : LINE;
- BEGIN
- IF (led /= next_led) THEN
- STD.TEXTIO.write(TX_LOC, string'("Error at time="));
- STD.TEXTIO.write(TX_LOC, TX_TIME);
- STD.TEXTIO.write(TX_LOC, string'("ns led="));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, led);
- STD.TEXTIO.write(TX_LOC, string'(", Expected = "));
- IEEE.STD_LOGIC_TEXTIO.write(TX_LOC, next_led);
- STD.TEXTIO.write(TX_LOC, string'(" "));
- TX_STR(TX_LOC.all'range) := TX_LOC.all;
- STD.TEXTIO.Deallocate(TX_LOC);
- ASSERT (FALSE) REPORT TX_STR SEVERITY ERROR;
- TX_ERROR := TX_ERROR + 1;
- END IF;
- END;
- BEGIN
- -- ------------- Current Time: 129ns
- WAIT FOR 129 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 131ns
- WAIT FOR 2 ns;
- CHECK_led('0', 131);
- -- -------------------------------------
- -- ------------- Current Time: 169ns
- WAIT FOR 38 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 171ns
- WAIT FOR 2 ns;
- CHECK_led('1', 171);
- -- -------------------------------------
- -- ------------- Current Time: 189ns
- WAIT FOR 18 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 209ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 249ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 269ns
- WAIT FOR 20 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 309ns
- WAIT FOR 40 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 369ns
- WAIT FOR 60 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 549ns
- WAIT FOR 180 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 669ns
- WAIT FOR 120 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 809ns
- WAIT FOR 140 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 1029ns
- WAIT FOR 220 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 1251ns
- WAIT FOR 222 ns;
- CHECK_led('0', 1251);
- -- -------------------------------------
- -- ------------- Current Time: 1409ns
- WAIT FOR 158 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 2709ns
- WAIT FOR 1300 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 2931ns
- WAIT FOR 222 ns;
- CHECK_led('1', 2931);
- -- -------------------------------------
- -- ------------- Current Time: 4269ns
- WAIT FOR 1338 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 4309ns
- WAIT FOR 40 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 4769ns
- WAIT FOR 460 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 5429ns
- WAIT FOR 660 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 5651ns
- WAIT FOR 222 ns;
- CHECK_led('0', 5651);
- -- -------------------------------------
- -- ------------- Current Time: 6629ns
- WAIT FOR 978 ns;
- button <= '1';
- -- -------------------------------------
- -- ------------- Current Time: 8269ns
- WAIT FOR 1640 ns;
- button <= '0';
- -- -------------------------------------
- -- ------------- Current Time: 8491ns
- WAIT FOR 222 ns;
- CHECK_led('1', 8491);
- -- -------------------------------------
- WAIT FOR 1529 ns;
-
- IF (TX_ERROR = 0) THEN
- STD.TEXTIO.write(TX_OUT, string'("No errors or warnings"));
- ASSERT (FALSE) REPORT
- "Simulation successful (not a failure). No problems detected."
- SEVERITY FAILURE;
- ELSE
- STD.TEXTIO.write(TX_OUT, TX_ERROR);
- STD.TEXTIO.write(TX_OUT,
- string'(" errors found in simulation"));
- ASSERT (FALSE) REPORT "Errors found during simulation"
- SEVERITY FAILURE;
- END IF;
- END PROCESS;
-
- END testbench_arch;
-
Deleted: trunk/firmware/led/led_top_tbw_selfcheck_beh_beh.prj
===================================================================
--- trunk/firmware/led/led_top_tbw_selfcheck_beh_beh.prj 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/led_top_tbw_selfcheck_beh_beh.prj 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,5 +0,0 @@
-vhdl work "flip_flop.vhd"
-vhdl work "debouncer.vhd"
-vhdl work "clock_divider.vhd"
-vhdl work "led_top.vhd"
-vhdl work "led_top_tbw_selfcheck_beh.vhd"
Deleted: trunk/firmware/led/schema
===================================================================
--- trunk/firmware/led/schema 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/led/schema 2008-12-10 14:41:05 UTC (rev 942)
@@ -1,37 +0,0 @@
-v 20060906 1
-C 55400 64400 1 0 0 3.3V-plus-1.sym
-C 55300 62200 1 0 1 diode-1.sym
-{
-T 54900 62800 5 10 0 0 0 6 1
-device=DIODE
-T 55000 62700 5 10 1 1 0 6 1
-refdes=D1
-}
-C 54400 63100 1 0 0 pushbutton.sym
-C 56500 62300 1 0 1 resistor-1.sym
-{
-T 56200 62700 5 10 0 0 0 6 1
-device=RESISTOR
-T 56300 62600 5 10 1 1 0 6 1
-refdes=R1
-}
-C 55700 63200 1 90 0 resistor-1.sym
-{
-T 55300 63500 5 10 0 0 90 0 1
-device=RESISTOR
-T 55400 63400 5 10 1 1 90 0 1
-refdes=R2
-}
-N 55600 62400 55300 62400 4
-N 54400 61800 54400 63200 4
-N 55600 64100 55600 64400 4
-N 55200 63200 57000 63200 4
-N 56500 62400 57000 62400 4
-T 57200 64600 9 10 1 0 0 0 1
-R2=47 kOhm
-T 57200 64200 9 10 1 0 0 0 1
-R1=850 Ohm
-T 57200 62400 9 10 1 0 0 0 1
-L28P_1/P118/led
-T 57200 63200 9 10 1 0 0 0 1
-L28N_1/P119/button
Modified: trunk/firmware/sram_test/sram_test.vhd
===================================================================
--- trunk/firmware/sram_test/sram_test.vhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/sram_test/sram_test.vhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -42,32 +42,32 @@
SRAM_OEn : out std_logic;
SRAM_CEn : out std_logic;
SRAM_BLEn : out std_logic;
- SRAM_BHEn : out std_logic
+ SRAM_BHEn : out std_logic
);
end sram_test;
architecture hierarchical of sram_test is
-
- type readAccessType is ('0','1','2');
- subtype reg is std_logic_vector (12 downto 0);
-
- constant SRAM_READ : readAccessType := '0';
+
+ type readAccessType is ('0','1','2');
+ subtype reg is std_logic_vector (12 downto 0);
+
+ constant SRAM_READ : readAccessType := '0';
constant INTERNAL_READ : readAccessType := '1';
constant OTHER_READ : readAccessType := '2';
- constant DATA_REGISTER : reg := b"0000000000010";
- constant ADDRESS_REGISTER: reg := b"0000000000000";
+ constant DATA_REGISTER : reg := b"0000000000010";
+ constant ADDRESS_REGISTER: reg := b"0000000000000";
signal resetn : std_logic;
signal DataxD_out : std_logic_vector(15 downto 0);
signal regSRAM_Data_out : std_logic_vector(15 downto 0);
signal SRAM_Addr_out : std_logic_vector(15 downto 0);
signal regSRAM_WEn_out : std_logic;
- signal regSRAM_OEn_out : std_logic;
- signal readAccess : readAccessType;
+ signal regSRAM_OEn_out : std_logic;
+ signal readAccess : readAccessType;
begin
- resetn <= '1';
+ resetn <= '1';
-----------------------------------------------------------------------------
-- Process
@@ -76,15 +76,15 @@
TestRegister_write : process (CSxBI, ClkxCI, WRxBI, AddrxDI, DataxD )
begin -- process TestRegister_write
if resetn = '0' then -- asynchronous reset (active low)
- regSRAM_Data_out <= (others => 'Z');
+ regSRAM_Data_out <= (others => 'Z');
elsif ClkxCI'event and ClkxCI = '1' then -- rising clock edge
if CSxBI = '0' and WRxBI = '0' then
case AddrxDI is
- when ADDRESS_REGISTER =>
+ when ADDRESS_REGISTER =>
SRAM_Addr_out <= DataxD(15 downto 0);
regSRAM_WEn_out <= '1';
when DATA_REGISTER =>
- regSRAM_Data_out <= DataxD(15 downto 0);
+ regSRAM_Data_out <= DataxD(15 downto 0);
regSRAM_WEn_out <= '0';
when others =>
regSRAM_Data_out <= (others => '0');
@@ -96,35 +96,35 @@
end if;
end if;
end process TestRegister_write;
-
-
-SRAM_read_process : process (ClkxCI, readAccess, SRAM_Data )
-begin -- process TestRegister_write
- if ClkxCI'event and ClkxCI = '1' then
- if readAccess = SRAM_READ then
+
+
+SRAM_read_process : process (ClkxCI, readAccess, SRAM_Data )
+begin -- process TestRegister_write
+ if ClkxCI'event and ClkxCI = '1' then
+ if readAccess = SRAM_READ then
DataxD_out <= SRAM_Data(15 downto 0);
- elsif readAccess = INTERNAL_READ then
+ elsif readAccess = INTERNAL_READ then
DataxD_out <= (others => '0');
else -- other
DataxD_out <= (others => 'Z');
- end if;
- end if;
-end process SRAM_read_process;
-
+ end if;
+ end if;
+end process SRAM_read_process;
+
TestRegister_read : process (CSxBI, RDxBI, AddrxDI, DataxD, ClkxCI )
- begin -- process TestRegister_write
-
- if CSxBI = '0' and RDxBI = '0' then
+ begin -- process TestRegister_write
+
+ if CSxBI = '0' and RDxBI = '0' then
case AddrxDI is
- when DATA_REGISTER => -- data register
- regSRAM_OEn_out <= '0';
+ when DATA_REGISTER => -- data register
+ regSRAM_OEn_out <= '0';
readAccess <= SRAM_READ; -- SRAM read
- when others =>
- readAccess <= INTERNAL_READ; -- INTERNAL read
+ when others =>
+ readAccess <= INTERNAL_READ; -- INTERNAL read
regSRAM_OEn_out <= '1';
end case;
else
- readAccess <= OTHER_READ;
+ readAccess <= OTHER_READ;
regSRAM_OEn_out <= '1';
end if;
end process TestRegister_read;
Modified: trunk/firmware/wishbone_example/testbench/Wb_top_tb.vhd
===================================================================
--- trunk/firmware/wishbone_example/testbench/Wb_top_tb.vhd 2008-12-10 12:18:28 UTC (rev 941)
+++ trunk/firmware/wishbone_example/testbench/Wb_top_tb.vhd 2008-12-10 14:41:05 UTC (rev 942)
@@ -21,151 +21,148 @@
use work.apf_test_pkg.ALL;
----------------------------------------------------------------------------------
Entity Wb_top_tb is
-----------------------------------------------------------------------------------
- end entity Wb_top_tb;
+ ----------------------------------------------------------------------------------
+ end entity Wb_top_tb;
----------...
[truncated message content] |
|
From: <Fa...@us...> - 2008-12-10 12:18:31
|
Revision: 941
http://armadeus.svn.sourceforge.net/armadeus/?rev=941&view=rev
Author: FabM
Date: 2008-12-10 12:18:28 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
[BUILDROOT] Oups ... patch error
Modified Paths:
--------------
trunk/patches/057-buildroot-pymysql.diff
Modified: trunk/patches/057-buildroot-pymysql.diff
===================================================================
--- trunk/patches/057-buildroot-pymysql.diff 2008-12-10 10:37:35 UTC (rev 940)
+++ trunk/patches/057-buildroot-pymysql.diff 2008-12-10 12:18:28 UTC (rev 941)
@@ -1,10 +1,10 @@
---- buildroot/package/Config.in 2008-12-10 10:18:38.000000000 +0100
-+++ buildroot/package/Config.in.old 2008-12-10 10:18:00.000000000 +0100
-@@ -467,7 +467,6 @@ source "package/lua/Config.in"
+--- buildroot/package/Config.in.old 2008-12-10 10:18:00.000000000 +0100
++++ buildroot/package/Config.in 2008-12-10 10:18:38.000000000 +0100
+@@ -467,6 +467,7 @@ source "package/lua/Config.in"
source "package/microperl/Config.in"
source "package/python/Config.in"
source "package/pyserial/Config.in"
--source "package/pymysql/Config.in"
++source "package/pymysql/Config.in"
source "package/ruby/Config.in"
source "package/tcl/Config.in"
source "package/php/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2008-12-10 10:37:39
|
Revision: 940
http://armadeus.svn.sourceforge.net/armadeus/?rev=940&view=rev
Author: FabM
Date: 2008-12-10 10:37:35 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
[BUILDROOT] Adding MySQL-python in buildroot menu
Added Paths:
-----------
trunk/patches/057-buildroot-pymysql.diff
Added: trunk/patches/057-buildroot-pymysql.diff
===================================================================
--- trunk/patches/057-buildroot-pymysql.diff (rev 0)
+++ trunk/patches/057-buildroot-pymysql.diff 2008-12-10 10:37:35 UTC (rev 940)
@@ -0,0 +1,10 @@
+--- buildroot/package/Config.in 2008-12-10 10:18:38.000000000 +0100
++++ buildroot/package/Config.in.old 2008-12-10 10:18:00.000000000 +0100
+@@ -467,7 +467,6 @@ source "package/lua/Config.in"
+ source "package/microperl/Config.in"
+ source "package/python/Config.in"
+ source "package/pyserial/Config.in"
+-source "package/pymysql/Config.in"
+ source "package/ruby/Config.in"
+ source "package/tcl/Config.in"
+ source "package/php/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-10 09:09:19
|
Revision: 939
http://armadeus.svn.sourceforge.net/armadeus/?rev=939&view=rev
Author: artemys
Date: 2008-12-10 09:09:14 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
[BUILDROOT] Add MySQL support module for Python (to test and clean when tested)
Added Paths:
-----------
trunk/buildroot/package/pymysql/
trunk/buildroot/package/pymysql/Config.in
trunk/buildroot/package/pymysql/patches/
trunk/buildroot/package/pymysql/patches/000-setup.patch
trunk/buildroot/package/pymysql/patches/010-threadsafe.patch
trunk/buildroot/package/pymysql/pymysql.mk
Added: trunk/buildroot/package/pymysql/Config.in
===================================================================
--- trunk/buildroot/package/pymysql/Config.in (rev 0)
+++ trunk/buildroot/package/pymysql/Config.in 2008-12-10 09:09:14 UTC (rev 939)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYMYSQL
+ depends on BR2_PACKAGE_PYTHON
+ bool "MySQL support for Python"
+ help
+ MySQLdb is an thread-compatible interface to the popular MySQL
+ database server that provides the Python database API.
+
+ http://sourceforge.net/projects/mysql-python
+
Added: trunk/buildroot/package/pymysql/patches/000-setup.patch
===================================================================
--- trunk/buildroot/package/pymysql/patches/000-setup.patch (rev 0)
+++ trunk/buildroot/package/pymysql/patches/000-setup.patch 2008-12-10 09:09:14 UTC (rev 939)
@@ -0,0 +1,12 @@
+--- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100
++++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200
+@@ -2,8 +2,7 @@
+
+ import os
+ import sys
+-import ez_setup; ez_setup.use_setuptools()
+-from setuptools import setup, Extension
++from distutils.core import setup, Extension
+
+ if sys.version_info < (2, 3):
+ raise Error, "Python-2.3 or newer is required"
Added: trunk/buildroot/package/pymysql/patches/010-threadsafe.patch
===================================================================
--- trunk/buildroot/package/pymysql/patches/010-threadsafe.patch (rev 0)
+++ trunk/buildroot/package/pymysql/patches/010-threadsafe.patch 2008-12-10 09:09:14 UTC (rev 939)
@@ -0,0 +1,11 @@
+--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
++++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
+@@ -4,7 +4,7 @@
+ # static: link against a static library (probably required for embedded)
+
+ embedded = False
+-threadsafe = True
++threadsafe = False
+ static = False
+
+ # The path to mysql_config.
Added: trunk/buildroot/package/pymysql/pymysql.mk
===================================================================
--- trunk/buildroot/package/pymysql/pymysql.mk (rev 0)
+++ trunk/buildroot/package/pymysql/pymysql.mk 2008-12-10 09:09:14 UTC (rev 939)
@@ -0,0 +1,76 @@
+#############################################################
+#
+# python
+#
+#############################################################
+PYMYSQL_VERSION=1.2.2
+PYMYSQL_SOURCE:=MySQL-python-$(PYMYSQL_VERSION).tar.gz
+PYMYSQL_SITE:=http://python.org/ftp/python/$(PYMYSQL_VERSION)
+PYMYSQL_DIR:=$(BUILD_DIR)/MySQL-python-$(PYMYSQL_VERSION)
+PYMYSQL_CAT:=$(ZCAT)
+PYMYSQL_BINARY:=_mysql.so
+PYMYSQL_TARGET_BINARY:=usr/bin/python
+PYMYSQL_DEPS:=mysql_client
+TARGET_PYTHON_PACKAGE_DIR:=usr/lib/python2.4/site-packages
+PYMYSQL_SITE_PACKAGE_DIR=$(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
+#HOST_PYTHON:=$(BUILD_DIR)/Python-2.4.5/hostpython
+HOST_PYTHON=python2.4
+
+
+$(DL_DIR)/$(PYMYSQL_SOURCE):
+ $(WGET) -P $(DL_DIR) $(PYMYSQL_SITE)/$(PYMYSQL_SOURCE)
+
+pymysql-source: $(DL_DIR)/$(PYMYSQL_SOURCE)
+
+$(PYMYSQL_DIR)/.unpacked: $(DL_DIR)/$(PYMYSQL_SOURCE)
+ $(PYMYSQL_CAT) $(DL_DIR)/$(PYMYSQL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(PYMYSQL_DIR)/.patched: $(PYMYSQL_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(PYMYSQL_DIR) package/pymysql/patches/ \*.patch
+ touch $@
+
+$(PYMYSQL_DIR)/.configured: $(PYMYSQL_DIR)/.patched
+ (cd $(PYMYSQL_DIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
+ $(HOST_PYTHON) setup.py build );
+ touch $@
+
+$(PYMYSQL_DIR)/.installed: $(PYMYSQL_DIR)/.configured
+ mkdir -p $(STAGING_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
+ (cd $(PYMYSQL_DIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
+ $(HOST_PYTHON) setup.py install --prefix=$(STAGING_DIR)/usr );
+ touch $@
+
+$(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/$(PYMYSQL_BINARY): $(PYMYSQL_DIR)/.installed
+ mkdir -p $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
+ (cd $(STAGING_DIR)/$(TARGET_PYTHON_PACKAGE_DIR); \
+ cp -f _mysql.so $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/; \
+ cp -f _mysql_exceptions.py* $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/; \
+ cp -Rdpf MySQLdb $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/ );
+ touch $@
+
+pymysql: uclibc $(PYMYSQL_DEPS) $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/$(PYMYSQL_BINARY)
+
+pymysql-clean:
+ -$(MAKE) -C $(PYMYSQL_DIR) distclean
+ rm -rf $(PYMYSQL_DIR)/.configured $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/MySQLdb
+ rm -f $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/_mysql.so
+ rm -f $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/_mysql_exceptions.py
+
+pymysql-dirclean:
+ rm -rf $(PYMYSQL_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_PYMYSQL)),y)
+TARGETS+=pymysql
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-09 10:17:38
|
Revision: 938
http://armadeus.svn.sourceforge.net/armadeus/?rev=938&view=rev
Author: artemys
Date: 2008-12-09 10:17:34 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
[BUILDROOT] re-populate default /dev even if we are now using mdev
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
Modified: trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/device_table.txt 2008-12-09 09:53:28 UTC (rev 937)
+++ trunk/buildroot/target/device/armadeus/rootfs/device_table.txt 2008-12-09 10:17:34 UTC (rev 938)
@@ -33,8 +33,8 @@
#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
/dev d 755 0 0 - - - - -
-#/dev/pts d 755 0 0 - - - - -
-#/dev/snd d 755 0 0 - - - - -
+/dev/pts d 755 0 0 - - - - -
+/dev/snd d 755 0 0 - - - - -
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
/sys d 755 0 0 - - - - -
@@ -54,46 +54,46 @@
# uncomment this to allow starting x as non-root
#/usr/X11R6/bin/Xfbdev f 4755 0 0 - - - - -
# Normal system devices
-#/dev/mem c 640 0 0 1 1 0 0 -
-#/dev/kmem c 640 0 0 1 2 0 0 -
+/dev/mem c 640 0 0 1 1 0 0 -
+/dev/kmem c 640 0 0 1 2 0 0 -
/dev/null c 666 0 0 1 3 0 0 -
-#/dev/zero c 666 0 0 1 5 0 0 -
-#/dev/random c 666 0 0 1 8 0 0 -
-#/dev/urandom c 666 0 0 1 9 0 0 -
-#/dev/ram b 640 0 0 1 1 0 0 -
-#/dev/ram b 640 0 0 1 0 0 1 4
-#/dev/loop b 640 0 0 7 0 0 1 2
-#/dev/rtc c 640 0 0 254 0 - - -
-#/dev/rtc c 640 0 0 254 0 0 1 3
+/dev/zero c 666 0 0 1 5 0 0 -
+/dev/random c 666 0 0 1 8 0 0 -
+/dev/urandom c 666 0 0 1 9 0 0 -
+/dev/ram b 640 0 0 1 1 0 0 -
+/dev/ram b 640 0 0 1 0 0 1 4
+/dev/loop b 640 0 0 7 0 0 1 2
+/dev/rtc c 640 0 0 254 0 - - -
+/dev/rtc c 640 0 0 254 0 0 1 3
/dev/console c 666 0 0 5 1 - - -
-#/dev/tty c 666 0 0 5 0 - - -
-#/dev/tty c 666 0 0 4 0 0 1 8
-#/dev/ttyp c 666 0 0 3 0 0 1 10
-#/dev/ptyp c 666 0 0 2 0 0 1 10
-#/dev/ptmx c 666 0 0 5 2 - - -
-#/dev/ttyP c 666 0 0 57 0 0 1 4
-#/dev/ttyS c 666 0 0 4 64 0 1 4
-#/dev/ttygserial c 666 0 0 127 0 - - -
-#/dev/fb c 640 0 5 29 0 0 32 4
-#/dev/ttySMX c 666 0 0 204 41 0 1 6
+/dev/tty c 666 0 0 5 0 - - -
+/dev/tty c 666 0 0 4 0 0 1 8
+/dev/ttyp c 666 0 0 3 0 0 1 10
+/dev/ptyp c 666 0 0 2 0 0 1 10
+/dev/ptmx c 666 0 0 5 2 - - -
+/dev/ttyP c 666 0 0 57 0 0 1 4
+/dev/ttyS c 666 0 0 4 64 0 1 4
+/dev/ttygserial c 666 0 0 127 0 - - -
+/dev/fb c 640 0 5 29 0 0 32 4
+/dev/ttySMX c 666 0 0 204 41 0 1 6
#/dev/ttySA c 666 0 0 204 5 0 1 3
-#/dev/psaux c 666 0 0 10 1 0 0 -
+/dev/psaux c 666 0 0 10 1 0 0 -
#/dev/ppp c 666 0 0 108 0 - - -
# Input stuff
-#/dev/input d 755 0 0 - - - - -
-#/dev/input/mice c 640 0 0 13 63 0 0 -
-#/dev/input/mouse c 660 0 0 13 32 0 1 4
-#/dev/input/event c 660 0 0 13 64 0 1 4
+/dev/input d 755 0 0 - - - - -
+/dev/input/mice c 640 0 0 13 63 0 0 -
+/dev/input/mouse c 660 0 0 13 32 0 1 4
+/dev/input/event c 660 0 0 13 64 0 1 4
#/dev/input/js c 660 0 0 13 0 0 1 4
# MTD stuff
-#/dev/mtd c 640 0 0 90 0 0 2 8
-#/dev/mtdblock b 640 0 0 31 0 0 1 8
+/dev/mtd c 640 0 0 90 0 0 2 8
+/dev/mtdblock b 640 0 0 31 0 0 1 8
#Tun/tap driver
-#/dev/net d 755 0 0 - - - - -
-#/dev/net/tun c 660 0 0 10 200 - - -
+/dev/net d 755 0 0 - - - - -
+/dev/net/tun c 660 0 0 10 200 - - -
# Audio stuff
#/dev/audio c 666 0 29 14 4 - - -
@@ -102,16 +102,16 @@
#/dev/dsp1 c 666 0 29 14 19 - - -
#/dev/sndstat c 666 0 29 14 6 - - -
-#/dev/audio c 666 0 29 14 4 - - -
-#/dev/audio1 c 666 0 29 14 20 - - -
-#/dev/dsp c 666 0 29 14 3 - - -
-#/dev/dsp1 c 666 0 29 14 19 - - -
-#/dev/sndstat c 666 0 29 14 6 - - -
-#/dev/snd/controlC0 c 666 0 29 116 0 - - -
-#/dev/snd/pcmC0D0p c 666 0 29 116 16 - - -
-#/dev/snd/pcmC0D1p c 666 0 29 116 17 - - -
-#/dev/snd/pcmC0D0c c 666 0 29 116 24 - - -
-#/dev/snd/timer c 666 0 29 116 33 - - -
+/dev/audio c 666 0 29 14 4 - - -
+/dev/audio1 c 666 0 29 14 20 - - -
+/dev/dsp c 666 0 29 14 3 - - -
+/dev/dsp1 c 666 0 29 14 19 - - -
+/dev/sndstat c 666 0 29 14 6 - - -
+/dev/snd/controlC0 c 666 0 29 116 0 - - -
+/dev/snd/pcmC0D0p c 666 0 29 116 16 - - -
+/dev/snd/pcmC0D1p c 666 0 29 116 17 - - -
+/dev/snd/pcmC0D0c c 666 0 29 116 24 - - -
+/dev/snd/timer c 666 0 29 116 33 - - -
# User-mode Linux stuff
#/dev/ubda b 640 0 0 98 0 0 0 -
@@ -187,10 +187,10 @@
#/dev/optcd b 640 0 0 17 0 0 0 -
# I2C bus interface
-# /dev/i2c-0 c 666 0 0 89 0
+/dev/i2c-0 c 666 0 0 89 0
# MMC/SD Devices
-#/dev/mmcblk0 b 640 0 0 179 0 0 0 -
-#/dev/mmcblk0p b 640 0 0 179 1 1 1 8
+/dev/mmcblk0 b 640 0 0 179 0 0 0 -
+/dev/mmcblk0p b 640 0 0 179 1 1 1 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-09 09:53:38
|
Revision: 937
http://armadeus.svn.sourceforge.net/armadeus/?rev=937&view=rev
Author: artemys
Date: 2008-12-09 09:53:28 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
[LINUX] Remove debugging + add ALSA in 2.6.23.1 APF9328 default config
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-08 14:23:25 UTC (rev 936)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-09 09:53:28 UTC (rev 937)
@@ -641,7 +641,7 @@
# CONFIG_SPI_AT25 is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_TSC2102 is not set
+CONFIG_SPI_TSC2102=m
# CONFIG_W1 is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
@@ -777,9 +777,41 @@
#
# Advanced Linux Sound Architecture
#
-# CONFIG_SND is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_IMX_TSC2102=m
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
@@ -1134,35 +1166,10 @@
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_PREEMPT=y
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KERNEL is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_FAULT_INJECTION is not set
# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_LL is not set
#
# Security options
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-08 14:23:26
|
Revision: 936
http://armadeus.svn.sourceforge.net/armadeus/?rev=936&view=rev
Author: artemys
Date: 2008-12-08 14:23:25 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
[LINUX] Updates Linux 2.6.23.1 APF9328 default MTD map to handle new FLASH partitionning
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-022-apf9328-mtd.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-022-apf9328-mtd.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-022-apf9328-mtd.patch 2008-12-08 13:25:52 UTC (rev 935)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-022-apf9328-mtd.patch 2008-12-08 14:23:25 UTC (rev 936)
@@ -1,6 +1,6 @@
--- linux-org/drivers/mtd/maps/apf9328.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-imx/drivers/mtd/maps/apf9328.c 2006-10-01 14:29:08.000000000 +0200
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,144 @@
+/*
+ * $Id: drivers/mtd/maps/apf9328.c, v1.0
+ *
@@ -60,17 +60,21 @@
+ .offset = 0x00060000,
+ },{
+ .name = "Kernel",
-+ .size = 0x00100000, // 1M
++ .size = 0x00200000, // 2M
+ .offset = 0x000a0000,
+ },{
+ .name = "Rootfs",
-+ .size = 0x00600000, // 6M
-+ .offset = 0x001a0000,
-+ },{
++#ifdef CONFIG_IMX_APF9328_FLASH_8MB
++ .size = 0x00560000, // 5,5M
++#else
++ .size = 0x00c60000, // 13,5M
++#endif
++ .offset = 0x002a0000,
++ }, /*{
+ .name = "Userfs",
+ .size = MTDPART_SIZ_FULL,
+ .offset = 0x007a0000
-+ }
++ }*/
+};
+
+static struct mtd_info *mymtds;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2008-12-08 13:25:56
|
Revision: 935
http://armadeus.svn.sourceforge.net/armadeus/?rev=935&view=rev
Author: artemys
Date: 2008-12-08 13:25:52 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
[LINUX] Makes max1027 driver compiles again with Linux 2.6.23.1
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
trunk/target/linux/modules/max1027/max1027.c
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-063-armadeus-max1027-add_max1027_include.patch
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-07 15:48:43 UTC (rev 934)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.23.1.config 2008-12-08 13:25:52 UTC (rev 935)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23.1
-# Thu Oct 30 12:23:07 2008
+# Mon Dec 8 13:53:53 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -832,7 +832,7 @@
CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
-# CONFIG_ARMADEUS_FAST_MAX1027 is not set
+CONFIG_ARMADEUS_MAX1027=m
#
# FPGA related
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-063-armadeus-max1027-add_max1027_include.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-063-armadeus-max1027-add_max1027_include.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/linux-2.6.23.1-063-armadeus-max1027-add_max1027_include.patch 2008-12-08 13:25:52 UTC (rev 935)
@@ -0,0 +1,67 @@
+--- linux-2.6.23.1.ref/include/linux/spi/max1027.h 2008-11-18 06:04:39.000000000 +0100
++++ linux-2.6.23.1/include/linux/spi/max1027.h 2008-11-18 06:04:39.000000000 +0100
+@@ -0,0 +1,64 @@
++/*
++ * include/linux/spi/max1027.h
++ *
++ * 8x10bits ADC
++ *
++ * Copyright (c) 2008 Armadeus Systems
++ *
++ * This package 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 package 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 package; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef __LINUX_SPI_MAX1027_H
++#define __LINUX_SPI_MAX1027_H
++
++#define SCAN_MODE_00 0
++#define SCAN_MODE_01 1
++#define SCAN_MODE_10 2
++#define SCAN_MODE_11 3
++
++#define MAX1027_CONV_CHSEL(x) ((x&0x0f)<<3)
++#define MAX1027_CONV_SCAN(x) ((x&0x03)<<1)
++#define GET_SCAN_MODE(conv) ( (conv & 0x06) >> 1 )
++#define MAX1027_CONV_TEMP 0x01
++
++#define MAX1027_SETUP_CLKSEL(x) ((x&0x03)<<4)
++#define MAX1027_SETUP_REFSEL(x) ((x&0x03)<<2)
++#define MAX1027_SETUP_DIFFSEL(x) (x&0x03)
++
++#define MAX1027_AVG_AVGON(x) ((x&0x01)<<4)
++#define MAX1027_AVG_NAVG(x) ((x&0x03)<<2)
++#define MAX1027_AVG_NSCAN(x) (x&0x03)
++
++/* All channels and temperature are scanned per conversion */
++#define MAX1027_CONV_DEFAULT (MAX1027_CONV_CHSEL(6) | \
++ MAX1027_CONV_SCAN(0) | MAX1027_CONV_TEMP)
++/* Internal clock and reference stays on */
++#define MAX1027_SETUP_DEFAULT (MAX1027_SETUP_CLKSEL(0) | \
++ MAX1027_SETUP_REFSEL(2))
++/* Averaging Off */
++#define MAX1027_AVG_DEFAULT ( MAX1027_AVG_AVGON(0) )
++
++struct spi_device;
++struct max1027_config {
++ u8 conv; /* initial conversion register value*/
++ u8 setup; /* initial setup register value */
++ u8 avg; /* initial average register value */
++ int cnvst_pin; /*gpio to start conversion. -1 for software start */
++ int (*init)(struct spi_device *spi);
++ int (*exit)(struct spi_device *spi);
++};
++
++
++#endif /* __LINUX_SPI_MAX1027_H */
Modified: trunk/target/linux/modules/max1027/max1027.c
===================================================================
--- trunk/target/linux/modules/max1027/max1027.c 2008-12-07 15:48:43 UTC (rev 934)
+++ trunk/target/linux/modules/max1027/max1027.c 2008-12-08 13:25:52 UTC (rev 935)
@@ -29,9 +29,11 @@
#include <linux/interrupt.h> /* request_irq */
#include <linux/version.h>
#include <linux/spi/max1027.h>
-#include <mach/gpio.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
#include <linux/cdev.h> /* struct class_device */
+#include <asm/arch/gpio.h>
+#else
+#include <mach/gpio.h>
#endif
#include <linux/device.h>
#include <linux/err.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-12-07 15:48:56
|
Revision: 934
http://armadeus.svn.sourceforge.net/armadeus/?rev=934&view=rev
Author: jorasse
Date: 2008-12-07 15:48:43 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
[armadeus] Tag "armadeus-2.x" at the latest revision compatible with armadeus 2.x software.
Added Paths:
-----------
tags/armadeus-2.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-12-07 15:36:57
|
Revision: 933
http://armadeus.svn.sourceforge.net/armadeus/?rev=933&view=rev
Author: jorasse
Date: 2008-12-07 15:36:50 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
[armadeus] Remove deprecated branch apf2
Removed Paths:
-------------
branches/apf2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-12-07 12:57:38
|
Revision: 932
http://armadeus.svn.sourceforge.net/armadeus/?rev=932&view=rev
Author: jorasse
Date: 2008-12-07 12:57:35 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
[uboot] added board name to CONFIG_ROOTPATH
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2008-12-06 22:22:08 UTC (rev 931)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2008-12-07 12:57:35 UTC (rev 932)
@@ -32,8 +32,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "3.3"
-#define CONFIG_IDENT_STRING " apf9328 patch 3.3"
+#define CONFIG_ENV_VERSION "3.4"
+#define CONFIG_IDENT_STRING " apf9328 patch 3.4"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
@@ -211,7 +211,7 @@
#define CONFIG_GATEWAYIP 192.168.000.1
#define CONFIG_SERVERIP 192.168.000.2
#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/root"
+#define CONFIG_ROOTPATH "/tftpboot/apf9328-root"
/*
* General options for u-boot. Modify to save memory foot print
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|