changed order of loading AXE modules (exclusive boot time), moved everything related to /lib/modules/axe

Makefile

@@ -10,8 +10,7 @@ HOST_ARCH=$(shell uname -m)
 EXTRA_AXE_MODULES_DIR=firmware/initramfs/root/modules_idl4k_7108_ST40HOST_LINUX_32BITS
 EXTRA_AXE_MODULES=axe_dmx.ko axe_dmxts.ko axe_fe.ko axe_fp.ko axe_i2c.ko \
                   stapi_core_stripped.ko stapi_ioctl_stripped.ko stsys_ioctl.ko \
-                  load_modules_list_32BITS.txt load_modules_list_axe_32BITS.txt \
-                  load_modules.sh load_env.sh
+                  load_modules_list_32BITS.txt load_modules_list_axe_32BITS.txt
 
 ORIG_FILES=main_axe.out mknodes.out
 
@@ -67,8 +66,8 @@ fs.cpio: kernel-modules busybox dropbear minisatip oscam
 	fakeroot tools/do_min_fs.py \
 	  -r "$(VERSION)" \
 	  -b "bash strace" \
-	  $(foreach m,$(EXTRA_AXE_MODULES), -e "$(EXTRA_AXE_MODULES_DIR)/$(m):lib/modules/$(m)") \
-	  $(foreach m,$(ORIG_FILES), -e "$(EXTRA_AXE_MODULES_DIR)/../$(m):root") \
+	  $(foreach m,$(EXTRA_AXE_MODULES), -e "$(EXTRA_AXE_MODULES_DIR)/$(m):lib/modules/axe/$(m)") \
+	  $(foreach m,$(ORIG_FILES), -e "$(EXTRA_AXE_MODULES_DIR)/../$(m):lib/modules/axe/$(m)") \
 	  $(foreach m,$(KMODULES), -e "kernel/$(m):lib/modules/$(m)") \
 	  -e "apps/$(BUSYBOX)/busybox:bin/busybox" \
 	  $(foreach f,$(DROPBEAR_SBIN_FILES), -e "apps/$(DROPBEAR)/$(f):sbin/$(f)") \

firmware/.gitignore

@@ -1 +1,2 @@
 initramfs
+fw.tgz

fs-add/etc/init.d/axe

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-echo "Starting axe services:"
-mknod -m 0777 /tmp/usbdevmon125788 p
-source /lib/modules/load_env.sh
+#echo "Starting axe services:"
+#mknod -m 0777 /tmp/usbdevmon125788 p
+source /lib/modules/axe/load_env.sh
 cd /root
 export AXE_API_TYPE=linuxdvb
-exec ./main_axe.out
+exec /lib/modules/axe/main_axe.out

fs-add/etc/init.d/dropbear

@@ -6,8 +6,6 @@ if test "$DROPBEAR" != "yes"; then
   exit 0
 fi
 
-sleep 5
-
 if ! test -r /etc/dropbear/dropbear_dss_host_key; then
   mkdir -p /etc/dropbear
   if test -r /etc/sysconfig/dropbear_dss_host_key; then

fs-add/etc/init.d/rcS

@@ -37,9 +37,14 @@ sysctl -q -p
 # start syslogd
 syslogd -C256
 
-# AXE modules
-ln -s /lib/modules /root/modules
-/lib/modules/load_modules.sh
+# loopback
+ifconfig lo 127.0.0.1 netmask 255.255.255.0
+
+# AXE modules and AXE hw initialization
+/lib/modules/axe/load_modules.sh
+/etc/init.d/axe &
+nc -l 127.0.0.1:1001 -e /bin/true
+rm -f /root/main_init.sh
 
 # config/data storage
 mkdir -p /mnt/data
@@ -66,7 +71,6 @@ if test -n "$KMODULES"; then
 fi
 
 # basic network
-ifconfig lo 127.0.0.1 netmask 255.255.255.0
 ifconfig eth0 up
 route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
 

fs-add/etc/init.d/telnetd

@@ -6,6 +6,4 @@ if test "$TELNETD" != "yes"; then
   exit 0
 fi
 
-sleep 5
-
 exec /usr/sbin/telnetd -F -l /bin/login

fs-add/etc/inittab

@@ -6,14 +6,14 @@ ttyAS0::askfirst:/bin/sh
 ::once:/etc/init.d/network
 # Time Network Protocol
 ::once:/etc/init.d/ntpd
+# minisatip
+::once:/etc/init.d/satip
 # telnetd
 ::once:/etc/init.d/telnetd
 # dropbear
 ::once:/etc/init.d/dropbear
 # oscamd
 ::once:/etc/init.d/oscamd
-# AXE kernel modules and environment
-::once:/etc/init.d/axe
 # Others
 ::ctrlaltdel:/sbin/reboot
 ::shutdown:/sbin/swapoff -a

fs-add/root/main_init.sh

@@ -4,10 +4,5 @@
 # it is respawned immediately on exit
 #
 
-while [ 1 ]; do
-  if [ -x /etc/init.d/satip ]; then
-    . /etc/init.d/satip
-  else
-    sleep 33554432
-  fi
-done
+echo | nc 127.0.0.1 1001
+while test 1; do sleep 999999999; done