nps: TODO, common/dimm_map.h, common/jnet_shared.c, common/jnet_sh...
jajcus
jajcus at pld-linux.org
Mon Apr 10 13:25:59 CEST 2006
Author: jajcus Date: Mon Apr 10 11:25:59 2006 GMT
Module: nps Tag: HEAD
---- Log message:
- updated to V2.4.0.8
- updated to build with currend PLD dist kernel sources (should work with
non-dist kernel too, but that is not tested)
---- Files affected:
nps:
TODO (1.2 -> 1.3)
nps/common:
dimm_map.h (1.1.1.1 -> 1.2) , jnet_shared.c (1.2 -> 1.3) , jnet_shared.h (1.1.1.1 -> 1.2) , mc.h (1.3 -> 1.4) , nwsVersion.h (1.2 -> 1.3) , poci-start-script.sh (1.2 -> 1.3) , poci.h (1.2 -> 1.3) , product.h (1.1.1.1 -> 1.2) , sp_sockets.h (1.1.1.1 -> 1.2) , swinventory.h (1.1.1.1 -> 1.2) , swinventory.xml (1.2 -> 1.3)
nps/jnet:
.cvsignore (1.1 -> 1.2) , Makefile (1.4 -> 1.5) , jnet_plat_src.c (1.1.1.1 -> 1.2) , jnet_plat_src.h (1.1.1.1 -> 1.2) , jnet_shared.c (1.2 -> 1.3) , makefile.2_6 (1.5 -> 1.6) , swinventory.xml (1.2 -> 1.3)
nps/nws_mc:
.cvsignore (1.1 -> 1.2) , Makefile (1.3 -> 1.4) , makefile.2_4 (1.4 -> 1.5) , makefile.2_6 (1.5 -> 1.6) , nws_mc_src.c (1.2 -> 1.3) , swinventory.xml (1.2 -> 1.3)
nps/poci:
nws_hb.c (1.3 -> 1.4) , nws_hb.h (1.1.1.1 -> 1.2) , nws_mc.c (1.4 -> 1.5) , nws_mc.h (1.1.1.1 -> 1.2) , nws_poci.c (1.17 -> 1.18) , nws_poci.h (1.2 -> 1.3) , poci.h (1.2 -> 1.3) , swinventory.xml (1.2 -> 1.3)
---- Diffs:
================================================================
Index: nps/TODO
diff -u nps/TODO:1.2 nps/TODO:1.3
--- nps/TODO:1.2 Thu Sep 22 01:50:06 2005
+++ nps/TODO Mon Apr 10 13:25:54 2006
@@ -1,3 +1,6 @@
+- spec:
+ - update to current NPS version
+ - build a nice PLD package
- jnet:
- add sp_ip and plat_ip options
- or create a proggy to set them from userland
================================================================
Index: nps/common/dimm_map.h
diff -u nps/common/dimm_map.h:1.1.1.1 nps/common/dimm_map.h:1.2
--- nps/common/dimm_map.h:1.1.1.1 Mon Jul 25 21:42:49 2005
+++ nps/common/dimm_map.h Mon Apr 10 13:25:54 2006
@@ -2,7 +2,7 @@
// dimm_map.h
//----------------------------------------------------------------------------
//
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
//
//----------------------------------------------------------------------------
// $Header$
================================================================
Index: nps/common/jnet_shared.c
diff -u nps/common/jnet_shared.c:1.2 nps/common/jnet_shared.c:1.3
--- nps/common/jnet_shared.c:1.2 Sun Jul 31 01:37:47 2005
+++ nps/common/jnet_shared.c Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Ethernet over Prs driver for Linux kernel 2.4
// ----------------------------------------------------------------------------
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
// ----------------------------------------------------------------------------
// $Header$
@@ -90,7 +77,7 @@
#include <asm/uaccess.h>
#include <asm/checksum.h>
#include <linux/pci.h>
-#include <linux/byteorder/swab.h>
+#include <byteswap.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
@@ -1024,7 +1011,7 @@
*fifo = priv->myConfigIpSettings.pid;
*fifo = priv->myConfigIpSettings.action;
- ip = swab32(priv->myConfigIpSettings.spIp);
+ ip = bswap_32(priv->myConfigIpSettings.spIp);
DEBUGP(D_TRACE, ("spIp = %08x\n",ip));
for(i=0; i<4; i++) {
*fifo = (ip & 0x000000ff);
@@ -1032,7 +1019,7 @@
}
//ip address is sent in little endian, hence the need to bswap.
- ip = swab32(priv->myConfigIpSettings.platIp);
+ ip = bswap_32(priv->myConfigIpSettings.platIp);
DEBUGP(D_TRACE, ("platIP = %08x\n",ip));
for(i=0; i<4; i++) {
*fifo = (ip & 0x000000ff);
@@ -1176,7 +1163,7 @@
}
#if SP
- ip = swab32(priv->myConfigIpSettings.spIp);
+ ip = bswap_32(priv->myConfigIpSettings.spIp);
#elif PLATFORM
ip = ntohl(priv->myConfigIpSettings.spIp);
#endif
@@ -1223,7 +1210,7 @@
}
#if SP
- ip = swab32(priv->myConfigIpSettings.platIp);
+ ip = bswap_32(priv->myConfigIpSettings.platIp);
#elif PLATFORM
ip = ntohl(priv->myConfigIpSettings.platIp);
#endif
================================================================
Index: nps/common/jnet_shared.h
diff -u nps/common/jnet_shared.h:1.1.1.1 nps/common/jnet_shared.h:1.2
--- nps/common/jnet_shared.h:1.1.1.1 Mon Jul 25 21:42:51 2005
+++ nps/common/jnet_shared.h Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Ethernet over Prs driver for Linux kernel 2.4, Solaris9 and Windows.
// ----------------------------------------------------------------------------
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
// ----------------------------------------------------------------------------
// $Header$
================================================================
Index: nps/common/mc.h
diff -u nps/common/mc.h:1.3 nps/common/mc.h:1.4
--- nps/common/mc.h:1.3 Sun Sep 25 21:38:42 2005
+++ nps/common/mc.h Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Global header file for machine check
//
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
#ifndef NWS_MC
#define NWS_MC
@@ -83,7 +70,7 @@
#define DEFAULT_HB_POLL_INTERVAL 4000
-#define MAX_NUM_CPUS 8
+#define MAX_NUM_CPUS 4
#define MAX_PARTITIONS 2
#define NUM_MCA_REGS 18
================================================================
Index: nps/common/nwsVersion.h
diff -u nps/common/nwsVersion.h:1.2 nps/common/nwsVersion.h:1.3
--- nps/common/nwsVersion.h:1.2 Sun Sep 25 21:38:42 2005
+++ nps/common/nwsVersion.h Mon Apr 10 13:25:54 2006
@@ -1,5 +1,5 @@
#ifndef __NEWISYS_INCLUDE_NWSVERSION_H__
#define __NEWISYS_INCLUDE_NWSVERSION_H__
-#define PLATFORM_PRODUCT_VERSION "V2.3.0.9"
+#define PLATFORM_PRODUCT_VERSION "V2.4.0.2"
#endif /* __NEWISYS_INCLUDE_NWSVERSION_H__ */
================================================================
Index: nps/common/poci-start-script.sh
diff -u nps/common/poci-start-script.sh:1.2 nps/common/poci-start-script.sh:1.3
--- nps/common/poci-start-script.sh:1.2 Sun Sep 25 21:38:42 2005
+++ nps/common/poci-start-script.sh Mon Apr 10 13:25:54 2006
@@ -18,7 +18,7 @@
# Short-Description: Poci daemon
### END INIT INFO
#
-#
+# (c) 2002-2003 Newisys, Inc. All rights reserved.
#
# $Header$
#
================================================================
Index: nps/common/poci.h
diff -u nps/common/poci.h:1.2 nps/common/poci.h:1.3
--- nps/common/poci.h:1.2 Sun Sep 25 22:04:45 2005
+++ nps/common/poci.h Mon Apr 10 13:25:54 2006
@@ -1,19 +1,6 @@
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
//
// $Header$
@@ -56,8 +43,7 @@
#define LG_STR 4096
#define HOST_IP "169.254.101.3"
#define SP_IP "sp.D332B385-5567-42e9-8D66-545897E8120A"
-#define SP_IP_CONF "/etc/newisys/jnet/jnet.conf"
-#define PLATFORM_IP_CONF "/etc/newisys/jnet/ip_platform"
+#define SP_IP_CONF "/etc/jnet/jnet.conf"
#define MAX_PARAM 5
================================================================
Index: nps/common/product.h
diff -u nps/common/product.h:1.1.1.1 nps/common/product.h:1.2
--- nps/common/product.h:1.1.1.1 Mon Jul 25 21:42:52 2005
+++ nps/common/product.h Mon Apr 10 13:25:54 2006
@@ -1,19 +1,6 @@
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
#ifndef __PRODUCT_H__
#define __PRODUCT_H__
================================================================
Index: nps/common/sp_sockets.h
diff -u nps/common/sp_sockets.h:1.1.1.1 nps/common/sp_sockets.h:1.2
--- nps/common/sp_sockets.h:1.1.1.1 Mon Jul 25 21:42:52 2005
+++ nps/common/sp_sockets.h Mon Apr 10 13:25:54 2006
@@ -5,7 +5,7 @@
// diagnostics code
//
//
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
//**********************************************************
//
================================================================
Index: nps/common/swinventory.h
diff -u nps/common/swinventory.h:1.1.1.1 nps/common/swinventory.h:1.2
--- nps/common/swinventory.h:1.1.1.1 Mon Jul 25 21:42:53 2005
+++ nps/common/swinventory.h Mon Apr 10 13:25:54 2006
@@ -1,5 +1,5 @@
/*
- *
+ * (c) 2002-2003 Newisys, Inc. All rights reserved.
*
* $Header$
*
================================================================
Index: nps/common/swinventory.xml
diff -u nps/common/swinventory.xml:1.2 nps/common/swinventory.xml:1.3
--- nps/common/swinventory.xml:1.2 Sun Sep 25 21:38:42 2005
+++ nps/common/swinventory.xml Mon Apr 10 13:25:54 2006
@@ -2,10 +2,10 @@
<SoftwareInventory>
<Software>
<SWName>Platform Drivers</SWName>
- <SWRev>V2.3.0.9</SWRev>
+ <SWRev>V2.4.0.2</SWRev>
<SWInfo>Platform Driver Software Bundle</SWInfo>
<SWInstalledDate>0</SWInstalledDate>
- <os>linux</os>
+ <os>Linux</os>
</Software>
</SoftwareInventory>
</Inventory>
================================================================
Index: nps/jnet/.cvsignore
diff -u nps/jnet/.cvsignore:1.1 nps/jnet/.cvsignore:1.2
--- nps/jnet/.cvsignore:1.1 Sat Jul 30 12:33:43 2005
+++ nps/jnet/.cvsignore Mon Apr 10 13:25:54 2006
@@ -4,3 +4,4 @@
*.mod.c
.*.cmd
.tmp_versions
+o
================================================================
Index: nps/jnet/Makefile
diff -u nps/jnet/Makefile:1.4 nps/jnet/Makefile:1.5
--- nps/jnet/Makefile:1.4 Sun Sep 25 22:03:59 2005
+++ nps/jnet/Makefile Mon Apr 10 13:25:54 2006
@@ -18,6 +18,11 @@
# $Header$
#
################################################################################
+
+ifneq ($(KERNELRELEASE),)
+ include $(M)/makefile.2_6
+else
+
SP_HOSTNAME = sp.D332B385-5567-42e9-8D66-545897E8120A
###########################################################################
@@ -25,7 +30,7 @@
KERNEL_DIR=/usr/src/linux
PWD=$(shell pwd)
-TOPDIR=$(shell dirname $(PWD))
+NPS_TOPDIR=$(shell dirname $(PWD))
ifeq (,$(BITS))
$(error BITS has not been defined!)
@@ -66,10 +71,10 @@
.PHONY: clean install uninstall postinstall postuninstall
ifeq ($(KERNEL_VERSION),2.4)
- include $(TOPDIR)/jnet/makefile.2_4
+ include $(NPS_TOPDIR)/jnet/makefile.2_4
else
ifeq ($(KERNEL_VERSION),2.6)
- include $(TOPDIR)/jnet/makefile.2_6
+ include $(NPS_TOPDIR)/jnet/makefile.2_6
endif
endif
@@ -137,3 +142,4 @@
rm -rf /etc/jnet
@sed /.*$(SP_HOSTNAME)/d < /etc/hosts > /etc/hosts.bak
@mv /etc/hosts.bak /etc/hosts
+endif
================================================================
Index: nps/jnet/jnet_plat_src.c
diff -u nps/jnet/jnet_plat_src.c:1.1.1.1 nps/jnet/jnet_plat_src.c:1.2
--- nps/jnet/jnet_plat_src.c:1.1.1.1 Mon Jul 25 21:42:53 2005
+++ nps/jnet/jnet_plat_src.c Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Ethernet over Prs driver for Linux kernel 2.4
// ----------------------------------------------------------------------------
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
// ----------------------------------------------------------------------------
// $Header$
@@ -108,7 +95,7 @@
int debugLevel = D_WARNING; //debugging level
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
struct net_device *jnet_devs;
#else
struct net_device jnet_devs[1] = {
================================================================
Index: nps/jnet/jnet_plat_src.h
diff -u nps/jnet/jnet_plat_src.h:1.1.1.1 nps/jnet/jnet_plat_src.h:1.2
--- nps/jnet/jnet_plat_src.h:1.1.1.1 Mon Jul 25 21:42:53 2005
+++ nps/jnet/jnet_plat_src.h Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Ethernet over Prs driver for Linux kernel 2.4
// ----------------------------------------------------------------------------
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
// ----------------------------------------------------------------------------
// $Header$
================================================================
Index: nps/jnet/jnet_shared.c
diff -u nps/jnet/jnet_shared.c:1.2 nps/jnet/jnet_shared.c:1.3
--- nps/jnet/jnet_shared.c:1.2 Sun Jul 31 01:36:25 2005
+++ nps/jnet/jnet_shared.c Mon Apr 10 13:25:54 2006
@@ -4,21 +4,8 @@
// Ethernet over Prs driver for Linux kernel 2.4
// ----------------------------------------------------------------------------
//
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+// (c) 2002-2003 Newisys, Inc. All rights reserved.
+// $GPL$
//
// ----------------------------------------------------------------------------
// $Header$
@@ -90,9 +77,9 @@
#include <asm/uaccess.h>
#include <asm/checksum.h>
#include <linux/pci.h>
-#include <linux/byteorder/swab.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
+#include <linux/byteorder/swab.h>
#include <linux/fs.h>
#include <asm/unistd.h>
@@ -119,7 +106,7 @@
/*** Global Variables ***/
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
extern struct net_device *jnet_devs;
#else
extern struct net_device jnet_devs[1];
@@ -165,7 +152,7 @@
DEBUGP(D_TRACE, ("+init module\n"));
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
jnet_devs = alloc_netdev(sizeof(jnet_priv), JNET_DEVICE_NAME, jnet_init);
if(jnet_devs == NULL) {
DEBUGP(D_ERROR, ("unable to allocate netdev\n"));
@@ -178,7 +165,7 @@
if ( (rc = register_netdev(jnet_devs)) ) {
DEBUGP(D_ERROR, ("error %i registering device \"%s\"\n",
rc, jnet_devs[0].name));
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
free_netdev(jnet_devs);
#endif //2.4 vs 2.6 kernel
@@ -198,7 +185,7 @@
DEBUGP(D_ERROR, ("register_chrdev failed\n"));
unregister_netdev(jnet_devs);
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
free_netdev(jnet_devs);
#endif //2.4 vs 2.6 kernel
}
@@ -228,7 +215,7 @@
devfs_unregister_chrdev( jnet_major_num, CHAR_DEVICE_NAME);
unregister_netdev(jnet_devs);
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
free_netdev(jnet_devs);
#endif //2.4 vs 2.6 kernel
return -EBUSY;
@@ -261,7 +248,7 @@
DEBUGP( D_TRACE, ("+cleanup_module\n"));
unregister_netdev(jnet_devs);
-#if LINUX_VERSION_CODE <= MAX_2_4_KERNEL
+#if defined(LINUX_VERSION_CODE) && LINUX_VERSION_CODE <= MAX_2_4_KERNEL
if(jnet_devs[0].priv) {
kfree(jnet_devs[0].priv);
}
@@ -282,7 +269,7 @@
DEBUGP(D_WARNING, ("unregister_chrdev failed\n"));
}
-#if LINUX_VERSION_CODE > MAX_2_4_KERNEL
+#if !defined(LINUX_VERSION_CODE) || LINUX_VERSION_CODE > MAX_2_4_KERNEL
free_netdev(jnet_devs);
#endif //2.4 vs 2.6 kernel
================================================================
Index: nps/jnet/makefile.2_6
diff -u nps/jnet/makefile.2_6:1.5 nps/jnet/makefile.2_6:1.6
--- nps/jnet/makefile.2_6:1.5 Thu Sep 22 01:37:48 2005
+++ nps/jnet/makefile.2_6 Mon Apr 10 13:25:54 2006
@@ -1,11 +1,36 @@
TARGET = jnet_prs.ko
-EXTRA_CFLAGS += -I$(TOPDIR)/common -DPLATFORM=1 -DSP=0 -DLINUX_2_6_KERNEL=1
+CFG=up
+
+EXTRA_CFLAGS += -I$(M)/../common -DPLATFORM=1 -DSP=0 -DLINUX_2_6_KERNEL=1
obj-m := jnet_prs.o
jnet_prs-objs := jnet_plat_src.o jnet_shared.o
all:
- $(MAKE) -C $(KERNEL_DIR) M=$(PWD) TOPDIR=$(TOPDIR) modules
+ install -d o/include/linux
+ if [ -f "$(KERNEL_DIR)/config-$(CFG)" ] ; then \
+ ln -sf $(KERNEL_DIR)/config-$(CFG) o/.config ; \
+ else \
+ ln -sf $(KERNEL_DIR)/.config o/.config ; \
+ fi
+ if [ -f "$(KERNEL_DIR)/Module.symvers-$(CFG)" ] ; then \
+ ln -sf $(KERNEL_DIR)/Module.symvers-$(CFG) o/Module.symvers ; \
+ else \
+ ln -sf $(KERNEL_DIR)/Module.symvers o/Module.symvers ; \
+ fi
+ if [ -f "$(KERNEL_DIR)/include/linux/autoconf-$(CFG).h" ] ; then \
+ ln -sf $(KERNEL_DIR)/include/linux/autoconf-$(CFG).h o/include/linux/autoconf.h ; \
+ else \
+ ln -sf $(KERNEL_DIR)/include/linux/autoconf.h o/include/linux/autoconf.h ; \
+ fi
+ if [ -f "$(KERNEL_DIR)/.config" ] ; then \
+ install -d o/include/config ; \
+ touch o/include/config/MARKER ; \
+ rm -f o/scripts 2>/dev/null ; ln -s $(KERNEL_DIR)/scripts o/scripts ; \
+ else \
+ $(MAKE) -C $(KERNEL_DIR) O=$(PWD)/o prepare scripts ; \
+ fi
+ $(MAKE) -C $(KERNEL_DIR) modules M=$(PWD) O=$(PWD)/o
clean:
@rm -f .jnet*
================================================================
Index: nps/jnet/swinventory.xml
diff -u nps/jnet/swinventory.xml:1.2 nps/jnet/swinventory.xml:1.3
--- nps/jnet/swinventory.xml:1.2 Sun Sep 25 21:38:42 2005
+++ nps/jnet/swinventory.xml Mon Apr 10 13:25:54 2006
@@ -2,10 +2,11 @@
<SoftwareInventory>
<Software>
<SWName>JNet</SWName>
- <SWRev>V2.3.0.9</SWRev>
+ <SWRev>V2.4.0.2</SWRev>
<SWInfo>JNet Communications Platform Driver</SWInfo>
<SWInstalledDate>0</SWInstalledDate>
- <os>linux</os>
+ <bits />
+ <os>Linux</os>
<bits></bits>
</Software>
</SoftwareInventory>
================================================================
Index: nps/nws_mc/.cvsignore
diff -u nps/nws_mc/.cvsignore:1.1 nps/nws_mc/.cvsignore:1.2
--- nps/nws_mc/.cvsignore:1.1 Sat Jul 30 12:33:43 2005
+++ nps/nws_mc/.cvsignore Mon Apr 10 13:25:54 2006
@@ -4,3 +4,4 @@
*.mod.c
.*.cmd
.tmp_versions
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/nps/TODO?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/common/dimm_map.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/common/jnet_shared.c?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/common/jnet_shared.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/common/mc.h?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/nps/common/nwsVersion.h?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/common/poci-start-script.sh?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/common/poci.h?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/common/product.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/common/sp_sockets.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/common/swinventory.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/common/swinventory.xml?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/jnet/.cvsignore?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/jnet/Makefile?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/nps/jnet/jnet_plat_src.c?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/jnet/jnet_plat_src.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/jnet/jnet_shared.c?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/jnet/makefile.2_6?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/nps/jnet/swinventory.xml?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/nws_mc/.cvsignore?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/nws_mc/Makefile?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/nps/nws_mc/makefile.2_4?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/nps/nws_mc/makefile.2_6?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/nps/nws_mc/nws_mc_src.c?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/nws_mc/swinventory.xml?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/poci/nws_hb.c?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/nps/poci/nws_hb.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/poci/nws_mc.c?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/nps/poci/nws_mc.h?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/poci/nws_poci.c?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/nps/poci/nws_poci.h?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/poci/poci.h?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/nps/poci/swinventory.xml?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list