coreboot-gerrit July 2014

coreboot-gerrit@coreboot.org

1 participants
861 discussions

New patch to review for coreboot: 9a1df0a YABEL: Initialize global `biosmem` pointer for VBE
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6250 -gerrit commit 9a1df0ae1e093a5b43a9298eeecda9f462db1798 Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Jul 8 15:32:02 2014 +0200 YABEL: Initialize global `biosmem` pointer for VBE The global pointer `biosmem` defined in vbe.c was never set. Thus, VBE calls didn't work within YABEL. Change-Id: I63c1c77755f9c442cfec227a495332595ce2b70c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- src/device/oprom/yabel/compat/functions.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/device/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c index 2c3dc33..27d0413 100644 --- a/src/device/oprom/yabel/compat/functions.c +++ b/src/device/oprom/yabel/compat/functions.c @@ -33,8 +33,11 @@ u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */ u8* vmem = NULL; #endif +extern u8 *biosmem; + void run_bios(struct device * dev, unsigned long addr) { + biosmem = vmem; biosemu(vmem, VMEM_SIZE, dev, addr);

1 0

New patch to review for coreboot: 25dc6e2 kontron/ktqm77: Clean up int15 handler
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6249 -gerrit commit 25dc6e2a0d2fc83dcb94f614c5ccaa3261064bdc Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Fri Jun 27 12:17:17 2014 +0200 kontron/ktqm77: Clean up int15 handler Worked out the purpose of more int15 calls and let them return appropriate values. Also remove handlers for copy-pasted calls never observed on this board. Change-Id: I3d8c4ec5542bd19baca1dca83badc9b568779e1b Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- src/mainboard/kontron/ktqm77/mainboard.c | 80 +++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 26 deletions(-) diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c index b3dec20..fd9cbf1 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -97,40 +97,68 @@ static int int15_handler(void) X86_ECX |= 0x0000; /* TODO: Make this configurable in NVRAM? */ res = 1; break; - case 0x5f70: - switch ((X86_ECX >> 8) & 0xff) { - case 0: - /* Get Mux */ + case 0x5f40: + /* + * Boot Panel Type Hook: + * BL(in): 00h = LFP, 01h = LFP2 + * CL(out): panel type id in table: 1..16 + */ + if (0 == (X86_EBX & 0xff)) { X86_EAX &= 0xffff0000; - X86_EAX |= 0x005f; - X86_ECX &= 0xffff0000; - X86_ECX |= 0x0000; + X86_EAX |= 0x015f; res = 1; - break; - case 1: - /* Set Mux */ + } else if (1 == (X86_EBX & 0xff)) { X86_EAX &= 0xffff0000; - X86_EAX |= 0x005f; - X86_ECX &= 0xffff0000; - X86_ECX |= 0x0000; + X86_EAX |= 0x015f; res = 1; - break; - case 2: - /* Get SG/Non-SG mode */ + } else { + printk(BIOS_DEBUG, + "Unknown panel index %u " + "in INT15 function %04x!\n", + X86_EBX & 0xff, X86_EAX & 0xffff); + } + break; + case 0x5f52: + /* + * Panel Color Depth: + * 00h = 18 bit + * 01h = 24 bit + */ + X86_EAX &= 0xffff0000; + X86_EAX |= 0x005f; + X86_ECX &= 0xffff0000; + X86_ECX |= 0x0001; + res = 1; + break; + case 0x5f14: + if ((X86_EBX & 0xffff) == 0x78f) { + /* + * Get Miscellaneous Status Hook: + * bit 2: AC power active? + * bit 1: lid closed? + * bit 0: docked? + */ X86_EAX &= 0xffff0000; - X86_EAX |= 0x005f; - X86_ECX &= 0xffff0000; - X86_ECX |= 0x0000; + X86_EAX |= 0x015f; res = 1; - break; - default: - /* Interrupt was not handled */ - printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n", - ((X86_ECX >> 8) & 0xff)); - return 1; + } else { + printk(BIOS_DEBUG, + "Unknown BX 0x%04x in INT15 function %04x!\n", + X86_EBX & 0xffff, X86_EAX & 0xffff); } break; - + case 0x5f49: + /* + * Get Inverter Type and Polarity: + * EBX: backlight control brightness: 0..255 + * ECX: + * 0 = Enable PWM inverted, 2 = Enable PWM + * 1 = Enable I2C inverted, 3 = Enable I2C + */ + X86_EAX &= 0xffff0000; + X86_EAX |= 0x015f; + res = 1; + break; default: printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_EAX & 0xffff);

1 0

New patch to review for coreboot: 1a0ba47 kontron/ktqm77: Improve W83627DHG's GPIO config
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6248 -gerrit commit 1a0ba47c7279a881dc7be9201852bb0486e09bec Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Oct 22 11:07:23 2013 +0200 kontron/ktqm77: Improve W83627DHG's GPIO config Fix some outputs of the super i/o that should be GPIOs and make variables out of magic values that configure LVDS. Change-Id: Ib9eef065980cefff0046485549a68cf8f070d5b9 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- src/mainboard/kontron/ktqm77/romstage.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c index 09fd634..d74f3a6 100644 --- a/src/mainboard/kontron/ktqm77/romstage.c +++ b/src/mainboard/kontron/ktqm77/romstage.c @@ -140,13 +140,22 @@ static void pnp_exit_ext_func_mode(device_t dev) static void superio_gpio_config(void) { + int lvds_3v = 0; // 0 (5V) or 1 (3V3) + int dis_bl_inv = 1; // backlight inversion: 1 = disabled, 0 = enabled device_t dev = PNP_DEV(0x2e, 0x9); pnp_enter_ext_func_mode(dev); + pnp_write_config(dev, 0x29, 0x02); /* Pins 119, 120 are GPIO21, 20 */ + pnp_write_config(dev, 0x30, 0x03); /* Enable GPIO2+3 */ + pnp_write_config(dev, 0x2a, 0x01); /* Pins 62, 63, 65, 66 are + GPIO27, 26, 25, 24 */ + pnp_write_config(dev, 0x2c, 0xc3); /* Pin 90 is GPIO32, + Pins 78~85 are UART B */ + pnp_write_config(dev, 0x2d, 0x00); /* Pins 67, 68, 70~73, 75, 77 are + GPIO57~50 */ pnp_set_logical_device(dev); /* Values can only be changed, when devices are enabled. */ - pnp_write_config(dev, 0x30, 0x03); /* Enable GPIO2+3 */ pnp_write_config(dev, 0xe3, 0xdd); /* GPIO2 bits 1, 5 are output */ - pnp_write_config(dev, 0xe4, 0x22); /* GPIO2 bits 1, 5 are 1 */ + pnp_write_config(dev, 0xe4, (dis_bl_inv << 5) | (lvds_3v << 1)); /* GPIO2 bits 1, 5 */ pnp_exit_ext_func_mode(dev); }

1 0

New patch to review for coreboot: e08037e libpayload: Keep physical addresses in console drivers
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6247 -gerrit commit e08037ee6caa1013126bc1fe50a747976b9d4d25 Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Jul 8 15:07:19 2014 +0200 libpayload: Keep physical addresses in console drivers Like done in FILO, libpayload's console drivers might be initialized before a relocation. So keep physical pointers in there which won't break on relocation. Change-Id: I52e5d9d26801a53fd6a5f3c7ee03f61d6941d736 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/video/corebootfb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c index faf9e2c..d661466 100644 --- a/payloads/libpayload/drivers/video/corebootfb.c +++ b/payloads/libpayload/drivers/video/corebootfb.c @@ -62,11 +62,11 @@ static const u32 vga_colors[] = { }; /* Addresses for the various components */ -static struct cb_framebuffer *fbinfo; +static unsigned long fbinfo; static unsigned long fbaddr; static unsigned long chars; -#define FI (fbinfo) +#define FI ((struct cb_framebuffer *) phys_to_virt(fbinfo)) #define FB ((unsigned char *) phys_to_virt(fbaddr)) #define CHARS ((unsigned short *) phys_to_virt(chars)) @@ -232,15 +232,18 @@ static int corebootfb_init(void) if (lib_sysinfo.framebuffer == NULL) return -1; - fbinfo = lib_sysinfo.framebuffer; + /* We might have been called before relocation (like FILO does). So + just keep the physical address which won't break on relocation. */ + fbinfo = virt_to_phys(lib_sysinfo.framebuffer); fbaddr = FI->physical_address; coreboot_video_console.columns = FI->x_resolution / FONT_WIDTH; coreboot_video_console.rows = FI->y_resolution / FONT_HEIGHT; - chars = (unsigned long) malloc(coreboot_video_console.rows * - coreboot_video_console.columns * 2); + /* See setting of fbinfo above. */ + chars = virt_to_phys(malloc(coreboot_video_console.rows * + coreboot_video_console.columns * 2)); // clear boot splash screen if there is one. corebootfb_clear();

1 0

New patch to review for coreboot: 6c9fded libpayload: xHCI: Always initialize controller->pcidev
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6246 -gerrit commit 6c9fded3785b77350e7c7480b786b1923e09d419 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon Jul 7 17:20:53 2014 +0200 libpayload: xHCI: Always initialize controller->pcidev As the controller structure is never fully cleared, this one wasn't initialized for non-pci controllers (but checked for non-null later). Change-Id: I852671c5f55650bdb6cd97f4ec74b1f95ee894c7 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/xhci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index 1455734..69ddab7 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -169,6 +169,7 @@ xhci_init (unsigned long physical_bar) controller->create_intr_queue = xhci_create_intr_queue; controller->destroy_intr_queue = xhci_destroy_intr_queue; controller->poll_intr_queue = xhci_poll_intr_queue; + controller->pcidev = 0; for (i = 0; i < 128; ++i) { controller->devices[i] = NULL; }

1 0

New patch to review for coreboot: 44881d6 libpayload: Catch null-pointer dereference in xHCI
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6245 -gerrit commit 44881d67a9e25b1a95f2d43487ddf4daf5e8ac67 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon Jul 7 17:11:53 2014 +0200 libpayload: Catch null-pointer dereference in xHCI Fix a possible null-pointer dereference (hopefully) before anyone runs into this. Also don't switch ports to xHCI if initialization failed. Change-Id: I5dbaeb435a98ead0b50d27fde13c9f1433ea3e81 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/xhci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index f540230..1455734 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -311,9 +311,11 @@ xhci_pci_init (pcidev_t addr) } controller = xhci_init((unsigned long)reg_addr); - controller->pcidev = addr; + if (controller) { + controller->pcidev = addr; - xhci_switch_ppt_ports(addr); + xhci_switch_ppt_ports(addr); + } return controller; }

1 0

New patch to review for coreboot: 319e899 libpayload: Use unsigned long for BARs in *hci_init()
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6244 -gerrit commit 319e8990ccb0e9922bbe33332bf81f213a465ed3 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon Jul 7 16:33:59 2014 +0200 libpayload: Use unsigned long for BARs in *hci_init() Using void* for physical addresses leads to much casting and confuses developers when to convert from physical to virtual addresses or the other way around. When using plain integers for physical addresses and pointers for virtual addresses things become much cleaner and we won't ever end up dereferencing a physical address. Change-Id: I24cd53b81c7863b6d14f0cbb4ce8937728b37c1c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ehci.c | 6 +++--- payloads/libpayload/drivers/usb/ehci.h | 2 +- payloads/libpayload/drivers/usb/ohci.c | 6 +++--- payloads/libpayload/drivers/usb/ohci.h | 2 +- payloads/libpayload/drivers/usb/usbinit.c | 6 +++--- payloads/libpayload/drivers/usb/xhci.c | 6 +++--- payloads/libpayload/drivers/usb/xhci.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index e58bd38..03d0aef 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -724,7 +724,7 @@ static u8 *ehci_poll_intr_queue(void *const queue) } hci_t * -ehci_init (void *bar) +ehci_init (unsigned long physical_bar) { int i; hci_t *controller = new_controller (); @@ -751,7 +751,7 @@ ehci_init (void *bar) controller->create_intr_queue = ehci_create_intr_queue; controller->destroy_intr_queue = ehci_destroy_intr_queue; controller->poll_intr_queue = ehci_poll_intr_queue; - controller->reg_base = (u32)(unsigned long)bar; + controller->reg_base = (u32)physical_bar; for (i = 0; i < 128; i++) { controller->devices[i] = 0; } @@ -822,7 +822,7 @@ ehci_pci_init (pcidev_t addr) /* default value for frame length adjust */ pci_write_config8(addr, FLADJ, FLADJ_framelength(60000)); - controller = ehci_init((void *)(unsigned long)reg_base); + controller = ehci_init((unsigned long)reg_base); return controller; } diff --git a/payloads/libpayload/drivers/usb/ehci.h b/payloads/libpayload/drivers/usb/ehci.h index c1b1fa9..aa1bcf7 100644 --- a/payloads/libpayload/drivers/usb/ehci.h +++ b/payloads/libpayload/drivers/usb/ehci.h @@ -34,7 +34,7 @@ #include <usb/usb.h> hci_t *ehci_pci_init (pcidev_t addr); -hci_t *ehci_init (void *bar); +hci_t *ehci_init (unsigned long physical_bar); void ehci_rh_init (usbdev_t *dev); diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index edd275b..84547e6 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -167,7 +167,7 @@ static const char *direction[] = { #endif hci_t * -ohci_init (void *bar) +ohci_init (unsigned long physical_bar) { int i; @@ -201,7 +201,7 @@ ohci_init (void *bar) init_device_entry (controller, 0); OHCI_INST (controller)->roothub = controller->devices[0]; - controller->reg_base = (u32)(unsigned long)bar; + controller->reg_base = (u32)physical_bar; OHCI_INST (controller)->opreg = (opreg_t*)phys_to_virt(controller->reg_base); usb_debug("OHCI Version %x.%x\n", (OHCI_INST (controller)->opreg->HcRevision >> 4) & 0xf, OHCI_INST (controller)->opreg->HcRevision & 0xf); @@ -263,7 +263,7 @@ ohci_pci_init (pcidev_t addr) * OHCI mandates MMIO, so bit 0 is clear */ reg_base = pci_read_config32 (addr, 0x10) & 0xfffff000; - return ohci_init((void *)(unsigned long)reg_base); + return ohci_init((unsigned long)reg_base); } #endif diff --git a/payloads/libpayload/drivers/usb/ohci.h b/payloads/libpayload/drivers/usb/ohci.h index 9c31d9c..d810c48 100644 --- a/payloads/libpayload/drivers/usb/ohci.h +++ b/payloads/libpayload/drivers/usb/ohci.h @@ -34,7 +34,7 @@ #include <usb/usb.h> hci_t *ohci_pci_init (pcidev_t addr); -hci_t *ohci_init (void *bar); +hci_t *ohci_init (unsigned long physical_bar); void ohci_rh_init (usbdev_t *dev); diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c index f74a833..ca0bf76 100644 --- a/payloads/libpayload/drivers/usb/usbinit.c +++ b/payloads/libpayload/drivers/usb/usbinit.c @@ -160,13 +160,13 @@ static void usb_scan_pci_bus(int bus) static void usb_scan_memory(void) { #ifdef CONFIG_USB_XHCI - xhci_init((void *)(unsigned long)CONFIG_USB_XHCI_BASE_ADDRESS); + xhci_init(CONFIG_USB_XHCI_BASE_ADDRESS); #endif #ifdef CONFIG_USB_EHCI - ehci_init((void *)(unsigned long)CONFIG_USB_EHCI_BASE_ADDRESS); + ehci_init(CONFIG_USB_EHCI_BASE_ADDRESS); #endif #ifdef CONFIG_USB_OHCI - ohci_init((void *)(unsigned long)CONFIG_USB_OHCI_BASE_ADDRESS); + ohci_init(CONFIG_USB_OHCI_BASE_ADDRESS); #endif } #endif diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index d9ac0a4..f540230 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -143,7 +143,7 @@ xhci_wait_ready(xhci_t *const xhci) } hci_t * -xhci_init (const void *bar) +xhci_init (unsigned long physical_bar) { int i; @@ -192,7 +192,7 @@ xhci_init (const void *bar) goto _free_xhci; } - controller->reg_base = (u32)(unsigned long)bar; + controller->reg_base = (u32)physical_bar; xhci->capreg = phys_to_virt(controller->reg_base); xhci->opreg = ((void *)xhci->capreg) + xhci->capreg->caplength; @@ -310,7 +310,7 @@ xhci_pci_init (pcidev_t addr) fatal("We don't do 64bit addressing.\n"); } - controller = xhci_init((void *)(unsigned long)reg_addr); + controller = xhci_init((unsigned long)reg_addr); controller->pcidev = addr; xhci_switch_ppt_ports(addr); diff --git a/payloads/libpayload/drivers/usb/xhci.h b/payloads/libpayload/drivers/usb/xhci.h index ddc9297..5f15da3 100644 --- a/payloads/libpayload/drivers/usb/xhci.h +++ b/payloads/libpayload/drivers/usb/xhci.h @@ -34,7 +34,7 @@ #include <usb/usb.h> hci_t *xhci_pci_init (pcidev_t addr); -hci_t *xhci_init (const void *bar); +hci_t *xhci_init (unsigned long physical_bar); void xhci_rh_init (usbdev_t *dev);

1 0

New patch to review for coreboot: 1ebe659 libpayload: Remove redundant phys_to_virt() from xHCI driver
by Nico Huber 10 Jul '14

10 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6243 -gerrit commit 1ebe659f4d2b8159ceee3ef737a88a629eb3ed17 Author: Nico Huber <nico.huber(a)secunet.com> Date: Fri Jul 4 18:17:39 2014 +0200 libpayload: Remove redundant phys_to_virt() from xHCI driver Remove a redundant phys_to_virt() that sneaked in the initialization of PCI xHCI controllers. The use of casts from void* to u32 (and vice versa) prompts for things going wrong here. That will be addressed in a later commit. Change-Id: Ibc71ed6ee7016529c0e3a51559aaec07aaaba315 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index 6106342..d9ac0a4 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -305,7 +305,7 @@ xhci_pci_init (pcidev_t addr) u32 reg_addr; hci_t *controller; - reg_addr = (u32)phys_to_virt(pci_read_config32 (addr, 0x10) & ~0xf); + reg_addr = pci_read_config32 (addr, 0x10) & ~0xf; if (pci_read_config32 (addr, 0x14) > 0) { fatal("We don't do 64bit addressing.\n"); }

1 0

New patch to review for coreboot: b64d9da build system: avoid more race conditions
by Patrick Georgi 10 Jul '14

10 Jul '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6242 -gerrit commit b64d9dac5ba501051e80f11612894664bb75438b Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Jul 10 09:42:03 2014 +0200 build system: avoid more race conditions In an abuild run, cbfstool is built in a shared directory using "make tools". Unfortunately the build system doesn't actually use that binary directly but creates a per-board copy (for convenience purposes when editing the image later) and uses that. With this change the build system uses the original file but still creates the copy for the user, avoiding the race while ensuring convenience. Change-Id: I38c603a7eca5ef859875ad3031bf7a850189645f Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- Makefile.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 5e4c5c5..42ed707 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -57,7 +57,7 @@ export objgenerated := $(obj)/generated ####################################################################### # root rule to resolve if in build mode (ie. configuration exists) real-target: $(obj)/config.h coreboot -coreboot: build-dirs $(obj)/coreboot.rom +coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool ####################################################################### # our phony targets @@ -258,13 +258,13 @@ build-dirs: ####################################################################### # Build the tools -CBFSTOOL:=$(obj)/cbfstool -RMODTOOL:=$(obj)/rmodtool +CBFSTOOL:=$(objutil)/cbfstool/cbfstool +RMODTOOL:=$(objutil)/cbfstool/rmodtool -$(CBFSTOOL): $(objutil)/cbfstool/cbfstool +$(obj)/cbfstool: $(CBFSTOOL) cp $< $@ -$(RMODTOOL): $(objutil)/cbfstool/rmodtool +$(obj)/rmodtool: $(RMODTOOL) cp $< $@ _WINCHECK=$(shell uname -o 2> /dev/null)

1 0

Patch set updated for coreboot: 7c1a8a5 NOTFORMERGE: test
by Edward O'Callaghan 10 Jul '14

10 Jul '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6232 -gerrit commit 7c1a8a59711f4bd91f58ffcb6ad4a358f48512b3 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Jul 10 02:49:54 2014 +1000 NOTFORMERGE: test Change-Id: Icb2eca566a96b723a3162983aac57394e6a866d3 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/arch/x86/include/arch/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h index d5cdf35..4ae9fe2 100644 --- a/src/arch/x86/include/arch/io.h +++ b/src/arch/x86/include/arch/io.h @@ -224,7 +224,7 @@ static inline int log2f(int value) /* FIXME: Sources for romstage still use device_t. */ /* Use pci_devfn_t or pnp_devfn_t instead */ -typedef u32 device_t; +//typedef u32 device_t; /* FIXME: We need to make the coreboot to run at 64bit mode, So when read/write memory above 4G, * We don't need to set %fs, and %gs anymore

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
87
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2014