karo: configs: Update the tx6*_defconfig files from defconfigs generated with 'make...

diff --git a/configs/tx6q-1036_defconfig b/configs/tx6q-1036_defconfig
index d4e3865cad203b24974fedf12ccd0f83f081bc19..b910820df0c753a3d019383874e573ee14889f73 100644 (file)
--- a/configs/tx6q-1036_defconfig
+++ b/configs/tx6q-1036_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6Q_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-1036_mfg_defconfig b/configs/tx6q-1036_mfg_defconfig
index 772bb7761235c137c5451acab5b65a20b6257b0d..b7e16d19bbd6ee1f5a1e218f20c77e96c3e658a8 100644 (file)
--- a/configs/tx6q-1036_mfg_defconfig
+++ b/configs/tx6q-1036_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6Q_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-1036_noenv_defconfig b/configs/tx6q-1036_noenv_defconfig
index aba1798f0abada712ee837336e5258ee9fea1bbb..fb8b9ffd1d13219eea9a0a71db9e7c7439677676 100644 (file)
--- a/configs/tx6q-1036_noenv_defconfig
+++ b/configs/tx6q-1036_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6Q_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-1036_sec_defconfig b/configs/tx6q-1036_sec_defconfig
index 1cca243860a64c19e01ef4243ace9477716fa21f..e87b25937c7679e177dbd3dad0e538b2aef72474 100644 (file)
--- a/configs/tx6q-1036_sec_defconfig
+++ b/configs/tx6q-1036_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6Q_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-10x0_defconfig b/configs/tx6q-10x0_defconfig
index 6e1514c1ec90ff4037fe4ad5a8f12f0ba97c9662..075860d1971e2dcf60cfcd686d8354fd33d586da 100644 (file)
--- a/configs/tx6q-10x0_defconfig
+++ b/configs/tx6q-10x0_defconfig
@@ -1,36 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-10x0_mfg_defconfig b/configs/tx6q-10x0_mfg_defconfig
index a8b1b289003748f23fd8aad0e1e8707ce6457274..2f7759715fe6cef5c3d1456e1c55fbe32379da7c 100644 (file)
--- a/configs/tx6q-10x0_mfg_defconfig
+++ b/configs/tx6q-10x0_mfg_defconfig
@@ -1,35 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-10x0_noenv_defconfig b/configs/tx6q-10x0_noenv_defconfig
index e9e090c8a2860af6ed124a9892018da9676b546d..1d683b59f8d697a852157730b71d0cac6cad58d4 100644 (file)
--- a/configs/tx6q-10x0_noenv_defconfig
+++ b/configs/tx6q-10x0_noenv_defconfig
@@ -1,35 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-10x0_sec_defconfig b/configs/tx6q-10x0_sec_defconfig
index ac64560047e69ef8512003f66e0b87f2751f7066..2cffd5483f2847012218d51900f678d74e79d497 100644 (file)
--- a/configs/tx6q-10x0_sec_defconfig
+++ b/configs/tx6q-10x0_sec_defconfig
@@ -1,37 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-11x0_defconfig b/configs/tx6q-11x0_defconfig
index 16862b726d5b8ce532f2e4375f3fbc1fc110d74c..3bc6e20bc89cd302915f7ca1a5e09ade6cc03a68 100644 (file)
--- a/configs/tx6q-11x0_defconfig
+++ b/configs/tx6q-11x0_defconfig
@@ -1,37 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-11x0_mfg_defconfig b/configs/tx6q-11x0_mfg_defconfig
index fcb47dcffbff2da46991ae56a941497a0372c077..60dc3129e3291d9c99650124323913fca83285de 100644 (file)
--- a/configs/tx6q-11x0_mfg_defconfig
+++ b/configs/tx6q-11x0_mfg_defconfig
@@ -1,36 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-11x0_noenv_defconfig b/configs/tx6q-11x0_noenv_defconfig
index ee3cfe2e280bb9d04aad373ae2b481e81396f607..045a227d00dfb00cf3ac38f1d6539a0d29989314 100644 (file)
--- a/configs/tx6q-11x0_noenv_defconfig
+++ b/configs/tx6q-11x0_noenv_defconfig
@@ -1,36 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6q-11x0_sec_defconfig b/configs/tx6q-11x0_sec_defconfig
index 3744f9a78e95fff00090ee5347518d15ee0a9b52..f49848181bacab3b279bacdc251b80febb9898c4 100644 (file)
--- a/configs/tx6q-11x0_sec_defconfig
+++ b/configs/tx6q-11x0_sec_defconfig
@@ -1,37 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6Q_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6Q U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8037_defconfig b/configs/tx6qp-8037_defconfig
index 046d2b98934b31d3aa12eb88ef9b290c7b232972..02229250a5e81f8555ea4a9dd8ecf4c7abccbe8d 100644 (file)
--- a/configs/tx6qp-8037_defconfig
+++ b/configs/tx6qp-8037_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8037_mfg_defconfig b/configs/tx6qp-8037_mfg_defconfig
index 1fa3366d260dc88f5ae9322b093bb81906f94764..c3bad8dcfaeccd4b313fff97ab7d81b77d7f7ffb 100644 (file)
--- a/configs/tx6qp-8037_mfg_defconfig
+++ b/configs/tx6qp-8037_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8037_noenv_defconfig b/configs/tx6qp-8037_noenv_defconfig
index cf1e7d5a93e9dafd46092323741bee3883f93372..f5d025df635150c9fd3e19b985b6aac6cf92d778 100644 (file)
--- a/configs/tx6qp-8037_noenv_defconfig
+++ b/configs/tx6qp-8037_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8037_sec_defconfig b/configs/tx6qp-8037_sec_defconfig
index 88820f616ce9c46c4722d9f4a870dc05ee69ca5d..1094e47b4e300ed9d440b79983ebfdc14d8cc08e 100644 (file)
--- a/configs/tx6qp-8037_sec_defconfig
+++ b/configs/tx6qp-8037_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8137_defconfig b/configs/tx6qp-8137_defconfig
index 0020822a65cdd4ecb0063a311e8ec08269101f20..fabcc229218acc4a68eb45ca113ad1b72185521e 100644 (file)
--- a/configs/tx6qp-8137_defconfig
+++ b/configs/tx6qp-8137_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8137_mfg_defconfig b/configs/tx6qp-8137_mfg_defconfig
index a03866d1fb0cefee1b0a62c0ffe0b589571b39bd..cf1a6d7dbb681033d22c5a7ff7126bfae2aea04b 100644 (file)
--- a/configs/tx6qp-8137_mfg_defconfig
+++ b/configs/tx6qp-8137_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8137_noenv_defconfig b/configs/tx6qp-8137_noenv_defconfig
index 3a26ad2f4abda19249c36634e2de2f3fc24bf4ff..90feabc031a831136f875e6f8daa916ee8f3e541 100644 (file)
--- a/configs/tx6qp-8137_noenv_defconfig
+++ b/configs/tx6qp-8137_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6qp-8137_sec_defconfig b/configs/tx6qp-8137_sec_defconfig
index a6f024b79beabefe3335f5e9c4556a2ded6b4f4b..e83378e038a76fe619fbdfd5ae7ea2d5250d52f3 100644 (file)
--- a/configs/tx6qp-8137_sec_defconfig
+++ b/configs/tx6qp-8137_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6QP_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6QP U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6QP U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8034_defconfig b/configs/tx6s-8034_defconfig
index 3c10572fe0e1816b8365ed212085120afe7064b2..a513b809fd85ae8f70e079fc37be289e7994a85d 100644 (file)
--- a/configs/tx6s-8034_defconfig
+++ b/configs/tx6s-8034_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8034_mfg_defconfig b/configs/tx6s-8034_mfg_defconfig
index 08b04f048921c1bb2f04f15b0f93a019aad2c37d..2b9296da20a82f7a66c4019750e8c8df5eab854c 100644 (file)
--- a/configs/tx6s-8034_mfg_defconfig
+++ b/configs/tx6s-8034_mfg_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8034_noenv_defconfig b/configs/tx6s-8034_noenv_defconfig
index 0639684d8b8cb6d6e21537a99b4fe7fefbf242d9..3cc2b3b52fd5ff8c4774b639826d847e8ff595ad 100644 (file)
--- a/configs/tx6s-8034_noenv_defconfig
+++ b/configs/tx6s-8034_noenv_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8034_sec_defconfig b/configs/tx6s-8034_sec_defconfig
index b8cc8dde7734af95f6d1d426057044d10c0b2364..2c510f0c97c9d9e37453e3ae77fdab60df7eeb7d 100644 (file)
--- a/configs/tx6s-8034_sec_defconfig
+++ b/configs/tx6s-8034_sec_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8035_defconfig b/configs/tx6s-8035_defconfig
index fb477c41fc830a77fee2dbfd1eed78f70d86dd3b..36c6499d6c360a9d079e2d5064b82a926ef64c34 100644 (file)
--- a/configs/tx6s-8035_defconfig
+++ b/configs/tx6s-8035_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8035_mfg_defconfig b/configs/tx6s-8035_mfg_defconfig
index 4fcbbea842e86987170873b406b9d78118058f39..ff59988ed3366944d6230ab2b56ad64eb615cbb0 100644 (file)
--- a/configs/tx6s-8035_mfg_defconfig
+++ b/configs/tx6s-8035_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8035_noenv_defconfig b/configs/tx6s-8035_noenv_defconfig
index 6bd85a2abcdaeb5058dd6354a60cfd12832a6e02..a0204e018e7349c39512f372e2bebd117199c428 100644 (file)
--- a/configs/tx6s-8035_noenv_defconfig
+++ b/configs/tx6s-8035_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8035_sec_defconfig b/configs/tx6s-8035_sec_defconfig
index f38d9b4e6df51348010a84f39b8fdae7b9952acd..822d7158fcef7bd034c3fec9b879d964bd05b607 100644 (file)
--- a/configs/tx6s-8035_sec_defconfig
+++ b/configs/tx6s-8035_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8134_defconfig b/configs/tx6s-8134_defconfig
index 1c044f659fe02459f248a0ce71d7052182c2e518..160d0a5118187db921f8028c0769e6ca9595c387 100644 (file)
--- a/configs/tx6s-8134_defconfig
+++ b/configs/tx6s-8134_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8134_mfg_defconfig b/configs/tx6s-8134_mfg_defconfig
index 3acf4258291a618e79037c6808e98eec5847f470..b4cebc2c0348a829fefeb8c0f0d517d2bc596f1d 100644 (file)
--- a/configs/tx6s-8134_mfg_defconfig
+++ b/configs/tx6s-8134_mfg_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8134_noenv_defconfig b/configs/tx6s-8134_noenv_defconfig
index c43825cf494a98fa8bacd2079d6b92fa6ad4d239..1897523476e923bdf439b857650fee0cb6a4aa14 100644 (file)
--- a/configs/tx6s-8134_noenv_defconfig
+++ b/configs/tx6s-8134_noenv_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8134_sec_defconfig b/configs/tx6s-8134_sec_defconfig
index d3fd7023b150be6c09de5dd6b3d292c488eef083..3bb14ec90b062ce81fa2815b43cb59e2988e785e 100644 (file)
--- a/configs/tx6s-8134_sec_defconfig
+++ b/configs/tx6s-8134_sec_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=16"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8135_defconfig b/configs/tx6s-8135_defconfig
index bc07420a08cde29fbb9700211e7d40dab0eb72a4..9963e134011ee7dd1ceb8760537e7f0311e5abe7 100644 (file)
--- a/configs/tx6s-8135_defconfig
+++ b/configs/tx6s-8135_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8135_mfg_defconfig b/configs/tx6s-8135_mfg_defconfig
index 1d95a2c0acf911e8f76d0bd4f86d440897a0ff71..0b93acbb1e0272d749eeb1c08c3a974916572942 100644 (file)
--- a/configs/tx6s-8135_mfg_defconfig
+++ b/configs/tx6s-8135_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8135_noenv_defconfig b/configs/tx6s-8135_noenv_defconfig
index ce464f10f59ee6f6cb0ea04168669790ca59fab9..e26e7d34e0ab949e135bec0b2adaa07059f33040 100644 (file)
--- a/configs/tx6s-8135_noenv_defconfig
+++ b/configs/tx6s-8135_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6s-8135_sec_defconfig b/configs/tx6s-8135_sec_defconfig
index c5be3060a907500bb9644b2efd9f50975527686a..dd09036f8792a5dd2a8428debf04447dfc1a400e 100644 (file)
--- a/configs/tx6s-8135_sec_defconfig
+++ b/configs/tx6s-8135_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6S_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6S U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8012_defconfig b/configs/tx6u-8012_defconfig
index b8331e54bf1d903518c3c90104cff4e0bc9da0b8..de43db9ef70410af42e35d10d7073f419316abab 100644 (file)
--- a/configs/tx6u-8012_defconfig
+++ b/configs/tx6u-8012_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8012_mfg_defconfig b/configs/tx6u-8012_mfg_defconfig
index 40eb32e71bd5586b6fea240ce490dfc3116c7963..3bb5c208b9b14feebd5ce5a294b4abfc27f67acb 100644 (file)
--- a/configs/tx6u-8012_mfg_defconfig
+++ b/configs/tx6u-8012_mfg_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8012_noenv_defconfig b/configs/tx6u-8012_noenv_defconfig
index d8956c66eab47a282fd3cb4aada37b5665097526..570c571a9f4fffaa9b38a1a0b9793fee6a140ae7 100644 (file)
--- a/configs/tx6u-8012_noenv_defconfig
+++ b/configs/tx6u-8012_noenv_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8012_sec_defconfig b/configs/tx6u-8012_sec_defconfig
index cb657e16120fa851b3f15f297adac5eccf3a23ed..00797c598239dc7975b27aa7d89bbca647ccd592 100644 (file)
--- a/configs/tx6u-8012_sec_defconfig
+++ b/configs/tx6u-8012_sec_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8033_defconfig b/configs/tx6u-8033_defconfig
index b9d7c16c8b4577b5dee88e4f8727d3561d46f1ac..c25e6ca996f82b69030809b7807622b3819107f4 100644 (file)
--- a/configs/tx6u-8033_defconfig
+++ b/configs/tx6u-8033_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8033_mfg_defconfig b/configs/tx6u-8033_mfg_defconfig
index d6323d41dde66d984d66b03d31bba7c1d9aee315..cfaeab931eb27d80b3ac8846f7a4b5bbe8c0bc4a 100644 (file)
--- a/configs/tx6u-8033_mfg_defconfig
+++ b/configs/tx6u-8033_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8033_noenv_defconfig b/configs/tx6u-8033_noenv_defconfig
index 0fddb34915ee85ec0656265e9a2af915f108f290..3f9cf9537b7ffe60b1cbbcad926cfb7157bed36b 100644 (file)
--- a/configs/tx6u-8033_noenv_defconfig
+++ b/configs/tx6u-8033_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8033_sec_defconfig b/configs/tx6u-8033_sec_defconfig
index 640284f971af9bc6af8753314432c15e72d5522f..92223c04aae36ed9ba2ea6a67d8a5c3337446953 100644 (file)
--- a/configs/tx6u-8033_sec_defconfig
+++ b/configs/tx6u-8033_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-80x0_defconfig b/configs/tx6u-80x0_defconfig
index 8ef4f36f5fd7ea0b1e773f2196e249481f7e005b..41706f1003b81b0e3ab4aeb3605802ee70b31b98 100644 (file)
--- a/configs/tx6u-80x0_defconfig
+++ b/configs/tx6u-80x0_defconfig
@@ -1,36 +1,29 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-80x0_mfg_defconfig b/configs/tx6u-80x0_mfg_defconfig
index 1634be62e7f24353b3d5a2746cebab1b8bab08c4..852558e7e10bfe3cb39cd4eccd3507c2a17cd3c0 100644 (file)
--- a/configs/tx6u-80x0_mfg_defconfig
+++ b/configs/tx6u-80x0_mfg_defconfig
@@ -1,35 +1,29 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-80x0_noenv_defconfig b/configs/tx6u-80x0_noenv_defconfig
index f70c0fbf65e2004a1d3b6b12b2103f1d9fc24368..1de18ea113aa84e1e89c18772154b8842dd5de16 100644 (file)
--- a/configs/tx6u-80x0_noenv_defconfig
+++ b/configs/tx6u-80x0_noenv_defconfig
@@ -1,35 +1,29 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-80x0_sec_defconfig b/configs/tx6u-80x0_sec_defconfig
index 9ca5b74a6c962e129b6ba7af0bfbf502498531eb..ed965f613b2a60a4a9300637a1b28379effde123 100644 (file)
--- a/configs/tx6u-80x0_sec_defconfig
+++ b/configs/tx6u-80x0_sec_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8133_defconfig b/configs/tx6u-8133_defconfig
index 21d65b4dffd263a898644cb69b10300c0d134f4f..2235847322d905dab7c305d568e0842299cc6729 100644 (file)
--- a/configs/tx6u-8133_defconfig
+++ b/configs/tx6u-8133_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8133_mfg_defconfig b/configs/tx6u-8133_mfg_defconfig
index 53ade5c0ee22645e44721f78bbfdbda00d8a0b12..8868bda58121bcc34bb04134cdd80a570d2d241d 100644 (file)
--- a/configs/tx6u-8133_mfg_defconfig
+++ b/configs/tx6u-8133_mfg_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8133_noenv_defconfig b/configs/tx6u-8133_noenv_defconfig
index 5dd4e8f0da741c65efc7ba8c3793761e7ae45f50..e3dc0395557e7c34b695d2a40c244279c64ac639 100644 (file)
--- a/configs/tx6u-8133_noenv_defconfig
+++ b/configs/tx6u-8133_noenv_defconfig
@@ -1,32 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-8133_sec_defconfig b/configs/tx6u-8133_sec_defconfig
index 2771871f6e42bf4fd163899ea521e07570ba799f..1f75854a65e067ee56c5db868416cf591696d95e 100644 (file)
--- a/configs/tx6u-8133_sec_defconfig
+++ b/configs/tx6u-8133_sec_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-81x0_defconfig b/configs/tx6u-81x0_defconfig
index 97ad112b7decbb5295a25b8979c1bf4bf50a6946..45ea61b428d068c127835db5564f0e4f7f4b2742 100644 (file)
--- a/configs/tx6u-81x0_defconfig
+++ b/configs/tx6u-81x0_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-81x0_mfg_defconfig b/configs/tx6u-81x0_mfg_defconfig
index 7a6d7aae50f81ae34caa3bb95a2ca28a7dfaa8b1..f2d18cc402606fb52f39c225061f2d57fcee4d21 100644 (file)
--- a/configs/tx6u-81x0_mfg_defconfig
+++ b/configs/tx6u-81x0_mfg_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-81x0_noenv_defconfig b/configs/tx6u-81x0_noenv_defconfig
index 55df71d5d21f5276c2cde56deb4ed7209b488f7e..51ab7cf0181fd4611bf7c96c2787c6fc453300ce 100644 (file)
--- a/configs/tx6u-81x0_noenv_defconfig
+++ b/configs/tx6u-81x0_noenv_defconfig
@@ -1,36 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6u-81x0_sec_defconfig b/configs/tx6u-81x0_sec_defconfig
index 7e9114bf0d78e5accc211ac21058da99ba6f9c77..7c591561a30f671b53b0dd167078454cc275e852 100644 (file)
--- a/configs/tx6u-81x0_sec_defconfig
+++ b/configs/tx6u-81x0_sec_defconfig
@@ -1,37 +1,30 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6U_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6DL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0010_defconfig b/configs/tx6ul-0010_defconfig
index 6a58cf659f35dbc9021d3743f376f4317f64403f..3b1c05f3281365a0dfb42ee178b6459c06fa7d00 100644 (file)
--- a/configs/tx6ul-0010_defconfig
+++ b/configs/tx6ul-0010_defconfig
@@ -1,36 +1,29 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0010_mfg_defconfig b/configs/tx6ul-0010_mfg_defconfig
index f80a0cd7021b481e53f4a7822cd5103143bd4f24..bee13ea24f909f80b681654dc76352d8fd7b3aa3 100644 (file)
--- a/configs/tx6ul-0010_mfg_defconfig
+++ b/configs/tx6ul-0010_mfg_defconfig
@@ -1,34 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0010_noenv_defconfig b/configs/tx6ul-0010_noenv_defconfig
index 6d1dd96731583e85f4624e9eb8f95401fb493f0e..15bbbfaa51af9a8bedb05d21e3819232b6077a2f 100644 (file)
--- a/configs/tx6ul-0010_noenv_defconfig
+++ b/configs/tx6ul-0010_noenv_defconfig
@@ -1,34 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0010_sec_defconfig b/configs/tx6ul-0010_sec_defconfig
index b75b939aa7923145e2fd4eb2e571cc28404f9c34..35e7c301f61595149cc39a7e131ed53b08e1d1b0 100644 (file)
--- a/configs/tx6ul-0010_sec_defconfig
+++ b/configs/tx6ul-0010_sec_defconfig
@@ -1,36 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0011_defconfig b/configs/tx6ul-0011_defconfig
index 0bb3ba61354281ed5432dad32e725aa05d4a7ee9..2ec117c5737236eef5e070cce2afa9c330768c9b 100644 (file)
--- a/configs/tx6ul-0011_defconfig
+++ b/configs/tx6ul-0011_defconfig
@@ -1,33 +1,27 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0011_mfg_defconfig b/configs/tx6ul-0011_mfg_defconfig
index 73f5a9a8c11920693a03c40034fac3dd8d40f8cb..5b1727a5899a2f59b34d69ed3ab2a200e28fb618 100644 (file)
--- a/configs/tx6ul-0011_mfg_defconfig
+++ b/configs/tx6ul-0011_mfg_defconfig
@@ -1,31 +1,26 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_EMMC=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0011_noenv_defconfig b/configs/tx6ul-0011_noenv_defconfig
index f3b978dd1640850793d85a15d3bddcbd83ed2bb4..27a86f03b8566e456d6ea06a3c10819563d178dc 100644 (file)
--- a/configs/tx6ul-0011_noenv_defconfig
+++ b/configs/tx6ul-0011_noenv_defconfig
@@ -1,31 +1,26 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_EMMC=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-0011_sec_defconfig b/configs/tx6ul-0011_sec_defconfig
index 2c964b6651fd3d26f2fef0c683222decc9faa30a..db04654a78a1b3c36c94fbcff07925a4f134266e 100644 (file)
--- a/configs/tx6ul-0011_sec_defconfig
+++ b/configs/tx6ul-0011_sec_defconfig
@@ -1,32 +1,26 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=512
 CONFIG_TARGET_TX6UL_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=512
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-5012_defconfig b/configs/tx6ul-5012_defconfig
index 4009fb2f618680c5d517f6aa6480f4e528fb0c7d..10d7f670d09b295695c94f195b8e1c89917b6248 100644 (file)
--- a/configs/tx6ul-5012_defconfig
+++ b/configs/tx6ul-5012_defconfig
@@ -1,36 +1,29 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-5012_mfg_defconfig b/configs/tx6ul-5012_mfg_defconfig
index be30bdd935af91d7a43e98efff93a11c9a488e69..fbb88cf014bf66384e3aa862cec8e445f4c0d8d4 100644 (file)
--- a/configs/tx6ul-5012_mfg_defconfig
+++ b/configs/tx6ul-5012_mfg_defconfig
@@ -1,34 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_NAND=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-5012_noenv_defconfig b/configs/tx6ul-5012_noenv_defconfig
index 58c506ed723eb73bc3b8821a94234d9609efc27b..94250d39716a8173041372bd1e9f22391f9f6d2b 100644 (file)
--- a/configs/tx6ul-5012_noenv_defconfig
+++ b/configs/tx6ul-5012_noenv_defconfig
@@ -1,34 +1,28 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_NAND=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-5012_sec_defconfig b/configs/tx6ul-5012_sec_defconfig
index 5992643b1766de4050943bb8fbd3e53e95810b6e..d5c12c18a5fff323c997ac1869639e9b0bf013a4 100644 (file)
--- a/configs/tx6ul-5012_sec_defconfig
+++ b/configs/tx6ul-5012_sec_defconfig
@@ -1,36 +1,29 @@
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_BOARD_TX6UL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_NAND=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_TRIMFFS=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
-CONFIG_NET=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-8013_defconfig b/configs/tx6ul-8013_defconfig
index 3c3f434507412e1b8c3a2c19bb583ea3efb5f4e9..b4c951d90232a936de51acc52f73d82a0749934b 100644 (file)
--- a/configs/tx6ul-8013_defconfig
+++ b/configs/tx6ul-8013_defconfig
@@ -1,33 +1,28 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_TX6ULL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_TX6ULL=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-8013_mfg_defconfig b/configs/tx6ul-8013_mfg_defconfig
index 5a01fbcd9717fcfe35c7a4b958c9f6ed9d6ac16e..4f1e6d6ce22902ca71151f6b2ae03b481ef76968 100644 (file)
--- a/configs/tx6ul-8013_mfg_defconfig
+++ b/configs/tx6ul-8013_mfg_defconfig
@@ -1,32 +1,28 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_TX6ULL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_EMMC=y
+CONFIG_TX6ULL=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-8013_noenv_defconfig b/configs/tx6ul-8013_noenv_defconfig
index 2ba619bf9a7db96b61644f7559f2d5df468cd632..8862d5f6a6b8f1d38d9936fcebd23c6d512e9a66 100644 (file)
--- a/configs/tx6ul-8013_noenv_defconfig
+++ b/configs/tx6ul-8013_noenv_defconfig
@@ -1,32 +1,28 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_TX6ULL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_EMMC=y
+CONFIG_TX6ULL=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/tx6ul-8013_sec_defconfig b/configs/tx6ul-8013_sec_defconfig
index 9afa05109c5a734024c5c6b16ca3d5a9500dbb97..e996167921097f48b6ce2c267ce661e71ce9ffa4 100644 (file)
--- a/configs/tx6ul-8013_sec_defconfig
+++ b/configs/tx6ul-8013_sec_defconfig
@@ -1,33 +1,28 @@
-CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_TX6ULL=y
 CONFIG_TARGET_TX6=y
+CONFIG_SYS_SDRAM_CHIP_SIZE=1024
 CONFIG_TARGET_TX6UL_EMMC=y
-CONFIG_TX6_UBOOT=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_CMD_BMP=y
+CONFIG_TX6ULL=y
+CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
+CONFIG_SYS_PROMPT="TX6UL U-Boot > "
 CONFIG_CMD_BOOTCE=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_FUSE=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MII=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_DOS_PARTITION=y
+CONFIG_CMD_FUSE=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
-CONFIG_NET=y
+CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PHY_SMSC=y
-CONFIG_SYS_PROMPT="TX6UL U-Boot > "
-CONFIG_SYS_SDRAM_CHIP_SIZE=1024
+CONFIG_IMX_WATCHDOG=y