rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / MAI / AmigaOneG3SE / cmd_boota.c

diff --git a/board/MAI/AmigaOneG3SE/cmd_boota.c b/board/MAI/AmigaOneG3SE/cmd_boota.c
index db1ecfc30837b1c84413518bb852284bc807c3e5..949af1802549629e8c37cb1a79c1bde382e91fb3 100644 (file)
--- a/board/MAI/AmigaOneG3SE/cmd_boota.c
+++ b/board/MAI/AmigaOneG3SE/cmd_boota.c
@@ -3,6 +3,7 @@
 #include "../disk/part_amiga.h"
 #include <asm/cache.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 #undef BOOTA_DEBUG
 
@@ -26,7 +27,7 @@ struct bootcode_block bblk;
 
 int do_boota (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
-       unsigned char *load_address = (unsigned char *) CFG_LOAD_ADDR;
+       unsigned char *load_address = (unsigned char *) CONFIG_SYS_LOAD_ADDR;
        unsigned char *base_address;
        unsigned long offset;
 
@@ -108,8 +109,6 @@ int do_boota (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        s = getenv ("autostart");
        if (s && strcmp (s, "yes") == 0) {
-               DECLARE_GLOBAL_DATA_PTR;
-
                void (*boot) (bd_t *, char *, block_dev_desc_t *);
                char *args;
 
@@ -120,9 +119,9 @@ int do_boota (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
-#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP)
-cmd_tbl_t U_BOOT_CMD(BOOTA) = MK_CMD_ENTRY(
-       "boota",   3,      1,      do_boota,
+#if defined(CONFIG_AMIGAONEG3SE) && defined(CONFIG_CMD_BSP)
+U_BOOT_CMD(
+       boota,   3,      1,      do_boota,
        "boota   - boot an Amiga kernel\n",
        "address disk"
 );