add new config options and some fixes

diff --git a/.gitignore b/.gitignore
index aacc67b80a7d84b6eb7cc5a44f6ab2f360524718..1ca02549649c647b5b4a28021bf667db4358bef5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 build_tmp
 ccache
+config
 cross
 deps
 download
 hack
 host
+root
 store
 test
 source

diff --git a/Makefile b/Makefile
index d79cb629a81e2921d1cb9fedd423f06a183e0602..d54839a128d96fea6c06556944dd7b7512319ec4 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,11 @@ printenv:
        @echo ' ============================================================================== '
        @PATH=$(PATH):$(CROSS_DIR)/bin; \
        if type -p $(TARGET)-gcc >/dev/null 2>&1; then \
-               echo "    $(TARGET)-gcc found in PATH or in \$$CROSS_DIR/bin."; \
+               echo -e "    \033[32m$(TARGET)-gcc found in PATH or in \$$CROSS_DIR/bin.\033[0m"; \
                echo; \
        else \
-               echo "    $(TARGET)-gcc not found in PATH or \$$CROSS_DIR/bin"; \
-               echo "    please check your setup. Maybe you want to 'make crosstool'."; \
+               echo -e "    \033[31m$(TARGET)-gcc not found in PATH or \$$CROSS_DIR/bin\033[0m"; \
+               echo -e "    \033[31mplease check your setup. Maybe you want to 'make crosstool'.\033[0m"; \
                echo; \
        fi
        @echo ""
@@ -77,6 +77,7 @@ printenv:
        @echo "                                            after that you need to restart with 'bootstrap'"
        @echo "    * make all-clean                      - additionally remove the crosscompiler"
        @echo "                                            you usually don't want to do that."
+       @echo ""
        @echo
 
 help:
@@ -107,49 +108,54 @@ update-git-target:
 all:
        @echo ""
        @echo " ****************************************************************************** "
-       @echo "    !!! 'make all' is not a valid target, please read the documentation !!!"
+       @echo -e "    \033[31m!!! 'make all' is not a valid target, please read the documentation !!!\033[0m"
        @echo " ****************************************************************************** "
+       @echo ""
 
 # wittinobi
 wittinobi-init:
        $(MAKE) prerequisites bootstrap
        @echo ""
        @echo ' ============================================================================== '
-       @echo "    make wittinobi-init done"
+       @echo -e "    \033[32mmake wittinobi-init done\033[0m"
        @echo ' ============================================================================== '
+       @echo ""
 
 wittinobi-neutrino:
        if [ $(MULTIMEDIA) = "yes" ]; then \
-               $(MAKE) neutrino applications-all plugins multimedia skeleton rootfs; \
+               $(MAKE) neutrino applications multimedia plugins skeleton rootfs; \
        else \
-               $(MAKE) neutrino applications-all plugins skeleton rootfs; \
+               $(MAKE) neutrino applications plugins skeleton rootfs; \
        fi
        @echo ""
        @echo ' ============================================================================== '
-       @echo "    make wittinobi-neutrino done"
+       @echo -e "    \033[32mmake wittinobi-neutrino done\033[0m"
        @echo ' ============================================================================== '
+       @echo ""
 
 wittinobi-neutrino-flash:
        if [ $(MULTIMEDIA) = "yes" ]; then \
-               $(MAKE) neutrino applications-all plugins multimedia skeleton rootfs flash; \
+               $(MAKE) neutrino applications multimedia plugins skeleton rootfs flash flash-check; \
        else \
-               $(MAKE) neutrino applications-all plugins skeleton rootfs flash; \
+               $(MAKE) neutrino applications plugins skeleton rootfs flash flash-check; \
        fi
        @echo ""
        @echo ' ============================================================================== '
-       @echo "    make wittinobi-neutrino-flash done"
+       @echo -e "    \033[32mmake wittinobi-neutrino-flash done\033[0m"
        @echo ' ============================================================================== '
+       @echo ""
 
 wittinobi-all:
        if [ $(MULTIMEDIA) = "yes" ]; then \
-               $(MAKE) neutrino applications-all plugins-all multimedia skeleton bootloader kernel drivers rootfs flash flash-full; \
+               $(MAKE) neutrino applications multimedia plugins skeleton bootloader kernel drivers rootfs flash flash-full flash-check flash-full-check; \
        else \
-               $(MAKE) neutrino applications-all plugins-all skeleton bootloader kernel drivers rootfs flash flash-full; \
+               $(MAKE) neutrino applications plugins skeleton bootloader kernel drivers rootfs flash flash-full flash-check flash-full-check; \
        fi
        @echo ""
        @echo ' ============================================================================== '
-       @echo "    make wittinobi-all done"
+       @echo -e "    \033[32mmake wittinobi-all done\033[0m"
        @echo ' ============================================================================== '
+       @echo ""
 
 # prerequisites.mk
 prerequisites:
@@ -188,31 +194,38 @@ neutrino-libs:
        $(MAKE) $(D)/neutrino-hd-libs
 
 # applications.mk
-applications-all:
+applications:
+       $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp
        if [ $(LCD4LINUX) = "yes" ]; then \
-               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd $(D)/lcd4linux; \
-       else \
-               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd; \
+               $(MAKE) $(D)/lcd4linux; \
        fi
-
-# plugins.mk
-plugins:
-       if [ $(GAMES) = "yes" ]; then \
-               $(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg $(D)/yahtzee $(D)/sokoban $(D)/sudoku $(D)/lemm $(D)/solitair $(D)/c64emu; \
-       else \
-               $(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm; \
+       if [ $(INADYN) = "yes" ]; then \
+               $(MAKE) $(D)/inadyn; \
        fi
-plugins-all:
-       if [ $(GAMES) = "yes" ]; then \
-               $(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg $(D)/yahtzee $(D)/sokoban $(D)/sudoku $(D)/lemm $(D)/solitair $(D)/c64emu; \
-       else \
-               $(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm; \
+       if [ $(DJMOUNT) = "yes" ]; then \
+               $(MAKE) $(D)/djmount; \
+       fi
+       if [ $(USHARE) = "yes" ]; then \
+               $(MAKE) $(D)/ushare; \
+       fi
+       if [ $(XUPNPD) = "yes" ]; then \
+               $(MAKE) $(D)/xupnpd; \
        fi
 
 # multimedia.mk
 multimedia:
        $(MAKE) $(D)/libsdl-mixer
 
+# plugins.mk
+plugins:
+       $(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2
+       if [ $(CHARTS) = "yes" ]; then \
+               $(MAKE) $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1; \
+       fi
+       if [ $(GAMES) = "yes" ]; then \
+               $(MAKE) $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg $(D)/yahtzee $(D)/sokoban $(D)/sudoku $(D)/lemm $(D)/solitair $(D)/c64emu; \
+       fi
+
 # kernel.mk
 kernel:
        if [ $(TARGET) = "arm-pnx8400-linux-uclibcgnueabi" ]; then \
@@ -267,9 +280,9 @@ PHONY += prerequisites download
 PHONY += bootstrap includes-and-libs modules
 PHONY += neutrino
 PHONY += neutrino-libs
-PHONY += applications-all
-PHONY += plugins plugins-all
+PHONY += applications
 PHONY += multimedia
+PHONY += plugins
 PHONY += kernel
 PHONY += bootloader
 PHONY += drivers

diff --git a/archive-sources/sudoku/board.cpp b/archive-sources/sudoku/board.cpp
index 86c4e0d60999653e2717b3402694bc500ae5cbe6..3b5d0aad5382685053ef643834f3a683d3de6dd1 100644 (file)
--- a/archive-sources/sudoku/board.cpp
+++ b/archive-sources/sudoku/board.cpp
@@ -19,8 +19,6 @@
        If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_CONSTANT_MACROS
-
 #include "board.h"
 
 #include <fstream>

diff --git a/archive-sources/sudoku/menu.cpp b/archive-sources/sudoku/menu.cpp
index 88cb1b10ec2031fbdf86712c74ba833c2e890972..c1fa5c0904a43837cdde74e8561770ca04a7e94e 100644 (file)
--- a/archive-sources/sudoku/menu.cpp
+++ b/archive-sources/sudoku/menu.cpp
@@ -19,8 +19,6 @@
        If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_CONSTANT_MACROS
-
 #include "menu.h"
 
 #include <cstdio>
@@ -48,16 +46,6 @@ extern "C"
 
 #define FORMAT_TMP_LEN                                                                 1024
 
-#define        RC_0                    0
-#define        RC_1                    1
-#define        RC_2                    2
-#define        RC_3                    3
-#define        RC_4                    4
-#define        RC_5                    5
-#define        RC_6                    6
-#define        RC_7                    7
-#define        RC_8                    8
-#define        RC_9                    9
 
 // ----------------------------------------------------------------------------
 // tMenuItem::tMenuItem()

diff --git a/archive-sources/sudoku/somain.cpp b/archive-sources/sudoku/somain.cpp
index 2b8dc5fd37c6a26365cc626aaf5822af10c2aa11..1cad153ec3f2ec98db1ea92f01e1a35ac47171fb 100644 (file)
--- a/archive-sources/sudoku/somain.cpp
+++ b/archive-sources/sudoku/somain.cpp
@@ -19,8 +19,6 @@
        If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_CONSTANT_MACROS
-
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/archive-sources/sudoku/sudoku.cpp b/archive-sources/sudoku/sudoku.cpp
index a6d6bbffd814a5f29e51bbd498e2d18d79e31d62..afc4e98aef4c1d30bb51b156070284385065454f 100644 (file)
--- a/archive-sources/sudoku/sudoku.cpp
+++ b/archive-sources/sudoku/sudoku.cpp
@@ -27,17 +27,7 @@
 #include <fstream>
 
 //#define _DEBUG_
-
-#define        RC_0                    0
-#define        RC_1                    1
-#define        RC_2                    2
-#define        RC_3                    3
-#define        RC_4                    4
-#define        RC_5                    5
-#define        RC_6                    6
-#define        RC_7                    7
-#define        RC_8                    8
-#define        RC_9                    9
+#define HAVE_DBOX_HARDWARE
 
 #ifdef HAVE_DBOX_HARDWARE
        #include "misc.h"

diff --git a/config b/config
index 1e075548395a4b5aec54ce1a042ce922aebc6156..42167f8d5c2113c0b2dae55c7b93249fb43d490c 100755 (executable)
--- a/config
+++ b/config
@@ -1,3 +1,7 @@
+###########################################################################################
+### PART 1 # SYSTEM #######################################################################
+###########################################################################################
+
 # choose one of the following crosstool versions:
 # CROSSTOOL_VERSION=1.16.0
 # CROSSTOOL_VERSION=1.19.0
@@ -41,17 +45,78 @@ CST_KERNEL_VERSION=2.6.34.13
 # CST_DRIVER_VERSION=test
 CST_DRIVER_VERSION=master
 
-# if you want to build multimedia, define MULTIMEDIA=yes:
-# MULTIMEDIA=yes
-# MULTIMEDIA=no
-MULTIMEDIA=no
+###########################################################################################
+###########################################################################################
+
+
+
+
 
-# if you want to build lcd4linux, define LCD4LINUX=yes:
+###########################################################################################
+### PART 2 # APPLICATIONS # OPTIONAL ######################################################
+###########################################################################################
+
+# if you want to build lcd4linux (optional), define LCD4LINUX=yes:
 # LCD4LINUX=yes
 # LCD4LINUX=no
 LCD4LINUX=no
 
-# if you want to build games, define GAMES=yes:
+# if you want to build inadyn (optional), define INADYN=yes:
+# INADYN=yes
+# INADYN=no
+INADYN=no
+
+# if you want to build djmount (optional), define DJMOUNT=yes:
+# DJMOUNT=yes
+# DJMOUNT=no
+DJMOUNT=no
+
+# if you want to build ushare (optional), define USHARE=yes:
+# USHARE=yes
+# USHARE=no
+USHARE=no
+
+# if you want to build xupnpd (optional), define XUPNPD=yes:
+# XUPNPD=yes
+# XUPNPD=no
+XUPNPD=no
+
+###########################################################################################
+###########################################################################################
+
+
+
+
+
+###########################################################################################
+### PART 3 # MULTIMEDIA # OPTIONAL ########################################################
+###########################################################################################
+
+# if you want to build multimedia (optional), define MULTIMEDIA=yes:
+# MULTIMEDIA=yes
+# MULTIMEDIA=no
+MULTIMEDIA=no
+
+###########################################################################################
+###########################################################################################
+
+
+
+
+
+###########################################################################################
+### PART 4 # PLUGINS # OPTIONAL ###########################################################
+###########################################################################################
+
+# if you want to build charts (optional), define CHARTS=yes:
+# CHARTS=yes
+# CHARTS=no
+CHARTS=no
+
+# if you want to build games (optional), define GAMES=yes:
 # GAMES=yes
 # GAMES=no
 GAMES=no
+
+###########################################################################################
+###########################################################################################

diff --git a/make/cleantargets.mk b/make/cleantargets.mk
index c37fe26391dfcb25887ee06d755b2e8b62e14845..df6c30480b53e497fcd250c15bbac0c16f0da3d0 100755 (executable)
--- a/make/cleantargets.mk
+++ b/make/cleantargets.mk
@@ -17,28 +17,20 @@ all-clean: rebuild-clean
 #      -rm -rf $(TARGETPREFIX)/bin
 
 bootloader-clean:
-       -rm -rf $(BUILD_TMP)/u-boot*
-       -rm $(BUILD_TMP)/hd1-mtd0-u-boot*
-       -rm $(BUILD_TMP)/neo-mtd0-u-boot*
-       -rm $(BUILD_TMP)/zee-mtd0-u-boot*
+       -rm -rf $(BUILD_TMP)/BOOTLOADER
+       -rm $(BUILD_TMP)/u-boot*
        -rm $(D)/coolstream-u-boot
 
 #drivers-clean:
 #      -rm -rf $(TARGETPREFIX)
 
 flashimage-clean:
-       -rm $(BUILD_TMP)/hd1-mtd2-systemfs*
-       -rm $(BUILD_TMP)/hd1-full*
-       -rm $(BUILD_TMP)/neo-mtd3-systemfs*
-       -rm $(BUILD_TMP)/neo-full*
-       -rm $(BUILD_TMP)/zee-mtd3-systemfs*
-       -rm $(BUILD_TMP)/zee-full*
+       -rm $(BUILD_TMP)/system*
+       -rm $(BUILD_TMP)/full*
 
 kernel-clean:
        -rm -rf $(BUILD_TMP)/linux*
-       -rm $(BUILD_TMP)/hd1-mtd1-kernel*
-       -rm $(BUILD_TMP)/neo-mtd2-kernel*
-       -rm $(BUILD_TMP)/zee-mtd2-kernel*
+       -rm $(BUILD_TMP)/kernel*
        -rm $(D)/coolstream-kernel*
 
 #libraries-clean:
@@ -47,9 +39,12 @@ kernel-clean:
 neutrino-clean:
        -make -C $(N_OBJDIR) uninstall distclean
        -rm -rf $(BUILD_TMP)/neutrino-hd
-       -rm $(D)/neutrino-hd
-       -rm $(D)/neutrino-hd-new
        -rm -rf $(BUILD_TMP)/rootfs
+       if [ $(TARGET) = "arm-pnx8400-linux-uclibcgnueabi" ]; then \
+               rm $(D)/neutrino-hd-apollo; \
+       else \
+               rm $(D)/neutrino-hd-nevis; \
+       fi
 
 rootfs-clean:
        -rm -rf $(BUILD_TMP)/rootfs

diff --git a/make/flashimage.mk b/make/flashimage.mk
index ac24ee561504b419a100a5821ef844d0997da949..e23abfff739bfa7a43cab9636e6df4e3b2780b97 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -14,6 +14,21 @@ flash: $(D)/flashcp
        cp -f $(BUILD_TMP)/update.sh $(BUILD_TMP)/rootfs/etc/init.d/update.sh
        rm -f $(BUILD_TMP)/update.sh
 
+flash-check:
+       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/system*.img`" ]; then \
+               echo ""; \
+               echo " ============================================================================== "; \
+               echo -e "    \033[32mIMAGE SIZE OK\033[0m"; \
+               echo " ============================================================================== "; \
+               echo ""; \
+       else \
+               echo ""; \
+               echo " ============================================================================== "; \
+               echo -e "    \033[31mIMAGE SIZE NOT OK, TOO BIG !!!\033[0m"; \
+               echo " ============================================================================== "; \
+               echo ""; \
+       fi
+
 flash-full:
        cd $(BUILD_TMP)/rootfs && \
        cp -f $(BUILD_TMP)/kernel-compressed-??.??.????.img $(BUILD_TMP)/rootfs/var/update/uImage
@@ -22,3 +37,18 @@ flash-full:
        $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/full-$(DATE).img
        rm -f $(BUILD_TMP)/devtable
        rm -f $(BUILD_TMP)/rootfs/var/update/uImage
+
+flash-full-check:
+       @if [ "28835840" -gt "`stat -c %s $(BUILD_TMP)/full*.img`" ]; then \
+               echo ""; \
+               echo " ============================================================================== "; \
+               echo -e "    \033[32mFULL IMAGE SIZE OK\033[0m"; \
+               echo " ============================================================================== "; \
+               echo ""; \
+       else \
+               echo ""; \
+               echo " ============================================================================== "; \
+               echo -e "    \033[31mFULL IMAGE SIZE NOT OK, TOO BIG !!!\033[0m"; \
+               echo " ============================================================================== "; \
+               echo ""; \
+       fi

diff --git a/make/libraries.mk b/make/libraries.mk
index 49e895ae1646091744fb2898b1dfb6a457089b37..01bc870fb762ad76d269b48e17570f99b8966f32 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -219,6 +219,7 @@ $(D)/ffmpeg: | $(TARGETPREFIX)
                        --enable-decoder=dca \
                        --enable-decoder=dvdsub \
                        --enable-decoder=dvbsub \
+                       --enable-decoder=pcm* \
                        --disable-demuxers \
                        --enable-demuxer=aac \
                        --enable-demuxer=ac3 \

diff --git a/make/plugins.mk b/make/plugins.mk
index 3d651a675c2ab195c544750c3d19517c0e088c3f..1e92546f25c2bffc09938a1e1da2ca662d66a615 100644 (file)
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -404,7 +404,7 @@ $(D)/sudoku: $(D)/libfx2
        mkdir -p $(LIBPLUG) && \
        cp -a $(SOURCE)/sudoku $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/sudoku && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so misc.cpp menu.cpp sudoku.cpp board.cpp somain.cpp
+               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so misc.cpp menu.cpp sudoku.cpp board.cpp somain.cpp
        cp -f $(BUILD_TMP)/sudoku/sudoku.so $(LIBPLUG)/
        cp -f $(BUILD_TMP)/sudoku/sudoku.cfg $(LIBPLUG)/
        rm -rf $(BUILD_TMP)/sudoku