common, env: optimize boottime

[karo-tx-uboot.git] / common / cmd_fdt.c

diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index e5829616fc4028c7f6bc3b5c2ea23475f1db3080..3a9edd6468c3b47d06fb51018be99651e51077c7 100644 (file)
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -5,23 +5,7 @@
  *   Pantelis Antoniou <pantelis.antoniou@gmail.com> and
  *   Matthew McClintock <msm@freescale.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -31,6 +15,7 @@
 #include <asm/global_data.h>
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <asm/io.h>
 
 #define MAX_LEVEL      32              /* how deeply nested we will go */
 #define SCRATCHPAD     1024            /* bytes of scratchpad memory */
@@ -55,7 +40,10 @@ struct fdt_header *working_fdt;
 
 void set_working_fdt_addr(void *addr)
 {
-       working_fdt = addr;
+       void *buf;
+
+       buf = map_sysmem((ulong)addr, 0);
+       working_fdt = buf;
        setenv_addr("fdtaddr", addr);
 }
 
@@ -129,13 +117,13 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
 
                addr = simple_strtoul(argv[0], NULL, 16);
-               blob = (struct fdt_header *)addr;
+               blob = map_sysmem(addr, 0);
                if (!fdt_valid(&blob))
                        return 1;
                if (control)
                        gd->fdt_blob = blob;
                else
-                       set_working_fdt_addr((void *)addr);
+                       set_working_fdt_addr(blob);
 
                if (argc >= 2) {
                        int  len;