projects / kernel / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
recovery: update is modified to support various image
[kernel/u-boot.git] / include / configs / s5pc1xx_universal.h
diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index 0745304..c4ffa75 100644 (file)
--- a/include/configs/s5pc1xx_universal.h
+++ b/include/configs/s5pc1xx_universal.h
@@ -36,6 +36,8 @@
 #define CONFIG_S5PC100         1       /* which is in a S5PC100 */
 #define CONFIG_S5PC110         1       /* which is in a S5PC110 */
 #define CONFIG_UNIVERSAL       1       /* working with Universal */
+#define CONFIG_MACH_AQUILA     1       /* working with Aquila */
+#define CONFIG_RECOVERY                1       /* working with recovery block */
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 
@@ -101,16 +103,20 @@
  ***********************************************************/
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_BOOTD
+#undef CONFIG_CMD_CONSOLE
+#undef CONFIG_CMD_ECHO
 #undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_XIMG
-#undef CONFIG_CMD_NAND
-#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_ITEST
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_ITEST
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_NAND
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_NFS
+#undef CONFIG_CMD_SOURCE
+#undef CONFIG_CMD_XIMG
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
@@ -119,10 +125,12 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_SLEEP
-#define CONFIG_CMD_GPIO
 #define CONFIG_CMD_PMIC
 #define CONFIG_CMD_DEVICE_POWER
 
+/* disabled commands */
+//#define CONFIG_CMD_GPIO
+
 #undef CONFIG_CRC16
 #undef CONFIG_XYZMODEM
 
@@ -136,6 +144,8 @@
 #if 0
 #define CONFIG_CMD_UBI
 #define CONFIG_RBTREE
+#define CONFIG_CMD_UBIFS
+#define CONFIG_LZO
 #endif
 
 /* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */
@@ -148,7 +158,6 @@
 #define CONFIG_NET_DO_NOT_TRY_ANOTHER  1
 
 /* NFS support in Ethernet over USB is broken */
-#undef CONFIG_CMD_NFS
 
 /* Configure Ethernet over USB */
 #define CONFIG_USB_ETH_RNDIS           1
@@ -178,24 +187,24 @@
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 #define MTDIDS_DEFAULT         "onenand0=samsung-onenand"
-#define MTDPARTS_DEFAULT       "mtdparts=samsung-onenand:256k(bootloader)"\
+#define MTDPARTS_DEFAULT       "mtdparts=samsung-onenand:1m(bootloader)"\
                                ",128k(params)"\
-                               ",3584k(config)"\
+                               ",2816k(config)"\
                                ",8m(csa)"\
                                ",7m(kernel)"\
                                ",1m(log)"\
                                ",12m(modem)"\
-                               ",32m(qboot)"\
+                               ",60m(qboot)"\
                                ",-(UBI)\0"
 
-#define MTDPARTS_DEFAULT_4KB   "mtdparts=samsung-onenand:256k(bootloader)"\
+#define MTDPARTS_DEFAULT_4KB   "mtdparts=samsung-onenand:1m(bootloader)"\
                                ",256k(params)"\
-                               ",3584k(config)"\
+                               ",2816k(config)"\
                                ",8m(csa)"\
                                ",7m(kernel)"\
                                ",1m(log)"\
                                ",12m(modem)"\
-                               ",32m(qboot)"\
+                               ",60m(qboot)"\
                                ",-(UBI)\0"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
@@ -209,13 +218,13 @@
 
 #define CONFIG_COMMON_BOOT     "${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock8 ubi.mtd=8 ubi.mtd=3" \
+#define CONFIG_BOOTARGS        "root=/dev/mtdblock8 ubi.mtd=8 ubi.mtd=3 ubi.mtd=6" \
                " rootfstype=cramfs " CONFIG_COMMON_BOOT
 
-#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
-                       " onenand write 0x32008000 0x0 0x40000\0"
+#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \
+                       " onenand write 0x32008000 0x0 0x100000\0"
 
-#define CONFIG_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=3"
+#define CONFIG_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=3 ubi.mtd=6"
 
 #define CONFIG_UBIFS_OPTION    "rootflags=bulk_read,no_chk_data_crc"
 
@@ -248,6 +257,7 @@
         " initrd=0x33000000,8M ramdisk=8192\0" \
        "mmcboot=set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
         CONFIG_UBI_MTD " ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
+       "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
        "verify=n\0" \
        "rootfstype=cramfs\0" \
        "console=" CONFIG_DEFAULT_CONSOLE \
@@ -257,7 +267,8 @@
        "mmcblk=/dev/mmcblk1p1\0" \
        "bootblock=9\0" \
        "ubiblock=8\0" \
-       "ubi=enabled"
+       "ubi=enabled\0" \
+       "opts=always_resume=1"
 
 /*
  * Miscellaneous configurable options
@@ -272,7 +283,8 @@
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE   /* memtest works on           */
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5000000)
 
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4800000)
+#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4000000)
+#define CONFIG_SYS_BOOT_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4800000)
 
 #define CONFIG_SYS_HZ                  1000
 
@@ -327,10 +339,16 @@
 /* OneNAND IPL uses 8KiB */
 #define CONFIG_ONENAND_START_PAGE      4
 
+/* IPL + RECOVERY + U-BOOT */
+#define CONFIG_RECOVERY_UBOOT_BLOCK    1
+#define CONFIG_RECOVERY_BOOT_BLOCKS    4
+
 #define CONFIG_ENV_IS_IN_ONENAND       1
 #define CONFIG_ENV_SIZE                        (256 << 10)     /* 256 KiB, 0x40000 */
-#define CONFIG_ENV_ADDR                        (256 << 10)     /* 256 KiB, 0x40000 */
-#define CONFIG_ENV_OFFSET              (256 << 10)     /* 256 KiB, 0x40000 */
+#define CONFIG_ENV_ADDR                        (1 << 20)       /* 1 MB, 0x100000 */
+
+#define CONFIG_RECOVERY_SIZE           (768 << 10)     /* 768 KiB, 0xC0000 */
+#define CONFIG_RECOVERY_ADDR           (256 << 10)     /* 256 KiB, 0x40000 */
 
 #define CONFIG_USE_ONENAND_BOARD_INIT
 #define CONFIG_SAMSUNG_ONENAND         1
@@ -366,6 +384,7 @@
 /* LCD */
 #if 1          /* For LCD test */
 #define CONFIG_LCD             1
+#define CONFIG_FB_RESERVED_MEM 0x42504000
 #define CONFIG_S5PC1XXFB       1
 #define CONFIG_S6E63M0         1
 #define CONFIG_S6D16A0X                1
Domain: System / Kernel;