diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-13 18:27:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-13 21:05:17 -0500 |
| commit | 20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51 (patch) | |
| tree | f1cefba44b166b5f698d2b9aa8ec988a369c8e15 /drivers/core | |
| parent | 774da4b9aadeea4d6973a16debc02a6801ff9344 (diff) | |
| parent | fc82edd8440721aadf3bfc784f29a513ad7680be (diff) | |
| download | blackbird-obmc-uboot-20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51.tar.gz blackbird-obmc-uboot-20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/core/device.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index f332480e1d..c5c9d2a42e 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -60,6 +60,15 @@ config DM_SEQ_ALIAS help Most boards will have a '/aliases' node containing the path to numbered devices (e.g. serial0 = &serial0). This feature can be + disabled if it is not required. + +config SPL_DM_SEQ_ALIAS + bool "Support numbered aliases in device tree in SPL" + depends on DM + default n + help + Most boards will have a '/aliases' node containing the path to + numbered devices (e.g. serial0 = &serial0). This feature can be disabled if it is not required, to save code space in SPL. config REGMAP diff --git a/drivers/core/device.c b/drivers/core/device.c index 8c6e6b067e..818d03fac1 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -64,7 +64,7 @@ int device_bind(struct udevice *parent, const struct driver *drv, dev->seq = -1; dev->req_seq = -1; - if (CONFIG_IS_ENABLED(OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) { + if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS)) { /* * Some devices, such as a SPI bus, I2C bus and serial ports * are numbered using aliases. |
