From 632cf034b401cdd01dae253a8b577fe518e37654 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 18 Dec 2009 12:01:12 +0100 Subject: roms: remove option rom packing logic Now that we load the option roms via fw_cfg, we can stop copying them to the 0xc000 -> 0xe000. The patch does just that. Also the rom loader gets simplified as all remaining users of the rom loader load the bits at a fixed address so the packing and aligning logic can go away. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/loader.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/loader.h') diff --git a/hw/loader.h b/hw/loader.h index 634f7d5..77beb0e 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -20,9 +20,9 @@ void pstrcpy_targphys(const char *name, const char *source); int rom_add_file(const char *file, const char *fw_dir, const char *fw_file, - target_phys_addr_t min, target_phys_addr_t max, int align); + target_phys_addr_t addr); int rom_add_blob(const char *name, const void *blob, size_t len, - target_phys_addr_t min, target_phys_addr_t max, int align); + target_phys_addr_t addr); int rom_load_all(void); int rom_load_fw(void *fw_cfg); int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size); @@ -30,9 +30,9 @@ void *rom_ptr(target_phys_addr_t addr); void do_info_roms(Monitor *mon); #define rom_add_file_fixed(_f, _a) \ - rom_add_file(_f, NULL, NULL, _a, 0, 0) + rom_add_file(_f, NULL, NULL, _a) #define rom_add_blob_fixed(_f, _b, _l, _a) \ - rom_add_blob(_f, _b, _l, _a, 0, 0) + rom_add_blob(_f, _b, _l, _a) #define PC_ROM_MIN_VGA 0xc0000 #define PC_ROM_MIN_OPTION 0xc8000 -- cgit v1.1