X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fcam_enc_4xx.h;h=71faf1cc9ff2bbbe67eb44a40e63ebb41d536916;hb=3996a96c5e33aeb676b364936c95e61a987c4e61;hp=79a8611f821b755c79f1b84f6f49a72a40d204b0;hpb=8f5d468721ef3931e4c6f9c6555348f26acdec19;p=u-boot

diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 79a8611f82..71faf1cc9f 100644
--- 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 */
@@ -161,15 +161,14 @@
 #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
 
@@ -220,6 +219,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
@@ -229,7 +229,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
@@ -274,12 +274,7 @@
 
 #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)
@@ -435,7 +430,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"			\
@@ -472,14 +467,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; "					\