X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=include%2Fconfigs%2Ftqma6.h;h=b5b71570d1424c31269018d7303ec6f32853c964;hb=91c868fe7cd7c5a7157c5eeca64f89dc2a2ee967;hp=295e16303ca23ec61c4a9a3f2ff8b73204c8ab4e;hpb=fbb0c7bd92255bfcb13826a8ac81be6e2f94ba48;p=people%2Fms%2Fu-boot.git diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 295e16303c..b5b71570d1 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2013, 2014 Markus Niebel + * Copyright (C) 2013, 2014, 2017 Markus Niebel * - * Configuration settings for the TQ Systems TQMa6 module. + * Configuration settings for the TQ Systems TQMa6 module. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -12,54 +12,43 @@ #include /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */ - -#define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_EXT_SUPPORT - /* common IMX6 SPL configuration */ #include "imx6_spl.h" /* #endif */ /* place code in last 4 MiB of RAM */ -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) +#if defined(CONFIG_TQMA6S) #define CONFIG_SYS_TEXT_BASE 0x2fc00000 -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) +#elif defined(CONFIG_TQMA6Q) || defined(CONFIG_TQMA6DL) #define CONFIG_SYS_TEXT_BASE 0x4fc00000 #endif #include "mx6_common.h" -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) +#if defined(CONFIG_TQMA6S) #define PHYS_SDRAM_SIZE (512u * SZ_1M) -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) -#define PHYS_SDRAM_SIZE (1024u * SZ_1M) +#elif defined(CONFIG_TQMA6DL) +#define PHYS_SDRAM_SIZE (SZ_1G) +#elif defined(CONFIG_TQMA6Q) +#define PHYS_SDRAM_SIZE (SZ_1G) #endif -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT - #define CONFIG_MXC_UART /* SPI */ -#define CONFIG_CMD_SPI #define CONFIG_MXC_SPI /* SPI Flash */ -#define CONFIG_SPI_FLASH_STMICRO #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K -#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) /* I2C Configs */ -#define CONFIG_CMD_I2C #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ @@ -68,19 +57,11 @@ #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_SPEED 100000 -/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM75 -#define CONFIG_DTT_MAX_TEMP 70 -#define CONFIG_DTT_MIN_TEMP -30 -#define CONFIG_DTT_HYSTERESIS 3 -#define CONFIG_CMD_DTT - /* I2C EEPROM (M24C64) */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS 5 /* 32 Bytes */ #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS 20 -#define CONFIG_CMD_EEPROM #define CONFIG_POWER #define CONFIG_POWER_I2C @@ -92,33 +73,18 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII - #define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_PHYLIB #define CONFIG_MII #define CONFIG_ARP_TIMEOUT 200UL -/* Network config - Allow larger/faster download for TFTP/NFS */ -#define CONFIG_IP_DEFRAG -#define CONFIG_TFTP_BLOCKSIZE 4096 -#define CONFIG_NFS_READ_SIZE 4096 - -/* Command definition */ -#define CONFIG_CMD_BMODE #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ @@ -126,7 +92,6 @@ #if defined(CONFIG_TQMA6X_MMC_BOOT) -#define CONFIG_ENV_IS_IN_MMC #define TQMA6_UBOOT_OFFSET SZ_1K #define TQMA6_UBOOT_SECTOR_START 0x2 #define TQMA6_UBOOT_SECTOR_COUNT 0x7fe @@ -156,8 +121,8 @@ "update_uboot=if tftp ${uboot}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${uboot_size}; then " \ "mmc write ${loadaddr} ${uboot_start} " \ "${blkc}; " \ @@ -168,8 +133,8 @@ "if tftp ${kernel}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${kernel_size}; then " \ "mmc write ${loadaddr} " \ "${kernel_start} ${blkc}; " \ @@ -180,8 +145,8 @@ "update_fdt=if tftp ${fdt_file}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${fdt_size}; then " \ "mmc write ${loadaddr} ${fdt_start} ${blkc}; " \ "fi; " \ @@ -201,7 +166,6 @@ #define TQMA6_UBOOT_SIZE (TQMA6_UBOOT_SECTOR_SIZE * \ TQMA6_UBOOT_SECTOR_COUNT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_OFFSET (TQMA6_UBOOT_SIZE) #define CONFIG_ENV_SECT_SIZE TQMA6_SPI_FLASH_SECTOR_SIZE @@ -285,10 +249,9 @@ __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \ "setexpr offset ${fdt_start} * " \ __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \ - "sf read ${${fdt_addr}} ${offset} ${size}; " \ + "sf read ${fdt_addr} ${offset} ${size}; " \ "setenv size ; setenv offset\0" \ - #define CONFIG_BOOTCOMMAND \ "sf probe; run mmcboot; run netboot; run panicboot" \ @@ -301,6 +264,9 @@ /* 128 MiB offset as in ARM related docu for linux suggested */ #define TQMA6_FDT_ADDRESS 0x18000000 +/* set to a resonable value, changeable by user */ +#define TQMA6_CMA_SIZE 160M + #define CONFIG_EXTRA_ENV_SETTINGS \ "board=tqma6\0" \ "uimage=uImage\0" \ @@ -312,17 +278,21 @@ "uboot=u-boot.imx\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \ - "console=" CONFIG_CONSOLE_DEV "\0" \ + "console=" CONSOLE_DEV "\0" \ + "cma_size="__stringify(TQMA6_CMA_SIZE)"\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "rootfsmode=ro\0" \ + "addcma=setenv bootargs ${bootargs} cma=${cma_size}\0" \ "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "addfb=setenv bootargs ${bootargs} " \ "imx-fbdev.legacyfb_depth=32 consoleblank=0\0" \ "mmcpart=2\0" \ "mmcblkdev=0\0" \ - "mmcargs=run addmmc addtty addfb\0" \ + "mmcargs=run addmmc addtty addfb addcma\0" \ "addmmc=setenv bootargs ${bootargs} " \ - "root=/dev/mmcblk${mmcblkdev}p${mmcpart} rw rootwait\0" \ + "root=/dev/mmcblk${mmcblkdev}p${mmcpart} ${rootfsmode} " \ + "rootwait\0" \ "mmcboot=echo Booting from mmc ...; " \ "setenv bootargs; " \ "run mmcargs; " \ @@ -337,7 +307,7 @@ "netdev=eth0\0" \ "rootpath=/srv/nfs/tqma6\0" \ "ipmode=static\0" \ - "netargs=run addnfs addip addtty addfb\0" \ + "netargs=run addnfs addip addtty addfb addcma\0" \ "addnfs=setenv bootargs ${bootargs} " \ "root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath},v3,tcp;\0" \ @@ -364,8 +334,6 @@ "panicboot=echo No boot device !!! reset\0" \ TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \ -#define CONFIG_STACKSIZE (128u * SZ_1K) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR @@ -379,11 +347,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE - /* * All the defines above are for the TQMa6 SoM * @@ -398,8 +361,5 @@ #endif /* Support at least the sensor on TQMa6 SOM */ -#if !defined(CONFIG_DTT_SENSORS) -#define CONFIG_DTT_SENSORS { 0 } -#endif #endif /* __CONFIG_H */