From: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> To: U-Boot Mailing List <u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org> Cc: Tom Rini <trini-l0cyMroinI0@public.gmane.org>, Jerry Van Baren <vanbaren-He//nVnquyzQT0dZR+AlfA@public.gmane.org>, Devicetree Discuss <devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org> Subject: [PATCH 02/14] fdt: Add function to get a config string from device tree Date: Thu, 25 Oct 2012 19:30:59 -0700 [thread overview] Message-ID: <1351218671-15228-3-git-send-email-sjg@chromium.org> (raw) In-Reply-To: <1351218671-15228-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Add a function to look up a configuration string such as board name and returns its value. We look in the "/config" node for this. Signed-off-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> --- include/fdtdec.h | 10 ++++++++++ lib/fdtdec.c | 28 ++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index d880fe8..e828662 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -367,6 +367,16 @@ int fdtdec_setup_gpio(struct fdt_gpio_state *gpio); int fdtdec_get_config_int(const void *blob, const char *prop_name, int default_val); +/** + * Look in the FDT for a config item with the given name and return its value + * as a string. + * + * @param blob FDT blob + * @param prop_name property name to look up + * @returns property string, NULL on error. + */ +char *fdtdec_get_config_string(const void *blob, const char *prop_name); + /* * Look up a property in a node and return its contents in a byte * array of given length. The property must have at least enough data for diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 1f50022..2d60c8a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -513,16 +513,6 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node, return cell; } -/** - * Look in the FDT for a config item with the given name and return its value - * as a 32-bit integer. The property must have at least 4 bytes of data. The - * value of the first cell is returned. - * - * @param blob FDT blob to use - * @param prop_name Node property name - * @param default_val default value to return if the property is not found - * @return integer value, if found, or default_val if not - */ int fdtdec_get_config_int(const void *blob, const char *prop_name, int default_val) { @@ -534,3 +524,21 @@ int fdtdec_get_config_int(const void *blob, const char *prop_name, return default_val; return fdtdec_get_int(blob, config_node, prop_name, default_val); } + +char *fdtdec_get_config_string(const void *blob, const char *prop_name) +{ + const char *nodep; + int nodeoffset; + int len; + + debug("%s: %s\n", __func__, prop_name); + nodeoffset = fdt_path_offset(blob, "/config"); + if (nodeoffset < 0) + return NULL; + + nodep = fdt_getprop(blob, nodeoffset, prop_name, &len); + if (!nodep) + return NULL; + + return (char *)nodep; +} -- 1.7.7.3
WARNING: multiple messages have this Message-ID (diff)
From: Simon Glass <sjg@chromium.org> To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 02/14] fdt: Add function to get a config string from device tree Date: Thu, 25 Oct 2012 19:30:59 -0700 [thread overview] Message-ID: <1351218671-15228-3-git-send-email-sjg@chromium.org> (raw) In-Reply-To: <1351218671-15228-1-git-send-email-sjg@chromium.org> Add a function to look up a configuration string such as board name and returns its value. We look in the "/config" node for this. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/fdtdec.h | 10 ++++++++++ lib/fdtdec.c | 28 ++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index d880fe8..e828662 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -367,6 +367,16 @@ int fdtdec_setup_gpio(struct fdt_gpio_state *gpio); int fdtdec_get_config_int(const void *blob, const char *prop_name, int default_val); +/** + * Look in the FDT for a config item with the given name and return its value + * as a string. + * + * @param blob FDT blob + * @param prop_name property name to look up + * @returns property string, NULL on error. + */ +char *fdtdec_get_config_string(const void *blob, const char *prop_name); + /* * Look up a property in a node and return its contents in a byte * array of given length. The property must have at least enough data for diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 1f50022..2d60c8a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -513,16 +513,6 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node, return cell; } -/** - * Look in the FDT for a config item with the given name and return its value - * as a 32-bit integer. The property must have at least 4 bytes of data. The - * value of the first cell is returned. - * - * @param blob FDT blob to use - * @param prop_name Node property name - * @param default_val default value to return if the property is not found - * @return integer value, if found, or default_val if not - */ int fdtdec_get_config_int(const void *blob, const char *prop_name, int default_val) { @@ -534,3 +524,21 @@ int fdtdec_get_config_int(const void *blob, const char *prop_name, return default_val; return fdtdec_get_int(blob, config_node, prop_name, default_val); } + +char *fdtdec_get_config_string(const void *blob, const char *prop_name) +{ + const char *nodep; + int nodeoffset; + int len; + + debug("%s: %s\n", __func__, prop_name); + nodeoffset = fdt_path_offset(blob, "/config"); + if (nodeoffset < 0) + return NULL; + + nodep = fdt_getprop(blob, nodeoffset, prop_name, &len); + if (!nodep) + return NULL; + + return (char *)nodep; +} -- 1.7.7.3
next prev parent reply other threads:[~2012-10-26 2:30 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-10-26 2:30 [PATCH 0/14] fdt: Add various device tree utilities and features Simon Glass 2012-10-26 2:30 ` [U-Boot] " Simon Glass [not found] ` <1351218671-15228-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2012-10-26 2:30 ` [PATCH 01/14] fdt: Add function to get config int from device tree Simon Glass 2012-10-26 2:30 ` [U-Boot] " Simon Glass 2012-10-26 2:30 ` Simon Glass [this message] 2012-10-26 2:30 ` [U-Boot] [PATCH 02/14] fdt: Add function to get a config string " Simon Glass 2012-10-26 2:31 ` [PATCH 03/14] fdt: Add fdtdec_decode_region() to decode memory region Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 04/14] fdt: Add function for decoding multiple gpios globally available Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 05/14] fdt: Export fdtdec_find_alias_node() function Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass [not found] ` <1351218671-15228-6-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2012-10-26 4:24 ` David Gibson 2012-10-26 4:24 ` [U-Boot] " David Gibson 2012-10-31 23:50 ` Simon Glass 2012-10-31 23:50 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 06/14] fdt: Export fdtdec_lookup() and fix the name Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 07/14] fdt: Add function to read boolean property Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 08/14] fdt: Add fdtdec_get_uint64 to decode a 64-bit value from a property Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 09/14] fdt: Add polarity-aware gpio functions to fdtdec Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 7:17 ` Lucas Stach 2012-10-26 7:17 ` [U-Boot] " Lucas Stach 2012-10-31 23:59 ` Simon Glass 2012-10-31 23:59 ` [U-Boot] " Simon Glass 2012-11-01 4:50 ` Stephen Warren 2012-11-01 4:50 ` [U-Boot] " Stephen Warren 2012-11-15 23:31 ` Simon Glass 2012-11-15 23:31 ` [U-Boot] " Simon Glass 2012-11-15 23:46 ` Stephen Warren 2012-11-15 23:46 ` [U-Boot] " Stephen Warren 2012-11-16 0:01 ` Simon Glass 2012-11-16 0:01 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 11/14] fdt: Tell the FDT library where the device tree is Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 12/14] fdt: Allow device tree to specify secure booting Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 10/14] fdt: Load boot command from device tree Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 13/14] fdt: Add option to default to most compatible conf in a fit image Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass 2012-10-26 2:31 ` [PATCH 14/14] fdt: Set kernaddr if fdt indicates a kernel is present Simon Glass 2012-10-26 2:31 ` [U-Boot] " Simon Glass [not found] ` <1351218671-15228-15-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2012-11-28 14:30 ` Dennis Lan (dlan) 2012-11-28 14:30 ` Dennis Lan 2012-11-28 15:16 ` Simon Glass 2012-11-18 1:35 ` [PATCH 0/14] fdt: Add various device tree utilities and features Jerry Van Baren 2012-11-18 1:35 ` [U-Boot] " Jerry Van Baren 2012-11-19 17:08 ` Simon Glass 2012-11-19 17:08 ` [U-Boot] " Simon Glass
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1351218671-15228-3-git-send-email-sjg@chromium.org \ --to=sjg-f7+t8e8rja9g9huczpvpmw@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=trini-l0cyMroinI0@public.gmane.org \ --cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \ --cc=vanbaren-He//nVnquyzQT0dZR+AlfA@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.