Update of /cvsroot/blob/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv22372
Modified Files:
configure.in acconfig.h
Log Message:
- PCMCIA, CF, IDE and GENERIC_IO support added to automake/autoconf
Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- configure.in 18 Mar 2003 17:38:14 -0000 1.61
+++ configure.in 3 Apr 2003 14:58:17 -0000 1.62
@@ -82,7 +82,7 @@
brutus Intel Brutus
cep Iskratel CEP
creditlart CreditLART
- frodo 2d3D, Inc. SA-1110 Development Board
+ frodo 2d3D, Inc. SA-1110 Development Board
h3600 Compaq Ipaq H36x0
hackkit The Hack Kit base board
idr Vercel UD-1
@@ -449,14 +449,6 @@
blob_commands="$all_commands"
fi
-ALL_COMMANDS=`echo $default_commands $all_commands | sed 's/,//g'`
-BLOB_COMMANDS=`echo $default_commands $blob_commands | sed 's/,//g'`
-
-AC_SUBST(ALL_COMMANDS)
-AC_SUBST(BLOB_COMMANDS)
-
-
-
dnl Check for individual features
AC_ARG_ENABLE(clock-scaling,
@@ -510,6 +502,11 @@
[network_flag=no])
+AC_ARG_ENABLE(gio,
+[ --enable-gio Enable generic IO (sysupd command)],
+[gio_flag=$enable_gio],
+[gio_flag=no])
+
dnl Check if the user wants *all* features
@@ -529,6 +526,7 @@
cramfs_flag=yes
zimage_flag=yes
network_flag=yes
+ network_flag=yes
fi
@@ -639,10 +637,46 @@
if test "x$network_flag" = "xyes" ; then
BLOB_NETWORK_OBJS="bootp.o arp.o tftp.o ip_bits.o"
AC_DEFINE(CONFIG_NETWORK_SUPPORT)
+ blob_commands="$blob_commands, setip, tftp";
+
fi
AC_SUBST(BLOB_NETWORK_OBJS)
+dnl Check wether or not gio support is wanted
+if test "x$gio_flag" = "xyes" ; then
+ BLOB_GIO_OBJS="generic_io.o gio_flash.o gio_part_blob.o gio_ram.o tar.o"
+ AC_DEFINE(CONFIG_GIO_SUPPORT)
+dnl gio needs cf, pcmcia and ide
+ pcmcia_flag="yes";
+ ide_flag="yes";
+ cf_flag="yes";
+
+ blob_commands="$blob_commands, sysupd";
+fi
+AC_SUBST(BLOB_GIO_OBJS)
+
+dnl Check wether or not pcmcia support is wanted
+if test "x$pcmcia_flag" = "xyes" ; then
+ BLOB_PCMCIA_OBJS="pcmcia.o"
+ AC_DEFINE(CONFIG_PCMCIA_SUPPORT)
+
+fi
+AC_SUBST(BLOB_PCMCIA_OBJS)
+
+dnl Check wether or not ide support is wanted
+if test "x$ide_flag" = "xyes" ; then
+ AC_DEFINE(CONFIG_IDE_SUPPORT)
+ BLOB_IDE_OBJS="ide.o"
+fi
+AC_SUBST(BLOB_IDE_OBJS)
+
+dnl Check wether or not cf support is wanted
+if test "x$cf_flag" = "xyes" ; then
+ AC_DEFINE(CONFIG_CF_SUPPORT)
+ BLOB_CF_OBJS="cf.o"
+fi
+AC_SUBST(BLOB_CF_OBJS)
dnl Check for extra debug info
AC_ARG_ENABLE(blob-debug,
@@ -655,6 +689,11 @@
fi
+dnl commands subst here so that extra flags can add commands
+ALL_COMMANDS=`echo $default_commands $all_commands | sed 's/,//g'`
+BLOB_COMMANDS=`echo $default_commands $blob_commands | sed 's/,//g'`
+AC_SUBST(ALL_COMMANDS)
+AC_SUBST(BLOB_COMMANDS)
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -754,6 +793,10 @@
echo "JFFS2 support ${jffs2_flag}"
echo "cramfs support ${cramfs_flag}"
echo "zImage support ${zimage_flag}"
+echo "PCMCIA support ${pcmcia_flag}"
+echo "CF support ${cf_flag}"
+echo "IDE support ${ide_flag}"
+echo "Generic IO support ${gio_flag}"
echo "Network support ${network_flag}"
echo "Blob commands: ${BLOB_COMMANDS}"
echo "Run-time debug information ${blob_debug_flag}"
Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- acconfig.h 18 Mar 2003 17:38:14 -0000 1.24
+++ acconfig.h 3 Apr 2003 14:58:17 -0000 1.25
@@ -113,6 +113,9 @@
/* Define for PT System 3 boards */
#undef PT_SYSTEM3
+/* Define for PT VibXpert boards */
+#undef PT_DAFIT
+
/* Define for Shannon (TuxScreen) */
#undef SHANNON
@@ -145,6 +148,18 @@
/* Define if network support is wanted */
#undef CONFIG_NETWORK_SUPPORT
+
+/* Define if generic io support is wanted */
+#undef CONFIG_GIO_SUPPORT
+
+/* Define if pcmcia support is wanted */
+#undef CONFIG_PCMCIA_SUPPORT
+
+/* Define if cf support is wanted */
+#undef CONFIG_CF_SUPPORT
+
+/* Define if ide support is wanted */
+#undef CONFIG_IDE_SUPPORT
@BOTTOM@
|
