diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
commit | f04c53762962280365005c9db12ab561a18f2692 (patch) | |
tree | 6cd2fa04929473afda1cceaa297cd340792bd326 /arch/arm/include/asm/arch-mxs/sys_proto.h | |
parent | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (diff) | |
parent | ce7a7f5e6bda35d7d0972be07b6983552d1a2cb2 (diff) | |
download | talos-obmc-uboot-f04c53762962280365005c9db12ab561a18f2692.tar.gz talos-obmc-uboot-f04c53762962280365005c9db12ab561a18f2692.zip |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-mxs/sys_proto.h')
-rw-r--r-- | arch/arm/include/asm/arch-mxs/sys_proto.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 1038592c92..43c7dd6bf1 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -28,8 +28,9 @@ int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int)); #include <asm/arch/iomux-mx28.h> #endif -void mxs_common_spl_init(const iomux_cfg_t *iomux_setup, - const unsigned int iomux_size); +void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, + const iomux_cfg_t *iomux_setup, + const unsigned int iomux_size); #endif struct mxs_pair { |