projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Convert all of our single license tags to Linux Kernel style
[oweals/u-boot.git]
/
arch
/
powerpc
/
lib
/
bootm.c
diff --git
a/arch/powerpc/lib/bootm.c
b/arch/powerpc/lib/bootm.c
index ef15e7ac92f292dd482cf65cf7bf9d2c05da91dc..15e9c2a83e583d620b86c806dede008b91a95cac 100644
(file)
--- a/
arch/powerpc/lib/bootm.c
+++ b/
arch/powerpc/lib/bootm.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2008 Semihalf
*
* (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2008 Semihalf
*
* (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
*/
@@
-18,9
+17,11
@@
#include <environment.h>
#include <asm/byteorder.h>
#include <asm/mp.h>
#include <environment.h>
#include <asm/byteorder.h>
#include <asm/mp.h>
+#include <bootm.h>
+#include <vxworks.h>
#if defined(CONFIG_OF_LIBFDT)
#if defined(CONFIG_OF_LIBFDT)
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <fdt_support.h>
#endif
#include <fdt_support.h>
#endif
@@
-79,7
+80,7
@@
static void boot_jump_linux(bootm_headers_t *images)
debug (" Booting using OF flat tree...\n");
WATCHDOG_RESET ();
(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
debug (" Booting using OF flat tree...\n");
WATCHDOG_RESET ();
(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
-
getenv
_bootm_mapsize(), 0, 0);
+
env_get
_bootm_mapsize(), 0, 0);
/* does not return */
} else
#endif
/* does not return */
} else
#endif
@@
-114,8
+115,8
@@
void arch_lmb_reserve(struct lmb *lmb)
phys_size_t bootm_size;
ulong size, sp, bootmap_base;
phys_size_t bootm_size;
ulong size, sp, bootmap_base;
- bootmap_base =
getenv
_bootm_low();
- bootm_size =
getenv
_bootm_size();
+ bootmap_base =
env_get
_bootm_low();
+ bootm_size =
env_get
_bootm_size();
#ifdef DEBUG
if (((u64)bootmap_base + bootm_size) >
#ifdef DEBUG
if (((u64)bootmap_base + bootm_size) >
@@
-268,7
+269,8
@@
static void set_clocks_in_mhz (bd_t *kbd)
{
char *s;
{
char *s;
- if ((s = getenv ("clocks_in_mhz")) != NULL) {
+ s = env_get("clocks_in_mhz");
+ if (s) {
/* convert all clock information to MHz */
kbd->bi_intfreq /= 1000000L;
kbd->bi_busfreq /= 1000000L;
/* convert all clock information to MHz */
kbd->bi_intfreq /= 1000000L;
kbd->bi_busfreq /= 1000000L;
@@
-278,10
+280,6
@@
static void set_clocks_in_mhz (bd_t *kbd)
kbd->bi_sccfreq /= 1000000L;
kbd->bi_vco /= 1000000L;
#endif
kbd->bi_sccfreq /= 1000000L;
kbd->bi_vco /= 1000000L;
#endif
-#if defined(CONFIG_MPC5xxx)
- kbd->bi_ipbfreq /= 1000000L;
- kbd->bi_pcifreq /= 1000000L;
-#endif /* CONFIG_MPC5xxx */
}
}
}
}
@@
-336,6
+334,6
@@
void boot_jump_vxworks(bootm_headers_t *images)
((void (*)(void *, ulong, ulong, ulong,
ulong, ulong, ulong))images->ep)(images->ft_addr,
((void (*)(void *, ulong, ulong, ulong,
ulong, ulong, ulong))images->ep)(images->ft_addr,
- 0, 0, EPAPR_MAGIC,
getenv
_bootm_mapsize(), 0, 0);
+ 0, 0, EPAPR_MAGIC,
env_get
_bootm_mapsize(), 0, 0);
}
#endif
}
#endif