summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-12 19:11:42 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-12 19:11:42 +0100
commita3f0169880a44ac06de5177e7926d7c732368663 (patch)
tree34d2fcde4020719ecb435acce0ecf698c63dd86e /include
parent3b2e4fd9b0348d49e7b55a19a0c919f6c83d9a43 (diff)
parent62ec6418d417b1fc887f979441c15fbd6602edc9 (diff)
downloadu-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.zip
u-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.tar.gz
u-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.tar.bz2
Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#ft_infr
Diffstat (limited to 'include')
-rw-r--r--include/configs/stxxtc.h2
-rw-r--r--include/ft_build.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 3ffe6b2..be6c36c 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -584,5 +584,7 @@ typedef unsigned int led_id_t;
#define OF_CPU "PowerPC,MPC870@0"
#define OF_TBCLK (MPC8XX_HZ / 16)
+#define CONFIG_OF_HAS_BD_T 1
+#define CONFIG_OF_HAS_UBOOT_ENV 1
#endif /* __CONFIG_H */
diff --git a/include/ft_build.h b/include/ft_build.h
index 9104b1a..47ca575 100644
--- a/include/ft_build.h
+++ b/include/ft_build.h
@@ -57,10 +57,12 @@ void ft_prop_int(struct ft_cxt *cxt, const char *name, int val);
void ft_begin(struct ft_cxt *cxt, void *blob, int max_size);
void ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
-void ft_setup(void *blob, int size, bd_t * bd);
+void ft_setup(void *blob, int size, bd_t * bd, ulong initrd_start, ulong initrd_end);
void ft_dump_blob(const void *bphp);
void ft_merge_blob(struct ft_cxt *cxt, void *blob);
void *ft_get_prop(void *bphp, const char *propname, int *szp);
+void ft_board_setup(void *blob, bd_t *bd);
+
#endif