New implementation for internal handling of environment variables.

[karo-tx-uboot.git] / board / zeus / zeus.c

diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 3f329c2fc99ab565f42889343255cdbbda34d052..4e6878a266623132b84cd6a05c46c2152f370eb0 100644 (file)
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -44,24 +44,24 @@ extern uchar default_environment[];
 
 ulong flash_get_size(ulong base, int banknum);
 void env_crc_update(void);
-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 static u32 start_time;
 
 int board_early_init_f(void)
 {
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicer, 0x00000000);       /* disable all ints */
-       mtdcr(uiccr, 0x00000000);
-       mtdcr(uicpr, 0xFFFF7F00);       /* set int polarities */
-       mtdcr(uictr, 0x00000000);       /* set int trigger levels */
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest priority */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr(UIC0ER, 0x00000000);      /* disable all ints */
+       mtdcr(UIC0CR, 0x00000000);
+       mtdcr(UIC0PR, 0xFFFF7F00);      /* set int polarities */
+       mtdcr(UIC0TR, 0x00000000);      /* set int trigger levels */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr(UIC0VCR, 0x00000001);     /* set vect base=0,INT0 highest priority */
 
        /*
         * Configure CPC0_PCI to enable PerWE as output
         */
-       mtdcr(cpc0_pci, CPC0_PCI_SPE);
+       mtdcr(CPC0_PCI, CPC0_PCI_SPE);
 
        return 0;
 }
@@ -107,7 +107,7 @@ int misc_init_r(void)
        /* Re-do sizing to get full correct info */
 
        /* adjust flash start and offset */
-       mfebc(pb0cr, pbcr);
+       mfebc(PB0CR, pbcr);
        switch (gd->bd->bi_flashsize) {
        case 1 << 20:
                size_val = 0;
@@ -135,7 +135,7 @@ int misc_init_r(void)
                break;
        }
        pbcr = (pbcr & 0x0001ffff) | gd->bd->bi_flashstart | (size_val << 17);
-       mtebc(pb0cr, pbcr);
+       mtebc(PB0CR, pbcr);
 
        /*
         * Re-check to get correct base address
@@ -222,27 +222,8 @@ static int restore_default(void)
        char *buf_save;
        u32 crc;
 
-       /*
-        * Unprotect and erase environment area
-        */
-       flash_protect(FLAG_PROTECT_CLEAR,
-                     CONFIG_ENV_ADDR_REDUND,
-                     CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
-                     &flash_info[0]);
+       set_default_env("");
 
-       flash_sect_erase(CONFIG_ENV_ADDR_REDUND,
-                        CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1);
-
-       /*
-        * Now restore default environment from U-Boot image
-        * -> ipaddr, serverip...
-        */
-       memset(env_ptr, 0, sizeof(env_t));
-       memcpy(env_ptr->data, default_environment, ENV_SIZE);
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
-       env_ptr->flags = 0xFF;
-#endif
-       env_crc_update();
        gd->env_valid = 1;
 
        /*
@@ -251,6 +232,10 @@ static int restore_default(void)
         * -> ethaddr, eth1addr, serial#
         */
        buf = buf_save = malloc(FACTORY_RESET_ENV_SIZE);
+       if (buf == NULL) {
+               printf("ERROR: malloc() failed\n");
+               return -1;
+       }
        if (eeprom_read(FACTORY_RESET_I2C_EEPROM, FACTORY_RESET_ENV_OFFS,
                        (u8 *)buf, FACTORY_RESET_ENV_SIZE)) {
                puts("\nError reading EEPROM!\n");
@@ -278,7 +263,7 @@ static int restore_default(void)
        return 0;
 }
 
-int do_set_default(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_set_default(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *buf;
        char *buf_save;
@@ -328,7 +313,7 @@ int do_set_default(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        setdef, 4,      1,      do_set_default,
        "write board-specific values to EEPROM (ethaddr...)",
-       "ethaddr eth1addr serial#\n    - write board-specific values to EEPROM\n"
+       "ethaddr eth1addr serial#\n    - write board-specific values to EEPROM"
        );
 
 static inline int sw_reset_pressed(void)
@@ -336,7 +321,7 @@ static inline int sw_reset_pressed(void)
        return !(in_be32((void *)GPIO0_IR) & GPIO_VAL(CONFIG_SYS_GPIO_SW_RESET));
 }
 
-int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char* argv[])
+int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char * const argv[])
 {
        int delta;
        int count = 0;
@@ -419,7 +404,7 @@ int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char* argv[])
 U_BOOT_CMD (
        chkreset, 1, 1, do_chkreset,
        "Check for status of SW-reset button and act accordingly",
-       NULL
+       ""
 );
 
 #if defined(CONFIG_POST)