* [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
@ 2015-09-03 13:02 Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 1/4] ipxe: update from " Gerd Hoffmann
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-03 13:02 UTC (permalink / raw
To: qemu-devel; +Cc: Gerd Hoffmann
Hi,
Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
now. Also upstream has a named configuration for qemu. That simplifies
the whole process, I could drop some patches and so there are only 4 of
them left, two of them being the actual ipxe update (one submodule, one
binaries).
Note that this is NOT current git master. Michael Brown added support
for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
commit before that work started to have a stable and known-good base.
I'll have a look a the new code shortly though, so stay tuned for more
ipxe updates.
cheers,
Gerd
The following changes since commit f8b8091d2779d956011a3fb83ff60dbf7465c71d:
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-09-01-v2-tag' into staging (2015-09-01 19:42:43 +0100)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-ipxe-20150903-1
for you to fetch changes up to f4798320144245da66128edb840bd940fd287d28:
ipxe: update binaries (2015-09-03 14:46:24 +0200)
----------------------------------------------------------------
ipxe: update to 35c53797 to 4e03af8, build tweaks.
----------------------------------------------------------------
Gerd Hoffmann (4):
ipxe: update from 35c53797 to 4e03af8
ipxe: don't override GITVERSION
ipxe: use upstream configuration
ipxe: update binaries
pc-bios/efi-e1000.rom | Bin 197120 -> 196608 bytes
pc-bios/efi-eepro100.rom | Bin 197632 -> 197120 bytes
pc-bios/efi-ne2k_pci.rom | Bin 195584 -> 195584 bytes
pc-bios/efi-pcnet.rom | Bin 195584 -> 195584 bytes
pc-bios/efi-rtl8139.rom | Bin 200192 -> 199168 bytes
pc-bios/efi-virtio.rom | Bin 194048 -> 193024 bytes
roms/Makefile | 11 ++++-------
roms/config.ipxe.general.h | 4 ----
roms/ipxe | 2 +-
9 files changed, 5 insertions(+), 12 deletions(-)
delete mode 100644 roms/config.ipxe.general.h
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 1/4] ipxe: update from 35c53797 to 4e03af8
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
@ 2015-09-03 13:02 ` Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 2/4] ipxe: don't override GITVERSION Gerd Hoffmann
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-03 13:02 UTC (permalink / raw
To: qemu-devel; +Cc: Gerd Hoffmann
git shortlog
============
Alex Williamson (1):
[dhcp] Extract timing parameters out to config/dhcp.h
Bernd Wiebelt (1):
[tg3] Add support for BCM57766
Christian Hesse (3):
[intel] Add PCI device IDs for Intel I218-LM and I218-V
[build] Add missing "const" qualifiers
[ath9k] Remove confusing logic inversion in an ANI variable
Christian Nilsson (1):
[bios] Add ANSI blink attribute
Daniel Pieczko (1):
[prefix] Use correct register for KEEP_IT_REAL physical address conversion
Ed Swierk (1):
[intel] Update PCI device IDs for Intel 82599 and X540 10G NICs
Fabrice Bacchella (2):
[efi] Improve NII driver logging
[efi] Work around bugs in Emulex NII driver
Laszlo Ersek (1):
[virtio] Downgrade per-iobuf debug messages to DBGC2
Michael Brown (284):
[device] Provide a driver-private data field for root devices
[iobuf] Add iob_split() to split an I/O buffer into portions
[rndis] Add generic RNDIS device abstraction
[hyperv] Add support for Hyper-V hypervisor
[hyperv] Add support for VMBus devices
[hyperv] Add support for NetVSC paravirtual network devices
[rndis] Send RNDIS_INITIALISE_MSG
[rndis] Send RNDIS_HALT_MSG
[hyperv] Tear down NetVSC RX buffer GPADL after closing VMBus device
[rndis] Clear receive filter when closing the device
[hyperv] Receive all VMBus messages in a poll
[hyperv] Increase TX ring size
[hyperv] Assume that VMBus xfer page ranges correspond to RNDIS messages
[rndis] Ignore start-of-day RNDIS_INDICATE_STATUS_MSG with status 0x40020006
[hyperv] Tidy up debug output
[hyperv] Require support for VMBus version 3.0 or newer
[build] Include Hyper-V driver in the all-drivers build
[pci] Allow drivers to specify a PCI class
[romprefix] Ensure UNDI loader can be included by all ROM types
[usb] Add basic support for USB devices
[usb] Add basic support for USB hubs
[usb] Add support for xHCI host controllers
[ncm] Add support for CDC-NCM USB Ethernet devices
[usb] Report xHCI host controller events
[ncm] Use large multi-packet buffers by default
[tftp] Explicitly abort connection whenever parent interface is closed
[uri] Allow tftp_uri() to construct a URI with a custom port
[pxe] Use tftp_uri() to construct PXE TFTP URIs
[pxe] Maintain a queue for received PXE UDP packets
[ncm] Reserve headroom in received packets
[usb] Try multiple USB device configurations
[usb] Handle CDC union functional descriptors
[usb] Parse endpoint descriptor bInterval field
[usb] Allow usb_stream() to enforce a terminating short packet
[ecm] Add support for CDC-ECM USB Ethernet devices
[xhci] Delay after (possibly) forcing port link state to RxDetect
[build] Move branding information to config/branding.h
[build] Use PRODUCT_SHORT_NAME for end-user visible strings
[build] Allow product URI to be customised via config/branding.h
[build] Allow error message URI to be customised via config/branding.h
[build] Allow command help text URI to be customised via config/branding.h
[build] Allow setting help text URI to be customised via config/branding.h
[build] Allow product tag line to be customised via config/branding.h
[rndis] Add rndis_rx_err()
[usb] Handle port status changes received after failing to find a driver
[efi] Disallow R_X86_64_32 relocations
[build] Apply the "-fno-PIE -nopie" workaround only to i386 builds
[usb] Provide generic framework for refilling receive endpoints
[usb] Use generic refill framework for USB hub interrupt endpoints
[ecm] Use generic refill framework for bulk IN and interrupt endpoints
[ncm] Use generic refill framework for bulk IN and interrupt endpoints
[libc] Remove unused string functions
[libc] Rewrite string functions
[test] Add self-tests for more string functions
[test] Add constant-length memset() self-tests
[libc] Reduce size of memset()
[usb] Add generic USB network device framework
[ecm] Use generic USB network device framework
[ncm] Use generic USB network device framework
[timer] Rewrite the 8254 Programmable Interval Timer support
[xhci] Leak memory if controller fails to disable slot
[xhci] Abort commands on timeout
[test] Add IPv4 self-tests
[legal] Add missing copyright header to net/ipv4.c
[ipv4] Rewrite inet_aton()
[libc] Rewrite strtoul()
[hyperv] Check for required features
[prefix] Use .bss16 as temporary stack space for calls to install_block
[zbin] Use LZMA compression
[zbin] Perform extra normalisation after completing decompression
[prefix] Call decompressor in flat real mode when DEBUG=libprefix is enabled
[zbin] Allow decompressor to generate debug output via BIOS console
[zbin] Fix check for existence of most recent output byte
[zbin] Remove now-unused unnrv2b.S decompressor
[legal] Update GPLv2 licence text
[legal] Include full licence text for all GPL2_OR_LATER files
[mucurses] Add missing FILE_LICENCE declarations
[legal] Add support for the Unmodified Binary Distribution Licence
[legal] Add UBDL relicensing tool
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[libc] Rewrite unrelicensable portions of stddef.h
[libc] Rewrite unrelicensable portions of ctype.h
[libc] Rewrite setjmp() and longjmp()
[libc] Rewrite byte-swapping code
[elf] Rewrite ELF header
[list] Relicense list.h
[iscsi] Rewrite unrelicensable portions of iscsi.c
[pci] Remove outdated and mostly-unused pci_ids.h file
[pci] Rewrite unrelicensable portions of pci.h
[settings] Use list_first_entry() when unregistering child settings
[settings] Rewrite unrelicensable portions of settings.c
[menu] Abstract out the generic concept of a jump scroller
[settings] Use generic jump scrolling abstraction
[malloc] Move valgrind headers out of arch/x86
[malloc] Rewrite unrelicensable portions of malloc.c
[build] Remove unused IMPORT_SYMBOL() and EXPORT_SYMBOL() macros
[build] Remove unused __keepme macro
[pxe] Remove obsolete references to pxeparent_dhcp
[build] Remove obsolete and unused portions of config.c
[build] Use REQUIRE_OBJECT() to drag in per-object configuration
[build] Fix the REQUIRE_SYMBOL mechanism
[i386] Move real_to_user() to realmode.h
[linux] Rewrite headers included in all builds
[retry] Rewrite unrelicensable portions of retry.c
[retry] Colourise debug output
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[xhci] Enable USB3 ports on Intel PCH8/PCH9 controllers
[xhci] Undo PCH-specific quirk fixes when removing device
[xen] Set the "feature-rx-notify" flag for netfront devices
[http] Abstract out HTTP Digest hash algorithm operations
[http] Support MD5-sess Digest authentication
[dm96xx] Add driver for Davicom DM96xx USB Ethernet NICs
[legal] Relicense Davicom DM96xx drivers
[mii] Add generic mii_check_link() function
[smsc75xx] Add driver for SMSC/Microchip LAN75xx USB Ethernet NICs
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
[tcp] Implement support for TCP Selective Acknowledgements (SACK)
[smsc75xx] Move RX FIFO overflow message to DBGLVL_EXTRA
[tcpip] Fix dubious calculation of min_port
[libc] Add ffs(), ffsl(), and ffsll()
[usb] Add the concept of a USB bus maximum transfer size
[ncm] Respect maximum transfer size of the bus
[usb] Add functions for manual device address assignment
[xhci] Forcibly disable SMIs if BIOS fails to release ownership
[autoboot] Match against parent devices when matching by bus type and location
[usb] Add config/usb.h for USB configuration options
[xhci] Do not release ownership back to BIOS when booting an OS
[ehci] Add support for EHCI host controllers
[netdevice] Add missing bus types to netdev_fetch_bustype()
[usb] Fix USB timeouts to match specification
[libprefix] Fix building on 64-bit FreeBSD 8.4
[xhci] Ring doorbell as part of endpoint reset
[usb] Reset endpoints without waiting for a new transfer to be enqueued
[usb] Add clear_tt() hub method to clear transaction translator buffer
[usb] Clear transaction translator buffers when applicable
[ehci] Support USB1 devices attached via transaction translators
[usb] Improve debug messages for failed control transactions
[xhci] Support USB1 devices attached via transaction translators
[libc] Fix typo in longjmp()
[libc] Add x86_64 versions of setjmp() and longjmp()
[test] Add setjmp()/longjmp() self-tests
[test] Simplify digest algorithm self-tests
[crypto] Add SHA-224 algorithm
[crypto] Add SHA-512 algorithm
[crypto] Add SHA-384 algorithm
[crypto] Add SHA-512/256 algorithm
[crypto] Add SHA-512/224 algorithm
[efi] Ensure drivers are disconnected when ExitBootServices() is called
[peerdist] Add support for decoding PeerDist Content Information
[xhci] Always reset root hub ports
[romprefix] Allow autoboot device filter to be disabled
[util] Add ability to dump PCI device ID list
[efi] Add EFI entropy source
[efi] Add EFI time source
[efi] Provide a dummy data block in nii_initialise()
[efi] Poll media status only if advertised as supported
[efi] Poll for TX completions only when there is an outstanding TX buffer
[efi] Use the EFI_RNG_PROTOCOL as an entropy source if available
[eepro100] Remove duplicate PCI_ROM() line
[prism2] Remove duplicate PCI_ROM() lines
[build] Allow building PCI ROMs with device ID lists
[build] Fix compiler warning on OpenBSD 5.7
[build] Work around binutils quirk on OpenBSD 5.7
[build] Use a single call to parserom.pl to speed up building
[intel] Report any unexpected interrupt causes
[intel] Force RX polling on VMware emulated 82545em
[realtek] Do not attempt to access EEPROM on RTL8169 chips
[rtl818x] Obviate RTL_ROM() hack
[build] Construct all-drivers list based on driver class
[test] Include IPv6 support when performing settings self-tests
[base16] Add buffer size parameter to base16_encode() and base16_decode()
[base64] Add buffer size parameter to base64_encode() and base64_decode()
[settings] Add "base64" setting type
[vram] Add "vram" built-in setting to dump video RAM
[usb] Include setup packet within I/O buffer for message transfers
[pci] Provide PCI_CLASS() to calculate a scalar PCI class value
[usb] Detect missed disconnections
[usb] Maintain a list of all USB buses
[usb] Maintain single lists of halted endpoints and changed ports
[ehci] Poll child companion controllers after disowning port
[usb] Add find_usb_bus_by_location() helper function
[ehci] Allow UHCI/OHCI controllers to locate the EHCI companion controller
[uhci] Add support for UHCI host controllers
[usb] Provide usb_endpoint_name() for use by host controller drivers
[xhci] Use meaningful device names in debug messages
[ehci] Use meaningful device names in debug messages
[uhci] Use meaningful device names in debug messages
[ipv6] Disambiguate received ICMPv6 errors
[usb] Add USB_INTERRUPT_OUT internal type
[usb] Add generic USB human interface device (HID) framework
[usb] Add basic support for USB keyboards
[usb] Do not call usb_hotplug() when registering a new hub
[usb] Always clear recorded disconnections after performing hotplug actions
[intel] Expose intel_diag() for use by other Intel NIC drivers
[intel] Allow for the use of advanced TX descriptors
[intel] Add support for mailbox used by virtual functions
[intel] Add intelxvf driver for Intel 10 GigE virtual function NICs
[int13con] Add basic ability to log to a local disk via INT 13
[intel] Add intelxvf_stats() to dump packet statistics registers
[intel] Fix operation when physical function has jumbo frames enabled
[neighbour] Return success when deferring a packet
[xhci] Fix length of allocated slot array
[build] Fix .ids.o creation for drivers not in the all-drivers build
[xhci] Fix comparison of signed and unsigned integers
[ipoib] Fix REMAC cache discarder
[xhci] Record device-specific quirks in xHCI device structure
[xhci] Ignore invalid protocol speed ID values on Intel Skylake platforms
[pci] Use flat real mode to call INT 1a,b101
[tcp] Do not shrink window when discarding received packets
[mromprefix] Report a dummy size at offset 0x02 of .mrom payload
[ethernet] Add minimal support for receiving LLC frames
[netdevice] Add a generic concept of a "blocked link"
[stp] Add support for detecting Spanning Tree Protocol non-forwarding ports
[stp] Fix interpretaton of hello time
[dhcp] Defer discovery if link is blocked
[pxe] Always reconstruct packet for PXENV_GET_CACHED_INFO
[serial] Add general abstraction of a 16550-compatible UART
[gdb] Use new UART abstraction in GDB serial transport
[serial] Use new UART abstraction in serial console driver
[ipoib] Mark REMAC cache as expensive
[ipoib] Attempt to generate ARPs as needed to repopulate REMAC cache
[gdb] Allow gdbstub to be started on an arbitrary serial port
[xen] Wait for and clear XenStore event before receiving data
[tcp] Gracefully close connections during shutdown
[ipoib] Transmit multicast packets as broadcasts
[efi] Fix receive and transmit completion reporting
[efi] Allow user experience to be downgraded
[build] Add named configuration for qemu
[tcp] Ensure FIN is actually sent if connection is closed while idle
[fault] Generalise NETDEV_DISCARD_RATE fault injection mechanism
[fault] Add inject_corruption() to randomly corrupt data
[profile] Add profile_custom() for profiling with arbitrary time units
[interface] Add intf_poke() helper
[xfer] Use intf_poke() to implement xfer_window_changed()
[xfer] Add xfer_check_order() utility function
[xferbuf] Generalise to handle umalloc()-based buffers
[xferbuf] Add xfer_buffer() to provide direct access to underlying buffer
[downloader] Use generic data-transfer buffer mechanism
[downloader] Provide direct access to the underlying data transfer buffer
[build] Fix compiler warnings on some gcc versions
[crypto] Add bit-rotation functions for 8-bit and 16-bit values
[802.11] Use correct SHA1_DIGEST_SIZE constant name
[crypto] Add ECB block cipher mode (for debug and self-tests only)
[test] Generalise cipher tests and use okx()
[test] Define shortcuts for frequently-used NIST AES test vectors
[test] Add NIST self-tests for AES128 and AES256 in ECB mode
[crypto] Replace AES implementation
[test] Add NIST self-tests for AES192 in ECB and CBC modes
[crypto] Remove AXTLS headers
[build] Fix strict-aliasing warning on older gcc versions
[ipv6] Treat a missing network device name as "netX"
[netdevice] Avoid using zero as a network device index
[ipv4] Redefine IP address constants to avoid unnecessary byte swapping
[ipv4] Allow IPv4 socket addresses to include a scope ID
[iscsi] Add missing "break" statements
[netdevice] Allow network devices to disclaim IRQ support at runtime
[peerdist] Include trimmed range within content information block
[peerdist] Add support for constructing and decoding discovery messages
[peerdist] Add support for constructing and decoding retrieval messages
[pool] Add a generic concept of a pooled connection
[linebuf] Support buffering of multiple lines
[elf] Reject ELFBoot images requiring virtual addressing
[comboot] Avoid dragging in serial console support unconditionally
[serial] Check for UART existence in uart_select()
[tls] Do not access beyond the end of a 24-bit integer
[tls] Report supported signature algorithms in ClientHello
[crypto] Support SHA-{224,384,512} in X.509 certificates
[efi] Hold off watchdog timer while running
[efi] Add missing "ULL" suffix on 64-bit constant
[block] Add generic block device translator
[http] Rewrite HTTP core to support content encodings
[peerdist] Add segment discovery mechanism
[peerdist] Add individual block download mechanism
[peerdist] Add block download multiplexer
[peerdist] Add support for PeerDist (aka BranchCache) HTTP content encoding
[dhcp] Allow pseudo-DHCP servers to use pseudo-identifiers
[dhcp] Ignore ProxyDHCPACKs without PXE options
[pxe] Warn about PXE NBPs that may be EFI executables
[test] Allow self-tests to report exit status when running under Linux
[image] Detect image type when image is first registered
[autoboot] Display image information as part of the default control flow
Olaf Hering (1):
[build] Sort objects in blib.a
Robin Smidsrød (2):
[vbox] Enable some more features now that we have LZMA compression
[build] Rewrite parserom.pl to support multiple source files
Thomas Miletich (1):
[intel] Add PCI ID for I218-LM
Tufan Karadere (1):
[crypto] Add ASN.1 OIDs for sha{224,384,512}WithRsaEncryption
Wissam Shoukair (2):
[comboot] Implement INT22,0x000c
[ipoib] Fix a race when chain-loading undionly.kpxe in IPoIB
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
roms/ipxe | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/ipxe b/roms/ipxe
index 35c5379..4e03af8 160000
--- a/roms/ipxe
+++ b/roms/ipxe
@@ -1 +1 @@
-Subproject commit 35c5379760aa1fea5e38f7a78b090f92bb7813ee
+Subproject commit 4e03af8ec2d497e725566a91fd5c19dd604c18a6
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 2/4] ipxe: don't override GITVERSION
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 1/4] ipxe: update from " Gerd Hoffmann
@ 2015-09-03 13:02 ` Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 3/4] ipxe: use upstream configuration Gerd Hoffmann
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-03 13:02 UTC (permalink / raw
To: qemu-devel; +Cc: Gerd Hoffmann
We had build problems due to the git version checking in the ipxe build
system in the past. Don't remember the details, but the problem seems
to be gone now, so lets remove the workaround.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
[ most likely ipxe commit 6153c09c41034250408f3596555fcaae715da46c:
[build] Set GITVERSION only if there is a git repository ]
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
roms/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index 7b3f156..eb13836 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -121,12 +121,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
-o ../pc-bios/efi-$*.rom
build-pxe-roms: ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src GITVERSION="" \
+ $(MAKE) -C ipxe/src \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin/%.rom,$(pxerom_targets))
build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src GITVERSION="" \
+ $(MAKE) -C ipxe/src \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 3/4] ipxe: use upstream configuration
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 1/4] ipxe: update from " Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 2/4] ipxe: don't override GITVERSION Gerd Hoffmann
@ 2015-09-03 13:02 ` Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 4/4] ipxe: update binaries Gerd Hoffmann
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-03 13:02 UTC (permalink / raw
To: qemu-devel; +Cc: Gerd Hoffmann
Upstream supports named configurations now and ships with
settings for qemu. Use them, drop our config header copying.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
roms/Makefile | 11 ++++-------
roms/config.ipxe.general.h | 4 ----
2 files changed, 4 insertions(+), 11 deletions(-)
delete mode 100644 roms/config.ipxe.general.h
diff --git a/roms/Makefile b/roms/Makefile
index eb13836..09e33b5 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -120,20 +120,17 @@ efi-rom-%: build-pxe-roms build-efi-roms
-ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
-o ../pc-bios/efi-$*.rom
-build-pxe-roms: ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src \
+build-pxe-roms:
+ $(MAKE) -C ipxe/src CONFIG=qemu \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin/%.rom,$(pxerom_targets))
-build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src \
+build-efi-roms: build-pxe-roms
+ $(MAKE) -C ipxe/src CONFIG=qemu \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
-ipxe/src/config/local/%: config.ipxe.%
- cp $< $@
-
slof:
$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
diff --git a/roms/config.ipxe.general.h b/roms/config.ipxe.general.h
deleted file mode 100644
index 619ee4c..0000000
--- a/roms/config.ipxe.general.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef BANNER_TIMEOUT
-#define BANNER_TIMEOUT 30
-#undef ROM_BANNER_TIMEOUT
-#define ROM_BANNER_TIMEOUT 0
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 4/4] ipxe: update binaries
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
` (2 preceding siblings ...)
2015-09-03 13:02 ` [Qemu-devel] [PULL 3/4] ipxe: use upstream configuration Gerd Hoffmann
@ 2015-09-03 13:02 ` Gerd Hoffmann
2015-09-03 13:32 ` [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Peter Maydell
2015-09-22 19:29 ` Peter Maydell
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-03 13:02 UTC (permalink / raw
To: qemu-devel; +Cc: Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
pc-bios/efi-e1000.rom | Bin 197120 -> 196608 bytes
pc-bios/efi-eepro100.rom | Bin 197632 -> 197120 bytes
pc-bios/efi-ne2k_pci.rom | Bin 195584 -> 195584 bytes
pc-bios/efi-pcnet.rom | Bin 195584 -> 195584 bytes
pc-bios/efi-rtl8139.rom | Bin 200192 -> 199168 bytes
pc-bios/efi-virtio.rom | Bin 194048 -> 193024 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom
index 4e29d9d..4bc89a3 100644
Binary files a/pc-bios/efi-e1000.rom and b/pc-bios/efi-e1000.rom differ
diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom
index 2a92d6f..85b7f9b 100644
Binary files a/pc-bios/efi-eepro100.rom and b/pc-bios/efi-eepro100.rom differ
diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom
index 6366017..ebafd84 100644
Binary files a/pc-bios/efi-ne2k_pci.rom and b/pc-bios/efi-ne2k_pci.rom differ
diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom
index a61f586..6f19723 100644
Binary files a/pc-bios/efi-pcnet.rom and b/pc-bios/efi-pcnet.rom differ
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom
index c9c77ea..086551b 100644
Binary files a/pc-bios/efi-rtl8139.rom and b/pc-bios/efi-rtl8139.rom differ
diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom
index eec2790..140c680 100644
Binary files a/pc-bios/efi-virtio.rom and b/pc-bios/efi-virtio.rom differ
--
1.8.3.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
` (3 preceding siblings ...)
2015-09-03 13:02 ` [Qemu-devel] [PULL 4/4] ipxe: update binaries Gerd Hoffmann
@ 2015-09-03 13:32 ` Peter Maydell
2015-09-15 10:25 ` Gerd Hoffmann
2015-09-22 19:29 ` Peter Maydell
5 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2015-09-03 13:32 UTC (permalink / raw
To: Gerd Hoffmann; +Cc: QEMU Developers
On 3 September 2015 at 14:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
> Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
> now. Also upstream has a named configuration for qemu. That simplifies
> the whole process, I could drop some patches and so there are only 4 of
> them left, two of them being the actual ipxe update (one submodule, one
> binaries).
>
> Note that this is NOT current git master. Michael Brown added support
> for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
> commit before that work started to have a stable and known-good base.
>
> I'll have a look a the new code shortly though, so stay tuned for more
> ipxe updates.
These patches appear to be not merely trivial "update submodule",
but some other changes too. I'd prefer them to appear on the list
as patches first for review, rather than making their first
appearance in a pull request.
thanks
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
2015-09-03 13:32 ` [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Peter Maydell
@ 2015-09-15 10:25 ` Gerd Hoffmann
2015-09-22 12:18 ` Gerd Hoffmann
0 siblings, 1 reply; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-15 10:25 UTC (permalink / raw
To: Peter Maydell; +Cc: QEMU Developers
On Do, 2015-09-03 at 14:32 +0100, Peter Maydell wrote:
> On 3 September 2015 at 14:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > Hi,
> >
> > Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
> > now. Also upstream has a named configuration for qemu. That simplifies
> > the whole process, I could drop some patches and so there are only 4 of
> > them left, two of them being the actual ipxe update (one submodule, one
> > binaries).
> >
> > Note that this is NOT current git master. Michael Brown added support
> > for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
> > commit before that work started to have a stable and known-good base.
> >
> > I'll have a look a the new code shortly though, so stay tuned for more
> > ipxe updates.
>
> These patches appear to be not merely trivial "update submodule",
> but some other changes too. I'd prefer them to appear on the list
> as patches first for review, rather than making their first
> appearance in a pull request.
Patches have been on the list now for a week, without comments.
Pull now?
cheers,
Gerd
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
2015-09-15 10:25 ` Gerd Hoffmann
@ 2015-09-22 12:18 ` Gerd Hoffmann
2015-09-22 13:51 ` Peter Maydell
0 siblings, 1 reply; 10+ messages in thread
From: Gerd Hoffmann @ 2015-09-22 12:18 UTC (permalink / raw
To: Peter Maydell; +Cc: QEMU Developers
On Di, 2015-09-15 at 12:25 +0200, Gerd Hoffmann wrote:
> On Do, 2015-09-03 at 14:32 +0100, Peter Maydell wrote:
> > On 3 September 2015 at 14:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > > Hi,
> > >
> > > Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
> > > now. Also upstream has a named configuration for qemu. That simplifies
> > > the whole process, I could drop some patches and so there are only 4 of
> > > them left, two of them being the actual ipxe update (one submodule, one
> > > binaries).
> > >
> > > Note that this is NOT current git master. Michael Brown added support
> > > for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
> > > commit before that work started to have a stable and known-good base.
> > >
> > > I'll have a look a the new code shortly though, so stay tuned for more
> > > ipxe updates.
> >
> > These patches appear to be not merely trivial "update submodule",
> > but some other changes too. I'd prefer them to appear on the list
> > as patches first for review, rather than making their first
> > appearance in a pull request.
>
> Patches have been on the list now for a week, without comments.
> Pull now?
Ping?
cheers,
Gerd
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
2015-09-22 12:18 ` Gerd Hoffmann
@ 2015-09-22 13:51 ` Peter Maydell
0 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2015-09-22 13:51 UTC (permalink / raw
To: Gerd Hoffmann; +Cc: QEMU Developers
On 22 September 2015 at 05:18, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On Di, 2015-09-15 at 12:25 +0200, Gerd Hoffmann wrote:
>> On Do, 2015-09-03 at 14:32 +0100, Peter Maydell wrote:
>> > On 3 September 2015 at 14:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> > > Hi,
>> > >
>> > > Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
>> > > now. Also upstream has a named configuration for qemu. That simplifies
>> > > the whole process, I could drop some patches and so there are only 4 of
>> > > them left, two of them being the actual ipxe update (one submodule, one
>> > > binaries).
>> > >
>> > > Note that this is NOT current git master. Michael Brown added support
>> > > for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
>> > > commit before that work started to have a stable and known-good base.
>> > >
>> > > I'll have a look a the new code shortly though, so stay tuned for more
>> > > ipxe updates.
>> >
>> > These patches appear to be not merely trivial "update submodule",
>> > but some other changes too. I'd prefer them to appear on the list
>> > as patches first for review, rather than making their first
>> > appearance in a pull request.
>>
>> Patches have been on the list now for a week, without comments.
>> Pull now?
>
> Ping?
OK. I had a look through them and they seemed OK, though I wasn't
solid enough on the area to actually call that a review.
PS: if you want my attention on a pull request your email must contain
the magic words for my email filter to find it, which is why I didn't
see your previous request from a week ago.
thanks
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
` (4 preceding siblings ...)
2015-09-03 13:32 ` [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Peter Maydell
@ 2015-09-22 19:29 ` Peter Maydell
5 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2015-09-22 19:29 UTC (permalink / raw
To: Gerd Hoffmann; +Cc: QEMU Developers
On 3 September 2015 at 06:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
> Here comes the ipxe update pull. Thanks to Stefan all bits are upstream
> now. Also upstream has a named configuration for qemu. That simplifies
> the whole process, I could drop some patches and so there are only 4 of
> them left, two of them being the actual ipxe update (one submodule, one
> binaries).
>
> Note that this is NOT current git master. Michael Brown added support
> for EFI_PXE_BASE_CODE_PROTOCOL recently, and I tried to pick the last
> commit before that work started to have a stable and known-good base.
>
> I'll have a look a the new code shortly though, so stay tuned for more
> ipxe updates.
>
> cheers,
> Gerd
>
> The following changes since commit f8b8091d2779d956011a3fb83ff60dbf7465c71d:
>
> Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-09-01-v2-tag' into staging (2015-09-01 19:42:43 +0100)
>
> are available in the git repository at:
>
>
> git://git.kraxel.org/qemu tags/pull-ipxe-20150903-1
>
> for you to fetch changes up to f4798320144245da66128edb840bd940fd287d28:
>
> ipxe: update binaries (2015-09-03 14:46:24 +0200)
>
> ----------------------------------------------------------------
> ipxe: update to 35c53797 to 4e03af8, build tweaks.
>
> ----------------------------------------------------------------
> Gerd Hoffmann (4):
> ipxe: update from 35c53797 to 4e03af8
> ipxe: don't override GITVERSION
> ipxe: use upstream configuration
> ipxe: update binaries
>
> pc-bios/efi-e1000.rom | Bin 197120 -> 196608 bytes
> pc-bios/efi-eepro100.rom | Bin 197632 -> 197120 bytes
> pc-bios/efi-ne2k_pci.rom | Bin 195584 -> 195584 bytes
> pc-bios/efi-pcnet.rom | Bin 195584 -> 195584 bytes
> pc-bios/efi-rtl8139.rom | Bin 200192 -> 199168 bytes
> pc-bios/efi-virtio.rom | Bin 194048 -> 193024 bytes
> roms/Makefile | 11 ++++-------
> roms/config.ipxe.general.h | 4 ----
> roms/ipxe | 2 +-
> 9 files changed, 5 insertions(+), 12 deletions(-)
> delete mode 100644 roms/config.ipxe.general.h
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-09-22 19:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-03 13:02 [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 1/4] ipxe: update from " Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 2/4] ipxe: don't override GITVERSION Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 3/4] ipxe: use upstream configuration Gerd Hoffmann
2015-09-03 13:02 ` [Qemu-devel] [PULL 4/4] ipxe: update binaries Gerd Hoffmann
2015-09-03 13:32 ` [Qemu-devel] [PULL 0/4] update to 35c53797 to 4e03af8 Peter Maydell
2015-09-15 10:25 ` Gerd Hoffmann
2015-09-22 12:18 ` Gerd Hoffmann
2015-09-22 13:51 ` Peter Maydell
2015-09-22 19:29 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).