Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 9066a24..0f26a5b 100644 (file)
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -25,7 +25,7 @@
 /*
  * High Level Board Configuration Options
  */
-#define        CONFIG_PXA27X           1       /* Marvell PXA270 CPU */
+#define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
 #define        CONFIG_BALLOON3         1       /* Balloon3 board */
 
 /*
@@ -33,19 +33,19 @@
  */
 #define        CONFIG_ENV_OVERWRITE
 #define        CONFIG_SYS_MALLOC_LEN           (128*1024)
-#define        CONFIG_SYS_GBL_DATA_SIZE        128
-
+#define        CONFIG_ARCH_CPU_INIT
 #define        CONFIG_BOOTCOMMAND                                              \
+       "fpga load 0x0 0x50000 0x62638; "                               \
        "if usb reset && fatload usb 0 0xa4000000 uImage; then "        \
                "bootm 0xa4000000; "                                    \
        "fi; "                                                          \
-       "bootm 0x40000;"
+       "bootm 0xd0000;"
 #define        CONFIG_BOOTARGS                 "console=tty0 console=ttyS2,115200"
 #define        CONFIG_TIMESTAMP
 #define        CONFIG_BOOTDELAY                2       /* Autoboot delay */
 #define        CONFIG_CMDLINE_TAG
 #define        CONFIG_SETUP_MEMORY_TAGS
-
+#define        CONFIG_SYS_TEXT_BASE            0x0
 #define        CONFIG_LZMA                     /* LZMA compression support */
 
 /*
@@ -53,8 +53,8 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
+#define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200
-#define        CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
@@ -62,6 +62,7 @@
 #include <config_cmd_default.h>
 
 #undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
 #undef CONFIG_CMD_ENV
 #undef CONFIG_CMD_IMLS
 #define        CONFIG_CMD_USB
@@ -80,7 +81,6 @@
  * HUSH Shell Configuration
  */
 #define        CONFIG_SYS_HUSH_PARSER          1
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define        CONFIG_SYS_LONGHELP
 #ifdef CONFIG_SYS_HUSH_PARSER
@@ -103,15 +103,6 @@
 #define        CONFIG_SYS_CPUSPEED             0x290           /* 520MHz */
 
 /*
- * Stack sizes
- */
-#define        CONFIG_STACKSIZE                (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define        CONFIG_STACKSIZE_IRQ            (4*1024)        /* IRQ stack */
-#define        CONFIG_STACKSIZE_FIQ            (4*1024)        /* FIQ stack */
-#endif
-
-/*
  * DRAM Map
  */
 #define        CONFIG_NR_DRAM_BANKS            3               /* 2 banks of DRAM */
@@ -130,6 +121,10 @@
 
 #define        CONFIG_SYS_LOAD_ADDR            0xa1000000
 
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define        CONFIG_SYS_INIT_SP_ADDR         \
+       (PHYS_SDRAM_1 + GENERATED_GBL_DATA_SIZE + 2048)
+
 /*
  * NOR FLASH
  */