diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 2 | ||||
| -rw-r--r-- | common/usb_kbd.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 5a83bca4817..a79bc085b20 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -610,7 +610,7 @@ int fdt_resize(void *blob) fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry); /* Make it so the fdt ends on a page boundary */ - actualsize = ALIGN(actualsize, 0x1000); + actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000); actualsize = actualsize - ((uint)blob & 0xfff); /* Change the fdt header to reflect the correct size */ diff --git a/common/usb_kbd.c b/common/usb_kbd.c index cf145609557..89e6ee7e5d1 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -211,7 +211,11 @@ int drv_usb_kbd_init(void) /* deregistering the keyboard */ int usb_kbd_deregister(void) { +#ifdef CONFIG_SYS_DEVICE_DEREGISTER return device_deregister(DEVNAME); +#else + return 1; +#endif } /************************************************************************** |