X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx6.h;h=d02d91afece0e89751824c7839bee2de29e095ea;hp=0c3fc74a61d7be0598e39392de473d5903d170d3;hb=2d2e56167cfbdae55f114162a7906d56d057a538;hpb=dfdb35946c027cdebf25c3705b2cce8658f71632 diff --git a/include/configs/tx6.h b/include/configs/tx6.h index 0c3fc74a61..d02d91afec 100644 --- a/include/configs/tx6.h +++ b/include/configs/tx6.h @@ -8,9 +8,26 @@ #ifndef __CONFIG_H #define __CONFIG_H +#ifndef CONFIG_SOC_MX6UL +#define CONFIG_ARM_ERRATA_743622 +#define CONFIG_ARM_ERRATA_751472 +#define CONFIG_ARM_ERRATA_794072 +#define CONFIG_ARM_ERRATA_761320 + +#ifndef CONFIG_SYS_L2CACHE_OFF +#define CONFIG_SYS_L2_PL310 +#define CONFIG_SYS_PL310_BASE L2_PL310_BASE +#endif + +#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE +#define CONFIG_MP +#endif +#define CONFIG_BOARD_POSTCLK_INIT +#define CONFIG_MXC_GPT_HCLK + +#include #include #include -#include "mx6_common.h" /* * Ka-Ro TX6 board - SoC configuration @@ -44,22 +61,23 @@ */ #define CONFIG_NR_DRAM_BANKS 0x1 /* # of SDRAM banks */ #define PHYS_SDRAM_1 0x10000000 /* Base address of bank 1 */ -#ifdef CONFIG_SYS_SDRAM_BUS_WIDTH -#define PHYS_SDRAM_1_WIDTH CONFIG_SYS_SDRAM_BUS_WIDTH -#elif defined(CONFIG_SYS_SDRAM_BUS_WIDTH_32) -#define PHYS_SDRAM_1_WIDTH 32 +#ifndef CONFIG_SYS_SDRAM_BUS_WIDTH +#if defined(CONFIG_SYS_SDRAM_BUS_WIDTH_32) +#define CONFIG_SYS_SDRAM_BUS_WIDTH 32 #elif defined(CONFIG_SYS_SDRAM_BUS_WIDTH_16) -#define PHYS_SDRAM_1_WIDTH 16 +#define CONFIG_SYS_SDRAM_BUS_WIDTH 16 #else -#define PHYS_SDRAM_1_WIDTH 64 +#define CONFIG_SYS_SDRAM_BUS_WIDTH 64 #endif -#define PHYS_SDRAM_1_SIZE (SZ_512M / 32 * PHYS_SDRAM_1_WIDTH) +#endif /* CONFIG_SYS_SDRAM_BUS_WIDTH */ +#define PHYS_SDRAM_1_SIZE (SZ_512M / 32 * CONFIG_SYS_SDRAM_BUS_WIDTH) #ifdef CONFIG_SOC_MX6Q #define CONFIG_SYS_SDRAM_CLK 528 #else #define CONFIG_SYS_SDRAM_CLK 400 #endif #define CONFIG_STACKSIZE SZ_128K +#define CONFIG_SPL_STACK (IRAM_BASE_ADDR + SZ_16K) #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 /* Memtest start address */ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_4M) @@ -69,11 +87,8 @@ */ #define CONFIG_SYS_LONGHELP #if defined(CONFIG_SOC_MX6Q) -#define CONFIG_SYS_PROMPT "TX6Q U-Boot > " #elif defined(CONFIG_SOC_MX6DL) -#define CONFIG_SYS_PROMPT "TX6DL U-Boot > " #elif defined(CONFIG_SOC_MX6S) -#define CONFIG_SYS_PROMPT "TX6S U-Boot > " #else #error Unsupported i.MX6 processor variant #endif @@ -90,14 +105,6 @@ #define CONFIG_SYS_64BIT_VSPRINTF -/* - * Flattened Device Tree (FDT) support -*/ -#ifdef CONFIG_OF_LIBFDT -#ifdef CONFIG_TX6_NAND -#endif -#endif /* CONFIG_OF_LIBFDT */ - /* * Boot Linux */ @@ -116,17 +123,28 @@ #endif #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_SYS_AUTOLOAD "no" -#ifndef CONFIG_TX6_UBOOT_MFG +#define DEFAULT_BOOTCMD "run bootcmd_${boot_mode} bootm_cmd" #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTARGS "init=/linuxrc console=ttymxc0,115200 ro debug panic=1" -#define CONFIG_BOOTCOMMAND "run bootcmd_${boot_mode} bootm_cmd" +#ifndef CONFIG_TX6_UBOOT_MFG +#define CONFIG_BOOTCOMMAND DEFAULT_BOOTCMD +#else +#define CONFIG_BOOTCOMMAND "setenv bootcmd '" DEFAULT_BOOTCMD "';" \ + "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg" +#if (defined(CONFIG_SOC_MX6SX) || defined(CONFIG_SOC_MX6SL) || defined(CONFIG_SOC_MX6UL)) +#define CONFIG_BOOTCMD_MFG_LOADADDR 80500000 #else -#define CONFIG_BOOTCOMMAND "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg" #define CONFIG_BOOTCMD_MFG_LOADADDR 10500000 +#endif #define CONFIG_DELAY_ENVIRONMENT #endif /* CONFIG_TX6_UBOOT_MFG */ +#if (defined(CONFIG_SOC_MX6SX) || defined(CONFIG_SOC_MX6SL) || defined(CONFIG_SOC_MX6UL)) +#define CONFIG_LOADADDR 82000000 +#define CONFIG_FDTADDR 81000000 +#else #define CONFIG_LOADADDR 18000000 #define CONFIG_FDTADDR 11000000 +#endif #define CONFIG_SYS_LOAD_ADDR _pfx(0x, CONFIG_LOADADDR) #define CONFIG_SYS_FDT_ADDR _pfx(0x, CONFIG_FDTADDR) #ifndef CONFIG_SYS_LVDS_IF @@ -138,11 +156,11 @@ /* * Extra Environments */ -#ifndef CONFIG_TX6_UBOOT_MFG -#ifdef CONFIG_ENV_IS_NOWHERE +#ifdef CONFIG_TX6_UBOOT_NOENV #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ "autoload=no\0" \ + "baseboard=stk5-v3\0" \ "bootdelay=-1\0" \ "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -151,27 +169,32 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "autostart=no\0" \ "baseboard=stk5-v3\0" \ - "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_jffs2=run default_bootargs" \ + ";setenv bootargs ${bootargs}" \ " root=/dev/mtdblock3 rootfstype=jffs2\0" \ - "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \ MMC_ROOT_STR \ - "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \ " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock" \ " ip=dhcp\0" \ - "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}" \ + "bootargs_ubifs=run default_bootargs" \ + ";setenv bootargs ${bootargs}" \ " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \ - "bootcmd_jffs2=set autostart no;run bootargs_jffs2" \ + "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2" \ ";nboot linux\0" \ - "bootcmd_mmc=set autostart no;run bootargs_mmc" \ + "bootcmd_mmc=setenv 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" \ + "bootcmd_net=setenv autoload y;setenv 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" \ - "default_bootargs=set bootargs " CONFIG_BOOTARGS \ + "default_bootargs=setenv bootargs " CONFIG_BOOTARGS \ " ${append_bootargs}\0" \ + EMMC_BOOT_PART_STR \ + EMMC_BOOT_ACK_STR \ "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ CONFIG_SYS_FDTSAVE_CMD \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -182,12 +205,11 @@ "touchpanel=tsc2007\0" \ "video_mode=" DEFAULT_VIDEO_MODE "\0" #endif /* CONFIG_ENV_IS_NOWHERE */ -#endif /* CONFIG_TX6_UBOOT_MFG */ #ifdef CONFIG_TX6_NAND -#define CONFIG_SYS_DEFAULT_BOOT_MODE "nand" +#define CONFIG_SYS_DEFAULT_BOOT_MODE "nand" #define CONFIG_SYS_BOOT_CMD_NAND \ - "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0" + "bootcmd_nand=setenv 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" @@ -195,19 +217,24 @@ #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 "" +#define ROOTPART_UUID_STR "" +#define EMMC_BOOT_ACK_STR "" +#define EMMC_BOOT_PART_STR "" #else -#define CONFIG_SYS_DEFAULT_BOOT_MODE "mmc" -#define CONFIG_SYS_BOOT_CMD_NAND "" +#define CONFIG_SYS_DEFAULT_BOOT_MODE "mmc" +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#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" + "fdtsave=mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} ${emmc_boot_part}" \ + ";mmc write ${fdtaddr} " xstr(CONFIG_SYS_DTB_BLKNO) " 80" \ + ";mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} 0\0" #define MTD_NAME "" #define MTDIDS_DEFAULT "" -#ifdef CONFIG_SUPPORT_EMMC_BOOT -#endif +#define MMC_ROOT_STR " root=PARTUUID=${rootpart_uuid} rootwait\0" +#define ROOTPART_UUID_STR "rootpart_uuid=0cc66cc0-02\0" +#define EMMC_BOOT_ACK_STR "emmc_boot_ack=1\0" +#define EMMC_BOOT_PART_STR "emmc_boot_part=" \ + xstr(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" #endif /* CONFIG_TX6_NAND */ /* @@ -218,6 +245,7 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, } #define CONFIG_SYS_CONSOLE_INFO_QUIET +#define CONFIG_CONS_INDEX 1 /* * GPIO driver @@ -238,7 +266,7 @@ /* * I2C Configs */ -#ifdef CONFIG_SYS_I2C +#ifdef CONFIG_HARD_I2C #define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 400000 #if defined(CONFIG_TX6_REV) @@ -276,8 +304,6 @@ #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_TX6_NAND */ #ifdef CONFIG_ENV_OFFSET_REDUND @@ -299,7 +325,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #endif #ifdef CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 @@ -312,15 +337,8 @@ #define CONFIG_SYS_MMC_ENV_PART 0x1 #define CONFIG_DYNAMIC_MMC_DEVNO #endif /* CONFIG_ENV_IS_IN_MMC */ -#else -#undef CONFIG_ENV_IS_IN_MMC #endif /* CONFIG_CMD_MMC */ -#ifdef CONFIG_ENV_IS_NOWHERE -#undef CONFIG_ENV_SIZE -#define CONFIG_ENV_SIZE SZ_4K -#endif - #ifdef CONFIG_TX6_NAND #define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \ xstr(CONFIG_SYS_U_BOOT_PART_SIZE) \