rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / include / configs / sacsng.h

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index ec7d34a..560bf05 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -124,7 +124,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena
- *          :              CFG_ENV_SECT_SIZE, 16k
+ *          :              CONFIG_ENV_SECT_SIZE, 16k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
@@ -272,10 +272,14 @@
 
 #undef  SPI_INIT                       /* no port initialization needed */
 #define SPI_READ        ((immr->im_ioport.iop_pdatd & I2C_MISO) != 0)
-#define SPI_SDA(bit)    if(bit) immr->im_ioport.iop_pdatd |=  I2C_MOSI; \
-                       else    immr->im_ioport.iop_pdatd &= ~I2C_MOSI
-#define SPI_SCL(bit)    if(bit) immr->im_ioport.iop_pdatd |=  I2C_SCLK; \
-                       else    immr->im_ioport.iop_pdatd &= ~I2C_SCLK
+#define SPI_SDA(bit)    do {                                           \
+                       if(bit) immr->im_ioport.iop_pdatd |=  I2C_MOSI; \
+                       else    immr->im_ioport.iop_pdatd &= ~I2C_MOSI; \
+                       } while (0)
+#define SPI_SCL(bit)    do {                                           \
+                       if(bit) immr->im_ioport.iop_pdatd |=  I2C_SCLK; \
+                       else    immr->im_ioport.iop_pdatd &= ~I2C_SCLK; \
+                       } while (0)
 #define SPI_DELAY                       /* No delay is needed */
 #endif /* CONFIG_SOFT_SPI */
 
@@ -312,7 +316,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1
 
 /* Define this to contain any number of null terminated strings that
  * will be part of the default enviroment compiled into the boot image.
@@ -432,7 +436,7 @@
  *     To stop use: " "
  */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting...\n"
+#define CONFIG_AUTOBOOT_PROMPT "Autobooting...\n"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -441,7 +445,7 @@
 /* Define a command string that is automatically executed when no character
  * is read on the console interface withing "Boot Delay" after reset.
  */
-#undef CONFIG_BOOT_ROOT_INITRD         /* Use ram disk for the root file system */
+#undef CONFIG_BOOT_ROOT_INITRD         /* Use ram disk for the root file system */
 #define        CONFIG_BOOT_ROOT_NFS            /* Use a NFS mounted root file system */
 
 #ifdef CONFIG_BOOT_ROOT_INITRD
@@ -606,7 +610,7 @@
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@ -703,21 +707,21 @@
 #define CFG_FLASH_WRITE_TOUT   1       /* Timeout for Flash Write (in ms)      */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 
-#  ifdef CFG_ENV_IN_OWN_SECT
-#    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#    define CFG_ENV_SECT_SIZE  0x10000
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#    define CONFIG_ENV_SECT_SIZE       0x10000
 #  else
-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector     */
-#    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size      */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE    0x1000  /* Total Size of Environment Sector     */
+#    define CONFIG_ENV_SECT_SIZE       0x10000 /* see README - env sect real size      */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_IS_IN_NVRAM       1
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------