Menu
▾
▴
blob-cvs-commit
|
From: Holger S. <hol...@us...> - 2003-08-15 06:28:37
|
Update of /cvsroot/blob/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv14195
Modified Files:
.cvsignore ChangeLog configure.in
Added Files:
Makefile.cvs
Removed Files:
acconfig.h
Log Message:
support for new autoconf/automake
--- NEW FILE: Makefile.cvs ---
all:
aclocal
autoheader
autoconf
automake --add-missing
Index: .cvsignore
===================================================================
RCS file: /cvsroot/blob/blob/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore 6 Jul 2002 08:28:11 -0000 1.4
+++ .cvsignore 15 Aug 2003 06:18:57 -0000 1.5
@@ -7,3 +7,4 @@
Makefile
*.diff
junk
+autom4te.cache
Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChangeLog 8 Feb 2002 16:44:14 -0000 1.24
+++ ChangeLog 15 Aug 2003 06:18:57 -0000 1.25
@@ -1,10 +1,21 @@
(If somebody can show me how to update the ChangeLog from CVS, I'd be
more than grateful -- Erik)
+(maybe with "rcs2log >Changelog; cvs commit ChangeLog" -- Holger)
+
$Id$
(NOTE: Please add new entries at the top, not at the bottom)
+
+- using new autoconf/automake Holger Schurig
+- made it fully PXA compatible Abraham van der Merwe
+- CSIR IMS support Abraham van der Merwe
+- dafit support Stefan Eletzhofer
+- PCMCIA, CF, IDE and GENERIC_IO support added to Stefan Eletzhofer
+ automake/autoconf & some other cleanup as well
+- smc91xxx driver Stefan Eletzhofer
+- bootp/tftp code Stefan Eletzhofer
blob-2.0.5-pre3:
- Added printf() from linux-2.4.17-rmk3 Erik Mouw
Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- configure.in 7 Aug 2003 19:46:54 -0000 1.65
+++ configure.in 15 Aug 2003 06:18:57 -0000 1.66
@@ -60,7 +60,7 @@
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
-
+AM_PROG_AS
dnl Checks for libraries.
@@ -77,27 +77,28 @@
Valid names are:
accelent_sa Accelent IDP
assabet Intel Assabet
- neponset Intel Assabet with Neponset board
badge4 HPL Badge 4
brutus Intel Brutus
cep Iskratel CEP
creditlart CreditLART
- dafit Prueftechnik VibXpert
- frodo 2d3D, Inc. SA-1110 Development Board
+ csir_ims CSIR Incident Management System
+ dafit Prueftechnik VibXpert
+ frodo 2d3D, Inc. SA-1110 Development Board
h3600 Compaq Ipaq H36x0
hackkit The Hack Kit base board
idr Vercel UD-1
jornada720 HP Jornada 720 with Flash board
lart LART
lubbock Intel HCDDBCTA1 (Lubbock)
- miniprint FGAG Miniprint
+ miniprint FGAG Miniprint
+ neponset Intel Assabet with Neponset board
nesa NESA
pleb PLEB
- pxa_idp Accelent PXA-based IDP
+ pxa_idp Accelent PXA-based IDP
+ ramses M&N "MN-CI" Logistics Terminal
shannon TuxScreen (Shannon)
system3 Prueftechnik Digital Board
trizeps Keith & Koep Trizeps Board
- csir_ims CSIR Incident Management System
Default board is lart],
board_name="$withval",
board_name="lart")
@@ -106,7 +107,7 @@
case "$board_name" in
accelent_sa)
board_name="Accelent IDP"
- AC_DEFINE(ACCELENT_SA)
+ AC_DEFINE([ACCELENT_SA],1,[Accelent IDP])
BLOB_PLATFORM_OBJS="accelent_sa.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -117,7 +118,7 @@
;;
assabet)
board_name="Intel Assabet"
- AC_DEFINE(ASSABET)
+ AC_DEFINE(ASSABET,1,[Intel Assabet])
BLOB_PLATFORM_OBJS="assabet.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -129,8 +130,8 @@
;;
neponset)
board_name="Intel Assabet with Neponset Expansion Board"
- AC_DEFINE(ASSABET)
- AC_DEFINE(NEPONSET)
+ AC_DEFINE(ASSABET,1,[Intel Assabet])
+ AC_DEFINE(NEPONSET,1,[Neponset Expansion Board])
BLOB_PLATFORM_OBJS="assabet.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -142,7 +143,7 @@
;;
badge4)
board_name="Hewlett-Packard Laboratories Badge-4"
- AC_DEFINE(BADGE4)
+ AC_DEFINE(BADGE4,1,[Hewlett-Packard Laboratories Badge-4])
BLOB_PLATFORM_OBJS="badge4.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -153,7 +154,7 @@
;;
brutus)
board_name="Intel Brutus"
- AC_DEFINE(BRUTUS)
+ AC_DEFINE(BRUTUS,1,[Intel Brutus])
BLOB_PLATFORM_OBJS="brutus.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -165,7 +166,7 @@
;;
cep)
board_name="Iskratel CEP"
- AC_DEFINE(CEP)
+ AC_DEFINE(CEP,1,[Iskratel CEP])
BLOB_PLATFORM_OBJS="cep.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -177,7 +178,7 @@
;;
creditlart)
board_name="Delft University of Technology CreditLART"
- AC_DEFINE(CLART)
+ AC_DEFINE(CLART,1,[Delft University of Technology CreditLART])
BLOB_PLATFORM_OBJS="clart.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -189,7 +190,7 @@
;;
dafit)
board_name="Prueftechnik VibXpert"
- AC_DEFINE(PT_DAFIT)
+ AC_DEFINE(PT_DAFIT,1,[Prueftechnik VibXpert])
BLOB_PLATFORM_OBJS="dafit.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_NETWORK_DRIVER_OBJS="smc9196.o"
@@ -201,7 +202,7 @@
;;
frodo)
board_name="2d3D, Inc. SA-1110 Development Board"
- AC_DEFINE(FRODO)
+ AC_DEFINE(FRODO,1,[2d3D, Inc. SA-1110 Development Board])
BLOB_PLATFORM_OBJS="frodo.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -212,7 +213,7 @@
;;
h3600)
board_name="Compaq Ipaq H3600 series"
- AC_DEFINE(H3600)
+ AC_DEFINE(H3600,1,[Compaq Ipaq H3600 series])
BLOB_PLATFORM_OBJS="h3600.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -225,7 +226,7 @@
;;
hackkit)
board_name="The Hack Kit base cpu board"
- AC_DEFINE(HKIT)
+ AC_DEFINE(HKIT,1,[The Hack Kit base cpu board])
BLOB_PLATFORM_OBJS="hackkit.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -236,7 +237,7 @@
;;
idr)
board_name="Vercel UD-1 (IDR)"
- AC_DEFINE(IDR)
+ AC_DEFINE(IDR,1,[Vercel UD-1 (IDR)])
BLOB_PLATFORM_OBJS="idr.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -247,7 +248,7 @@
;;
jornada720)
board_name="Hewlett-Packard Jornada 720 with flash daughter board"
- AC_DEFINE(JORNADA720)
+ AC_DEFINE(JORNADA720,1,[Hewlett-Packard Jornada 720 with flash daughter board])
BLOB_PLATFORM_OBJS="jornada720.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -259,7 +260,7 @@
;;
lart)
board_name="Delft University of Technology LART"
- AC_DEFINE(LART)
+ AC_DEFINE(LART,1,[Delft University of Technology LART])
BLOB_PLATFORM_OBJS="lart.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -270,7 +271,7 @@
;;
lubbock)
board_name="Intel HCDDBCTA1 (Lubbock)"
- AC_DEFINE(LUBBOCK)
+ AC_DEFINE(LUBBOCK,1,[Intel HCDDBCTA1 (Lubbock)])
AC_MSG_WARN([Warning: untested platform!])
BLOB_PLATFORM_OBJS="lubbock.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
@@ -282,7 +283,7 @@
;;
miniprint)
board_name="FGAG miniprint"
- AC_DEFINE(MINIPRINT)
+ AC_DEFINE(MINIPRINT,1,[FGAG miniprint])
BLOB_PLATFORM_OBJS="miniprint.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -293,7 +294,7 @@
;;
nesa)
board_name="NESA"
- AC_DEFINE(NESA)
+ AC_DEFINE(NESA,1,[NESA])
BLOB_PLATFORM_OBJS="nesa.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -304,7 +305,7 @@
;;
pleb)
board_name="University of New South Wales PLEB"
- AC_DEFINE(PLEB)
+ AC_DEFINE(PLEB,1,[University of New South Wales PLEB])
BLOB_PLATFORM_OBJS="pleb.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -316,16 +317,25 @@
;;
pxa_idp)
board_name="Accelent PXA250 IDP"
- AC_DEFINE(PXA_IDP)
+ AC_DEFINE(PXA_IDP,1,[Accelent PXA250 IDP])
BLOB_PLATFORM_OBJS="pxa_idp.o"
BLOB_FLASH_OBJS="intel32.o"
DIAG_PLATFORM_OBJS="pxa_idp.o"
use_cpu="pxa250"
use_lcd="no"
;;
+ ramses)
+ board_name="M&N MN-CI Logistic Terminal (ramses)"
+ AC_DEFINE(RAMSES,1,[M&N MN-CI Logistic Terminal (ramses)])
+ BLOB_PLATFORM_OBJS="ramses.o"
+ BLOB_FLASH_OBJS="intel32.o"
+ DIAG_PLATFORM_OBJS="ramses.o"
+ use_cpu="pxa250"
+ use_lcd="no"
+ ;;
shannon)
board_name="TuxScreen (Shannon)"
- AC_DEFINE(SHANNON)
+ AC_DEFINE(SHANNON,1,[TuxScreen (Shannon)])
BLOB_PLATFORM_OBJS="shannon.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -336,7 +346,7 @@
;;
system3)
board_name="Prueftechnik Digital Board REV 0802"
- AC_DEFINE(PT_SYSTEM3)
+ AC_DEFINE(PT_SYSTEM3,1,[Prueftechnik Digital Board REV 0802])
BLOB_PLATFORM_OBJS="system3.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_NETWORK_DRIVER_OBJS="smc9196.o"
@@ -348,7 +358,7 @@
;;
trizeps)
board_name="Keith & Koep Trizeps Board"
- AC_DEFINE(TRIZEPS)
+ AC_DEFINE(TRIZEPS,1,[Keith & Koep Trizeps Board])
BLOB_PLATFORM_OBJS="trizeps.o"
BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
BLOB_LED_STARTCODE="ledasm-sa11x0.o"
@@ -361,7 +371,7 @@
;;
csir_ims)
board_name="CSIR Incident Management System"
- AC_DEFINE(CSIR_IMS)
+ AC_DEFINE(CSIR_IMS,1,[CSIR Incident Management System])
BLOB_PLATFORM_OBJS="csir_ims.o"
BLOB_FLASH_OBJS="intel16.o"
DIAG_PLATFORM_OBJS="csir_ims.o"
@@ -384,8 +394,8 @@
dnl define board name and CPU in configuration
AC_MSG_RESULT("${board_name}")
-AC_DEFINE_UNQUOTED(BOARD_NAME, "${board_name}")
-AC_DEFINE_UNQUOTED(CPU, "${use_cpu}")
+AC_DEFINE_UNQUOTED(BOARD_NAME, "${board_name}","Board name")
+AC_DEFINE_UNQUOTED(CPU, "${use_cpu}", "CPU type")
dnl Select correct startup code and other platform dependent object files
@@ -451,7 +461,7 @@
AC_MSG_RESULT([yes])
LINUX_INCLUDE=${linux_prefix}/include
AC_SUBST(LINUX_INCLUDE)
-CFLAGS=`echo $CFLAGS -I$LINUX_INCLUDE`
+CFLAGS=`echo $AM_CFLAGS -I$LINUX_INCLUDE`
@@ -585,7 +595,7 @@
if test "x$lcd_flag" = "xyes" ; then
if test "x$use_lcd" = "xyes" ; then
DIAG_LCD_OBJS="lcd.o"
- AC_DEFINE(CONFIG_LCD_SUPPORT)
+ AC_DEFINE(CONFIG_LCD_SUPPORT,no,"lcd support")
else
AC_MSG_WARN([No LCD support for ${board_name}, disabling])
LCD=""
@@ -600,7 +610,7 @@
dnl Check wether or not MD5 support is wanted
if test "x$md5_flag" = "xyes" ; then
- AC_DEFINE(CONFIG_MD5_SUPPORT)
+ AC_DEFINE(CONFIG_MD5_SUPPORT,no,"MD5 support")
fi
@@ -608,7 +618,7 @@
dnl Check wether or not Xmodem support is wanted
if test "x$xmodem_flag" = "xyes" ; then
- AC_DEFINE(CONFIG_XMODEM_SUPPORT)
+ AC_DEFINE(CONFIG_XMODEM_SUPPORT,no,"Xmodem support")
BLOB_XMODEM_OBJS="xmodem.o"
fi
@@ -619,7 +629,7 @@
dnl Check wether or not UU Codec support is wanted
if test "x$uucodec_flag" = "xyes"; then
- AC_DEFINE(CONFIG_UUCODEC_SUPPORT)
+ AC_DEFINE(CONFIG_UUCODEC_SUPPORT,no,"UU Codec support")
BLOB_UUCODEC_OBJS="uucodec.o"
fi
@@ -631,7 +641,7 @@
dnl Check wether or not JFFS2 support is wanted
if test "x$jffs2_flag" = "xyes" ; then
BLOB_JFFS2_OBJS="compr_rtime.o compr_rubin.o jffs2.o"
- AC_DEFINE(CONFIG_JFFS2_SUPPORT)
+ AC_DEFINE(CONFIG_JFFS2_SUPPORT,no,"JFFS2 support")
fi
AC_SUBST(BLOB_JFFS2_OBJS)
@@ -642,7 +652,7 @@
dnl Check wether or not cramfs support is wanted
if test "x$cramfs_flag" = "xyes" ; then
BLOB_CRAMFS_OBJS="cramfs.o"
- AC_DEFINE(CONFIG_CRAMFS_SUPPORT)
+ AC_DEFINE(CONFIG_CRAMFS_SUPPORT,no,"CRAMFS support")
fi
AC_SUBST(BLOB_CRAMFS_OBJS)
@@ -651,7 +661,7 @@
dnl Check wether or not zImage support is wanted
if test "x$zimage_flag" = "xyes" ; then
BLOB_ZIMAGE_OBJS="zImage.o"
- AC_DEFINE(CONFIG_ZIMAGE_SUPPORT)
+ AC_DEFINE(CONFIG_ZIMAGE_SUPPORT,no,"zImage support")
fi
AC_SUBST(BLOB_ZIMAGE_OBJS)
@@ -659,7 +669,7 @@
dnl Check wether or not network support is wanted
if test "x$network_flag" = "xyes" ; then
BLOB_NETWORK_OBJS="bootp.o arp.o tftp.o ip_bits.o"
- AC_DEFINE(CONFIG_NETWORK_SUPPORT)
+ AC_DEFINE(CONFIG_NETWORK_SUPPORT,no,"Network support")
blob_commands="$blob_commands, setip, tftp";
fi
@@ -669,7 +679,7 @@
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)
+ AC_DEFINE(CONFIG_GIO_SUPPORT,no,"GIO support")
dnl gio needs cf, pcmcia and ide
pcmcia_flag="yes";
ide_flag="yes";
@@ -682,21 +692,21 @@
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)
+ AC_DEFINE(CONFIG_PCMCIA_SUPPORT,no,"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)
+ AC_DEFINE(CONFIG_IDE_SUPPORT,no,"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)
+ AC_DEFINE(CONFIG_CF_SUPPORT,no,"CF support")
BLOB_CF_OBJS="cf.o"
fi
AC_SUBST(BLOB_CF_OBJS)
@@ -708,7 +718,7 @@
[blob_debug_flag=no])
if test "x$blob_debug_flag" = "xyes" ; then
- AC_DEFINE(BLOB_DEBUG)
+ AC_DEFINE(BLOB_DEBUG,no,"Debug code")
fi
@@ -728,31 +738,34 @@
+dnl Initialize flags without --enable/--disable code:
+pcmcia_flag=no
+cf_flag=no
+ide_flag=no
dnl Add C flags to display more warnings
AC_MSG_CHECKING(for C flags to get more warnings)
-ac_save_CFLAGS="$CFLAGS"
+ac_save_CFLAGS="$AM_CFLAGS"
AC_LANG_SAVE
if test "x$ac_cv_prog_gcc" = "xyes" ; then
dnl gcc is the easiest C compiler
warning_CFLAGS="-Wall"
fi
AC_LANG_RESTORE
-CFLAGS="$ac_save_CFLAGS"
+AM_CFLAGS="$ac_save_CFLAGS"
if test "$warning_CFLAGS" = "none" ; then
AC_MSG_RESULT(none)
else
- CFLAGS="$CFLAGS $warning_CFLAGS"
+ AM_CFLAGS="$CFLAGS $warning_CFLAGS"
AC_MSG_RESULT($warning_CFLAGS)
fi
-
-dnl Remove the "-g" flag from CFLAGS and LDFLAGS
-CFLAGS=`echo $CFLAGS | sed 's/\ *-g\ */\ /'`
-LDFLAGS=`echo $LDFLAGS | sed 's/\ *-g\ */\ /'`
+dnl Remove the "-g" flag from CFLAGS and AM_LDFLAGS
+AM_CFLAGS=`echo $AM_CFLAGS | sed 's/\ *-g\ */\ /'`
+AM_LDFLAGS=`echo $AM_LDFLAGS | sed 's/\ *-g\ */\ /'`
dnl Change the "-O2" flag in "-Os"
-CFLAGS=`echo $CFLAGS | sed 's/-O2/-Os/'`
+AM_CFLAGS=`echo $AM_CFLAGS | sed 's/-O2/-Os/'`
dnl Figure out CPU specific CFLAGS to help optimisation
@@ -771,8 +784,8 @@
dnl define compiler and linker flags
-CFLAGS=`echo $CFLAGS $cpu_cflags -mapcs-32 -fomit-frame-pointer -fno-builtin`
-LDFLAGS=`echo $LDFLAGS -static -nostdlib`
+AM_CFLAGS=`echo $AM_CFLAGS $cpu_cflags -mapcs-32 -fomit-frame-pointer -fno-builtin`
+AM_LDFLAGS=`echo $AM_LDFLAGS -static -nostdlib`
OCFLAGS="-O binary -R .note -R .comment -S"
AC_SUBST(OCFLAGS)
@@ -804,8 +817,8 @@
echo "Target board ${board_name}"
echo "Target CPU ${use_cpu}"
echo "C compiler ${CC}"
-echo "C flags ${CFLAGS}"
-echo "Linker flags ${LDFLAGS}"
+echo "C flags ${AM_CFLAGS}"
+echo "Linker flags ${AM_LDFLAGS}"
echo "Objcopy tool ${OBJCOPY}"
echo "Objcopy flags ${OCFLAGS}"
echo "Clock scaling support ${clock_scaling_flag}"
--- acconfig.h DELETED ---
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X