Merge branch 'master' of rsync://rsync.denx.de/git/u-boot

[platform/kernel/u-boot.git] / board / hymod / bsp.c

diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c
index 7ea91e6..6868f26 100644 (file)
--- a/board/hymod/bsp.c
+++ b/board/hymod/bsp.c
@@ -28,6 +28,8 @@
 #include <net.h>
 #include <asm/iopin_8260.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*-----------------------------------------------------------------------
  * Board Special Commands: FPGA load/store, EEPROM erase
  */
@@ -75,8 +77,6 @@
 int
 fpga_load (int mezz, uchar *addr, ulong size)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        hymod_conf_t *cp = &gd->bd->bi_hymod_conf;
        xlx_info_t *fp;
        xlx_iopins_t *fpgaio;
@@ -275,8 +275,8 @@ do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        printf ("Usage:\n%s\n", cmdtp->usage);
        return 1;
 }
-cmd_tbl_t U_BOOT_CMD(fpga) = MK_CMD_ENTRY(
-       "fpga", 6,      1,      do_fpga,
+U_BOOT_CMD(
+       fpga,   6,      1,      do_fpga,
        "fpga    - FPGA sub-system\n",
        "load [type] addr size\n"
        "  - write the configuration data at memory address `addr',\n"
@@ -334,8 +334,8 @@ do_eecl (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
-cmd_tbl_t U_BOOT_CMD(eec) = MK_CMD_ENTRY(
-       "eeclear",      1,      0,      do_eecl,
+U_BOOT_CMD(
+       eeclear,        1,      0,      do_eecl,
        "eeclear - Clear the eeprom on a Hymod board \n",
        "[type]\n"
        "  - write zeroes into the EEPROM on the board of type `type'\n"