board: tqma6: change to use shareable tq environment

Create tqma6 environment file and remove CFG_FEC_MXC_PHYADDR as it comes
from device tree.

Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
This commit is contained in:
Max Merchel 2026-03-23 14:47:34 +01:00 committed by Fabio Estevam
parent b08dc109da
commit 8ff44f6f61
3 changed files with 61 additions and 233 deletions

47
board/tq/tqma6/tqma6.env Normal file
View File

@ -0,0 +1,47 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (c) 2024-2026 TQ-Systems GmbH <u-boot@ew.tq-group.com>,
* D-82229 Seefeld, Germany.
* Author: Max Merchel
*
* TQMa6 environment
*/
#include <env/tq/tq-imx-shared.env>
board=tqma6
boot_os=bootz "${kernel_addr_r}" - "${fdt_addr_r}"
emmc_bootp_start=TQMA6_MMC_UBOOT_SECTOR_START
emmc_dev=0
fdt_addr_r=TQMA6_FDT_ADDRESS
fdtoverlay_addr_r=TQMA6_FDT_OVERLAY_ADDR
image=zImage
kernel_addr_r=CONFIG_SYS_LOAD_ADDR
pxefile_addr_r=CONFIG_SYS_LOAD_ADDR
ramdisk_addr_r=TQMA6_INITRD_ADDRESS
mmcautodetect=yes
mmcblkdev=0
mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
netdev=eth0
sd_dev=1
uboot=u-boot-with-spl.imx
uboot_mmc_start=TQMA6_MMC_UBOOT_SECTOR_START
uboot_mmc_size=TQMA6_MMC_UBOOT_SECTOR_COUNT
uboot_spi_sector_size=TQMA6_SPI_FLASH_SECTOR_SIZE
uboot_spi_start=TQMA6_SPI_UBOOT_START
uboot_spi_size=TQMA6_SPI_UBOOT_SIZE
#ifdef CONFIG_USB_FUNCTION_FASTBOOT
/* 0=user 1=boot1 2=boot2 */
fastboot_mmc_boot_partition = 1
fastboot_partition_alias_all=CONFIG_FASTBOOT_FLASH_MMC_DEV :0
fastboot_raw_partition_bootloader=
TQMA6_MMC_UBOOT_SECTOR_START TQMA6_MMC_UBOOT_SECTOR_COUNT mmcpart
"${fastboot_mmc_boot_partition}"
fastbootcmd=fastboot usb 0
#endif /* CONFIG_USB_FUNCTION_FASTBOOT */

View File

@ -7,243 +7,22 @@
* Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module.
*/
#ifndef __CONFIG_H
#define __CONFIG_H
#include <linux/stringify.h>
/* place code in last 4 MiB of RAM */
#ifndef __TQMA6_CONFIG_H
#define __TQMA6_CONFIG_H
#include "mx6_common.h"
/* SPI Flash */
#define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0
#if defined(CONFIG_TQMA6X_MMC_BOOT)
#define TQMA6_UBOOT_OFFSET SZ_1K
#define TQMA6_UBOOT_SECTOR_START 0x2
#define TQMA6_UBOOT_SECTOR_COUNT 0x7fe
#define TQMA6_FDT_OFFSET (2 * SZ_1M)
#define TQMA6_FDT_SECTOR_START 0x1000
#define TQMA6_FDT_SECTOR_COUNT 0x800
#define TQMA6_KERNEL_SECTOR_START 0x2000
#define TQMA6_KERNEL_SECTOR_COUNT 0x2000
#define TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \
"uboot_start="__stringify(TQMA6_UBOOT_SECTOR_START)"\0" \
"uboot_size="__stringify(TQMA6_UBOOT_SECTOR_COUNT)"\0" \
"fdt_start="__stringify(TQMA6_FDT_SECTOR_START)"\0" \
"fdt_size="__stringify(TQMA6_FDT_SECTOR_COUNT)"\0" \
"kernel_start="__stringify(TQMA6_KERNEL_SECTOR_START)"\0" \
"kernel_size="__stringify(TQMA6_KERNEL_SECTOR_COUNT)"\0" \
"mmcdev="__stringify(CONFIG_ENV_MMC_DEVICE_INDEX)"\0" \
"loadimage=mmc dev ${mmcdev}; " \
"mmc read ${loadaddr} ${kernel_start} ${kernel_size};\0" \
"loadfdt=mmc dev ${mmcdev}; " \
"mmc read ${fdt_addr} ${fdt_start} ${fdt_size};\0" \
"update_uboot=if tftp ${uboot}; then " \
"if itest ${filesize} > 0; then " \
"mmc dev ${mmcdev}; mmc rescan; " \
"setexpr blkc ${filesize} + 0x1ff; " \
"setexpr blkc ${blkc} / 0x200; " \
"if itest ${blkc} <= ${uboot_size}; then " \
"mmc write ${loadaddr} ${uboot_start} " \
"${blkc}; " \
"fi; " \
"fi; fi; " \
"setenv filesize; setenv blkc \0" \
"update_kernel=run kernel_name; " \
"if tftp ${kernel}; then " \
"if itest ${filesize} > 0; then " \
"mmc dev ${mmcdev}; mmc rescan; " \
"setexpr blkc ${filesize} + 0x1ff; " \
"setexpr blkc ${blkc} / 0x200; " \
"if itest ${blkc} <= ${kernel_size}; then " \
"mmc write ${loadaddr} " \
"${kernel_start} ${blkc}; " \
"fi; " \
"fi; " \
"fi; " \
"setenv filesize; setenv blkc \0" \
"update_fdt=if tftp ${fdt_file}; then " \
"if itest ${filesize} > 0; then " \
"mmc dev ${mmcdev}; mmc rescan; " \
"setexpr blkc ${filesize} + 0x1ff; " \
"setexpr blkc ${blkc} / 0x200; " \
"if itest ${blkc} <= ${fdt_size}; then " \
"mmc write ${loadaddr} ${fdt_start} ${blkc}; " \
"fi; " \
"fi; fi; " \
"setenv filesize; setenv blkc \0" \
#elif defined(CONFIG_TQMA6X_SPI_BOOT)
#define TQMA6_UBOOT_OFFSET 0x400
#define TQMA6_UBOOT_SECTOR_START 0x0
/* max u-boot size: 512k */
#define TQMA6_UBOOT_SECTOR_SIZE TQMA6_SPI_FLASH_SECTOR_SIZE
#define TQMA6_UBOOT_SECTOR_COUNT 0x8
#define TQMA6_UBOOT_SIZE (TQMA6_UBOOT_SECTOR_SIZE * \
TQMA6_UBOOT_SECTOR_COUNT)
#define TQMA6_FDT_OFFSET (CONFIG_ENV_OFFSET_REDUND + \
CONFIG_ENV_SECT_SIZE)
#define TQMA6_FDT_SECT_SIZE (TQMA6_SPI_FLASH_SECTOR_SIZE)
#define TQMA6_FDT_SECTOR_START 0x0a /* 8 Sector u-boot, 2 Sector env */
#define TQMA6_FDT_SECTOR_COUNT 0x01
#define TQMA6_KERNEL_SECTOR_START 0x10
#define TQMA6_KERNEL_SECTOR_COUNT 0x60
#define TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \
"mmcblkdev=0\0" \
"uboot_offset="__stringify(TQMA6_UBOOT_OFFSET)"\0" \
"uboot_sectors="__stringify(TQMA6_UBOOT_SECTOR_COUNT)"\0" \
"fdt_start="__stringify(TQMA6_FDT_SECTOR_START)"\0" \
"fdt_sectors="__stringify(TQMA6_FDT_SECTOR_COUNT)"\0" \
"kernel_start="__stringify(TQMA6_KERNEL_SECTOR_START)"\0" \
"kernel_sectors="__stringify(TQMA6_KERNEL_SECTOR_COUNT)"\0" \
"update_uboot=if tftp ${uboot}; then " \
"if itest ${filesize} > 0; then " \
"setexpr blkc ${filesize} + " \
__stringify(TQMA6_UBOOT_OFFSET) "; " \
"setexpr size ${uboot_sectors} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"if itest ${blkc} <= ${size}; then " \
"sf probe; " \
"sf erase 0 ${size}; " \
"sf write ${loadaddr} ${uboot_offset} " \
"${filesize}; " \
"fi; " \
"fi; fi; " \
"setenv filesize 0; setenv blkc; setenv size \0" \
"update_kernel=run kernel_name; if tftp ${kernel}; then " \
"if itest ${filesize} > 0; then " \
"setexpr size ${kernel_sectors} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"setexpr offset ${kernel_start} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"if itest ${filesize} <= ${size}; then " \
"sf probe; " \
"sf erase ${offset} ${size}; " \
"sf write ${loadaddr} ${offset} " \
"${filesize}; " \
"fi; " \
"fi; fi; " \
"setenv filesize 0; setenv size ; setenv offset\0" \
"update_fdt=if tftp ${fdt_file}; then " \
"if itest ${filesize} > 0; then " \
"setexpr size ${fdt_sectors} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"setexpr offset ${fdt_start} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"if itest ${filesize} <= ${size}; then " \
"sf probe; " \
"sf erase ${offset} ${size}; " \
"sf write ${loadaddr} ${offset} " \
"${filesize}; " \
"fi; " \
"fi; fi; " \
"setenv filesize 0; setenv size ; setenv offset\0" \
"loadimage=sf probe; " \
"setexpr size ${kernel_sectors} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"setexpr offset ${kernel_start} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"sf read ${loadaddr} ${offset} ${size}; " \
"setenv size ; setenv offset\0" \
"loadfdt=sf probe; " \
"setexpr size ${fdt_sectors} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"setexpr offset ${fdt_start} * " \
__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \
"sf read ${fdt_addr} ${offset} ${size}; " \
"setenv size ; setenv offset\0"
#else
#error "need to define boot source"
#endif
/* 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
/* 256KiB above TQMA6_FDT_ADDRESS (TQMA6_FDT_ADDRESS + SZ_256K) */
#define TQMA6_FDT_OVERLAY_ADDR 0x18040000
#define CFG_EXTRA_ENV_SETTINGS \
"board=tqma6\0" \
"uimage=uImage\0" \
"zimage=zImage\0" \
"boot_type=bootz\0" \
"kernel_name=if test \"${boot_type}\" != bootz; then " \
"setenv kernel ${uimage}; " \
"else setenv kernel ${zimage}; fi\0" \
"uboot=u-boot.imx\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \
"console=" CONSOLE_DEV "\0" \
"cma_size="__stringify(TQMA6_CMA_SIZE)"\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 addcma\0" \
"addmmc=setenv bootargs ${bootargs} " \
"root=/dev/mmcblk${mmcblkdev}p${mmcpart} ${rootfsmode} " \
"rootwait\0" \
"mmcboot=echo Booting from mmc ...; " \
"setenv bootargs; " \
"run mmcargs; " \
"run loadimage; " \
"if run loadfdt; then " \
"echo boot device tree kernel ...; " \
"${boot_type} ${loadaddr} - ${fdt_addr}; " \
"else " \
"${boot_type}; " \
"fi;\0" \
"setenv bootargs \0" \
"netdev=eth0\0" \
"rootpath=/srv/nfs/tqma6\0" \
"ipmode=static\0" \
"netargs=run addnfs addip addtty addfb addcma\0" \
"addnfs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath},v3,tcp;\0" \
"addip_static=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:${netdev}:off\0" \
"addip_dynamic=setenv bootargs ${bootargs} ip=dhcp\0" \
"addip=if test \"${ipmode}\" != static; then " \
"run addip_dynamic; else run addip_static; fi\0" \
"set_getcmd=if test \"${ipmode}\" != static; then " \
"setenv getcmd dhcp; setenv autoload yes; " \
"else setenv getcmd tftp; setenv autoload no; fi\0" \
"netboot=echo Booting from net ...; " \
"run kernel_name; " \
"run set_getcmd; " \
"setenv bootargs; " \
"run netargs; " \
"if ${getcmd} ${kernel}; then " \
"if ${getcmd} ${fdt_addr} ${fdt_file}; then " \
"${boot_type} ${loadaddr} - ${fdt_addr}; " \
"fi; " \
"fi; " \
"echo ... failed\0" \
"panicboot=echo No boot device !!! reset\0" \
TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \
/* 16MiB above TQMA6_FDT_ADDRESS (TQMA6_FDT_ADDRESS + SZ_16M) */
#define TQMA6_INITRD_ADDRESS 0x19000000
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@ -252,6 +31,13 @@
#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE
#define TQMA6_MMC_UBOOT_SECTOR_START 0x2
#define TQMA6_MMC_UBOOT_SECTOR_COUNT 0x7fe
#define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K
#define TQMA6_SPI_UBOOT_START 0x400
#define TQMA6_SPI_UBOOT_SIZE 0xc0000
/*
* All the defines above are for the TQMa6 SoM
*
@ -265,6 +51,4 @@
#error "No baseboard for the TQMa6 defined!"
#endif
/* Support at least the sensor on TQMa6 SOM */
#endif /* __CONFIG_H */
#endif /* __TQMA6_CONFIG_H */

View File

@ -11,9 +11,6 @@
#ifndef __CONFIG_TQMA6_MBA6_H
#define __CONFIG_TQMA6_MBA6_H
#define CFG_FEC_MXC_PHYADDR 0x03
#define CFG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
#endif /* __CONFIG_TQMA6_MBA6_H */