Merge from Etherboot 5.4

diff --cc src/include/etherboot.h
index 83f117e,e61a711..b9546c0
--- 1/src/include/etherboot.h
--- 2/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@@ -159,7 -145,12 +159,7 @@@ struct arptable_t 
        uint8_t node[6];
  } PACKED;
  
 -struct igmptable_t {
 -      in_addr group;
 -      unsigned long time;
 -} PACKED;
 -
--#define       KERNEL_BUF      (BOOTP_DATA_ADDR->bootp_reply.bp_file)
++#define       KERNEL_BUF      (bootp_data.bootp_reply.bp_file)
  
  #define       FLOPPY_BOOT_LOCATION    0x7c00
  
@@@ -282,6 -288,6 +282,8 @@@ External variable
  extern struct rom_info rom;
  extern char *hostname;
  extern int hostnamelen;
++extern unsigned char *addparam;
++extern int addparamlen;
  extern jmp_buf restart_etherboot;
  extern int url_port;
  extern struct arptable_t arptable[MAX_ARP];