From: Lothar Waßmann Date: Tue, 5 May 2020 15:05:19 +0000 (+0200) Subject: karo: tx6: add support for TXUL-5014 X-Git-Tag: KARO_TX6-2020-09-18~15 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=2855dfb7f2b85cadcbfeeb9b05c202cad9413411 karo: tx6: add support for TXUL-5014 --- diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c index b12e801789..702a1f838a 100644 --- a/board/karo/tx6/tx6ul.c +++ b/board/karo/tx6/tx6ul.c @@ -418,10 +418,15 @@ static bool tx6ul_temp_check_enabled = true; #define tx6ul_temp_check_enabled 0 #endif +#ifndef CONFIG_SYS_NAND_BLOCKS +#define CONFIG_SYS_NAND_BLOCKS 0 +#endif + static inline u8 tx6ul_mem_suffix(void) { return '0' + CONFIG_SYS_SDRAM_CHIP_SIZE / 1024 * 2 + - IS_ENABLED(CONFIG_TX6_EMMC); + IS_ENABLED(CONFIG_TX6_EMMC) + + CONFIG_SYS_NAND_BLOCKS / 2048 * 4; } #ifdef CONFIG_RN5T567 diff --git a/configs/tx6ul-5014_defconfig b/configs/tx6ul-5014_defconfig new file mode 100644 index 0000000000..7b32320fde --- /dev/null +++ b/configs/tx6ul-5014_defconfig @@ -0,0 +1,30 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_TX6=y +CONFIG_SYS_SDRAM_CHIP_SIZE=512 +CONFIG_TARGET_TX6UL_NAND=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" +CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_CMD_BOOTCE=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_NAND=y +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS=y +CONFIG_BOOTP_GATEWAY=y +CONFIG_BOOTP_SUBNETMASK=y +CONFIG_CMD_PING=y +CONFIG_CMD_MII=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_FUSE=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_LCD=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_NETDEVICES=y +CONFIG_FEC_MXC=y +CONFIG_PHY_SMSC=y +CONFIG_IMX_WATCHDOG=y diff --git a/configs/tx6ul-5014_mfg_defconfig b/configs/tx6ul-5014_mfg_defconfig new file mode 100644 index 0000000000..ef5b7d8deb --- /dev/null +++ b/configs/tx6ul-5014_mfg_defconfig @@ -0,0 +1,29 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_TX6=y +CONFIG_SYS_SDRAM_CHIP_SIZE=512 +CONFIG_TARGET_TX6UL_NAND=y +CONFIG_TX6_UBOOT_MFG=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" +CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_CMD_BOOTCE=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_NAND=y +CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS=y +CONFIG_BOOTP_GATEWAY=y +CONFIG_BOOTP_SUBNETMASK=y +CONFIG_CMD_PING=y +CONFIG_CMD_MII=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_FUSE=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_NETDEVICES=y +CONFIG_FEC_MXC=y +CONFIG_PHY_SMSC=y +CONFIG_IMX_WATCHDOG=y diff --git a/configs/tx6ul-5014_noenv_defconfig b/configs/tx6ul-5014_noenv_defconfig new file mode 100644 index 0000000000..6c87d6e15b --- /dev/null +++ b/configs/tx6ul-5014_noenv_defconfig @@ -0,0 +1,29 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_TX6=y +CONFIG_SYS_SDRAM_CHIP_SIZE=512 +CONFIG_TARGET_TX6UL_NAND=y +CONFIG_TX6_UBOOT_NOENV=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" +CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_CMD_BOOTCE=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_NAND=y +CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS=y +CONFIG_BOOTP_GATEWAY=y +CONFIG_BOOTP_SUBNETMASK=y +CONFIG_CMD_PING=y +CONFIG_CMD_MII=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_FUSE=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_NETDEVICES=y +CONFIG_FEC_MXC=y +CONFIG_PHY_SMSC=y +CONFIG_IMX_WATCHDOG=y diff --git a/configs/tx6ul-5014_sec_defconfig b/configs/tx6ul-5014_sec_defconfig new file mode 100644 index 0000000000..195bedeeaa --- /dev/null +++ b/configs/tx6ul-5014_sec_defconfig @@ -0,0 +1,29 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_TX6=y +CONFIG_SYS_SDRAM_CHIP_SIZE=512 +CONFIG_TARGET_TX6UL_NAND=y +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_NAND_BLOCKS=2048" +CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_CMD_BOOTCE=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_NAND=y +CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_BOOTP_DNS=y +CONFIG_BOOTP_GATEWAY=y +CONFIG_BOOTP_SUBNETMASK=y +CONFIG_CMD_PING=y +CONFIG_CMD_MII=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_FUSE=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_LCD=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_NETDEVICES=y +CONFIG_FEC_MXC=y +CONFIG_PHY_SMSC=y +CONFIG_IMX_WATCHDOG=y