diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/zii-common/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/boards/zii-common/switch-cmd.c | 2 | ||||
| -rw-r--r-- | arch/arm/lib/pbl.lds.S | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/linkage.h | 6 | ||||
| -rw-r--r-- | arch/x86/mach-efi/reloc_x86_64.c | 3 |
5 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/boards/zii-common/board.c b/arch/arm/boards/zii-common/board.c index 9a9564e6d1..eafb5a3aa8 100644 --- a/arch/arm/boards/zii-common/board.c +++ b/arch/arm/boards/zii-common/board.c @@ -80,7 +80,8 @@ static int rdu_networkconfig(void) static char *rdu_netconfig; struct device_d *sp_dev; - if (!of_machine_is_compatible("zii,imx6q-zii-rdu2") && + if (!of_machine_is_compatible("zii,imx8mq-ultra") && + !of_machine_is_compatible("zii,imx6q-zii-rdu2") && !of_machine_is_compatible("zii,imx6qp-zii-rdu2") && !of_machine_is_compatible("zii,imx51-rdu1")) return 0; diff --git a/arch/arm/boards/zii-common/switch-cmd.c b/arch/arm/boards/zii-common/switch-cmd.c index 30438053a1..2b9c34bfac 100644 --- a/arch/arm/boards/zii-common/switch-cmd.c +++ b/arch/arm/boards/zii-common/switch-cmd.c @@ -42,7 +42,7 @@ static int do_rdu2_switch_reset(void) static int do_rdu1_switch_reset(void) { struct device_d *sp_dev = get_device_by_name("sp"); - struct rave_sp *sp = sp_dev->priv; + struct rave_sp *sp = sp_dev->parent->priv; u8 cmd[] = { [0] = RAVE_SP_CMD_RESET_ETH_SWITCH, [1] = 0 diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S index 01ed384495..b593d0329a 100644 --- a/arch/arm/lib/pbl.lds.S +++ b/arch/arm/lib/pbl.lds.S @@ -114,7 +114,7 @@ SECTIONS } __piggydata_end = .; - .image_end : { *(.__image_end) } + .image_end : { KEEP(*(.__image_end)) } pbl_image_size = . - BASE; diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h new file mode 100644 index 0000000000..a8d1bdb7de --- /dev/null +++ b/arch/x86/include/asm/linkage.h @@ -0,0 +1,6 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +/* referenced by <linux/linkage.h> */ + +#endif diff --git a/arch/x86/mach-efi/reloc_x86_64.c b/arch/x86/mach-efi/reloc_x86_64.c index 1db72f5dbc..e83bacb302 100644 --- a/arch/x86/mach-efi/reloc_x86_64.c +++ b/arch/x86/mach-efi/reloc_x86_64.c @@ -35,11 +35,14 @@ SUCH DAMAGE. */ +#include <linux/linkage.h> #include <common.h> #include <efi.h> #include <elf.h> +asmlinkage efi_status_t _relocate (long, Elf64_Dyn *, efi_handle_t, efi_system_table_t *); + efi_status_t _relocate (long ldbase, Elf64_Dyn *dyn, efi_handle_t image, efi_system_table_t *systab) { long relsz = 0, relent = 0; |