[U-Boot] [PATCH 2/3] pci: Remove parameter 'class' of pci_rom_load()

[U-Boot] [PATCH 2/3] pci: Remove parameter 'class' of pci_rom_load()

[Bin Meng]

pci_rom_load() does not use its parameter 'class', so remove it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/pci/pci_rom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 49c118d..37450c8 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -139,7 +139,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
 	return 0;
 }
 
-int pci_rom_load(uint16_t class, struct pci_rom_header *rom_header,
+int pci_rom_load(struct pci_rom_header *rom_header,
 		 struct pci_rom_header **ram_headerp)
 {
 	struct pci_rom_data *rom_data;
@@ -253,7 +253,7 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
 	if (ret)
 		return ret;
 
-	ret = pci_rom_load(class, rom, &ram);
+	ret = pci_rom_load(rom, &ram);
 	if (ret)
 		return ret;
 
-- 
1.8.2.1

[U-Boot] [PATCH 3/3] biosemu: Do not free vga_info->BIOSImage when it is 0xc0000

[Bin Meng]

For x86, vga_info->BIOSImage points to 0xc0000 which cannot be freed.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/bios_emulator/atibios.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 7ea5fa6..dec6230 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -502,7 +502,8 @@ int biosemu_run(pci_dev_t pcidev, uchar *bios_rom, int bios_len,
 	*/
 	if (clean_up) {
 		BE_exit();
-		if (vga_info->BIOSImage)
+		if (vga_info->BIOSImage &&
+		    (u32)(vga_info->BIOSImage) != 0xc0000)
 			free(vga_info->BIOSImage);
 		free(vga_info);
 		vga_info = NULL;
-- 
1.8.2.1

[U-Boot] [PATCH 2/3] pci: Remove parameter 'class' of pci_rom_load()

[Simon Glass]

On 24 April 2015 at 01:48, Bin Meng <bmeng.cn@gmail.com> wrote:
> pci_rom_load() does not use its parameter 'class', so remove it.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  drivers/pci/pci_rom.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 3/3] biosemu: Do not free vga_info->BIOSImage when it is 0xc0000

[Simon Glass]

On 24 April 2015 at 01:48, Bin Meng <bmeng.cn@gmail.com> wrote:
> For x86, vga_info->BIOSImage points to 0xc0000 which cannot be freed.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  drivers/bios_emulator/atibios.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 3/3] biosemu: Do not free vga_info->BIOSImage when it is 0xc0000

[Simon Glass]

On 24 April 2015 at 06:40, Simon Glass <sjg@chromium.org> wrote:
> On 24 April 2015 at 01:48, Bin Meng <bmeng.cn@gmail.com> wrote:
>> For x86, vga_info->BIOSImage points to 0xc0000 which cannot be freed.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  drivers/bios_emulator/atibios.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 3/3] biosemu: Do not free vga_info->BIOSImage when it is 0xc0000

[Simon Glass]

On 24 April 2015 at 21:54, Simon Glass <sjg@chromium.org> wrote:
> On 24 April 2015 at 06:40, Simon Glass <sjg@chromium.org> wrote:
>> On 24 April 2015 at 01:48, Bin Meng <bmeng.cn@gmail.com> wrote:
>>> For x86, vga_info->BIOSImage points to 0xc0000 which cannot be freed.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> ---
>>>
>>>  drivers/bios_emulator/atibios.c | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> Acked-by: Simon Glass <sjg@chromium.org>
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-x86, thanks!

[U-Boot] [PATCH 2/3] pci: Remove parameter 'class' of pci_rom_load()

[Simon Glass]

On 24 April 2015 at 06:40, Simon Glass <sjg@chromium.org> wrote:
> On 24 April 2015 at 01:48, Bin Meng <bmeng.cn@gmail.com> wrote:
>> pci_rom_load() does not use its parameter 'class', so remove it.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  drivers/pci/pci_rom.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-x86, thanks!