X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fcommon.h;h=751665f8a437e67a0921d9cb2ed8f17444bd6579;hb=6a34af5b411ed316b66547ac575d2669df223dc6;hp=b97b61d65d7eab25944a25935461c6252a64703c;hpb=89f5eaa1ee9a3307e05458aa4f3b2155ab0a7144;p=u-boot diff --git a/include/common.h b/include/common.h index b97b61d65d..751665f8a4 100644 --- a/include/common.h +++ b/include/common.h @@ -31,13 +31,6 @@ typedef volatile unsigned char vu_char; #include #include -#ifdef CONFIG_FSL_LSCH3 -#include -#endif -#ifdef CONFIG_FSL_LSCH2 -#include -#endif - #include #include #include @@ -366,6 +359,10 @@ int get_env_id (void); void pci_init (void); void pci_init_board(void); +#if defined(CONFIG_DTB_RESELECT) +int embedded_dtb_select(void); +#endif + int misc_init_f (void); int misc_init_r (void); @@ -445,11 +442,6 @@ void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn)); ulong get_endaddr (void); void trap_init (ulong); -#if defined (CONFIG_MICROBLAZE) -unsigned short in16(unsigned int); -void out16(unsigned int, unsigned short value); -#endif - /* $(CPU)/cpu.c */ static inline int cpumask_next(int cpu, unsigned int mask) { @@ -502,11 +494,6 @@ void serial_puts (const char *); int serial_getc (void); int serial_tstc (void); -/* These versions take a stdio_dev pointer */ -struct stdio_dev; -int serial_stub_getc(struct stdio_dev *sdev); -int serial_stub_tstc(struct stdio_dev *sdev); - /* $(CPU)/speed.c */ int get_clocks (void); ulong get_bus_freq (ulong);