GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-26 16:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: remove pre reloc properties in SPL and TPL device tree

Browse source 
We can remove the pre reloc property in SPL and TPL device-tree:
- u-boot,dm-pre-reloc
- u-boot,dm-spl
- u-boot,dm-tpl
As only the needed node are kept by fdtgrep (1st pass).

The associated function (XXX_pre_reloc) are simple for SPL/TPL:
return always true.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2019-02-11 12:49:57 +01:00 • committed by Simon Glass
parent 9d73e85a87
commit c7a88dae99
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/core/ofnode.c
View file

@ -700,18 +700,18 @@ int ofnode_read_simple_size_cells(ofnode node)
bool ofnode_pre_reloc(ofnode node) bool ofnode_pre_reloc(ofnode node)
{ {
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
/* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
* had property dm-pre-reloc or u-boot,dm-spl/tpl.
* They are removed in final dtb (fdtgrep 2nd pass)
*/
return true;
#else
if (ofnode_read_bool(node, "u-boot,dm-pre-reloc")) if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
return true; return true;
if (ofnode_read_bool(node, "u-boot,dm-pre-proper")) if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
return true; return true;
#ifdef CONFIG_TPL_BUILD
if (ofnode_read_bool(node, "u-boot,dm-tpl"))
return true;
#elif defined(CONFIG_SPL_BUILD)
if (ofnode_read_bool(node, "u-boot,dm-spl"))
return true;
#else
/* /*
* In regular builds individual spl and tpl handling both * In regular builds individual spl and tpl handling both
* count as handled pre-relocation for later second init. * count as handled pre-relocation for later second init.
@ -719,9 +719,9 @@ bool ofnode_pre_reloc(ofnode node)
if (ofnode_read_bool(node, "u-boot,dm-spl") || if (ofnode_read_bool(node, "u-boot,dm-spl") ||
ofnode_read_bool(node, "u-boot,dm-tpl")) ofnode_read_bool(node, "u-boot,dm-tpl"))
return true; return true;
#endif
return false; return false;
#endif
} }
int ofnode_read_resource(ofnode node, uint index, struct resource *res) int ofnode_read_resource(ofnode node, uint index, struct resource *res)

31
drivers/core/util.c
View file

@ -33,16 +33,15 @@ int list_count_items(struct list_head *head)
bool dm_fdt_pre_reloc(const void *blob, int offset) bool dm_fdt_pre_reloc(const void *blob, int offset)
{ {
if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL)) #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
return true; /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
* had property dm-pre-reloc or u-boot,dm-spl/tpl.
#ifdef CONFIG_TPL_BUILD * They are removed in final dtb (fdtgrep 2nd pass)
if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL)) */
return true;
#elif defined(CONFIG_SPL_BUILD)
if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL))
return true; return true;
#else #else
if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
return true;
/* /*
* In regular builds individual spl and tpl handling both * In regular builds individual spl and tpl handling both
* count as handled pre-relocation for later second init. * count as handled pre-relocation for later second init.
@ -57,16 +56,16 @@ bool dm_fdt_pre_reloc(const void *blob, int offset)
bool dm_ofnode_pre_reloc(ofnode node) bool dm_ofnode_pre_reloc(ofnode node)
{ {
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
/* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
* had property dm-pre-reloc or u-boot,dm-spl/tpl.
* They are removed in final dtb (fdtgrep 2nd pass)
*/
return true;
#else
if (ofnode_read_bool(node, "u-boot,dm-pre-reloc")) if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
return true; return true;
#ifdef CONFIG_TPL_BUILD
if (ofnode_read_bool(node, "u-boot,dm-tpl"))
return true;
#elif defined(CONFIG_SPL_BUILD)
if (ofnode_read_bool(node, "u-boot,dm-spl"))
return true;
#else
/* /*
* In regular builds individual spl and tpl handling both * In regular builds individual spl and tpl handling both
* count as handled pre-relocation for later second init. * count as handled pre-relocation for later second init.
@ -74,7 +73,7 @@ bool dm_ofnode_pre_reloc(ofnode node)
if (ofnode_read_bool(node, "u-boot,dm-spl") || if (ofnode_read_bool(node, "u-boot,dm-spl") ||
ofnode_read_bool(node, "u-boot,dm-tpl")) ofnode_read_bool(node, "u-boot,dm-tpl"))
return true; return true;
#endif
return false; return false;
#endif
} }

1
scripts/Makefile.lib
View file

@ -525,4 +525,5 @@ quiet_cmd_fdtgrep = FDTGREP $@
cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \ cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \
-n /chosen -n /config -O dtb | \ -n /chosen -n /config -O dtb | \
$(objtree)/tools/fdtgrep -r -O dtb - -o $@ \ $(objtree)/tools/fdtgrep -r -O dtb - -o $@ \
-P u-boot,dm-pre-reloc -P u-boot,dm-spl -P u-boot,dm-tpl \
$(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS))) $(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS)))