Remove unused definition IOMUX_SION

[karo-tx-uboot.git] / board / karo / tx53 / tx53.c

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 0b2c8c133598b58b0c384077536059a14515a997..aeb02cf40d1c1beba8bc114e472bd7ae021aa14b 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -55,8 +55,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define IOMUX_SION             IOMUX_PAD(0, 0, IOMUX_CONFIG_SION, 0, 0, 0)
-
 #define MX53_GPIO_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_PUE |            \
                                PAD_CTL_DSE_HIGH | PAD_CTL_PUS_22K_UP)
 
@@ -799,27 +797,20 @@ static void stk5v5_board_init(void)
 
 static void tx53_move_fdt(void)
 {
-       unsigned long fdt_addr = getenv_ulong("fdtcontroladdr", 16, 0);
-       void *fdt = NULL;
+       const void *fdt = gd->fdt_blob;
+       unsigned long fdt_addr = getenv_ulong("fdtaddr", 16, 0);
 
-       if (!fdt_addr)
-               return;
-
-#ifdef CONFIG_OF_EMBED
-       fdt = _binary_dt_dtb_start;
-#elif defined CONFIG_OF_SEPARATE
-       fdt = (void *)(_end_ofs + _TEXT_BASE);
-#endif
-       if (!fdt)
+       if (!fdt || !fdt_addr) {
+               printf("fdt=%p fdt_addr=%08lx\n", fdt, fdt_addr);
                return;
+       }
 
        if (fdt_check_header(fdt)) {
                printf("ERROR: No valid FDT found at %p\n", fdt);
                return;
        }
-       size_t fdt_len = fdt_totalsize(fdt);
 
-       memmove((void *)fdt_addr, fdt, fdt_len);
+       memmove((void *)fdt_addr, fdt, fdt_totalsize(fdt));
        set_working_fdt_addr((void *)fdt_addr);
 }