Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
old mode 100644 (file)
new mode 100755 (executable)
index 578153c..294cd26
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2005-2007
+ * (C) Copyright 2005-2008
  * Samsung Electronics,
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
@@ -39,14 +39,14 @@
 
 /* Clock config to target*/
 #define PRCM_CONFIG_I          1
-//#define PRCM_CONFIG_II       1
+/* #define PRCM_CONFIG_II      1 */
 
 /* Boot method */
 /* uncomment if you use NOR boot */
-//#define CFG_NOR_BOOT         1
+/* #define CFG_NOR_BOOT                1 */
 
 /* uncomment if you use NOR on CS3 */
-//#define CFG_USE_NOR          1
+/* #define CFG_USE_NOR         1 */
 
 #ifdef CFG_NOR_BOOT
 #undef CFG_USE_NOR
@@ -111,13 +111,13 @@
 #define        CFG_I2C_SLAVE   1
 #define        CONFIG_DRIVER_OMAP24XX_I2C
 
-/* allow to overwrite serial and ethaddr */ 
+/* allow to overwrite serial and ethaddr */
 #define        CONFIG_ENV_OVERWRITE
 #define        CONFIG_CONS_INDEX       1
 #define        CONFIG_BAUDRATE         115200
 #define        CFG_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ 
+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include       <config_cmd_default.h>
 
 #define        CONFIG_CMD_DHCP
@@ -148,16 +148,17 @@
 #endif
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
-       "Image=tftp 0x80008000 Image\; go 0x80008000\0"                 \
-       "zImage=tftp 0x80180000 zImage\; go 0x80180000\0"               \
-       "uImage=tftp 0x80180000 uImage\; bootm 0x80180000\0"            \
-       "uboot=tftp 0x80008000 u-boot.bin\; go 0x80008000\0"            \
-       "xloader=tftp 0x80180000 x-load.bin\; cp.w 0x80180000 0x00000400 0x1000\; go 0x00000400\0"      \
-       "syncmode50=mw.w 0x1e442 0xc0c4\; mw 0x6800a060 0xe30d1201\0"   \
-       "syncmode=mw.w 0x1e442 0xe0f4\; mw 0x6800a060 0xe30d1201\0"     \
-       "norboot=cp32 0x18040000 0x80008000 0x200000\; go 0x80008000\0" \
-       "oneboot=onenand read 0x80008000 0x40000 0x200000\; go 0x80008000\0"\
+       "Image=tftp 0x80008000 Image; go 0x80008000\0"                  \
+       "zImage=tftp 0x80180000 zImage; go 0x80180000\0"                \
+       "uImage=tftp 0x80180000 uImage; bootm 0x80180000\0"             \
+       "uboot=tftp 0x80008000 u-boot.bin; go 0x80008000\0"             \
+       "xloader=tftp 0x80180000 x-load.bin; cp.w 0x80180000 0x00000400 0x1000; go 0x00000400\0"        \
+       "syncmode50=mw.w 0x1e442 0xc0c4; mw 0x6800a060 0xe30d1201\0"    \
+       "syncmode=mw.w 0x1e442 0xe0f4; mw 0x6800a060 0xe30d1201\0"      \
+       "norboot=cp32 0x18040000 0x80008000 0x200000; go 0x80008000\0"  \
+       "oneboot=onenand read 0x80008000 0x40000 0x200000; go 0x80008000\0"\
        "onesyncboot=run syncmode oneboot\0"                            \
+       "updateb=tftp 0x80180000 u-boot-onenand.bin; onenand erase 0x0 0x20000; onenand write 0x80180000 0x0 0x20000\0"                                 \
        "bootcmd=run uboot\0"
 
 /*
@@ -180,8 +181,8 @@
 
 #define        CFG_LOAD_ADDR   (OMAP2420_SDRC_CS0)     /* default load address */
 
-/* The 2420 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) 
- * or by 32KHz clk, or from external sig. This rate is divided by a local 
+/* The 2420 has 12 GP timers, they can be driven by the SysClk (12/13/19.2)
+ * or by 32KHz clk, or from external sig. This rate is divided by a local
  * divisor.
  */
 #define        V_PVT   7       /* use with 12MHz/128 */
@@ -193,7 +194,7 @@
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
- * The stack sizes are set up in start.S using the settings below 
+ * The stack sizes are set up in start.S using the settings below
  */
 #define        CONFIG_STACKSIZE SZ_128K        /* regular stack */
 #ifdef CONFIG_USE_IRQ
@@ -223,7 +224,7 @@
  */
 # define       CFG_FLASH_CFI   1       /* Flash memory is CFI compliant */
 # define       CFG_FLASH_CFI_DRIVER    1       /* Use drivers/cfi_flash.c */
-//#define CFG_FLASH_USE_BUFFER_WRITE 1 /* Use buffered writes (~10x faster) */
+/* #define CFG_FLASH_USE_BUFFER_WRITE 1 */ /* Use buffered writes (~10x faster) */
 # define       CFG_FLASH_PROTECTION    1       /* Use h/w sector protection*/
 
 #else  /* !CFG_USE_NOR */