X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fmicroblaze%2Flib%2Fbootm.c;h=083a43c3a5c74de6b05adaab8f8a275b478f9559;hb=0421c9809a6f41a3aebbf2185ffb0c297cf83e22;hp=3eb3440be841c42096063246131d1d9b7c3cc4ba;hpb=4d339a9e8a758889de5da16b562aff5601bb3d8d;p=u-boot

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 3eb3440be8..083a43c3a5 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Michal Simek
  * (C) Copyright 2004 Atmark Techno, Inc.
  *
  * Michal  SIMEK <monstr@monstr.eu>
  * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -15,14 +14,12 @@
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 int do_bootm_linux(int flag, int argc, char * const argv[],
 		   bootm_headers_t *images)
 {
 	/* First parameter is mapped to $r5 for kernel boot args */
 	void	(*thekernel) (char *, ulong, ulong);
-	char	*commandline = getenv("bootargs");
+	char	*commandline = env_get("bootargs");
 	ulong	rd_data_start, rd_data_end;
 
 	/*
@@ -57,11 +54,12 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
 		of_flat_tree = (char *)simple_strtoul(argv[1], NULL, 16);
 
 	/* fixup the initrd now that we know where it should be */
-	if (images->rd_start && images->rd_end && of_flat_tree)
+	if (images->rd_start && images->rd_end && of_flat_tree) {
 		ret = fdt_initrd(of_flat_tree, images->rd_start,
 				 images->rd_end);
 		if (ret)
 			return 1;
+	}
 
 #ifdef DEBUG
 	printf("## Transferring control to Linux (at address 0x%08lx) ",