s390x: remove s390-zipl.rom
This is an s390 boot rom which was used in s390-virtio machine. but since commit 3538fb6f89dd9bb2e7e59de2bfad52a45321c744 "s390x: remove s390-virtio machine", this file isn't used. The only place it is referenced in the code is an unused define ZIPL_FILENAME. There's also comment in hw/s390/ipl.c which I'm modifying too, to refer to s390-ccw.img instead. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
		
							parent
							
								
									059db20419
								
							
						
					
					
						commit
						6e9965d429
					
				
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							| @ -400,7 +400,6 @@ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ | ||||
| qemu-icon.bmp qemu_logo_no_text.svg \ | ||||
| bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ | ||||
| multiboot.bin linuxboot.bin kvmvapic.bin \ | ||||
| s390-zipl.rom \ | ||||
| s390-ccw.img \ | ||||
| spapr-rtas.bin slof.bin \ | ||||
| palcode-clipper \ | ||||
|  | ||||
| @ -106,7 +106,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) | ||||
|             /* Adjust ELF start address to final location */ | ||||
|             ipl->bios_start_addr += fwbase; | ||||
|         } else { | ||||
|             /* Try to load non-ELF file (e.g. s390-zipl.rom) */ | ||||
|             /* Try to load non-ELF file (e.g. s390-ccw.img) */ | ||||
|             bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, | ||||
|                                             4096); | ||||
|             ipl->bios_start_addr = ZIPL_IMAGE_START; | ||||
|  | ||||
| @ -54,7 +54,6 @@ | ||||
| #endif | ||||
| 
 | ||||
| #define MAX_BLK_DEVS                    10 | ||||
| #define ZIPL_FILENAME                   "s390-zipl.rom" | ||||
| #define S390_MACHINE                    "s390-virtio" | ||||
| #define TYPE_S390_MACHINE               MACHINE_TYPE_NAME(S390_MACHINE) | ||||
| 
 | ||||
|  | ||||
| @ -35,10 +35,6 @@ | ||||
| 	10ec:8139 -> pxe-rtl8139.rom | ||||
| 	1af4:1000 -> pxe-virtio.rom | ||||
| 
 | ||||
| - The S390 zipl loader is an addition to the official IBM s390-tools | ||||
|   package. That fork is maintained in its own git repository at: | ||||
|   git://repo.or.cz/s390-tools.git | ||||
| 
 | ||||
| - The sources for the Alpha palcode image is available from: | ||||
|   git://github.com/rth7680/qemu-palcode.git | ||||
| 
 | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Michael Tokarev
						Michael Tokarev