spl: dm: Add SPL_DM_SEQ_ALIAS config option

The Device Model sequence alias feature is required by some Uclasses.
Instead of disabling the feature for all SPL targets allow it to be
configured.

The config option is disabled by default to reduce code size for targets
that are not interested or do not require this feature.

Signed-off-by: Nathan Rossi <[email protected]>
Acked-by: Simon Glass <[email protected]>
Acked-by: Michal Simek <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Masahiro Yamada <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Stefan Roese <[email protected]>
Signed-off-by: Michal Simek <[email protected]>

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index f332480e1d89eebeef28a2305468b57f3f3a577d..c5c9d2a42e5c943572740feac34042915696b266 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -57,6 +57,15 @@ config DM_SEQ_ALIAS
        bool "Support numbered aliases in device tree"
        depends on DM
        default y
+       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

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 758f39064cca9a4b288733cce1a1d8c1c00ff3ee..b237b88c0a3dca810eadf41b2a84af271018948c 100644 (file)
--- 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.

diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 6e299f69ae48a82ea770c077597ada36397476c0..3b198ae3ced6820b9c744cf9d948cc46d024fbaa 100644 (file)
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -29,7 +29,6 @@
 #endif
 
 #undef CONFIG_DM_WARN
-#undef CONFIG_DM_SEQ_ALIAS
 #undef CONFIG_DM_STDIO
 
 #endif /* CONFIG_SPL_BUILD */