diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
| commit | 13a3972585af60ec367d209cedbd3601e0c77467 (patch) | |
| tree | 4b3312669b3e501f6bc10b39d8c7bbf516f07aac /arch/arm/mach-uniphier/include/mach/boot-device.h | |
| parent | 208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff) | |
| parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'arch/arm/mach-uniphier/include/mach/boot-device.h')
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/boot-device.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/boot-device.h b/arch/arm/mach-uniphier/include/mach/boot-device.h index 7a10f1c5b2..2ab5a535fa 100644 --- a/arch/arm/mach-uniphier/include/mach/boot-device.h +++ b/arch/arm/mach-uniphier/include/mach/boot-device.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2011-2014 Panasonic Corporation - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com> + * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -8,13 +7,19 @@ #ifndef _ASM_BOOT_DEVICE_H_ #define _ASM_BOOT_DEVICE_H_ -int get_boot_mode_sel(void); - struct boot_device_info { u32 type; char *info; }; -extern struct boot_device_info boot_device_table[]; +u32 ph1_sld3_boot_device(void); +u32 ph1_ld4_boot_device(void); +u32 ph1_pro5_boot_device(void); +u32 proxstream2_boot_device(void); + +void ph1_sld3_boot_mode_show(void); +void ph1_ld4_boot_mode_show(void); +void ph1_pro5_boot_mode_show(void); +void proxstream2_boot_mode_show(void); #endif /* _ASM_BOOT_DEVICE_H_ */ |