projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: dts: tinker: add usb host power supply node
[oweals/u-boot.git]
/
common
/
fdt_support.c
diff --git
a/common/fdt_support.c
b/common/fdt_support.c
index 0609470dfb8bbaddcd4d8a2fab178d1b2fb481c6..55d4d6f6d444ef6cc4bd208efa4da58a9e11d386 100644
(file)
--- a/
common/fdt_support.c
+++ b/
common/fdt_support.c
@@
-381,6
+381,7
@@
void do_fixup_by_compat_u32(void *fdt, const char *compat,
do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create);
}
do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create);
}
+#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY
/*
* fdt_pack_reg - pack address and size array into the "reg"-suitable stream
*/
/*
* fdt_pack_reg - pack address and size array into the "reg"-suitable stream
*/
@@
-459,6
+460,7
@@
int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
}
return 0;
}
}
return 0;
}
+#endif
int fdt_fixup_memory(void *blob, u64 start, u64 size)
{
int fdt_fixup_memory(void *blob, u64 start, u64 size)
{
@@
-471,7
+473,7
@@
void fdt_fixup_ethernet(void *fdt)
char *tmp, *end;
char mac[16];
const char *path;
char *tmp, *end;
char mac[16];
const char *path;
- unsigned char mac_addr[
6
];
+ unsigned char mac_addr[
ARP_HLEN
];
int offset;
if (fdt_path_offset(fdt, "/aliases") < 0)
int offset;
if (fdt_path_offset(fdt, "/aliases") < 0)
@@
-901,14
+903,9
@@
void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size)
{
struct node_info *ni = node_info;
struct mtd_device *dev;
{
struct node_info *ni = node_info;
struct mtd_device *dev;
- char *parts;
int i, idx;
int noff;
int i, idx;
int noff;
- parts = getenv("mtdparts");
- if (!parts)
- return;
-
if (mtdparts_init() != 0)
return;
if (mtdparts_init() != 0)
return;