summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorsave2009-09-10 11:44:06 +0000
committersave2009-09-10 11:44:06 +0000
commit67c025466215f697ebf220c39252a3e8db5bd9b3 (patch)
tree09adc711fb70f35a62802fc07d7b27c496bb3b67 /cleopatre
parentdee9c3c0eec227909e8efa28e550962a9df483d0 (diff)
[CLEO]Preparation for first official malika livraison
- Cleanning rootfs (suppress scripts, change etc...) - Cleanning userfs (suppress ebtable, change interface...) - plcdrv: added afe reg 0x0e and suppress upper layer TRACE git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5490 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/inittab1
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/issue1
-rwxr-xr-xcleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/download17
-rwxr-xr-xcleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/plcdrv23
-rwxr-xr-xcleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/startplc37
-rw-r--r--cleopatre/devkit/plcdrv/arm/src/linux_drv.c6
-rwxr-xr-xcleopatre/tools/userfs/image/etc/init.d/S30ebtables13
-rwxr-xr-xcleopatre/tools/userfs/image/etc/init.d/S41plc21
-rw-r--r--cleopatre/tools/userfs/image/etc/network/NOPRUNE0
-rw-r--r--cleopatre/tools/userfs/image/etc/network/interfaces13
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_802_3.sobin4973 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_among.sobin9099 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_arp.sobin9375 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_arpreply.sobin5325 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_ip.sobin8562 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_limit.sobin6234 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_log.sobin6034 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_mark.sobin5907 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_mark_m.sobin4328 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_nat.sobin7336 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_pkttype.sobin4710 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_redirect.sobin4229 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_standard.sobin3483 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_stp.sobin9493 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_ulog.sobin5981 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebt_vlan.sobin5921 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebtable_broute.sobin2588 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebtable_filter.sobin2791 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebtable_nat.sobin2796 -> 0 bytes
-rwxr-xr-xcleopatre/tools/userfs/image/lib/ebtables/libebtc.sobin59699 -> 0 bytes
-rw-r--r--cleopatre/tools/userfs/image/scripts/NOPRUNE0
-rwxr-xr-xcleopatre/tools/userfs/image/scripts/startplc12
32 files changed, 19 insertions, 125 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/inittab b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/inittab
index 892db6e917..5748b58188 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/inittab
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/inittab
@@ -44,5 +44,4 @@ null::ctrlaltdel:/sbin/reboot
null::shutdown:/usr/bin/killall klogd
null::shutdown:/usr/bin/killall syslogd
null::shutdown:/bin/umount -a -r
-null::shutdown:/sbin/swapoff -a
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/issue b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/issue
index d5a0bc073c..a167c3047f 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/issue
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/etc/issue
@@ -1,4 +1,3 @@
Welcome to the SPC300 development environment.
-
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/download b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/download
deleted file mode 100755
index e82d4594bc..0000000000
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/download
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-hostip="192.168.2.144"
-
-#check if first arguments = -a address
-if [ "$1" = "-a" ]
-then
- hostip="$2"
- shift
- shift
-fi
-
-for file in $*
-do
- ftpget -u spidcom -p spidcom $hostip $file $file
-done
-
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/plcdrv b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/plcdrv
deleted file mode 100755
index 6bd4f765b2..0000000000
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/plcdrv
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This file is used to load correctly the PLC driver
-
-#Variables
-module="plcdrv"
-device="plcdrv"
-mode="666"
-
-#Invoke insmod will all arguments
-/sbin/insmod ./$module.ko $* || exit 1
-
-#Remove old node
-rm -f /dev/$device
-
-#Create new node
-#major=$(awk "\$2==\"$module\" {print \$1}" /proc/devices)
-#we don't have awk command so...
-major="254"
-
-mknod /dev/$device c $major 0
-chmod $mode /dev/$device
-
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/startplc b/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/startplc
deleted file mode 100755
index b9af913173..0000000000
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/target_skeleton/root/scripts/startplc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# This file is used to to start the prototype with cesar and plcdrv
-
-#Variables
-plc_module="plcdrv.ko"
-leon_file=$1
-hostip="192.168.3.100"
-shift
-
-if [ "$1" = "-a" ]
-then
- hostip="$2"
- shift
- shift
-fi
-
-if [ "$leon_file" = "" ]
-then
- echo "You need to precise the Cesar binary file"
- exit 1
-fi
-
-#Download Cesar binary
-/root/scripts/download -a $hostip $leon_file
-/root/scripts/download -a $hostip $plc_module
-
-#Insert plcdrv module
-/root/scripts/plcdrv $*
-
-#Copy Cesar binary into Memory
-dd if=$leon_file of=/dev/plcdrv
-
-#Open plc0 interface and added to the bridge
-/sbin/ifconfig plc0 0.0.0.0
-brctl addif br0 plc0
-
diff --git a/cleopatre/devkit/plcdrv/arm/src/linux_drv.c b/cleopatre/devkit/plcdrv/arm/src/linux_drv.c
index 45caaa7d82..901abed959 100644
--- a/cleopatre/devkit/plcdrv/arm/src/linux_drv.c
+++ b/cleopatre/devkit/plcdrv/arm/src/linux_drv.c
@@ -57,8 +57,8 @@ MODULE_DESCRIPTION("SPC300 PLC driver");
MODULE_LICENSE("SPiDCOM Technologies 2009");
/** Define Debug/Trace Level */
-#define TRACE(...) printk(DRV_NAME": "DRV_LAYER": " __VA_ARGS__)
-//#define TRACE(...)
+//#define TRACE(...) printk(DRV_NAME": "DRV_LAYER": " __VA_ARGS__)
+#define TRACE(...)
#define PRINTPKT(a,b,c) print_packet(a,b,c)
//#define PRINTPKT(a,b,c)
@@ -1004,6 +1004,8 @@ int plcdrv_open(struct net_device *dev)
mdly(10);
afe_write(0x0D, 0x01);
mdly(10);
+ afe_write(0x0E, 0x08);
+ mdly(10);
#endif
//Prepare init structure from lower layers
diff --git a/cleopatre/tools/userfs/image/etc/init.d/S30ebtables b/cleopatre/tools/userfs/image/etc/init.d/S30ebtables
deleted file mode 100755
index 82b4c95143..0000000000
--- a/cleopatre/tools/userfs/image/etc/init.d/S30ebtables
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- [ -d /usr/local/lib/ebtables ] && cp /usr/local/lib/ebtables/* /usr/lib
- ;;
- *)
- echo "Usage: $0 {start}"
- exit 1
-esac
-
-exit 0
-
diff --git a/cleopatre/tools/userfs/image/etc/init.d/S41plc b/cleopatre/tools/userfs/image/etc/init.d/S41plc
deleted file mode 100755
index 47b1f53ab9..0000000000
--- a/cleopatre/tools/userfs/image/etc/init.d/S41plc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Startin plc....
-#
-
-start() {
- echo "Starting PLC..."
- /usr/local/scripts/startplc test_phy.rom
-}
-
-case "$1" in
- start)
- start
- ;;
- *)
- echo $"Usage: $0 {start}"
- exit 1
-esac
-
-exit $?
-
diff --git a/cleopatre/tools/userfs/image/etc/network/NOPRUNE b/cleopatre/tools/userfs/image/etc/network/NOPRUNE
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/cleopatre/tools/userfs/image/etc/network/NOPRUNE
diff --git a/cleopatre/tools/userfs/image/etc/network/interfaces b/cleopatre/tools/userfs/image/etc/network/interfaces
index fd37add530..08c2234760 100644
--- a/cleopatre/tools/userfs/image/etc/network/interfaces
+++ b/cleopatre/tools/userfs/image/etc/network/interfaces
@@ -4,21 +4,18 @@ iface lo inet loopback
# Configure Ethernet interface
#auto eth0
-#iface eth0 inet static
-# address 192.168.3.101
-# netmask 255.255.255.0
+iface eth0 inet static
+ address 192.168.3.1
+ netmask 255.255.255.0
+# Configure bridge interface
auto br0
iface br0 inet static
- address 192.168.3.101
+ address 192.168.3.1
netmask 255.255.255.0
- pre-up ebtables -A OUTPUT -o plc0 \! -d 00:01:01:00:00:01 -j DROP
- pre-up ebtables -A FORWARD -o plc0 \! -d 00:01:01:00:00:01 -j DROP
pre-up brctl addbr br0
- pre-up ifconfig eth0 hw ether 00:01:01:00:01:01
pre-up ifconfig eth0 0.0.0.0
pre-up brctl addif br0 eth0
pre-up brctl setfd br0 1
post-down brctl delbr br0
post-down ifconfig eth0 down
- post-down ebtables -F
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_802_3.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_802_3.so
deleted file mode 100755
index d4e4414949..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_802_3.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_among.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_among.so
deleted file mode 100755
index 2b239f1ae2..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_among.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_arp.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_arp.so
deleted file mode 100755
index 928e150016..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_arp.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_arpreply.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_arpreply.so
deleted file mode 100755
index 839a283759..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_arpreply.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_ip.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_ip.so
deleted file mode 100755
index 5419752052..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_ip.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_limit.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_limit.so
deleted file mode 100755
index 81a1c99039..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_limit.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_log.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_log.so
deleted file mode 100755
index b2ae5a1754..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_log.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark.so
deleted file mode 100755
index 1459575823..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark_m.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark_m.so
deleted file mode 100755
index 5c29a0ef02..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_mark_m.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_nat.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_nat.so
deleted file mode 100755
index 3d06dc8e73..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_nat.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_pkttype.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_pkttype.so
deleted file mode 100755
index ee9cc929d5..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_pkttype.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_redirect.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_redirect.so
deleted file mode 100755
index c79ad473de..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_redirect.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_standard.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_standard.so
deleted file mode 100755
index 14ba492e4a..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_standard.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_stp.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_stp.so
deleted file mode 100755
index d8812dff44..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_stp.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_ulog.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_ulog.so
deleted file mode 100755
index 44adf5528c..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_ulog.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebt_vlan.so b/cleopatre/tools/userfs/image/lib/ebtables/libebt_vlan.so
deleted file mode 100755
index 11ec09c713..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebt_vlan.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_broute.so b/cleopatre/tools/userfs/image/lib/ebtables/libebtable_broute.so
deleted file mode 100755
index 93a312b352..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_broute.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_filter.so b/cleopatre/tools/userfs/image/lib/ebtables/libebtable_filter.so
deleted file mode 100755
index 4aeb02024f..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_filter.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_nat.so b/cleopatre/tools/userfs/image/lib/ebtables/libebtable_nat.so
deleted file mode 100755
index 30ac789578..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebtable_nat.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/lib/ebtables/libebtc.so b/cleopatre/tools/userfs/image/lib/ebtables/libebtc.so
deleted file mode 100755
index 9e0bf0a91a..0000000000
--- a/cleopatre/tools/userfs/image/lib/ebtables/libebtc.so
+++ /dev/null
Binary files differ
diff --git a/cleopatre/tools/userfs/image/scripts/NOPRUNE b/cleopatre/tools/userfs/image/scripts/NOPRUNE
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/cleopatre/tools/userfs/image/scripts/NOPRUNE
diff --git a/cleopatre/tools/userfs/image/scripts/startplc b/cleopatre/tools/userfs/image/scripts/startplc
index 39c25cd22e..6f4f836a45 100755
--- a/cleopatre/tools/userfs/image/scripts/startplc
+++ b/cleopatre/tools/userfs/image/scripts/startplc
@@ -5,8 +5,16 @@
#Variables
plc_module="plcdrv.ko"
leon_file=$1
+hostip="192.168.3.100"
shift
+if [ "$1" = "-a" ]
+then
+ hostip="$2"
+ shift
+ shift
+fi
+
if [ "$leon_file" = "" ]
then
echo "You need to precise the Cesar binary file"
@@ -14,8 +22,8 @@ then
fi
#Download Cesar binary
-/usr/local/scripts/download $leon_file
-/usr/local/scripts/download $plc_module
+/usr/local/scripts/download -a $hostip $leon_file
+/usr/local/scripts/download -a $hostip $plc_module
#Insert plcdrv module
/usr/local/scripts/plcdrv $*