Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 29629eb897f8d8119b06477d0ca3c4b424726e51

Authored by Simon Glass
1 parent 054b3a1e80
Exists in v2017.01-smarct4x and in 26 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

dm: core: Don't use device tree with of-platdata 

When CONFIG_SPL_OF_PLATDATA is enabled we should not access the device
tree. Remove all references to this in the core driver-model code.

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/core/device.c
Diff comments   View file @ 29629eb
... ... @@ -608,7 +608,7 @@
608 608  
609 609 fdt_addr_t dev_get_addr_index(struct udevice *dev, int index)
610 610 {
611   -#if CONFIG_IS_ENABLED(OF_CONTROL)
  611 +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
612 612 fdt_addr_t addr;
613 613  
614 614 if (CONFIG_IS_ENABLED(OF_TRANSLATE)) {
drivers/core/lists.c
Diff comments   View file @ 29629eb
... ... @@ -99,7 +99,7 @@
99 99 return 0;
100 100 }
101 101  
102   -#if CONFIG_IS_ENABLED(OF_CONTROL)
  102 +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
103 103 /**
104 104 * driver_check_compatible() - Check if a driver is compatible with this node
105 105 *
... ... @@ -188,7 +188,7 @@
188 188 return ret;
189 189 }
190 190  
191   -#if CONFIG_IS_ENABLED(OF_CONTROL)
  191 +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
192 192 int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
193 193 bool pre_reloc_only)
194 194 {
... ... @@ -244,7 +244,7 @@
244 244 return ret;
245 245 }
246 246  
247   - if (CONFIG_IS_ENABLED(OF_CONTROL)) {
  247 + if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
248 248 ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only);
249 249 if (ret) {
250 250 debug("dm_scan_fdt() failed: %d\n", ret);