Re: [Etherboot-developers] Etherboot 5.1.2rc7 released
Brought to you by:
marty_connor,
stefanhajnoczi
Menu
▾
▴
Re: [Etherboot-developers] Etherboot 5.1.2rc7 released
|
From: Doug A. <amb...@am...> - 2002-10-22 15:17:46
|
ke...@us... writes: | I have updated the tarball with Michael Brown's latest changes and it's | available from: | | http://www.etherboot.org/etherboot-5.1.2rc7.tar.bz2 | | I have tested it with a 3c509 and the following work: | | + mkelf-nfl image | + mkelf-linux image | + mknbi-fdos image | + mknbi-rom image (booting itself again, works repeatedly) | | It would be appreciated if people would test: | | Other NICs | mknbi-linux with and without --first32pm | -DRELOCATION | Other options | NFS booting | anything else you normally use | | and post here. | | You *need* mknbi-1.2-10 to make the images. mknbi-1.2-10 will appear at | the site as soon as the release system shows the files I have uploaded; | it seems to be taking a weekend holiday. I haven't tried to boot FreeBSD for a while. I needed to make some minor changes due to re-structure and a typo. I also added some Intel 10/100pro Id's. We should probably just match on anything matching 103X. I also haven't tried the external menu. I used the internal menu a lot and can't get the external menu to work or any older netboot images like nbgrub or netboot versions of tagged DOS images. Results from the netboot dos image. Probing pci nic... [E1000]Ethernet addr: 00:E0:81:50:15:F7 Searching for server (DHCP)... ..Me: 192.168.99.192, Server: 192.168.99.254, Gateway 192.168.99.254 Loading 192.168.99.254:/tftpboot/menu ..(NBI)........................... [ lots of dots deleted ] .....................................................Unable to load file. <sleep> <abort> [E1000]Ethernet addr: 00:E0:81:50:15:F7 Results from the nbgrub image. Searching for server (DHCP)... ..Me: 192.168.99.192, Server: 192.168.99.254, Gateway 192.168.99.254 Loading 192.168.99.254:/tftpboot/menu ..(NBI)segment [00010200, 0002E48C) overlaps etherboot [00020000, 000308D0) error: not a valid image Unable to load file. <sleep> I had similar trouble with the external menu. Actually I wasn't sure how to even create an external menu that functioned the same as the internal menu. I tried mknbi-1.2-10 but anything I did resulted in it not working. It might be usefull to show exactly how to create an external menu that is compatible to the old system. Either that or I'm just to dumb to figure it out. Anyhow here are the patches that boot FreeBSD image and build and FreeBSD. diff -r -u etherboot-5.1.2rc7.orig/src/eepro100.c etherboot-5.1.2rc7/src/eepro100.c --- etherboot-5.1.2rc7.orig/src/eepro100.c Tue Oct 15 05:56:37 2002 +++ etherboot-5.1.2rc7/src/eepro100.c Mon Oct 21 10:39:36 2002 @@ -669,6 +671,10 @@ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1029, "Intel EtherExpressPro100 ID1029" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1030, + "Intel Corporation 82559 InBusiness 10/100" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1039, + "Intel Corporation 82559 InBusiness 10/100" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID103A, "Intel Corporation 82559 InBusiness 10/100" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82562, "Intel EtherExpressPro100 82562EM" }, diff -r -u etherboot-5.1.2rc7.orig/src/etherboot.h etherboot-5.1.2rc7/src/etherboot.h --- etherboot-5.1.2rc7.orig/src/etherboot.h Tue Oct 15 05:56:37 2002 +++ etherboot-5.1.2rc7/src/etherboot.h Mon Oct 21 09:01:42 2002 @@ -720,7 +720,8 @@ extern unsigned char *end_of_rfc1533; #ifdef IMAGE_FREEBSD extern int freebsd_howto; -extern char freebsd_kernel_env[]; +#define FREEBSD_KERNEL_ENV_SIZE 256 +extern char freebsd_kernel_env[FREEBSD_KERNEL_ENV_SIZE]; #endif /* bootmenu.c */ diff -r -u etherboot-5.1.2rc7.orig/src/main.c etherboot-5.1.2rc7/src/main.c --- etherboot-5.1.2rc7.orig/src/main.c Tue Oct 15 05:56:37 2002 +++ etherboot-5.1.2rc7/src/main.c Mon Oct 21 09:02:20 2002 @@ -30,7 +30,7 @@ #ifdef IMAGE_FREEBSD int freebsd_howto = 0; -char freebsd_kernel_env[256]; +char freebsd_kernel_env[FREEBSD_KERNEL_ENV_SIZE]; #endif #ifdef FREEBSD_PXEEMU diff -r -u etherboot-5.1.2rc7.orig/src/nrv2b.c etherboot-5.1.2rc7/src/nrv2b.c --- etherboot-5.1.2rc7.orig/src/nrv2b.c Wed Aug 21 13:00:14 2002 +++ etherboot-5.1.2rc7/src/nrv2b.c Mon Oct 21 09:05:20 2002 @@ -36,7 +36,11 @@ #include <string.h> #include <ctype.h> #include <errno.h> +#ifdef __FreeBSD__ +#include <inttypes.h> +#else #include <stdint.h> +#endif #include <limits.h> #include <assert.h> #if UCLPACK_COMPAT diff -r -u etherboot-5.1.2rc7.orig/src/osloader.c etherboot-5.1.2rc7/src/osloader.c --- etherboot-5.1.2rc7.orig/src/osloader.c Tue Oct 15 05:56:37 2002 +++ etherboot-5.1.2rc7/src/osloader.c Mon Oct 21 12:46:24 2002 @@ -1390,7 +1390,7 @@ freebsd_howto |= 0x80000000; } - xstart32(entry, freebsd_hofwto, NODEV, 0, 0, 0, + xstart32(entry, freebsd_howto, NODEV, 0, 0, 0, virt_to_phys(&info.bsdinfo), 0, 0, 0); longjmp(restart_etherboot, -2); } diff -r -u etherboot-5.1.2rc7.orig/src/pci_ids.h etherboot-5.1.2rc7/src/pci_ids.h --- etherboot-5.1.2rc7.orig/src/pci_ids.h Tue Oct 15 05:56:37 2002 +++ etherboot-5.1.2rc7/src/pci_ids.h Mon Oct 21 09:26:14 2002 @@ -1620,6 +1620,8 @@ #define PCI_DEVICE_ID_INTEL_ID1029 0x1029 #define PCI_DEVICE_ID_INTEL_ID1030 0x1030 #define PCI_DEVICE_ID_INTEL_ID1038 0x1038 +#define PCI_DEVICE_ID_INTEL_ID1039 0x1039 +#define PCI_DEVICE_ID_INTEL_ID103A 0x103A #define PCI_DEVICE_ID_INTEL_82562ET 0x1031 #define PCI_DEVICE_ID_INTEL_82559ER 0x1209 #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 |
