Merge branch 'master' into next

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

diff --git a/board/zeus/update.c b/board/zeus/update.c
index c76519f094fb28724fb056c7fc464e44cd469dc5..c8487e58f8abfbf197ce21b9e3cd527c0a9b6960 100644 (file)
--- a/board/zeus/update.c
+++ b/board/zeus/update.c
@@ -67,12 +67,12 @@ u8 buf_zeus_pe[] = {
 static int update_boot_eeprom(void)
 {
        u32 len = 0x20;
-       u8 chip = CFG_I2C_EEPROM_ADDR;
+       u8 chip = CONFIG_SYS_I2C_EEPROM_ADDR;
        u8 *pbuf;
        u8 base;
        int i;
 
-       if (in_be32((void *)GPIO0_IR) & GPIO_VAL(CFG_GPIO_ZEUS_PE)) {
+       if (in_be32((void *)GPIO0_IR) & GPIO_VAL(CONFIG_SYS_GPIO_ZEUS_PE)) {
                pbuf = buf_zeus_pe;
                base = 0x40;
        } else {
@@ -98,8 +98,8 @@ int do_update_boot_eeprom(cmd_tbl_t* cmdtp, int flag, int argc, char* argv[])
 
 U_BOOT_CMD (
        update_boot_eeprom, 1, 1, do_update_boot_eeprom,
-       "update_boot_eeprom  - update boot eeprom content\n",
-       NULL
+       "update boot eeprom content",
+       ""
 );
 
 #endif