diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:18:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:18:05 +0100 |
| commit | f31f496e306489184c6963e0d56d0cf7b2c9cd0b (patch) | |
| tree | ed23c60148634abdfeb9a12d7a593ee1795c44e9 | |
| parent | 10d6c6965f253dfa3cad0a92024d2cc9868193c7 (diff) | |
| parent | 3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121 (diff) | |
| download | u-boot-imx-f31f496e306489184c6963e0d56d0cf7b2c9cd0b.zip u-boot-imx-f31f496e306489184c6963e0d56d0cf7b2c9cd0b.tar.gz u-boot-imx-f31f496e306489184c6963e0d56d0cf7b2c9cd0b.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
Fix constness of the fdt void pointer in fdt_getprop_u32_default
Add some missing endian conversions in fdt_support.c
| -rw-r--r-- | common/fdt_support.c | 8 | ||||
| -rw-r--r-- | include/fdt_support.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index bdda64d..593f16c 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -49,8 +49,8 @@ DECLARE_GLOBAL_DATA_PTR; * Convenience function to find a node and return it's property or a * default value if it doesn't exist. */ -u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, - const u32 dflt) +u32 fdt_getprop_u32_default(const void *fdt, const char *path, + const char *prop, const u32 dflt) { const u32 *val; int off; @@ -61,7 +61,7 @@ u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, val = fdt_getprop(fdt, off, prop, NULL); if (val) - return *val; + return fdt32_to_cpu(*val); else return dflt; } @@ -372,7 +372,7 @@ static int get_cells_len(void *blob, char *nr_cells_name) const u32 *cell; cell = fdt_getprop(blob, 0, nr_cells_name, NULL); - if (cell && *cell == 2) + if (cell && fdt32_to_cpu(*cell) == 2) return 8; return 4; diff --git a/include/fdt_support.h b/include/fdt_support.h index c7b4605..cef3c65 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -28,8 +28,8 @@ #include <fdt.h> -u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, - const u32 dflt); +u32 fdt_getprop_u32_default(const void *fdt, const char *path, + const char *prop, const u32 dflt); int fdt_chosen(void *fdt, int force); int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force); void do_fixup_by_path(void *fdt, const char *path, const char *prop, |