[U-Boot] [PATCH 1/2] microblaze: Use default implementation from include/linux/io.h
There is no reason not to use default ioremap/iounmap io functions. The patch remove Microblaze macros.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/microblaze/include/asm/io.h | 3 --- 1 file changed, 3 deletions(-)
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index c7516a47e8ca..26a437c248ed 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -120,9 +120,6 @@ io_outsl (unsigned long port, const void *src, unsigned long count) #define insw(a,b,l) io_insw(a,b,l) #define insl(a,b,l) io_insl(a,b,l)
- -#define iounmap(addr) ((void)0) -#define ioremap(physaddr, size) (physaddr) #define ioremap_nocache(physaddr, size) (physaddr) #define ioremap_writethrough(physaddr, size) (physaddr) #define ioremap_fullcache(physaddr, size) (physaddr)
sysreset uclass have own do_reset function which should be used instead of board/platform specific.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
board/xilinx/microblaze-generic/microblaze-generic.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 2cd945c177cd..c0ba0e0cb67f 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -68,6 +68,7 @@ int dram_init(void) return 0; };
+#if !defined(CONFIG_SYSRESET) || defined(CONFIG_SPL_BUILD) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { #ifndef CONFIG_SPL_BUILD @@ -92,6 +93,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; } +#endif
static int gpio_init(void) {
participants (1)
-
Michal Simek