X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fimx6-engicam.h;h=ff774ec54baad9a70ff4415bd2dc55207f2b976f;hb=22eb1526d4a619fc0095947b54f87317a55e911f;hp=72ae89c5f6e3ffe6c5b7fcbb3f0a08b63570eaf8;hpb=b0b13f4114d30b6756e0f6f3b5819d78de22541e;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 72ae89c..ff774ec 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -13,14 +13,8 @@ #include #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Total Size of Environment Sector */ -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE /* Environment in MMC */ @@ -33,7 +27,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=uImage\0" \ "fit_image=fit.itb\0" \ "fdt_high=0xffffffff\0" \ @@ -102,17 +96,12 @@ "run nandboot; " \ "fi\0" -#define CONFIG_BOOTCOMMAND "run $modeboot" - /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_SYS_HZ 1000 - #ifdef CONFIG_MX6UL # define DRAM_OFFSET(x) 0x87##x # define FDT_ADDR __stringify(DRAM_OFFSET(800000)) -#else +#else # define DRAM_OFFSET(x) 0x1##x # define FDT_ADDR __stringify(DRAM_OFFSET(8000000)) #endif @@ -139,18 +128,12 @@ #endif /* MMC */ -#ifdef CONFIG_FSL_USDHC -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* NAND */ #ifdef CONFIG_NAND_MXS # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_BASE 0x40000000 -# define CONFIG_SYS_NAND_5_ADDR_CYCLE -# define CONFIG_SYS_NAND_ONFI_DETECTION # define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -# define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 /* MTD device */ #endif @@ -159,36 +142,22 @@ #ifdef CONFIG_SPL_OS_BOOT # define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" # define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -# define CONFIG_CMD_SPL # define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -# define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) /* MMC support: args@1MB kernel@2MB */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) -# define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ #endif /* Framebuffer */ #ifdef CONFIG_VIDEO_IPUV3 # define CONFIG_IMX_VIDEO_SKIP -# define CONFIG_SPLASH_SCREEN -# define CONFIG_SPLASH_SCREEN_ALIGN -# define CONFIG_BMP_16BPP -# define CONFIG_VIDEO_BMP_RLE8 -# define CONFIG_VIDEO_LOGO # define CONFIG_VIDEO_BMP_LOGO #endif /* SPL */ #ifdef CONFIG_SPL -# ifdef CONFIG_ENV_IS_IN_NAND -# define CONFIG_SPL_NAND_SUPPORT -# else -# define CONFIG_SPL_MMC_SUPPORT -# endif - # include "imx6_spl.h" #endif