Menu
▾
▴
CVS: blob configure.in,1.44,1.45
|
From: Erik M. <er...@us...> - 2002-02-17 15:41:56
|
Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv889
Modified Files:
configure.in
Log Message:
- cleanup configure.in and Makefile.am
- make uudecode and xmodem conditionally compiled sources
- make cramfs and jffs2 really conditionally compiled
- move mini_inflate to libblob
Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- configure.in 8 Feb 2002 12:49:03 -0000 1.44
+++ configure.in 17 Feb 2002 15:41:53 -0000 1.45
@@ -98,19 +98,19 @@
accelent_sa)
board_name="Accelent IDP"
AC_DEFINE(ACCELENT_SA)
- BLOB_PLATFORM_OBJ="accelent_sa.o"
+ BLOB_PLATFORM_OBJS="accelent_sa.o"
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="accelent_sa.o"
+ DIAG_PLATFORM_OBJS="accelent_sa.o"
use_cpu="sa1110"
use_lcd="no"
;;
assabet)
board_name="Intel Assabet"
AC_DEFINE(ASSABET)
- BLOB_PLATFORM_OBJ="assabet.o"
+ BLOB_PLATFORM_OBJS="assabet.o"
AC_MSG_WARN([Please check assabet memory config in arch/assabet.h])
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="assabet.o"
+ DIAG_PLATFORM_OBJS="assabet.o"
use_cpu="sa1110"
use_lcd="no"
;;
@@ -118,124 +118,124 @@
board_name="Intel Assabet with Neponset Expansion Board"
AC_DEFINE(ASSABET)
AC_DEFINE(NEPONSET)
- BLOB_PLATFORM_OBJ="assabet.o"
+ BLOB_PLATFORM_OBJS="assabet.o"
AC_MSG_WARN([Please check assabet memory config in arch/assabet.h])
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="assabet.o"
+ DIAG_PLATFORM_OBJS="assabet.o"
use_cpu="sa1110"
use_lcd="no"
;;
badge4)
board_name="Hewlett-Packard Laboratories Badge-4"
AC_DEFINE(BADGE4)
- BLOB_PLATFORM_OBJ="badge4.o"
+ BLOB_PLATFORM_OBJS="badge4.o"
BLOB_FLASH_OBJS="intel16.o"
- DIAG_PLATFORM_OBJ="badge4.o"
+ DIAG_PLATFORM_OBJS="badge4.o"
use_cpu="sa1110"
use_lcd="no"
;;
brutus)
board_name="Intel Brutus"
AC_DEFINE(BRUTUS)
- BLOB_PLATFORM_OBJ="brutus.o"
+ BLOB_PLATFORM_OBJS="brutus.o"
AC_MSG_WARN([Please check Brutus flash])
BLOB_FLASH_OBJS="nullflash.o"
- DIAG_PLATFORM_OBJ="brutus.o"
+ DIAG_PLATFORM_OBJS="brutus.o"
use_cpu="sa1100"
use_lcd="no"
;;
creditlart)
board_name="Delft University of Technology CreditLART"
AC_DEFINE(CLART)
- BLOB_PLATFORM_OBJ="clart.o"
+ BLOB_PLATFORM_OBJS="clart.o"
AC_MSG_WARN([Please check creditlart memory config in arch/clart.h])
BLOB_FLASH_OBJS="intel16.o"
- DIAG_PLATFORM_OBJ="clart.o"
+ DIAG_PLATFORM_OBJS="clart.o"
use_cpu="sa1110"
use_lcd="no"
;;
frodo)
board_name="2d3D, Inc. SA-1110 Development Board"
AC_DEFINE(FRODO)
- BLOB_PLATFORM_OBJ="frodo.o"
+ BLOB_PLATFORM_OBJS="frodo.o"
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="frodo.o"
+ DIAG_PLATFORM_OBJS="frodo.o"
use_cpu="sa1110"
use_lcd="no"
;;
h3600)
board_name="Compaq Ipaq H3600 series"
AC_DEFINE(H3600)
- BLOB_PLATFORM_OBJ="h3600.o"
+ BLOB_PLATFORM_OBJS="h3600.o"
AC_MSG_WARN([Warning: untested platform!])
AC_MSG_WARN([Please check h3600 memory config in arch/h3600.h])
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="h3600.o"
+ DIAG_PLATFORM_OBJS="h3600.o"
use_cpu="sa1110"
use_lcd="no"
;;
idr)
board_name="Vercel UD-1 (IDR)"
AC_DEFINE(IDR)
- BLOB_PLATFORM_OBJ="idr.o"
+ BLOB_PLATFORM_OBJS="idr.o"
BLOB_FLASH_OBJS="intel16.o"
- DIAG_PLATFORM_OBJ="idr.o"
+ DIAG_PLATFORM_OBJS="idr.o"
use_cpu="sa1110"
use_lcd="no"
;;
jornada720)
board_name="Hewlett-Packard Jornada 720 with flash daughter board"
AC_DEFINE(JORNADA720)
- BLOB_PLATFORM_OBJ="jornada720.o"
+ BLOB_PLATFORM_OBJS="jornada720.o"
AC_MSG_WARN([Warning: untested platform!])
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="jornada720.o"
+ DIAG_PLATFORM_OBJS="jornada720.o"
use_cpu="sa1110"
use_lcd="no"
;;
lart)
board_name="Delft University of Technology LART"
AC_DEFINE(LART)
- BLOB_PLATFORM_OBJ="lart.o"
+ BLOB_PLATFORM_OBJS="lart.o"
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="lart.o"
+ DIAG_PLATFORM_OBJS="lart.o"
use_cpu="sa1100"
use_lcd="no"
;;
nesa)
board_name="NESA"
AC_DEFINE(NESA)
- BLOB_PLATFORM_OBJ="nesa.o"
+ BLOB_PLATFORM_OBJS="nesa.o"
BLOB_FLASH_OBJS="amd32.o"
- DIAG_PLATFORM_OBJ="nesa.o"
+ DIAG_PLATFORM_OBJS="nesa.o"
use_cpu="sa1100"
use_lcd="no"
;;
pleb)
board_name="University of New South Wales PLEB"
AC_DEFINE(PLEB)
- BLOB_PLATFORM_OBJ="pleb.o"
+ BLOB_PLATFORM_OBJS="pleb.o"
AC_MSG_WARN([Please check PLEB flash])
BLOB_FLASH_OBJS="nullflash.o"
- DIAG_PLATFORM_OBJ="pleb.o"
+ DIAG_PLATFORM_OBJS="pleb.o"
use_cpu="sa1100"
use_lcd="no"
;;
shannon)
board_name="TuxScreen (Shannon)"
AC_DEFINE(SHANNON)
- BLOB_PLATFORM_OBJ="shannon.o"
+ BLOB_PLATFORM_OBJS="shannon.o"
BLOB_FLASH_OBJS="amd32.o"
- DIAG_PLATFORM_OBJ="shannon.o"
+ DIAG_PLATFORM_OBJS="shannon.o"
use_cpu="sa1100"
use_lcd="no"
;;
system3)
board_name="Prueftechnik Digital Board"
AC_DEFINE(PT_SYSTEM3)
- BLOB_PLATFORM_OBJ="system3.o"
+ BLOB_PLATFORM_OBJS="system3.o"
BLOB_FLASH_OBJS="intel32.o"
- DIAG_PLATFORM_OBJ="system3.o"
+ DIAG_PLATFORM_OBJS="system3.o"
use_cpu="sa1110"
use_lcd="yes"
;;
@@ -245,6 +245,13 @@
;;
esac
+AC_SUBST(BLOB_FLASH_OBJS)
+AC_SUBST(BLOB_PLATFORM_OBJS)
+AC_SUBST(DIAG_PLATFORM_OBJS)
+
+
+
+
dnl define board name and CPU in configuration
AC_MSG_RESULT("${board_name}")
AC_DEFINE_UNQUOTED(BOARD_NAME, "${board_name}")
@@ -255,13 +262,13 @@
case "$use_cpu" in
sa1100)
dnl SA1100 CPU: EDORAM memory setup code
- STARTCODE="start-sa11x0.o"
- MEMSETUP="memsetup-sa1100.o"
+ BLOB_STARTCODE_OBJS="start-sa11x0.o"
+ BLOB_MEMSETUP_OBJS="memsetup-sa1100.o"
;;
sa1110)
dnl SA1110 CPU: SDRAM memory setup code
- STARTCODE="start-sa11x0.o"
- MEMSETUP="memsetup-sa1110.o"
+ BLOB_STARTCODE_OBJS="start-sa11x0.o"
+ BLOB_MEMSETUP_OBJS="memsetup-sa1110.o"
;;
*)
AC_MSG_ERROR([Unknown CPU name \"$use_cpu\", bailing out]);
@@ -269,8 +276,8 @@
esac
dnl Define in configuration
-AC_SUBST(STARTCODE)
-AC_SUBST(MEMSETUP)
+AC_SUBST(BLOB_STARTCODE_OBJS)
+AC_SUBST(BLOB_MEMSETUP_OBJS)
@@ -300,6 +307,7 @@
+
dnl Check for individual features
AC_ARG_ENABLE(clock-scaling,
[ --enable-clock-scaling Enable support for clock scaling (SA1100 only)],
@@ -347,6 +355,8 @@
[cramfs_flag=no])
+
+
dnl Check if the user wants *all* features
AC_ARG_ENABLE(all-features,
[ --enable-all-features Enable all features],
@@ -367,40 +377,47 @@
+
dnl Check wether or not clock scaling code is wanted
if test "x$clock_scaling_flag" = "xyes" ; then
if test "x$use_cpu" = "xsa1100"; then
- CLOCK="clock.o"
+ BLOB_CLOCK_OBJS="clock.o"
else
AC_MSG_WARN([No clock scaling support for SA1110 CPUs, disabling])
clock_scaling_flag=no
- CLOCK=""
+ BLOB_CLOCK_OBJS=""
fi
fi
-AC_SUBST(CLOCK)
+AC_SUBST(BLOB_CLOCK_OBJS)
dnl Check wether or not memtest code is wanted
if test "x$chkmem_flag" = "xyes" ; then
- CHKMEM="chkmem.o"
+ BLOB_CHKMEM_OBJS="chkmem.o"
fi
-AC_SUBST(CHKMEM)
+AC_SUBST(BLOB_CHKMEM_OBJS)
+
+
+
dnl Check wether or not debug code is wanted
if test "x$debug_flag" = "xyes" ; then
- DEBUG="debug.o"
+ BLOB_DEBUG_OBJS="debug.o"
fi
-AC_SUBST(DEBUG)
+AC_SUBST(BLOB_DEBUG_OBJS)
+
+
+
dnl Check wether or not lcd support code is wanted
if test "x$lcd_flag" = "xyes" ; then
if test "x$use_lcd" = "xyes" ; then
- LCD="lcd.o"
+ DIAG_LCD_OBJS="lcd.o"
AC_DEFINE(CONFIG_LCD_SUPPORT)
else
AC_MSG_WARN([No LCD support for ${board_name}, disabling])
@@ -409,40 +426,66 @@
fi
fi
-AC_SUBST(LCD)
+AC_SUBST(DIAG_LCD_OBJS)
+
+
+
dnl Check wether or not MD5 support is wanted
if test "x$md5_flag" = "xyes" ; then
AC_DEFINE(CONFIG_MD5_SUPPORT)
fi
+
+
+
dnl Check wether or not Xmodem support is wanted
if test "x$xmodem_flag" = "xyes" ; then
AC_DEFINE(CONFIG_XMODEM_SUPPORT)
+ BLOB_XMODEM_OBJS="xmodem.o"
fi
+AC_SUBST(BLOB_XMODEM_OBJS)
+
+
+
+
dnl Check wether or not UU Codec support is wanted
if test "x$uucodec_flag" = "xyes"; then
AC_DEFINE(CONFIG_UUCODEC_SUPPORT)
+ BLOB_UUCODEC_OBJS="uucodec.o"
fi
+AC_SUBST(BLOB_UUCODEC_OBJS)
+
+
+
+
dnl Check wether or not JFFS2 support is wanted
if test "x$jffs2_flag" = "xyes" ; then
- AC_MSG_WARN("JFFS2 support is only dummy code")
+ BLOB_JFFS2_OBJS="compr_rtime.o compr_rubin.o jffs2.o"
AC_DEFINE(CONFIG_JFFS2_SUPPORT)
fi
+AC_SUBST(BLOB_JFFS2_OBJS)
+
+
+
+
dnl Check wether or not cramfs support is wanted
if test "x$cramfs_flag" = "xyes" ; then
- AC_MSG_WARN("cramfs support is only dummy code")
+ BLOB_CRAMFS_OBJS="cramfs.o"
AC_DEFINE(CONFIG_CRAMFS_SUPPORT)
fi
+AC_SUBST(BLOB_CRAMFS_OBJS)
+
+
+
+
dnl Check wether or not additional platform source code
dnl for is needed
-AC_SUBST(BLOB_FLASH_OBJS)
-AC_SUBST(BLOB_PLATFORM_OBJ)
-AC_SUBST(DIAG_PLATFORM_OBJ)
+
|