ARM: uniphier: rework spl_boot_device() and related code

[people/ms/u-boot.git] / arch / arm / mach-uniphier / init.h

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index c41a5df8e92af339e49710d0360f2a7abaef991e..6691d446c6bdfe07d538ecb434148d7aa6f559c7 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -120,11 +120,14 @@ void uniphier_pro5_clk_init(void);
 void uniphier_pxs2_clk_init(void);
 void uniphier_ld11_clk_init(void);
 
+unsigned int uniphier_boot_device_raw(void);
 int uniphier_pin_init(const char *pinconfig_name);
 void uniphier_smp_kick_all_cpus(void);
 void cci500_init(int nr_slaves);
 
+#undef pr_warn
 #define pr_warn(fmt, args...)  printf(fmt, ##args)
+#undef pr_err
 #define pr_err(fmt, args...)   printf(fmt, ##args)
 
 #endif /* __MACH_INIT_H */