Adding Jentu modifications to the src folder

ipxe · Jun 27, 2016 · 4392d78 · 4392d78
1 parent 8f0bec4
commit 4392d78
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 30 deletions.
diff --git a/src/config/branding.h b/src/config/branding.h
@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 #define PRODUCT_NAME ""
-#define PRODUCT_SHORT_NAME "iPXE"
-#define PRODUCT_URI "http://ipxe.org"
+#define PRODUCT_SHORT_NAME "JentuPXE - Based on iPXE"
+#define PRODUCT_URI "http://www.jentu-networks.ca"
 
 /*
  * Tag line
@@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  * by "iPXE", then the standard tag line "Open Source Network Boot
  * Firmware" is unlikely to fit neatly onto the screen.
  */
-#define PRODUCT_TAG_LINE "Open Source Network Boot Firmware"
+#define PRODUCT_TAG_LINE "JentuPXE based on iPXE - Open Source Network Boot Firmware"
 
 /*
  * Error messages

diff --git a/src/config/console.h b/src/config/console.h
@@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  */
 
 //#define	CONSOLE_SERIAL		/* Serial port console */
-//#define	CONSOLE_FRAMEBUFFER	/* Graphical framebuffer console */
+#define	CONSOLE_FRAMEBUFFER	/* Graphical framebuffer console */
 //#define	CONSOLE_SYSLOG		/* Syslog console */
 //#define	CONSOLE_SYSLOGS		/* Encrypted syslog console */
 //#define	CONSOLE_VMWARE		/* VMware logfile console */

diff --git a/src/config/general.h b/src/config/general.h
@@ -111,7 +111,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 //#define	IMAGE_EFI		/* EFI image support */
 //#define	IMAGE_SDI		/* SDI image support */
 //#define	IMAGE_PNM		/* PNM image support */
-//#define	IMAGE_PNG		/* PNG image support */
+#define	IMAGE_PNG		/* PNG image support */
 
 /*
  * Command-line commands to include

diff --git a/src/core/exec.c b/src/core/exec.c
@@ -421,6 +421,7 @@ static int echo_exec ( int argc, char **argv ) {
 		return -ENOMEM;
 
 	/* Print text */
+	/* Print the Error Code ex 0x10 Menu Fetch Error */
 	printf ( "%s%s", text, ( opts.no_newline ? "" : "\n" ) );
 
 	free ( text );

diff --git a/src/core/monojob.c b/src/core/monojob.c
@@ -78,8 +78,11 @@ int monojob_wait ( const char *string, unsigned long timeout ) {
 	int key;
 	int rc;
 
-	if ( string )
-		printf ( "%s...", string );
+	if ( string ){
+		/* HERE */
+		/* printf ( "%s ...", string); */
+		printf ( "..." );
+	}
 	monojob_rc = -EINPROGRESS;
 	last_keycheck = last_progress = last_display = currticks();
 	while ( monojob_rc == -EINPROGRESS ) {

diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c
@@ -1067,7 +1067,6 @@ static struct pci_device_id intel_nics[] = {
 	PCI_ROM ( 0x8086, 0x15a1, "i218v-2", "I218-V", 0 ),
 	PCI_ROM ( 0x8086, 0x15a2, "i218lm-3", "I218-LM", INTEL_NO_PHY_RST ),
 	PCI_ROM ( 0x8086, 0x15a3, "i218v-3", "I218-V", INTEL_NO_PHY_RST ),
-	PCI_ROM ( 0x8086, 0x15b7, "i219lm-2", "I219-LM (2)", 0 ),
 	PCI_ROM ( 0x8086, 0x15b8, "i219v-2", "I219-V (2)", 0 ),
 	PCI_ROM ( 0x8086, 0x294c, "82566dc-2", "82566DC-2", 0 ),
 	PCI_ROM ( 0x8086, 0x2e6e, "cemedia", "CE Media Processor", 0 ),

diff --git a/src/include/ipxe/errfile.h b/src/include/ipxe/errfile.h
@@ -191,7 +191,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define ERRFILE_virtio_pci	     ( ERRFILE_DRIVER | 0x007f0000 )
 #define ERRFILE_pciea		     ( ERRFILE_DRIVER | 0x00c00000 )
 #define ERRFILE_axge		     ( ERRFILE_DRIVER | 0x00c10000 )
-#define ERRFILE_thunderx	     ( ERRFILE_DRIVER | 0x00c20000 )
 
 #define ERRFILE_aoe			( ERRFILE_NET | 0x00000000 )
 #define ERRFILE_arp			( ERRFILE_NET | 0x00010000 )

diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c
@@ -25,7 +25,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <byteswap.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/vlan.h>
 #include <ipxe/iobuf.h>
 #include <ipxe/in.h>
 #include <ipxe/version.h>
@@ -1546,10 +1545,8 @@ static int efi_snp_probe ( struct net_device *netdev ) {
 	struct efi_snp_device *snpdev;
 	EFI_DEVICE_PATH_PROTOCOL *path_end;
 	MAC_ADDR_DEVICE_PATH *macpath;
-	VLAN_DEVICE_PATH *vlanpath;
 	size_t path_prefix_len = 0;
 	unsigned int ifcnt;
-	unsigned int tag;
 	void *interface;
 	EFI_STATUS efirc;
 	int rc;
@@ -1637,7 +1634,7 @@ static int efi_snp_probe ( struct net_device *netdev ) {
 	/* Allocate the new device path */
 	path_prefix_len = efi_devpath_len ( efidev->path );
 	snpdev->path = zalloc ( path_prefix_len + sizeof ( *macpath ) +
-				sizeof ( *vlanpath ) + sizeof ( *path_end ) );
+				sizeof ( *path_end ) );
 	if ( ! snpdev->path ) {
 		rc = -ENOMEM;
 		goto err_alloc_device_path;
@@ -1646,24 +1643,14 @@ static int efi_snp_probe ( struct net_device *netdev ) {
 	/* Populate the device path */
 	memcpy ( snpdev->path, efidev->path, path_prefix_len );
 	macpath = ( ( ( void * ) snpdev->path ) + path_prefix_len );
+	path_end = ( ( void * ) ( macpath + 1 ) );
 	memset ( macpath, 0, sizeof ( *macpath ) );
 	macpath->Header.Type = MESSAGING_DEVICE_PATH;
 	macpath->Header.SubType = MSG_MAC_ADDR_DP;
 	macpath->Header.Length[0] = sizeof ( *macpath );
 	memcpy ( &macpath->MacAddress, netdev->ll_addr,
 		 sizeof ( macpath->MacAddress ) );
 	macpath->IfType = ntohs ( netdev->ll_protocol->ll_proto );
-	if ( ( tag = vlan_tag ( netdev ) ) ) {
-		vlanpath = ( ( ( void * ) macpath ) + sizeof ( *macpath ) );
-		memset ( vlanpath, 0, sizeof ( *vlanpath ) );
-		vlanpath->Header.Type = MESSAGING_DEVICE_PATH;
-		vlanpath->Header.SubType = MSG_VLAN_DP;
-		vlanpath->Header.Length[0] = sizeof ( *vlanpath );
-		vlanpath->VlanId = tag;
-		path_end = ( ( ( void * ) vlanpath ) + sizeof ( *vlanpath ) );
-	} else {
-		path_end = ( ( ( void * ) macpath ) + sizeof ( *macpath ) );
-	}
 	memset ( path_end, 0, sizeof ( *path_end ) );
 	path_end->Type = END_DEVICE_PATH_TYPE;
 	path_end->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;

diff --git a/src/script.ipxe b/src/script.ipxe
@@ -0,0 +1,6 @@
+#!ipxe
+:retry
+ifclose net0
+dhcp || goto retry
+chain http://192.168.0.4/boot.php?mac=${net0/mac:hexhyp}&ip=${net0/ip} || chain http://192.168.0.4/boot.php?mac=${net0/mac:hexhyp}&ip=${net0/ip} || goto retry
+exit
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
@@ -540,11 +540,9 @@ int ipxe ( struct net_device *netdev ) {
 	 * do so.
 	 *
 	 */
-	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
-		 NORMAL " -- " PRODUCT_TAG_LINE " -- "
-		 CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
-	for_each_table_entry ( feature, FEATURES )
-		printf ( " %s", feature->name );
+	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME "\n" NORMAL );
+	//for_each_table_entry ( feature, FEATURES )
+	//	printf ( " %s", feature->name );
 	printf ( "\n" );
 
 	/* Boot system */

diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c
@@ -291,7 +291,7 @@ int ifconf ( struct net_device *netdev,
 	}
 
 	/* Wait for configuration to complete */
-	printf ( "Configuring %s%s%s(%s %s)",
+	printf ( "Configuring JentuPXE %s%s%s(%s %s)",
 		 ( configurator ? "[" : "" ),
 		 ( configurator ? configurator->name : "" ),
 		 ( configurator ? "] " : "" ),