diff options
author | Tom Rini <trini@ti.com> | 2013-05-13 18:17:39 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-05-13 18:17:39 -0400 |
commit | a661b99dbc35e725f229a7b8e189ca21304ba026 (patch) | |
tree | b3f329efb8cda7a47db2b0e7bbbf6454a3e76db8 /arch/x86/lib/cmd_boot.c | |
parent | a7e62be09189dae3a16882e53f15c38754f9db91 (diff) | |
parent | 8f0278eab4410de57ea6a32a8e5a50614a28084f (diff) | |
download | talos-obmc-uboot-a661b99dbc35e725f229a7b8e189ca21304ba026.tar.gz talos-obmc-uboot-a661b99dbc35e725f229a7b8e189ca21304ba026.zip |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/cmd_boot.c')
-rw-r--r-- | arch/x86/lib/cmd_boot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index a81a9a38a6..315be5a60d 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -36,6 +36,8 @@ #include <malloc.h> #include <asm/u-boot-x86.h> +DECLARE_GLOBAL_DATA_PTR; + unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, char * const argv[]) { |