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

[u-boot] / include / configs / cam_enc_4xx.h

diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index bd94cf3c19c70efdbb828afcdcf8cdc6e2c8c562..91ab8128403653f13d6be635d28f42f4ce96dda4 100644 (file)
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -37,7 +37,7 @@
 
 #define CONFIG_HOSTNAME                        cam_enc_4xx
 
-#define        BOARD_LATE_INIT
+#define        CONFIG_BOARD_LATE_INIT
 #define CONFIG_CAM_ENC_LED_MASK                0x0fc00000
 
 /* Memory Info */
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM1                0x01c20000
 #define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200
 
@@ -68,7 +67,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_MII
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_RESET_PHY_R
@@ -122,6 +120,10 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
 
+#ifdef CONFIG_CMD_BDI
+#define CONFIG_CLOCKS
+#endif
+
 #ifdef CONFIG_MMC
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_EXT2
@@ -144,7 +146,6 @@
 #define CONFIG_MX_CYCLIC
 
 /* U-Boot general configuration */
-#undef CONFIG_USE_IRQ                          /* No IRQ/FIQ in U-Boot */
 #define CONFIG_BOOTFILE                "uImage"        /* Boot file name */
 #define CONFIG_SYS_PROMPT      "cam_enc_4xx> " /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size  */
@@ -152,21 +153,19 @@
                (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS     16              /* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_LONGHELP
 
 #define CONFIG_MENU
 #define CONFIG_MENU_SHOW
 #define CONFIG_FIT
-#define CONFIG_CMD_PXE
 #define CONFIG_BOARD_IMG_ADDR_R 0x80000000
 
 #ifdef CONFIG_NAND_DAVINCI
 #define CONFIG_ENV_SIZE                        (16 << 10)
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              0x180000
+#define CONFIG_ENV_RANGE               0x040000
 #define CONFIG_ENV_OFFSET_REDUND       0x1c0000
-#define CONFIG_ENV_RANGE               0x020000
 #undef CONFIG_ENV_IS_IN_FLASH
 #endif
 
@@ -191,7 +190,6 @@
 #define CONFIG_TIMESTAMP
 
 /* U-Boot memory configuration */
-#define CONFIG_STACKSIZE               (256 << 10)     /* 256 KiB */
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* 1 MiB */
 #define CONFIG_SYS_MEMTEST_START       0x80000000      /* physical address */
 #define CONFIG_SYS_MEMTEST_END         0x81000000      /* test 16MB RAM */
@@ -217,6 +215,7 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_NAND_LOAD
@@ -226,7 +225,7 @@
 #define CONFIG_SPL_LDSCRIPT            "$(BOARDDIR)/u-boot-spl.lds"
 #define CONFIG_SPL_STACK               (0x00010000 + 0x7f00)
 
-#define CONFIG_SPL_TEXT_BASE           0x0000020 /*CONFIG_SYS_SRAM_START*/
+#define CONFIG_SPL_TEXT_BASE           0x00000020 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE            12320
 
 #ifndef CONFIG_SPL_BUILD
@@ -265,19 +264,13 @@
 #define CONFIG_POST    CONFIG_SYS_POST_MEMORY
 #define _POST_WORD_ADDR        0x0
 
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SPL_STACK
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    0xa0000
-
-/*
- * U-Boot is a 3rd stage loader and if booting with spl, cpu setup is
- * done in board_init_f from c code.
- */
-#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SYS_NAND_U_BOOT_ERA_SIZE        0x100000
 
 /* for UBL header */
 #define CONFIG_SYS_UBL_BLOCK           (CONFIG_SYS_NAND_PAGE_SIZE)
@@ -433,7 +426,7 @@
                " 0 3000;nandrbl uboot\0"                               \
        "writeuboot=nandrbl uboot;"                                     \
                "nand erase " xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) " "     \
-                xstr(CONFIG_SYS_NAND_U_BOOT_SIZE)                      \
+                xstr(CONFIG_SYS_NAND_U_BOOT_ERA_SIZE)                  \
                ";nand write " xstr(DVN4XX_UBOOT_ADDR_R_UBOOT)          \
                " " xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) " "               \
                xstr(CONFIG_SYS_NAND_U_BOOT_SIZE) "\0"                  \
@@ -470,14 +463,14 @@
                "nand write ${img_addr_r} 0 3000;nandrbl uboot\0"       \
        "img_writeuboot=nandrbl uboot;"                                 \
                "nand erase " xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) " "     \
-                xstr(CONFIG_SYS_NAND_U_BOOT_SIZE)                      \
+                xstr(CONFIG_SYS_NAND_U_BOOT_ERA_SIZE)                  \
                ";nand write ${img_addr_r} "                            \
                xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) " "                   \
                xstr(CONFIG_SYS_NAND_U_BOOT_SIZE) "\0"                  \
        "img_writedfenv=ubi part ubi 2048;"                             \
                "ubi write ${img_addr_r} default ${filesize}\0"         \
        "img_volume=rootfs1\0"                                          \
-       "img_writeramdisk=ubi part ubi 2048;ubifsmount ${img_volume};"  \
+       "img_writeramdisk=ubi part ubi 2048;"                           \
                "ubi write ${img_addr_r} ${img_volume} ${filesize}\0"   \
        "load_img=tftp ${fit_addr_r} ${img_file}\0"                     \
        "net_nfs=run load_kernel; "                                     \