@@ -313,7 +313,7 @@ struct mipi_dsim_master_ops {
* @platform_data: lcd panel specific platform data.
*/
struct mipi_dsim_lcd_device {
- char *name;
+ const char *name;
int id;
int bus_id;
int reverse_panel;
@@ -111,7 +111,7 @@ static int setup_led(void)
{
#ifdef CONFIG_SPL_LED
struct udevice *dev;
- char *led_name;
+ const char *led_name;
int ret;
led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led");
@@ -372,7 +372,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
#ifdef CONFIG_LED
static int get_led(struct udevice **dev, char *led_string)
{
- char *led_name;
+ const char *led_name;
int ret;
led_name = fdtdec_get_config_string(gd->fdt_blob, led_string);
@@ -14,7 +14,7 @@ static int setup_led(void)
{
#ifdef CONFIG_SPL_LED
struct udevice *dev;
- char *led_name;
+ const char *led_name;
int ret;
led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led");
@@ -226,7 +226,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
static int get_led(struct udevice **dev, char *led_string)
{
- char *led_name;
+ const char *led_name;
int ret;
led_name = fdtdec_get_config_string(gd->fdt_blob, led_string);
@@ -156,7 +156,7 @@ int do_run(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
bool cli_process_fdt(const char **cmdp)
{
/* Allow the fdt to override the boot command */
- char *env = fdtdec_get_config_string(gd->fdt_blob, "bootcmd");
+ const char *env = fdtdec_get_config_string(gd->fdt_blob, "bootcmd");
if (env)
*cmdp = env;
/*
@@ -778,7 +778,7 @@ int fdtdec_get_config_bool(const void *blob, const char *prop_name);
* @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);
+const 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
@@ -879,7 +879,7 @@ int fdtdec_get_config_bool(const void *blob, const char *prop_name)
return prop != NULL;
}
-char *fdtdec_get_config_string(const void *blob, const char *prop_name)
+const char *fdtdec_get_config_string(const void *blob, const char *prop_name)
{
const char *nodep;
int nodeoffset;
@@ -894,7 +894,7 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
if (!nodep)
return NULL;
- return (char *)nodep;
+ return nodep;
}
u64 fdtdec_get_number(const fdt32_t *ptr, unsigned int cells)
Nobody should modify the string returned by fdtdec_get_config_string(), so make it return a const pointer. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- arch/arm/mach-exynos/include/mach/mipi_dsim.h | 2 +- arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- board/dhelectronics/dh_stm32mp1/board.c | 2 +- board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- common/cli.c | 2 +- include/fdtdec.h | 2 +- lib/fdtdec.c | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-)