diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:04 +0100 |
| commit | 0b12784089b6a4372ed27cf1fd578d85a7d3dbd4 (patch) | |
| tree | 6f25a55d72f51aeb1d42f02bf5f56edcc051b41a /commands/Kconfig | |
| parent | 5c6cc8736ed4e14119fb2e8c0ed1ecab7caff9ae (diff) | |
| parent | 9a554f8ff25685e44431079e73887b061d6f4a41 (diff) | |
| download | barebox-0b12784089b6a4372ed27cf1fd578d85a7d3dbd4.tar.gz barebox-0b12784089b6a4372ed27cf1fd578d85a7d3dbd4.tar.xz | |
Merge branch 'for-next/oftree'
Conflicts:
drivers/of/base.c
Diffstat (limited to 'commands/Kconfig')
| -rw-r--r-- | commands/Kconfig | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 1addd91d24..d3c338c832 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -481,18 +481,28 @@ config CMD_GO config CMD_OFTREE tristate select OFTREE + select OFDEVICE prompt "oftree" help The oftree command has support for dumping devicetrees and, if enabled, to probe devices from the devicetree -config CMD_OFTREE_PROBE - bool - depends on CMD_OFTREE +config CMD_OF_PROPERTY + tristate + select OFTREE + select OFDEVICE + prompt "of_property" + help + The of_property command allows setting and deleting of properties in + the currently loaded devicetree. + +config CMD_OF_NODE + tristate + select OFTREE select OFDEVICE - prompt "oftree probe support" + prompt "of_node" help - This enables the -p option to probe devices from the devicetree + The of_property command allows adding and removing devicetree nodes. endmenu |