summaryrefslogtreecommitdiff
path: root/drivers/core/device.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-08-02 23:15:48 (GMT)
committerSimon Glass <sjg@chromium.org>2015-08-31 13:57:26 (GMT)
commit628d792c0775ff4b0d373494d075dd7fcb74bb76 (patch)
treea5247aa5cdc88538ee80e67f4d07c6b24f1d91f7 /drivers/core/device.c
parent4e9838c102e8575fbff3944e1596a53ec579844a (diff)
downloadu-boot-628d792c0775ff4b0d373494d075dd7fcb74bb76.tar.xz
dm: core: Add Kconfig for simple bus driver
Add Kconfig entries for the simple-bus driver, both for U-Boot and for SPL. The simple-bus is enabled by default in U-Boot and disabled by default in SPL to preserve the original behavior. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org> Modified to fit on top of Masahiro's $(SPL) setup: Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core/device.c')
-rw-r--r--drivers/core/device.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 826d82c..01f6647 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -574,11 +574,9 @@ fdt_addr_t dev_get_addr(struct udevice *dev)
fdt_addr_t addr;
addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
- if (addr != FDT_ADDR_T_NONE) {
-#ifndef CONFIG_SPL_BUILD
+ if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) {
if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS)
addr = simple_bus_translate(dev->parent, addr);
-#endif
}
return addr;