diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-09-07 00:13:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-09-07 00:13:11 +0200 |
| commit | bf72a4ca9e08c9dcd4e6c3201772b565571da0a7 (patch) | |
| tree | 6c38e15d26ee62ab9f81fc0d9a090cd8bb21bf31 /include | |
| parent | 041a2554ad619e80dce520c1a33210affcb6a3f2 (diff) | |
| parent | e79021223bc339df655e360645a52c457a74b067 (diff) | |
| download | u-boot-imx-bf72a4ca9e08c9dcd4e6c3201772b565571da0a7.zip u-boot-imx-bf72a4ca9e08c9dcd4e6c3201772b565571da0a7.tar.gz u-boot-imx-bf72a4ca9e08c9dcd4e6c3201772b565571da0a7.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc5xxx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/IceCube.h | 2 | ||||
| -rw-r--r-- | include/configs/TQM5200.h | 2 | ||||
| -rw-r--r-- | include/configs/jupiter.h | 2 | ||||
| -rw-r--r-- | include/configs/motionpro.h | 2 | ||||
| -rw-r--r-- | include/libfdt.h | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index bdd92ba..4c16d22 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -178,7 +178,7 @@ #endif /* CONFIG_MPC5200 */ /* pass open firmware flat tree */ -#define CONFIG_OF_FLAT_TREE 1 +#define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 #define OF_CPU "PowerPC,5200@0" diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index c08173b..e0c9d81 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -701,7 +701,7 @@ * Open firmware flat tree support *----------------------------------------------------------------------- */ -#define CONFIG_OF_FLAT_TREE 1 +#define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 #define OF_CPU "PowerPC,5200@0" diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 4070ab9..b7100e9 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -145,7 +145,7 @@ #if 0 /* pass open firmware flat tree */ -#define CONFIG_OF_FLAT_TREE 1 +#define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 #define OF_CPU "PowerPC,5200@0" diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 82827c6..9a21632 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -417,7 +417,7 @@ extern void __led_set(led_id_t id, int state); #define CFG_RESET_ADDRESS 0xfff00100 /* pass open firmware flat tree */ -#define CONFIG_OF_FLAT_TREE 1 +#define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 #define OF_CPU "PowerPC,5200@0" diff --git a/include/libfdt.h b/include/libfdt.h index 340e89d..38c65a9 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -140,6 +140,8 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, }) #define fdt_setprop_string(fdt, nodeoffset, name, str) \ fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) +int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, + const void *val, int len, int create); int fdt_delprop(void *fdt, int nodeoffset, const char *name); int fdt_add_subnode_namelen(void *fdt, int parentoffset, const char *name, int namelen); |