rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git] / include / configs / lwmon5.h
index 7540c8e..e0dbd61 100644 (file)
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CFG_MONITOR_LEN                (512 * 1024)    /* Reserve 512 kB for Monitor   */
-#define CFG_MALLOC_LEN         (512 * 1024)    /* Reserve 512 kB for malloc()  */
-
-#define CFG_BOOT_BASE_ADDR     0xf0000000
-#define CFG_SDRAM_BASE         0x00000000      /* _must_ be 0          */
-#define CFG_FLASH_BASE         0xf8000000      /* start of FLASH       */
-#define CFG_MONITOR_BASE       TEXT_BASE
-#define CFG_LIME_BASE_0         0xc0000000
-#define CFG_LIME_BASE_1         0xc1000000
-#define CFG_LIME_BASE_2         0xc2000000
-#define CFG_LIME_BASE_3         0xc3000000
-#define CFG_FPGA_BASE_0         0xc4000000
-#define CFG_FPGA_BASE_1         0xc4200000
-#define CFG_OCM_BASE           0xe0010000      /* ocm                  */
-#define CFG_PCI_BASE           0xe0000000      /* Internal PCI regs    */
-#define CFG_PCI_MEMBASE                0x80000000      /* mapped pci memory    */
-#define CFG_PCI_MEMBASE1       CFG_PCI_MEMBASE  + 0x10000000
-#define CFG_PCI_MEMBASE2       CFG_PCI_MEMBASE1 + 0x10000000
-#define CFG_PCI_MEMBASE3       CFG_PCI_MEMBASE2 + 0x10000000
+#define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* Reserve 512 kB for Monitor   */
+#define CONFIG_SYS_MALLOC_LEN          (512 * 1024)    /* Reserve 512 kB for malloc()  */
+
+#define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
+#define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
+#define CONFIG_SYS_FLASH_BASE          0xf8000000      /* start of FLASH       */
+#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_LIME_BASE_0         0xc0000000
+#define CONFIG_SYS_LIME_BASE_1         0xc1000000
+#define CONFIG_SYS_LIME_BASE_2         0xc2000000
+#define CONFIG_SYS_LIME_BASE_3         0xc3000000
+#define CONFIG_SYS_FPGA_BASE_0         0xc4000000
+#define CONFIG_SYS_FPGA_BASE_1         0xc4200000
+#define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
+#define CONFIG_SYS_PCI_BASE            0xe0000000      /* Internal PCI regs    */
+#define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory    */
+#define CONFIG_SYS_PCI_MEMBASE1        CONFIG_SYS_PCI_MEMBASE  + 0x10000000
+#define CONFIG_SYS_PCI_MEMBASE2        CONFIG_SYS_PCI_MEMBASE1 + 0x10000000
+#define CONFIG_SYS_PCI_MEMBASE3        CONFIG_SYS_PCI_MEMBASE2 + 0x10000000
 
 /* Don't change either of these */
-#define CFG_PERIPHERAL_BASE    0xef600000      /* internal peripherals */
+#define CONFIG_SYS_PERIPHERAL_BASE     0xef600000      /* internal peripherals */
 
-#define CFG_USB2D0_BASE                0xe0000100
-#define CFG_USB_DEVICE         0xe0000000
-#define CFG_USB_HOST           0xe0000400
+#define CONFIG_SYS_USB2D0_BASE         0xe0000100
+#define CONFIG_SYS_USB_DEVICE          0xe0000000
+#define CONFIG_SYS_USB_HOST            0xe0000400
 
 /*-----------------------------------------------------------------------
  * Initial RAM & stack pointer
  * content during reset (GPT0_COMP6). This way we reserve the OCM (16k)
  * for logbuffer only. (GPT0_COMP1-COMP5 are reserved for logbuffer header.)
  */
-#define CFG_INIT_RAM_DCACHE    1               /* d-cache as init ram  */
-#define CFG_INIT_RAM_ADDR      0x70000000              /* DCache       */
-#define CFG_INIT_RAM_END       (4 << 10)
-#define CFG_GBL_DATA_SIZE      256             /* num bytes initial data*/
-#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
-#define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
-#define CFG_POST_ALT_WORD_ADDR (CFG_PERIPHERAL_BASE + GPT0_COMP6)
+#define CONFIG_SYS_INIT_RAM_DCACHE     1               /* d-cache as init ram  */
+#define CONFIG_SYS_INIT_RAM_ADDR       0x70000000              /* DCache       */
+#define CONFIG_SYS_INIT_RAM_END        (4 << 10)
+#define CONFIG_SYS_GBL_DATA_SIZE       256             /* num bytes initial data*/
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
+#define CONFIG_SYS_POST_ALT_WORD_ADDR  (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6)
                                                /* unused GPT0 COMP reg */
-#define CFG_MEM_TOP_HIDE       (4 << 10) /* don't use last 4kbytes     */
+#define CONFIG_SYS_MEM_TOP_HIDE        (4 << 10) /* don't use last 4kbytes     */
                                        /* 440EPx errata CHIP 11        */
-#define CFG_OCM_SIZE           (16 << 10)
+#define CONFIG_SYS_OCM_SIZE            (16 << 10)
 
 /* Additional registers for watchdog timer post test */
 
-#define CFG_WATCHDOG_TIME_ADDR (CFG_PERIPHERAL_BASE + GPT0_MASK2)
-#define CFG_WATCHDOG_FLAGS_ADDR        (CFG_PERIPHERAL_BASE + GPT0_MASK1)
-#define CFG_DSPIC_TEST_ADDR    CFG_WATCHDOG_FLAGS_ADDR
-#define CFG_OCM_STATUS_ADDR    CFG_WATCHDOG_FLAGS_ADDR
-#define CFG_WATCHDOG_MAGIC     0x12480000
-#define CFG_WATCHDOG_MAGIC_MASK        0xFFFF0000
-#define CFG_DSPIC_TEST_MASK    0x00000001
-#define CFG_OCM_STATUS_OK      0x00009A00
-#define CFG_OCM_STATUS_FAIL    0x0000A300
-#define CFG_OCM_STATUS_MASK    0x0000FF00
+#define CONFIG_SYS_WATCHDOG_TIME_ADDR  (CONFIG_SYS_PERIPHERAL_BASE + GPT0_MASK2)
+#define CONFIG_SYS_WATCHDOG_FLAGS_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_MASK1)
+#define CONFIG_SYS_DSPIC_TEST_ADDR     CONFIG_SYS_WATCHDOG_FLAGS_ADDR
+#define CONFIG_SYS_OCM_STATUS_ADDR     CONFIG_SYS_WATCHDOG_FLAGS_ADDR
+#define CONFIG_SYS_WATCHDOG_MAGIC      0x12480000
+#define CONFIG_SYS_WATCHDOG_MAGIC_MASK 0xFFFF0000
+#define CONFIG_SYS_DSPIC_TEST_MASK     0x00000001
+#define CONFIG_SYS_OCM_STATUS_OK       0x00009A00
+#define CONFIG_SYS_OCM_STATUS_FAIL     0x0000A300
+#define CONFIG_SYS_OCM_STATUS_MASK     0x0000FF00
 
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
-#undef CFG_EXT_SERIAL_CLOCK            /* no external clock provided   */
+#undef CONFIG_SYS_EXT_SERIAL_CLOCK             /* no external clock provided   */
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_SERIAL_MULTI     1
 /* define this if you want console on UART1 */
 #define CONFIG_UART1_CONSOLE   1       /* use UART1 as console         */
 
-#define CFG_BAUDRATE_TABLE                                             \
+#define CONFIG_SYS_BAUDRATE_TABLE                                              \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
 /*-----------------------------------------------------------------------
 /*-----------------------------------------------------------------------
  * FLASH related
  *----------------------------------------------------------------------*/
-#define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
+#define CONFIG_SYS_FLASH_CFI                           /* The flash is CFI compatible  */
 #define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
-#define CFG_FLASH0             0xFC000000
-#define CFG_FLASH1             0xF8000000
-#define CFG_FLASH_BANKS_LIST   { CFG_FLASH1, CFG_FLASH0 }
+#define CONFIG_SYS_FLASH0              0xFC000000
+#define CONFIG_SYS_FLASH1              0xF8000000
+#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH1, CONFIG_SYS_FLASH0 }
 
-#define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks           */
-#define CFG_MAX_FLASH_SECT     512     /* max number of sectors on one chip    */
+#define CONFIG_SYS_MAX_FLASH_BANKS     2       /* max number of memory banks           */
+#define CONFIG_SYS_MAX_FLASH_SECT      512     /* max number of sectors on one chip    */
 
-#define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
-#define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
+#define CONFIG_SYS_FLASH_ERASE_TOUT    120000  /* Timeout for Flash Erase (in ms)      */
+#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)      */
 
-#define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
-#define CFG_FLASH_PROTECTION   1       /* use hardware flash protection        */
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster)     */
+#define CONFIG_SYS_FLASH_PROTECTION    1       /* use hardware flash protection        */
 
-#define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
-#define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
+#define CONFIG_SYS_FLASH_EMPTY_INFO            /* print 'E' for empty sector on flinfo */
+#define CONFIG_SYS_FLASH_QUIET_TEST    1       /* don't warn upon unknown flash        */
 
 #define CONFIG_ENV_SECT_SIZE   0x40000 /* size of one complete sector          */
-#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                ((-CONFIG_SYS_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
 #define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */
 
 /* Address and size of Redundant Environment Sector    */
 /*-----------------------------------------------------------------------
  * DDR SDRAM
  *----------------------------------------------------------------------*/
-#define CFG_MBYTES_SDRAM       (256)           /* 256MB                        */
-#define CFG_DDR_CACHED_ADDR    0x40000000      /* setup 2nd TLB cached here    */
+#define CONFIG_SYS_MBYTES_SDRAM        (256)           /* 256MB                        */
+#define CONFIG_SYS_DDR_CACHED_ADDR     0x40000000      /* setup 2nd TLB cached here    */
 #define CONFIG_DDR_DATA_EYE    1               /* use DDR2 optimization        */
 #define CONFIG_DDR_ECC         1               /* enable ECC                   */
-#define CFG_POST_ECC_ON                CFG_POST_ECC
+#define CONFIG_SYS_POST_ECC_ON         CONFIG_SYS_POST_ECC
 
 /* POST support */
-#define CONFIG_POST            (CFG_POST_CACHE    | \
-                                CFG_POST_CPU      | \
-                                CFG_POST_ECC_ON   | \
-                                CFG_POST_ETHER    | \
-                                CFG_POST_FPU      | \
-                                CFG_POST_I2C      | \
-                                CFG_POST_MEMORY   | \
-                                CFG_POST_OCM      | \
-                                CFG_POST_RTC      | \
-                                CFG_POST_SPR      | \
-                                CFG_POST_UART     | \
-                                CFG_POST_SYSMON   | \
-                                CFG_POST_WATCHDOG | \
-                                CFG_POST_DSP      | \
-                                CFG_POST_BSPEC1   | \
-                                CFG_POST_BSPEC2   | \
-                                CFG_POST_BSPEC3   | \
-                                CFG_POST_BSPEC4   | \
-                                CFG_POST_BSPEC5)
+#define CONFIG_POST            (CONFIG_SYS_POST_CACHE    | \
+                                CONFIG_SYS_POST_CPU       | \
+                                CONFIG_SYS_POST_ECC_ON   | \
+                                CONFIG_SYS_POST_ETHER     | \
+                                CONFIG_SYS_POST_FPU       | \
+                                CONFIG_SYS_POST_I2C       | \
+                                CONFIG_SYS_POST_MEMORY   | \
+                                CONFIG_SYS_POST_OCM      | \
+                                CONFIG_SYS_POST_RTC      | \
+                                CONFIG_SYS_POST_SPR      | \
+                                CONFIG_SYS_POST_UART     | \
+                                CONFIG_SYS_POST_SYSMON   | \
+                                CONFIG_SYS_POST_WATCHDOG | \
+                                CONFIG_SYS_POST_DSP      | \
+                                CONFIG_SYS_POST_BSPEC1   | \
+                                CONFIG_SYS_POST_BSPEC2   | \
+                                CONFIG_SYS_POST_BSPEC3   | \
+                                CONFIG_SYS_POST_BSPEC4   | \
+                                CONFIG_SYS_POST_BSPEC5)
 
 #define CONFIG_POST_WATCHDOG  {\
        "Watchdog timer test",                          \
        &lwmon5_watchdog_post_test,                     \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_WATCHDOG                               \
+       CONFIG_SYS_POST_WATCHDOG                                \
        }
 
 #define CONFIG_POST_BSPEC1    {\
        &dspic_init_post_test,                          \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_BSPEC1                                 \
+       CONFIG_SYS_POST_BSPEC1                                  \
        }
 
 #define CONFIG_POST_BSPEC2    {\
        &dspic_post_test,                               \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_BSPEC2                                 \
+       CONFIG_SYS_POST_BSPEC2                                  \
        }
 
 #define CONFIG_POST_BSPEC3    {\
        &fpga_post_test,                                \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_BSPEC3                                 \
+       CONFIG_SYS_POST_BSPEC3                                  \
        }
 
 #define CONFIG_POST_BSPEC4    {\
        &gdc_post_test,                                 \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_BSPEC4                                 \
+       CONFIG_SYS_POST_BSPEC4                                  \
        }
 
 #define CONFIG_POST_BSPEC5    {\
        &sysmon1_post_test,                             \
        NULL,                                           \
        NULL,                                           \
-       CFG_POST_BSPEC5                                 \
+       CONFIG_SYS_POST_BSPEC5                                  \
        }
 
-#define CFG_POST_CACHE_ADDR    0x7fff0000 /* free virtual address      */
+#define CONFIG_SYS_POST_CACHE_ADDR     0x7fff0000 /* free virtual address      */
 #define CONFIG_LOGBUFFER
 /* Reserve GPT0_COMP1-COMP5 for logbuffer header */
-#define CONFIG_ALT_LH_ADDR     (CFG_PERIPHERAL_BASE + GPT0_COMP1)
-#define CONFIG_ALT_LB_ADDR     (CFG_OCM_BASE)
-#define CFG_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
+#define CONFIG_ALT_LH_ADDR     (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP1)
+#define CONFIG_ALT_LB_ADDR     (CONFIG_SYS_OCM_BASE)
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
 
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C                1               /* I2C with hardware support    */
 #undef CONFIG_SOFT_I2C                         /* I2C bit-banged               */
-#define CFG_I2C_SPEED          100000          /* I2C speed and slave address  */
-#define CFG_I2C_SLAVE          0x7F
+#define CONFIG_SYS_I2C_SPEED           100000          /* I2C speed and slave address  */
+#define CONFIG_SYS_I2C_SLAVE           0x7F
 
-#define CFG_I2C_EEPROM_ADDR    0x53    /* EEPROM AT24C128              */
-#define CFG_I2C_EEPROM_ADDR_LEN 2      /* Bytes of address             */
-#define CFG_EEPROM_PAGE_WRITE_BITS 6   /* The Atmel AT24C128 has       */
+#define CONFIG_SYS_I2C_EEPROM_ADDR     0x53    /* EEPROM AT24C128              */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2       /* Bytes of address             */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6    /* The Atmel AT24C128 has       */
                                        /* 64 byte page write mode using*/
                                        /* last 6 bits of the address   */
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10   /* and takes up to 10 msec */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10   /* and takes up to 10 msec */
 
 #define CONFIG_RTC_PCF8563     1               /* enable Philips PCF8563 RTC   */
-#define CFG_I2C_RTC_ADDR       0x51            /* Philips PCF8563 RTC address  */
-#define CFG_I2C_KEYBD_ADDR     0x56            /* PIC LWE keyboard             */
-#define CFG_I2C_DSPIC_IO_ADDR  0x57            /* PIC I/O addr               */
+#define CONFIG_SYS_I2C_RTC_ADDR        0x51            /* Philips PCF8563 RTC address  */
+#define CONFIG_SYS_I2C_KEYBD_ADDR      0x56            /* PIC LWE keyboard             */
+#define CONFIG_SYS_I2C_DSPIC_IO_ADDR   0x57            /* PIC I/O addr               */
 
 #define        CONFIG_POST_KEY_MAGIC   "3C+3E" /* press F3 + F5 keys to force POST */
 #if 0
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
-#define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
+#define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
 #define        CONFIG_IBM_EMAC4_V4     1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_RESET_DELAY 300
 
 #define CONFIG_HAS_ETH0
-#define CFG_RX_ETH_BUFFER      32      /* Number of ethernet rx buffers & descriptors */
+#define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx buffers & descriptors */
 
 #define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
  *----------------------------------------------------------------------*/
 #define CONFIG_SUPPORT_VFAT
 
-#define CFG_LONGHELP                   /* undef to save memory         */
-#define CFG_PROMPT             "=> "   /* Monitor Command Prompt       */
+#define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
+#define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt       */
 
-#define CFG_HUSH_PARSER                1       /* Use the HUSH parser          */
-#ifdef CFG_HUSH_PARSER
-#define        CFG_PROMPT_HUSH_PS2     "> "
+#define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
+#ifdef CONFIG_SYS_HUSH_PARSER
+#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 #endif
 
 #if defined(CONFIG_CMD_KGDB)
-#define CFG_CBSIZE             1024    /* Console I/O Buffer Size      */
+#define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size      */
 #else
-#define CFG_CBSIZE             256     /* Console I/O Buffer Size      */
+#define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size      */
 #endif
-#define CFG_PBSIZE              (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
-#define CFG_MAXARGS            16      /* max number of command args   */
-#define CFG_BARGSIZE           CFG_CBSIZE /* Boot Argument Buffer Size */
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
+#define CONFIG_SYS_MAXARGS             16      /* max number of command args   */
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size  */
 
-#define CFG_MEMTEST_START      0x0400000 /* memtest works on           */
-#define CFG_MEMTEST_END                0x0C00000 /* 4 ... 12 MB in DRAM        */
+#define CONFIG_SYS_MEMTEST_START       0x0400000 /* memtest works on           */
+#define CONFIG_SYS_MEMTEST_END         0x0C00000 /* 4 ... 12 MB in DRAM        */
 
-#define CFG_LOAD_ADDR          0x100000  /* default load address       */
-#define CFG_EXTBDINFO          1       /* To use extended board_into (bd_t) */
+#define CONFIG_SYS_LOAD_ADDR           0x100000  /* default load address       */
+#define CONFIG_SYS_EXTBDINFO           1       /* To use extended board_into (bd_t) */
 
-#define CFG_HZ                 1000    /* decrementer freq: 1 ms ticks */
+#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_LOOPW            1       /* enable loopw command         */
 #define CONFIG_PCI                     /* include pci support          */
 #undef CONFIG_PCI_PNP                  /* do (not) pci plug-and-play   */
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup  */
-#define CFG_PCI_TARGBASE        0x80000000 /* PCIaddr mapped to CFG_PCI_MEMBASE*/
+#define CONFIG_SYS_PCI_TARGBASE        0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/
 
 /* Board-specific PCI */
-#define CFG_PCI_TARGET_INIT
-#define CFG_PCI_MASTER_INIT
+#define CONFIG_SYS_PCI_TARGET_INIT
+#define CONFIG_SYS_PCI_MASTER_INIT
 
-#define CFG_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC                         */
-#define CFG_PCI_SUBSYS_ID       0xcafe /* Whatever                     */
+#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8  /* AMCC                         */
+#define CONFIG_SYS_PCI_SUBSYS_ID       0xcafe  /* Whatever                     */
 
 #define CONFIG_HW_WATCHDOG     1       /* Use external HW-Watchdog     */
 #define CONFIG_WD_PERIOD       40000   /* in usec */
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
+#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
  *----------------------------------------------------------------------*/
-#define CFG_FLASH              CFG_FLASH_BASE
+#define CONFIG_SYS_FLASH               CONFIG_SYS_FLASH_BASE
 
 /* Memory Bank 0 (NOR-FLASH) initialization                                    */
-#define CFG_EBC_PB0AP          0x03050200
-#define CFG_EBC_PB0CR          (CFG_FLASH | 0xfc000)
+#define CONFIG_SYS_EBC_PB0AP           0x03050200
+#define CONFIG_SYS_EBC_PB0CR           (CONFIG_SYS_FLASH | 0xfc000)
 
 /* Memory Bank 1 (Lime) initialization                                         */
-#define CFG_EBC_PB1AP          0x01004380
-#define CFG_EBC_PB1CR          (CFG_LIME_BASE_0 | 0xdc000)
+#define CONFIG_SYS_EBC_PB1AP           0x01004380
+#define CONFIG_SYS_EBC_PB1CR           (CONFIG_SYS_LIME_BASE_0 | 0xdc000)
 
 /* Memory Bank 2 (FPGA) initialization                                         */
-#define CFG_EBC_PB2AP          0x01004400
-#define CFG_EBC_PB2CR          (CFG_FPGA_BASE_0 | 0x1c000)
+#define CONFIG_SYS_EBC_PB2AP           0x01004400
+#define CONFIG_SYS_EBC_PB2CR           (CONFIG_SYS_FPGA_BASE_0 | 0x1c000)
 
 /* Memory Bank 3 (FPGA2) initialization                                                */
-#define CFG_EBC_PB3AP          0x01004400
-#define CFG_EBC_PB3CR          (CFG_FPGA_BASE_1 | 0x1c000)
+#define CONFIG_SYS_EBC_PB3AP           0x01004400
+#define CONFIG_SYS_EBC_PB3CR           (CONFIG_SYS_FPGA_BASE_1 | 0x1c000)
 
-#define CFG_EBC_CFG            0xb8400000
+#define CONFIG_SYS_EBC_CFG             0xb8400000
 
 /*-----------------------------------------------------------------------
  * Graphics (Fujitsu Lime)
  *----------------------------------------------------------------------*/
 /* SDRAM Clock frequency adjustment register */
-#define CFG_LIME_SDRAM_CLOCK   0xC1FC0038
+#define CONFIG_SYS_LIME_SDRAM_CLOCK    0xC1FC0038
 /* Lime Clock frequency is to set 100MHz */
-#define CFG_LIME_CLOCK_100MHZ  0x00000
+#define CONFIG_SYS_LIME_CLOCK_100MHZ   0x00000
 #if 0
 /* Lime Clock frequency for 133MHz */
-#define CFG_LIME_CLOCK_133MHZ  0x10000
+#define CONFIG_SYS_LIME_CLOCK_133MHZ   0x10000
 #endif
 
 /* SDRAM Parameter register */
-#define CFG_LIME_MMR           0xC1FCFFFC
+#define CONFIG_SYS_LIME_MMR            0xC1FCFFFC
 /* SDRAM parameter value; was 0x414FB7F2, caused several vertical bars
    and pixel flare on display when 133MHz was configured. According to
    SDRAM chip datasheet CAS Latency is 3 for 133MHz and -75 Speed Grade */
-#ifdef CFG_LIME_CLOCK_133MHZ
-#define CFG_LIME_MMR_VALUE     0x414FB7F3
+#ifdef CONFIG_SYS_LIME_CLOCK_133MHZ
+#define CONFIG_SYS_LIME_MMR_VALUE      0x414FB7F3
 #else
-#define CFG_LIME_MMR_VALUE     0x414FB7F2
+#define CONFIG_SYS_LIME_MMR_VALUE      0x414FB7F2
 #endif
 
 /*-----------------------------------------------------------------------
  * GPIO Setup
  *----------------------------------------------------------------------*/
-#define CFG_GPIO_PHY1_RST      12
-#define CFG_GPIO_FLASH_WP      14
-#define CFG_GPIO_PHY0_RST      22
-#define CFG_GPIO_DSPIC_READY   51
-#define CFG_GPIO_EEPROM_EXT_WP 55
-#define CFG_GPIO_HIGHSIDE      56
-#define CFG_GPIO_EEPROM_INT_WP 57
-#define CFG_GPIO_BOARD_RESET   58
-#define CFG_GPIO_LIME_S                59
-#define CFG_GPIO_LIME_RST      60
-#define CFG_GPIO_SYSMON_STATUS 62
-#define CFG_GPIO_WATCHDOG      63
+#define CONFIG_SYS_GPIO_PHY1_RST       12
+#define CONFIG_SYS_GPIO_FLASH_WP       14
+#define CONFIG_SYS_GPIO_PHY0_RST       22
+#define CONFIG_SYS_GPIO_DSPIC_READY    51
+#define CONFIG_SYS_GPIO_EEPROM_EXT_WP  55
+#define CONFIG_SYS_GPIO_HIGHSIDE       56
+#define CONFIG_SYS_GPIO_EEPROM_INT_WP  57
+#define CONFIG_SYS_GPIO_BOARD_RESET    58
+#define CONFIG_SYS_GPIO_LIME_S         59
+#define CONFIG_SYS_GPIO_LIME_RST       60
+#define CONFIG_SYS_GPIO_SYSMON_STATUS  62
+#define CONFIG_SYS_GPIO_WATCHDOG       63
 
 /*-----------------------------------------------------------------------
  * PPC440 GPIO Configuration
  */
-#define CFG_4xx_GPIO_TABLE { /*          Out             GPIO  Alternate1      Alternate2      Alternate3 */ \
+#define CONFIG_SYS_4xx_GPIO_TABLE { /*   Out             GPIO  Alternate1      Alternate2      Alternate3 */ \
 {                                                                                      \
 /* GPIO Core 0 */                                                                      \
 {GPIO0_BASE, GPIO_OUT, GPIO_ALT1, GPIO_OUT_0}, /* GPIO0        EBC_ADDR(7)     DMA_REQ(2)      */      \