X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx6.h;h=0d34a9a7033a3fd4aea100aa049547f188f74264;hp=361a81dfda8af95169d298ff5efe49c07943f5f4;hb=0ec3e0464e923142c845b23b1fc34dc9310540db;hpb=685c3f235ac2a4a6d140e94d2fad21d32911c978 diff --git a/include/configs/tx6.h b/include/configs/tx6.h index 361a81dfda..0d34a9a703 100644 --- a/include/configs/tx6.h +++ b/include/configs/tx6.h @@ -31,7 +31,7 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_IPUV3 -#define CONFIG_IPUV3_CLK 266000000 +#define CONFIG_IPUV3_CLK (CONFIG_SYS_SDRAM_CLK * 1000000 / 2) #define CONFIG_LCD_LOGO #define LCD_BPP LCD_COLOR24 #define CONFIG_CMD_BMP @@ -39,12 +39,6 @@ #endif /* CONFIG_LCD */ #endif /* CONFIG_MFG */ -#ifdef CONFIG_SYS_LVDS_IF -#define is_lvds() 1 -#else -#define is_lvds() 0 -#endif - /* * Memory configuration options */ @@ -80,7 +74,7 @@ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */ -#define CONFIG_SYS_MAXARGS 64 /* Max number of command args */ +#define CONFIG_SYS_MAXARGS 256 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ @@ -96,9 +90,10 @@ #ifndef CONFIG_MFG #define CONFIG_OF_LIBFDT #ifdef CONFIG_OF_LIBFDT +#ifndef CONFIG_TX6_V2 #define CONFIG_FDT_FIXUP_PARTITIONS +#endif #define CONFIG_OF_BOARD_SETUP -#define CONFIG_SYS_FDT_ADDR (PHYS_SDRAM_1 + SZ_16M) #endif /* CONFIG_OF_LIBFDT */ #endif /* CONFIG_MFG */ @@ -122,17 +117,24 @@ #define CONFIG_SYS_AUTOLOAD "no" #ifndef CONFIG_MFG #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttymxc0,115200 ro debug panic=1" -#define CONFIG_BOOTCOMMAND "run bootcmd_nand" +#define CONFIG_BOOTARGS "init=/linuxrc console=ttymxc0,115200 ro debug panic=1" +#define CONFIG_BOOTCOMMAND "run bootcmd_${boot_mode} bootm_cmd" #else #define CONFIG_BOOTCOMMAND "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg" #define CONFIG_BOOTCMD_MFG_LOADADDR 10500000 #define CONFIG_DELAY_ENVIRONMENT #endif /* CONFIG_MFG */ #define CONFIG_LOADADDR 18000000 +#define CONFIG_FDTADDR 10001000 #define CONFIG_SYS_LOAD_ADDR _pfx(0x, CONFIG_LOADADDR) +#define CONFIG_SYS_FDT_ADDR _pfx(0x, CONFIG_FDTADDR) #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 +#ifndef CONFIG_SYS_LVDS_IF +#define DEFAULT_VIDEO_MODE "VGA" +#else +#define DEFAULT_VIDEO_MODE "HSD100PXN1" +#endif /* * Extra Environments @@ -143,44 +145,71 @@ "autostart=no\0" \ "autoload=no\0" \ "bootdelay=-1\0" \ - "fdtaddr=11000000\0" \ + "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ "baseboard=stk5-v3\0" \ - "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ - " root=/dev/mmcblk0p3 rootwait\0" \ - "bootargs_nand=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}" \ " root=/dev/mtdblock3 rootfstype=jffs2\0" \ + "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ + MMC_ROOT_STR \ "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}" \ - " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\ - "bootcmd_mmc=set autostart no;run bootargs_mmc;" \ - "fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0" \ - "bootcmd_nand=set autostart no;run bootargs_nand;" \ - "nboot linux;run bootm_cmd\0" \ - "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;" \ - "run bootm_cmd\0" \ + " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock" \ + " ip=dhcp\0" \ + "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}" \ + " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \ + "bootcmd_jffs2=set autostart no;run bootargs_jffs2" \ + ";nboot linux\0" \ + "bootcmd_mmc=set autostart no;run bootargs_mmc" \ + ";fatload mmc 0 ${loadaddr} uImage\0" \ + CONFIG_SYS_BOOT_CMD_NAND \ + "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs" \ + ";dhcp\0" \ "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ + "boot_mode=" CONFIG_SYS_DEFAULT_BOOT_MODE "\0" \ "cpu_clk=800\0" \ - "bootdelay=-1\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " ${append_bootargs}\0" \ - "fdtaddr=11000000\0" \ - "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \ + "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ + CONFIG_SYS_FDTSAVE_CMD \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "nfsroot=/tftpboot/rootfs\0" \ "otg_mode=device\0" \ + ROOTPART_UUID_STR \ "touchpanel=tsc2007\0" \ - "video_mode=VGA\0" + "video_mode=" DEFAULT_VIDEO_MODE "\0" #endif /* CONFIG_ENV_IS_NOWHERE */ #endif /* CONFIG_MFG */ +#ifndef CONFIG_TX6_V2 +#define CONFIG_SYS_DEFAULT_BOOT_MODE "nand" +#define CONFIG_SYS_BOOT_CMD_NAND \ + "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0" +#define CONFIG_SYS_FDTSAVE_CMD \ + "fdtsave=fdt resize;nand erase.part dtb" \ + ";nand write ${fdtaddr} dtb ${fdtsize}\0" #define MTD_NAME "gpmi-nand" #define MTDIDS_DEFAULT "nand0=" MTD_NAME #define CONFIG_SYS_NAND_ONFI_DETECTION +#define MMC_ROOT_STR " root=dev/mmcblk0p2 rootwait\0" +#define ROOTPART_UUID_STR "" +#else +#define CONFIG_SYS_DEFAULT_BOOT_MODE "mmc" +#define CONFIG_SYS_BOOT_CMD_NAND "" +#define CONFIG_SYS_FDTSAVE_CMD \ + "fdtsave=mmc open 0 1;mmc write ${fdtaddr} " \ + xstr(CONFIG_SYS_DTB_BLKNO) " 80;mmc close 0 1\0" +#define MMC_ROOT_STR " root=PARTUUID=${rootpart_uuid} rootwait\0" +#define ROOTPART_UUID_STR "rootpart_uuid=0cc66cc0-02\0" +#define MTD_NAME "" +#define MTDIDS_DEFAULT "" +#define CONFIG_SUPPORT_EMMC_BOOT +#define CONFIG_MMC_BOOT_DEV 0 +#endif /* * U-Boot Commands @@ -188,8 +217,10 @@ #include #define CONFIG_CMD_CACHE #define CONFIG_CMD_MMC +#ifndef CONFIG_TX6_V2 #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS +#endif #define CONFIG_CMD_BOOTCE #define CONFIG_CMD_TIME #define CONFIG_CMD_I2C @@ -243,7 +274,13 @@ #define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR #define CONFIG_SYS_I2C_MX6_PORT1 #define CONFIG_SYS_I2C_SPEED 400000 +#ifndef CONFIG_TX6_V2 #define CONFIG_SYS_I2C_SLAVE 0x3c +#define CONFIG_LTC3676 +#else +#define CONFIG_SYS_I2C_SLAVE 0x32 +#define CONFIG_RN5T618 +#endif #endif #ifndef CONFIG_ENV_IS_NOWHERE @@ -278,13 +315,14 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_BASE 0x00000000 #define CONFIG_CMD_ROMUPDATE -#else -#undef CONFIG_ENV_IS_IN_NAND -#endif /* CONFIG_CMD_NAND */ #define CONFIG_ENV_OFFSET (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS) #define CONFIG_ENV_SIZE SZ_128K #define CONFIG_ENV_RANGE (3 * CONFIG_SYS_NAND_BLOCK_SIZE) +#else +#undef CONFIG_ENV_IS_IN_NAND +#endif /* CONFIG_CMD_NAND */ + #ifdef CONFIG_ENV_OFFSET_REDUND #define CONFIG_SYS_ENV_PART_STR xstr(CONFIG_SYS_ENV_PART_SIZE) \ "(env)," \ @@ -309,6 +347,7 @@ #define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 /* @@ -316,11 +355,7 @@ */ #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#undef CONFIG_ENV_OFFSET -#undef CONFIG_ENV_SIZE -/* Associated with the MMC layout defined in mmcops.c */ -#define CONFIG_ENV_OFFSET SZ_1K -#define CONFIG_ENV_SIZE (SZ_128K - CONFIG_ENV_OFFSET) +#define CONFIG_SYS_MMC_ENV_PART 1 #define CONFIG_DYNAMIC_MMC_DEVNO #endif /* CONFIG_ENV_IS_IN_MMC */ #else @@ -332,16 +367,20 @@ #define CONFIG_ENV_SIZE SZ_4K #endif +#ifndef CONFIG_TX6_V2 #define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \ xstr(CONFIG_SYS_U_BOOT_PART_SIZE) \ "@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) \ "(u-boot)," \ CONFIG_SYS_ENV_PART_STR \ - "4m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR "," \ + "6m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR "," \ xstr(CONFIG_SYS_DTB_PART_SIZE) \ - "(dtb)," \ + "@" xstr(CONFIG_SYS_NAND_DTB_OFFSET) "(dtb)," \ xstr(CONFIG_SYS_NAND_BBT_SIZE) \ "@" xstr(CONFIG_SYS_NAND_BBT_OFFSET) "(bbt)ro" +#else +#define MTDPARTS_DEFAULT "" +#endif #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \