X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx51.h;h=129bd091d70d4cfdeb7655134139db73c86fc01d;hp=d9b6a81d01275e5f3e40ba88e6cb6df6d29fc729;hb=8f8b36e84c427318b8c2e8996b65c9675abf1810;hpb=58494052b5fa1c2cbed9f1e04049f2951708cfa3 diff --git a/include/configs/tx51.h b/include/configs/tx51.h index d9b6a81d01..129bd091d7 100644 --- a/include/configs/tx51.h +++ b/include/configs/tx51.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012-2014 * * SPDX-License-Identifier: GPL-2.0 * @@ -41,7 +41,7 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_IPUV3 -#define CONFIG_IPUV3_CLK 200000000 +#define CONFIG_IPUV3_CLK 133000000 #define CONFIG_LCD_LOGO #define LCD_BPP LCD_COLOR24 #define CONFIG_CMD_BMP @@ -49,31 +49,20 @@ #endif /* CONFIG_LCD */ /* - * Memory configurations + * Memory configuration options */ #define PHYS_SDRAM_1 0x90000000 /* Base address of bank 1 */ #define PHYS_SDRAM_1_SIZE SZ_128M #if CONFIG_NR_DRAM_BANKS > 1 #define PHYS_SDRAM_2 0x98000000 /* Base address of bank 2 */ #define PHYS_SDRAM_2_SIZE SZ_128M -#else -#define TX51_MOD_SUFFIX "0" #endif #define CONFIG_STACKSIZE SZ_128K #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 /* Memtest start address */ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + SZ_4M) /* 4 MB RAM test */ -#if CONFIG_SYS_SDRAM_CLK == 200 -#define CONFIG_SYS_CLKTL_CBCDR 0x59e35180 -#define TX51_MOD_SUFFIX "1" -#elif CONFIG_SYS_SDRAM_CLK == 166 -#define CONFIG_SYS_CLKTL_CBCDR 0x01e35180 -#ifndef TX51_MOD_SUFFIX -#define TX51_MOD_SUFFIX "2" -#endif -#else -#error Invalid SDRAM clock -#endif +#define CONFIG_SYS_SDRAM_CLK 166 +#define CONFIG_SYS_CLKTL_CBCDR 0x01e35100 /* * U-Boot general configurations @@ -84,7 +73,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 */ @@ -98,10 +87,7 @@ * Flattened Device Tree (FDT) support */ #define CONFIG_OF_LIBFDT -#define CONFIG_OF_EMBED #define CONFIG_OF_BOARD_SETUP -#define CONFIG_DEFAULT_DEVICE_TREE tx51 -#define CONFIG_ARCH_DEVICE_TREE mx51 #define CONFIG_SYS_FDT_ADDR (PHYS_SDRAM_1 + SZ_16M) /* @@ -118,39 +104,49 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_SYS_AUTOLOAD "no" #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" #define CONFIG_LOADADDR 94000000 #define CONFIG_SYS_LOAD_ADDR _pfx(0x, CONFIG_LOADADDR) #define CONFIG_U_BOOT_IMG_SIZE SZ_1M #define CONFIG_HW_WATCHDOG /* - * Extra Environments + * Extra Environment Settings */ +#define CONFIG_SYS_CPU_CLK_STR xstr(CONFIG_SYS_CPU_CLK) + #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" \ - "nfsroot=/tftpboot/rootfs\0" \ + "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ + " root=/dev/mmcblk0p2 rootwait\0" \ "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;" \ - "mmc read ${loadaddr} 100 3000;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" \ + "bootcmd_nand=set autostart no;run bootargs_ubifs" \ + ";nboot linux\0" \ + "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs" \ + ";dhcp\0" \ "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ + "boot_mode=nand\0" \ + "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " ${append_bootargs}\0" \ - "cpu_clk=" xstr(CONFIG_SYS_CPU_CLK) "\0" \ "fdtaddr=91000000\0" \ + "fdtsave=fdt resize;nand erase.part dtb" \ + ";nand write ${fdtaddr} dtb ${fdtsize}\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "nfsroot=/tftpboot/rootfs\0" \ "otg_mode=device\0" \ "touchpanel=tsc2007\0" \ "video_mode=VGA\0" @@ -213,8 +209,6 @@ #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_MXC_NAND_HWECC #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_SYS_MAX_FLASH_SECT 1024 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_5_ADDR_CYCLE @@ -225,14 +219,8 @@ #define CONFIG_ENV_SIZE 0x20000 /* 128 KiB */ #define CONFIG_ENV_RANGE 0x60000 #endif -#ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH -#define CONFIG_SYS_NAND_BASE 0xa0000000 -#define CONFIG_FIT -#else #define CONFIG_SYS_NAND_BASE 0x00000000 #define CONFIG_CMD_ROMUPDATE -#endif #endif /* CONFIG_CMD_NAND */ /* @@ -246,10 +234,10 @@ #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_SYS_FSL_ESDHC_NUM 2 #define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 /* @@ -271,12 +259,12 @@ xstr(CONFIG_ENV_RANGE) \ "(env)," \ xstr(CONFIG_ENV_RANGE) \ - "(env2),4m(linux),16m(rootfs),256k(dtb),?(userfs),512k@0x7f80000(bbt)ro" + "(env2),6m(linux),32m(rootfs),89344k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro" #else #define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \ "1m(u-boot)," \ xstr(CONFIG_ENV_RANGE) \ - "(env),4m(linux),16m(rootfs),256k(dtb),?(userfs),512k@0x7f80000(bbt)ro" + "(env),6m(linux),32m(rootfs),89728k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro" #endif #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1