]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
karo: cleanup after merge of v2015.10-rc2
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 17 Sep 2015 05:31:36 +0000 (07:31 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 17 Sep 2015 05:31:36 +0000 (07:31 +0200)
201 files changed:
MAINTAINERS
README
arch/arc/include/asm/config.h
arch/arm/Kconfig
arch/arm/cpu/arm926ejs/cpu.c
arch/arm/cpu/arm926ejs/mxs/Makefile
arch/arm/cpu/armv7/am33xx/ddr.c
arch/arm/cpu/armv7/cpu.c
arch/arm/cpu/armv7/mx5/Kconfig
arch/arm/cpu/armv7/mx6/Kconfig
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/imx-common/iomux-v3.c
arch/arm/include/asm/arch-am33xx/cpu.h
arch/arm/include/asm/arch-am33xx/da8xx-fb.h
arch/arm/include/asm/arch-mx5/imx-regs.h
arch/arm/include/asm/arch-mx6/imx-regs.h
arch/arm/include/asm/arch-mx6/mx6-pins.h
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/armv7/Makefile
arch/arm/mach-at91/include/mach/at91_pmc.h
arch/arm/mach-at91/include/mach/atmel_usba_udc.h
arch/arm/mach-at91/include/mach/hardware.h
arch/arm/mach-at91/mpddrc.c
arch/arm/mach-at91/spl_atmel.c
arch/arm/mach-exynos/include/mach/system.h
arch/arm/mach-uniphier/ph1-ld4/Makefile
arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
arch/arm/mach-uniphier/ph1-ld4/sg_init.c
arch/arm/mach-uniphier/ph1-pro4/Makefile
arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
arch/arm/mach-uniphier/ph1-pro4/sg_init.c
arch/arm/mach-uniphier/ph1-sld8/Makefile
arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
arch/arm/mach-uniphier/smp.S [deleted file]
arch/m68k/config.mk
arch/m68k/lib/Makefile
board/karo/common/env.c
board/karo/common/fdt.c
board/karo/tx28/Kconfig
board/karo/tx28/config.mk
board/karo/tx48/Kconfig
board/karo/tx48/config.mk
board/karo/tx48/spl.c
board/karo/tx48/tx48.c
board/karo/tx48/u-boot.lds
board/karo/tx51/Kconfig
board/karo/tx51/u-boot.lds
board/karo/tx53/Kconfig
board/karo/tx6/Kconfig
board/karo/tx6/config.mk
board/karo/tx6/lowlevel_init.S
board/karo/tx6/tx6qdl.c
board/karo/tx6/u-boot.lds
board/karo/txa5/Kconfig
common/Kconfig
common/cmd_bootce.c
common/lcd.c
configs/sama5d4_xplained_mmc_defconfig
configs/sama5d4_xplained_nandflash_defconfig
configs/sama5d4_xplained_spiflash_defconfig
configs/sama5d4ek_mmc_defconfig
configs/sama5d4ek_nandflash_defconfig
configs/sama5d4ek_spiflash_defconfig
configs/socfpga_arria5_defconfig
configs/socfpga_cyclone5_defconfig
configs/socfpga_socrates_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
configs/tx28-40x1_defconfig
configs/tx28-40x1_noenv_defconfig
configs/tx28-40x2_defconfig
configs/tx28-40x2_noenv_defconfig
configs/tx28-40x3_defconfig
configs/tx28-40x3_noenv_defconfig
configs/tx28-41x0_defconfig
configs/tx28-41x0_noenv_defconfig
configs/tx48_defconfig
configs/tx51-8xx0_defconfig
configs/tx51-8xx0_noenv_defconfig
configs/tx51-8xx1_2_defconfig
configs/tx51-8xx1_2_noenv_defconfig
configs/tx53-1232_defconfig
configs/tx53-1232_noenv_defconfig [new file with mode: 0644]
configs/tx53-1232_sec_defconfig
configs/tx53-x030_defconfig
configs/tx53-x030_noenv_defconfig [new file with mode: 0644]
configs/tx53-x030_sec_defconfig
configs/tx53-x130_defconfig
configs/tx53-x130_noenv_defconfig [new file with mode: 0644]
configs/tx53-x130_sec_defconfig
configs/tx53-x131_defconfig
configs/tx53-x131_noenv_defconfig [new file with mode: 0644]
configs/tx53-x131_sec_defconfig
configs/tx6q-1020_defconfig
configs/tx6q-1020_mfg_defconfig
configs/tx6q-1020_noenv_defconfig
configs/tx6q-1020_sec_defconfig
configs/tx6q-1033_defconfig
configs/tx6q-1033_mfg_defconfig
configs/tx6q-1033_noenv_defconfig
configs/tx6q-1033_sec_defconfig
configs/tx6q-10x0_defconfig
configs/tx6q-10x0_mfg_defconfig
configs/tx6q-10x0_noenv_defconfig
configs/tx6q-10x0_sec_defconfig
configs/tx6q-11x0_defconfig
configs/tx6q-11x0_mfg_defconfig
configs/tx6q-11x0_noenv_defconfig
configs/tx6q-11x0_sec_defconfig [new file with mode: 0644]
configs/tx6s-8034_defconfig
configs/tx6s-8034_mfg_defconfig
configs/tx6s-8034_noenv_defconfig
configs/tx6s-8034_sec_defconfig
configs/tx6s-8035_defconfig
configs/tx6s-8035_mfg_defconfig
configs/tx6s-8035_noenv_defconfig
configs/tx6s-8035_sec_defconfig
configs/tx6u-8011_defconfig
configs/tx6u-8011_mfg_defconfig
configs/tx6u-8011_noenv_defconfig
configs/tx6u-8011_sec_defconfig
configs/tx6u-8012_defconfig
configs/tx6u-8012_mfg_defconfig
configs/tx6u-8012_noenv_defconfig
configs/tx6u-8012_sec_defconfig
configs/tx6u-8033_defconfig
configs/tx6u-8033_mfg_defconfig
configs/tx6u-8033_noenv_defconfig
configs/tx6u-8033_sec_defconfig
configs/tx6u-80x0_defconfig
configs/tx6u-80x0_mfg_defconfig
configs/tx6u-80x0_noenv_defconfig
configs/tx6u-80x0_sec_defconfig
configs/tx6u-8111_defconfig
configs/tx6u-8111_mfg_defconfig
configs/tx6u-8111_noenv_defconfig
configs/tx6u-8111_sec_defconfig
configs/tx6u-81x0_defconfig
configs/tx6u-81x0_mfg_defconfig
configs/tx6u-81x0_noenv_defconfig
configs/tx6u-81x0_sec_defconfig
configs/txa5-5010_defconfig
configs/txa5-5011_defconfig
drivers/core/Kconfig
drivers/mmc/Kconfig
drivers/mmc/omap_hsmmc.c
drivers/mtd/nand/atmel_nand.c
drivers/mtd/nand/omap_gpmc.c
drivers/net/cpsw.c
drivers/net/fec_mxc.c
drivers/spi/Kconfig
drivers/usb/host/ehci-mx6.c
drivers/video/atmel_hlcdfb.c
drivers/video/da8xx-fb.c
drivers/video/da8xx-fb.h [deleted file]
include/atmel_lcd.h
include/configs/amcore.h
include/configs/calimain.h
include/configs/da830evm.h
include/configs/da850evm.h
include/configs/davinci_dm355evm.h
include/configs/davinci_dm355leopard.h
include/configs/davinci_dm365evm.h
include/configs/davinci_dm6467evm.h
include/configs/davinci_dvevm.h
include/configs/davinci_schmoogie.h
include/configs/davinci_sffsdr.h
include/configs/davinci_sonata.h
include/configs/dbau1x00.h
include/configs/ea20.h
include/configs/embestmx6boards.h
include/configs/enbw_cmc.h
include/configs/flea3.h
include/configs/ipam390.h
include/configs/k2e_evm.h
include/configs/k2hk_evm.h
include/configs/k2l_evm.h
include/configs/pb1x00.h
include/configs/socfpga_cyclone5.h
include/configs/ti_armv7_keystone2.h
include/configs/tqma6.h
include/configs/tx28.h
include/configs/tx48.h
include/configs/tx51.h
include/configs/tx53.h
include/configs/tx6.h
include/configs/txa5.h
include/configs/wandboard.h
include/linux/mtd/omap_gpmc.h
include/netdev.h
net/bootme.c
net/tftp.c
tools/elftosb/common/EncoreBootImage.h
tools/elftosb/makefile
tools/elftosb/makefile.rules

index b478c8c3934bfe4fc5f73c20874f252cbcb36f7d..bf60c67668b1281a583d98c13432a3c0974d26af 100644 (file)
@@ -99,7 +99,6 @@ M:    Luka Perkov <luka.perkov@sartura.hr>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-marvell.git
 F:     arch/arm/mach-kirkwood/
 S:     Maintained
 T:     git git://git.denx.de/u-boot-marvell.git
 F:     arch/arm/mach-kirkwood/
-F:     arch/arm/include/asm/arch-kirkwood/
 
 ARM MARVELL PXA
 M:     Marek Vasut <marex@denx.de>
 
 ARM MARVELL PXA
 M:     Marek Vasut <marex@denx.de>
diff --git a/README b/README
index 5980f6da85c6f5699ba27003b72a1c0dbeb7b343..de436ce786f020ece8904a74f0b2383b36f0e136 100644 (file)
--- a/README
+++ b/README
@@ -701,6 +701,9 @@ The following options need to be configured:
                NOTE: The following can be machine specific errata. These
                do have ability to provide rudimentary version and machine
                specific checks, but expect no product checks.
                NOTE: The following can be machine specific errata. These
                do have ability to provide rudimentary version and machine
                specific checks, but expect no product checks.
+               CONFIG_ARM_ERRATA_430973
+               CONFIG_ARM_ERRATA_454179
+               CONFIG_ARM_ERRATA_621766
                CONFIG_ARM_ERRATA_798870
                CONFIG_ARM_ERRATA_801819
 
                CONFIG_ARM_ERRATA_798870
                CONFIG_ARM_ERRATA_801819
 
@@ -711,119 +714,6 @@ The following options need to be configured:
                impossible actions will be skipped if the CPU is in NS mode,
                such as ARM architectural timer initialization.
 
                impossible actions will be skipped if the CPU is in NS mode,
                such as ARM architectural timer initialization.
 
-- Driver Model
-               Driver model is a new framework for devices in U-Boot
-               introduced in early 2014. U-Boot is being progressively
-               moved over to this. It offers a consistent device structure,
-               supports grouping devices into classes and has built-in
-               handling of platform data and device tree.
-
-               To enable transition to driver model in a relatively
-               painful fashion, each subsystem can be independently
-               switched between the legacy/ad-hoc approach and the new
-               driver model using the options below. Also, many uclass
-               interfaces include compatibility features which may be
-               removed once the conversion of that subsystem is complete.
-               As a result, the API provided by the subsystem may in fact
-               not change with driver model.
-
-               See doc/driver-model/README.txt for more information.
-
-               CONFIG_DM
-
-               Enable driver model. This brings in the core support,
-               including scanning of platform data on start-up. If
-               CONFIG_OF_CONTROL is enabled, the device tree will be
-               scanned also when available.
-
-               CONFIG_CMD_DM
-
-               Enable driver model test commands. These allow you to print
-               out the driver model tree and the uclasses.
-
-               CONFIG_DM_DEMO
-
-               Enable some demo devices and the 'demo' command. These are
-               really only useful for playing around while trying to
-               understand driver model in sandbox.
-
-               CONFIG_SPL_DM
-
-               Enable driver model in SPL. You will need to provide a
-               suitable malloc() implementation. If you are not using the
-               full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
-               consider using CONFIG_SYS_MALLOC_SIMPLE. In that case you
-               must provide CONFIG_SYS_MALLOC_F_LEN to set the size.
-               In most cases driver model will only allocate a few uclasses
-               and devices in SPL, so 1KB should be enable. See
-               CONFIG_SYS_MALLOC_F_LEN for more details on how to enable
-               it.
-
-               CONFIG_DM_SERIAL
-
-               Enable driver model for serial. This replaces
-               drivers/serial/serial.c with the serial uclass, which
-               implements serial_putc() etc. The uclass interface is
-               defined in include/serial.h.
-
-               CONFIG_DM_GPIO
-
-               Enable driver model for GPIO access. The standard GPIO
-               interface (gpio_get_value(), etc.) is then implemented by
-               the GPIO uclass. Drivers provide methods to query the
-               particular GPIOs that they provide. The uclass interface
-               is defined in include/asm-generic/gpio.h.
-
-               CONFIG_DM_SPI
-
-               Enable driver model for SPI. The SPI slave interface
-               (spi_setup_slave(), spi_xfer(), etc.) is then implemented by
-               the SPI uclass. Drivers provide methods to access the SPI
-               buses that they control. The uclass interface is defined in
-               include/spi.h. The existing spi_slave structure is attached
-               as 'parent data' to every slave on each bus. Slaves
-               typically use driver-private data instead of extending the
-               spi_slave structure.
-
-               CONFIG_DM_SPI_FLASH
-
-               Enable driver model for SPI flash. This SPI flash interface
-               (spi_flash_probe(), spi_flash_write(), etc.) is then
-               implemented by the SPI flash uclass. There is one standard
-               SPI flash driver which knows how to probe most chips
-               supported by U-Boot. The uclass interface is defined in
-               include/spi_flash.h, but is currently fully compatible
-               with the old interface to avoid confusion and duplication
-               during the transition parent. SPI and SPI flash must be
-               enabled together (it is not possible to use driver model
-               for one and not the other).
-
-               CONFIG_DM_CROS_EC
-
-               Enable driver model for the Chrome OS EC interface. This
-               allows the cros_ec SPI driver to operate with CONFIG_DM_SPI
-               but otherwise makes few changes. Since cros_ec also supports
-               I2C and LPC (which don't support driver model yet), a full
-               conversion is not yet possible.
-
-
-               ** Code size options: The following options are enabled by
-               default except in SPL. Enable them explicitly to get these
-               features in SPL.
-
-               CONFIG_DM_WARN
-
-               Enable the dm_warn() function. This can use up quite a bit
-               of space for its strings.
-
-               CONFIG_DM_STDIO
-
-               Enable registering a serial device with the stdio library.
-
-               CONFIG_DM_DEVICE_REMOVE
-
-               Enable removing of devices.
-
 - Linux Kernel Interface:
                CONFIG_CLOCKS_IN_MHZ
 
 - Linux Kernel Interface:
                CONFIG_CLOCKS_IN_MHZ
 
index 8936f5cdf79be40875c6624c5ab3f48ab7f9824a..d2d791988e2abbbfef49ff8595792297f311210a 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 #define CONFIG_ARCH_EARLY_INIT_R
 
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 #define CONFIG_ARCH_EARLY_INIT_R
 
index 28c97aef18c6c42cee4b5225a3cafda5914d642a..67982f5dba793ded2002262c719cb5b083bdef0b 100644 (file)
@@ -42,6 +42,9 @@ config CPU_PXA
 config CPU_SA1100
         bool
 
 config CPU_SA1100
         bool
 
+config OMAP_COMMON
+       bool
+
 config SYS_CPU
         default "arm720t" if CPU_ARM720T
         default "arm920t" if CPU_ARM920T
 config SYS_CPU
         default "arm720t" if CPU_ARM720T
         default "arm920t" if CPU_ARM920T
@@ -216,10 +219,6 @@ config TARGET_TX6
        bool "Support tx6"
        select SOC_MX6
 
        bool "Support tx6"
        select SOC_MX6
 
-config TARGET_TXA5
-       bool "Support txA5"
-       select SOC_SAMA5D4
-
 config TARGET_ZMX25
        bool "Support zmx25"
        select CPU_ARM926EJS
 config TARGET_ZMX25
        bool "Support zmx25"
        select CPU_ARM926EJS
@@ -930,11 +929,11 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/mach-nomadik/Kconfig"
+source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
index d1d2a176f673448321a9edb5869d166b3fb54d85..a90ce3047bd27f2f100512ce6239073ac6c92fa9 100644 (file)
@@ -15,7 +15,6 @@
 
 #include <common.h>
 #include <command.h>
 
 #include <common.h>
 #include <command.h>
-#include <lcd.h>
 #include <asm/system.h>
 
 static void cache_flush(void);
 #include <asm/system.h>
 
 static void cache_flush(void);
@@ -31,14 +30,6 @@ int cleanup_before_linux (void)
 
        disable_interrupts ();
 
 
        disable_interrupts ();
 
-#ifdef CONFIG_LCD
-       {
-               /* switch off LCD panel */
-               lcd_panel_disable();
-               /* disable LCD controller */
-               lcd_disable();
-       }
-#endif
 
        /* turn off I/D-cache */
        icache_disable();
 
        /* turn off I/D-cache */
        icache_disable();
index e80867ed602b619bd0e91c7d8d40fb9364980dfa..d66577c9b0678c3c6f60882d3d2ddefef9c47aa8 100644 (file)
@@ -86,8 +86,8 @@ ELFTOSB_TARGET-$(CONFIG_SOC_MX28) = imx28
 u-boot.bd: $(KBUILD_SRC)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
        sed "s@OBJTREE@$(objtree)@g" $^ > $@
 
 u-boot.bd: $(KBUILD_SRC)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
        sed "s@OBJTREE@$(objtree)@g" $^ > $@
 
-u-boot.sb: u-boot spl/u-boot-spl $(objtree)/u-boot.bd $(KBUILD_SRC)/tools/elftosb/bld/linux/elftosb
-               $(KBUILD_SRC)/tools/elftosb/bld/linux/elftosb -V -zf $(ELFTOSB_TARGET-y) -c u-boot.bd -o u-boot.sb
+u-boot.sb: u-boot spl/u-boot-spl $(objtree)/u-boot.bd $(KBUILD_OUTPUT)/tools/elftosb/bld/linux/elftosb
+               $(KBUILD_OUTPUT)/tools/elftosb/bld/linux/elftosb -V -zf $(ELFTOSB_TARGET-y) -c u-boot.bd -o u-boot.sb
 
 u-boot-signed.sb: $(src)/mxsimage-signed.cfg u-boot.ivt u-boot.sig spl/u-boot-spl.ivt spl/u-boot-spl.sig FORCE
        $(call if_changed,mkimage_mxs)
 
 u-boot-signed.sb: $(src)/mxsimage-signed.cfg u-boot.ivt u-boot.sig spl/u-boot-spl.ivt spl/u-boot-spl.sig FORCE
        $(call if_changed,mkimage_mxs)
index 311104be43d16e4541afbad5aa17785237fe0b2a..59dfe45dba63dd6ac27e5a1596be755d62babcd1 100644 (file)
@@ -122,7 +122,7 @@ void config_sdram_emif4d5(const struct emif_regs *regs, int nr)
                        EMIF_REG_INITREF_DIS_MASK);
 
        writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
                        EMIF_REG_INITREF_DIS_MASK);
 
        writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
-       writel(regs->sdram_config, &cstat->secure_emif_sdram_config);
+       writel(regs->sdram_config, &cstat->emif_sdram_config);
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
 
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
 
@@ -165,7 +165,7 @@ void config_sdram(const struct emif_regs *regs, int nr)
 {
        if (regs->zq_config) {
                writel(regs->zq_config, &emif_reg[nr]->emif_zq_config);
 {
        if (regs->zq_config) {
                writel(regs->zq_config, &emif_reg[nr]->emif_zq_config);
-               writel(regs->sdram_config, &cstat->secure_emif_sdram_config);
+               writel(regs->sdram_config, &cstat->emif_sdram_config);
                writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
                writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
index f5160b93e5530c80ac97d53e9d743b1d8db83e6e..0b0e5003cc3c390e9cb86fe13d8426e5840ae731 100644 (file)
@@ -17,7 +17,6 @@
 
 #include <common.h>
 #include <command.h>
 
 #include <common.h>
 #include <command.h>
-#include <lcd.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
index 9f250c6b1e6fba5e4400765c5a2fe6fc8f6e7d4e..ca3c6556d042fa508102d0692d730fd1fde56b14 100644 (file)
@@ -1,13 +1,13 @@
 if ARCH_MX5
 
 if ARCH_MX5
 
-config MX5
+config SOC_MX5
        bool
        default y
 
        bool
        default y
 
-config MX51
+config SOC_MX51
        bool
 
        bool
 
-config MX53
+config SOC_MX53
        bool
 
 choice
        bool
 
 choice
index dce7ffc022ae7ef9d30a29147c509dfdd3cd98f5..373ef3fd3bab62f2ea35e38abf38397747cbc1d5 100644 (file)
@@ -1,31 +1,31 @@
 if ARCH_MX6
 
 if ARCH_MX6
 
-config MX6
+config SOC_MX6
        bool
        default y
 
        bool
        default y
 
-config MX6D
+config SOC_MX6D
        bool
 
        bool
 
-config MX6DL
+config SOC_MX6DL
        bool
 
        bool
 
-config MX6Q
+config SOC_MX6Q
        bool
 
        bool
 
-config MX6QDL
+config SOC_MX6QDL
        bool
 
        bool
 
-config MX6S
+config SOC_MX6S
        bool
 
        bool
 
-config MX6SL
+config SOC_MX6SL
        bool
 
        bool
 
-config MX6SX
+config SOC_MX6SX
        bool
 
        bool
 
-config MX6UL
+config SOC_MX6UL
        select SYS_L2CACHE_OFF
        bool
 
        select SYS_L2CACHE_OFF
        bool
 
index 63d250f92bb8ab2ba6ff513b0f21acb989059436..eefb58ed7c74ed600279830226cae5eed093d050 100644 (file)
@@ -8,24 +8,24 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>
-#include <stdbool.h>
-#include <dm.h>
 #include <div64.h>
 #include <ipu.h>
 #include <div64.h>
 #include <ipu.h>
-#include <imx_thermal.h>
 #include <asm/armv7.h>
 #include <asm/bootm.h>
 #include <asm/pl310.h>
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/armv7.h>
 #include <asm/bootm.h>
 #include <asm/pl310.h>
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/regs-ocotp.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/mxc_hdmi.h>
+#include <asm/arch/regs-ocotp.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/imx-common/boot_mode.h>
 #include <asm/imx-common/dma.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/imx-common/boot_mode.h>
 #include <asm/imx-common/dma.h>
+#include <stdbool.h>
+#include <asm/arch/mxc_hdmi.h>
+#include <asm/arch/crm_regs.h>
+#include <dm.h>
+#include <imx_thermal.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 
index c002530cf901dc0d7df9d164a1a782b033afbcb9..f429876f6a5e8aa7709f12d8c143e1228b800cd4 100644 (file)
@@ -41,8 +41,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
        }
 #endif
 #ifdef DEBUG
        }
 #endif
 #ifdef DEBUG
-       printf("PAD[%2d]=%016llx mux[%03x]=%02x pad[%03x]=%05x%c inp[%03x]=%d\n",
-               i, pad, mux_ctrl_ofs, mux_mode, pad_ctrl_ofs, pad_ctrl,
+       printf("PAD=%016llx mux[%03x]=%02x pad[%03x]=%05x%c inp[%03x]=%d\n",
+               pad, mux_ctrl_ofs, mux_mode, pad_ctrl_ofs, pad_ctrl,
                pad & PAD_CTRL_VALID ? ' ' : '!', sel_input_ofs, sel_input);
 #endif
 
                pad & PAD_CTRL_VALID ? ' ' : '!', sel_input_ofs, sel_input);
 #endif
 
index e34f71cfc20ddc8dec77b1962bdddd03d5cdb04e..16273c8cb569b66df56074187638f16116138565 100644 (file)
@@ -605,6 +605,7 @@ struct pwmss_ecap_regs {
 
 unsigned long __clk_get_rate(u32 m_n, u32 div_m2);
 
 
 unsigned long __clk_get_rate(u32 m_n, u32 div_m2);
 
+unsigned long lcdc_clk_rate(void);
 unsigned long mpu_clk_rate(void);
 
 #endif /* __ASSEMBLY__ */
 unsigned long mpu_clk_rate(void);
 
 #endif /* __ASSEMBLY__ */
index 208b2320e38377be9036ffb1ce33315dc2bd6cc0..a4220c321ea8ea05f88bc329af3bde1fe3a58033 100644 (file)
@@ -29,7 +29,8 @@
 #define DA8XX_FB_H
 
 enum panel_type {
 #define DA8XX_FB_H
 
 enum panel_type {
-       QVGA = 0
+       QVGA,
+       WVGA,
 };
 
 enum panel_shade {
 };
 
 enum panel_shade {
@@ -121,6 +122,7 @@ struct lcd_sync_arg {
 };
 
 void da8xx_fb_disable(void);
 };
 
 void da8xx_fb_disable(void);
-void da8xx_video_init(const struct da8xx_panel *panel, int bits_pixel);
+void da8xx_video_init(const struct da8xx_panel *panel,
+               const struct lcd_ctrl_config *lcd_cfg, int bits_pixel);
 
 #endif  /* ifndef DA8XX_FB_H */
 
 #endif  /* ifndef DA8XX_FB_H */
index 960d8ee81deabcbb85b9a70767c9cef90e242411..b6b61307341a5b39bcefbd40a1dda621d57db026 100644 (file)
@@ -11,7 +11,7 @@
 
 #define CONFIG_SYS_CACHELINE_SIZE 64
 
 
 #define CONFIG_SYS_CACHELINE_SIZE 64
 
-#if defined(CONFIG_MX51)
+#if defined(CONFIG_SOC_MX51)
 #define IRAM_BASE_ADDR         0x1FFE0000      /* internal ram */
 #define IPU_SOC_BASE_ADDR      0x40000000
 #define SPBA0_BASE_ADDR                0x70000000
 #define IRAM_BASE_ADDR         0x1FFE0000      /* internal ram */
 #define IPU_SOC_BASE_ADDR      0x40000000
 #define SPBA0_BASE_ADDR                0x70000000
index c0f8f4a72ff0e364a0cb4e5b4f53f638bfcd6fe9..49a124ea61ec6f48d9a3981f2960af72fbe5e9ae 100644 (file)
@@ -11,7 +11,7 @@
 
 #define ARCH_MXC
 
 
 #define ARCH_MXC
 
-#ifdef CONFIG_MX6UL
+#ifdef CONFIG_SOC_MX6UL
 #define CONFIG_SYS_CACHELINE_SIZE      64
 #else
 #define CONFIG_SYS_CACHELINE_SIZE      32
 #define CONFIG_SYS_CACHELINE_SIZE      64
 #else
 #define CONFIG_SYS_CACHELINE_SIZE      32
index f1a9fae36e232c44d4b1c8f5ae4726602d9f529b..708eaaabd74acfac0c21c84ac2d592ed93138e11 100644 (file)
@@ -37,7 +37,7 @@ enum {
 #include "mx6sl_pins.h"
 #elif defined(CONFIG_SOC_MX6SX)
 #include "mx6sx_pins.h"
 #include "mx6sl_pins.h"
 #elif defined(CONFIG_SOC_MX6SX)
 #include "mx6sx_pins.h"
-#elif defined(CONFIG_MX6UL)
+#elif defined(CONFIG_SOC_MX6UL)
 #include "mx6ul_pins.h"
 #else
 #error "Please select cpu"
 #include "mx6ul_pins.h"
 #else
 #error "Please select cpu"
index f9f148d496332495e64b31435d7d5c5cc194a4aa..9d0cc83706ac344a11117d7d965a9d8caf5ef324 100644 (file)
@@ -134,6 +134,10 @@ config TARGET_SMARTWEB
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
+config TARGET_TXA5
+       bool "Support txA5"
+       select SOC_SAMA5D4
+
 endchoice
 
 config SYS_SOC
 endchoice
 
 config SYS_SOC
index 313eb47894819f4573d32942430d002aff4b6787..cbf205e1978dc0888d38e30a712d5ac6a148f602 100644 (file)
@@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o
 obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o
 obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o
 obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
 obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o
 obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o
 obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
-obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o
+obj-$(CONFIG_SOC_SAMA5D4) += mpddrc.o spl_atmel.o
 obj-y += spl.o
 endif
 
 obj-y += spl.o
 endif
 
index f4f35a4bc1923ac59b700925b1ac6fcba66050db..4c8ff811b6c467d7483039fc5e7995cca7ecf5a3 100644 (file)
@@ -9,7 +9,7 @@
 #
 
 obj-$(CONFIG_SAMA5D3)  += sama5d3_devices.o
 #
 
 obj-$(CONFIG_SAMA5D3)  += sama5d3_devices.o
-obj-$(CONFIG_SAMA5D4)  += sama5d4_devices.o
+obj-$(CONFIG_SOC_SAMA5D4)      += sama5d4_devices.o
 obj-y += clock.o
 obj-y += cpu.o
 obj-y += reset.o
 obj-y += clock.o
 obj-y += cpu.o
 obj-y += reset.o
index 8a3fb942f7725b3de78b0929d06caf7a94833ad6..6ea18b556e552d30acd630b777f084c191afd805 100644 (file)
@@ -78,7 +78,7 @@ typedef struct at91_pmc {
 #define AT91_PMC_PLLXR_DIV(x)          (x & 0xFF)
 #define AT91_PMC_PLLXR_PLLCOUNT(x)     ((x & 0x3F) << 8)
 #define AT91_PMC_PLLXR_OUT(x)          ((x & 0x03) << 14)
 #define AT91_PMC_PLLXR_DIV(x)          (x & 0xFF)
 #define AT91_PMC_PLLXR_PLLCOUNT(x)     ((x & 0x3F) << 8)
 #define AT91_PMC_PLLXR_OUT(x)          ((x & 0x03) << 14)
-#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4)
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4)
 #define AT91_PMC_PLLXR_MUL(x)          ((x & 0x7F) << 18)
 #else
 #define AT91_PMC_PLLXR_MUL(x)          ((x & 0x7FF) << 16)
 #define AT91_PMC_PLLXR_MUL(x)          ((x & 0x7F) << 18)
 #else
 #define AT91_PMC_PLLXR_MUL(x)          ((x & 0x7FF) << 16)
@@ -97,7 +97,7 @@ typedef struct at91_pmc {
 #define AT91_PMC_MCKR_CSS_PLLB         0x00000003
 #define AT91_PMC_MCKR_CSS_MASK         0x00000003
 
 #define AT91_PMC_MCKR_CSS_PLLB         0x00000003
 #define AT91_PMC_MCKR_CSS_MASK         0x00000003
 
-#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4) || \
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
 #define AT91_PMC_MCKR_PRES_1           0x00000000
 #define AT91_PMC_MCKR_PRES_2           0x00000010
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
 #define AT91_PMC_MCKR_PRES_1           0x00000000
 #define AT91_PMC_MCKR_PRES_2           0x00000010
@@ -127,7 +127,7 @@ typedef struct at91_pmc {
 #else
 #define AT91_PMC_MCKR_MDIV_1           0x00000000
 #define AT91_PMC_MCKR_MDIV_2           0x00000100
 #else
 #define AT91_PMC_MCKR_MDIV_1           0x00000000
 #define AT91_PMC_MCKR_MDIV_2           0x00000100
-#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4) || \
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
 #define AT91_PMC_MCKR_MDIV_3           0x00000300
 #endif
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
 #define AT91_PMC_MCKR_MDIV_3           0x00000300
 #endif
index 38b5012fce5cc17b828310b9c352677ab5bba060..f90a1c3a079b8845a1076c741c174b342991e1b9 100644 (file)
@@ -31,7 +31,7 @@ static struct usba_ep_data usba_udc_ep[] = {
        EP("ep5", 5, 1024, 3, 1, 1),
        EP("ep6", 6, 1024, 3, 1, 1),
 };
        EP("ep5", 5, 1024, 3, 1, 1),
        EP("ep6", 6, 1024, 3, 1, 1),
 };
-#elif defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4)
+#elif defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4)
 static struct usba_ep_data usba_udc_ep[] = {
        EP("ep0", 0, 64, 1, 0, 0),
        EP("ep1", 1, 1024, 3, 1, 0),
 static struct usba_ep_data usba_udc_ep[] = {
        EP("ep0", 0, 64, 1, 0, 0),
        EP("ep1", 1, 1024, 3, 1, 0),
index ff6b71b13575814fbd86e105e367f84be2f73f1f..1bba84d2dcb303724e02e6d67ecd8a1720d4bfee 100644 (file)
@@ -25,7 +25,7 @@
 # include <asm/arch/at91sam9x5.h>
 #elif defined(CONFIG_SAMA5D3)
 # include <asm/arch/sama5d3.h>
 # include <asm/arch/at91sam9x5.h>
 #elif defined(CONFIG_SAMA5D3)
 # include <asm/arch/sama5d3.h>
-#elif defined(CONFIG_SAMA5D4)
+#elif defined(CONFIG_SOC_SAMA5D4)
 # include <asm/arch/sama5d4.h>
 #else
 # error "Unsupported AT91 processor"
 # include <asm/arch/sama5d4.h>
 #else
 # error "Unsupported AT91 processor"
index 47e6e5a3cdc4290265b020fdcebab73d06aae9a7..82047f8731b905163056cbff0b392be5a7657fd1 100644 (file)
@@ -19,7 +19,7 @@ static inline void atmel_mpddr_op(const struct atmel_mpddr *mpddr,
 
 static int ddr2_decodtype_is_seq(u32 cr)
 {
 
 static int ddr2_decodtype_is_seq(u32 cr)
 {
-#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4) || \
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
        if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED)
                return 0;
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
        if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED)
                return 0;
index 8ac53353e62d3a5755611d858995484e78434de3..16277e5150ee8890fca412b5ba4562665e6e907b 100644 (file)
@@ -51,7 +51,7 @@ static void switch_to_main_crystal_osc(void)
        while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY))
                ;
 
        while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY))
                ;
 
-#ifndef CONFIG_SAMA5D4
+#ifndef CONFIG_SOC_SAMA5D4
        tmp = readl(&pmc->mor);
        tmp &= ~AT91_PMC_MOR_MOSCRCEN;
        tmp &= ~AT91_PMC_MOR_KEY(0xff);
        tmp = readl(&pmc->mor);
        tmp &= ~AT91_PMC_MOR_MOSCRCEN;
        tmp &= ~AT91_PMC_MOR_KEY(0xff);
index 6ad62b234e2be08913905e3685056c741a3a8795..3ffb296a57fc1c97085d885b4ecfcb56ade5f945 100644 (file)
@@ -10,7 +10,7 @@
 
 #ifndef __ASSEMBLY__
 struct exynos4_sysreg {
 
 #ifndef __ASSEMBLY__
 struct exynos4_sysreg {
-       unsigned int    res1[0x210 / 4];
+       unsigned char   res1[0x210];
        unsigned int    display_ctrl;
        unsigned int    display_ctrl2;
        unsigned int    camera_control;
        unsigned int    display_ctrl;
        unsigned int    display_ctrl2;
        unsigned int    camera_control;
@@ -19,7 +19,7 @@ struct exynos4_sysreg {
 };
 
 struct exynos5_sysreg {
 };
 
 struct exynos5_sysreg {
-       unsigned int    res1[0x214 / 4];
+       unsigned char   res1[0x214];
        unsigned int    disp1blk_cfg;
        unsigned int    disp2blk_cfg;
        unsigned int    hdcp_e_fuse;
        unsigned int    disp1blk_cfg;
        unsigned int    disp2blk_cfg;
        unsigned int    hdcp_e_fuse;
@@ -28,7 +28,7 @@ struct exynos5_sysreg {
        unsigned int    reserved;
        unsigned int    ispblk_cfg;
        unsigned int    usb20phy_cfg;
        unsigned int    reserved;
        unsigned int    ispblk_cfg;
        unsigned int    usb20phy_cfg;
-       unsigned int    res2[0x29c / 4];
+       unsigned char   res2[0x29c];
        unsigned int    mipi_dphy;
        unsigned int    dptx_dphy;
        unsigned int    phyclk_sel;
        unsigned int    mipi_dphy;
        unsigned int    dptx_dphy;
        unsigned int    phyclk_sel;
index 6ab2dd58ede67673265acb7e70db2c836df84b6f..1410b12cb6fe74b973a395722dd18ad48113544f 100644 (file)
@@ -9,8 +9,7 @@ obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
 else
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
 else
-obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o
-obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
+obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o
 endif
 
 obj-y += boot-mode.o
 endif
 
 obj-y += boot-mode.o
index 1bbd9440deb4ac1a20661087d595ed9241bce5fa..2de81f0a5609c7de807724d1fcea43ed0798a31b 100644 (file)
@@ -13,15 +13,29 @@ void clkrst_init(void)
 
        /* deassert reset */
        tmp = readl(SC_RSTCTRL);
 
        /* deassert reset */
        tmp = readl(SC_RSTCTRL);
-       tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1
-               | SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND;
+#ifdef CONFIG_UNIPHIER_ETH
+       tmp |= SC_RSTCTRL_NRST_ETHER;
+#endif
+#ifdef CONFIG_USB_EHCI_UNIPHIER
+       tmp |= SC_RSTCTRL_NRST_STDMAC;
+#endif
+#ifdef CONFIG_NAND_DENALI
+       tmp |= SC_RSTCTRL_NRST_NAND;
+#endif
        writel(tmp, SC_RSTCTRL);
        readl(SC_RSTCTRL); /* dummy read */
 
        /* privide clocks */
        tmp = readl(SC_CLKCTRL);
        writel(tmp, SC_RSTCTRL);
        readl(SC_RSTCTRL); /* dummy read */
 
        /* privide clocks */
        tmp = readl(SC_CLKCTRL);
-       tmp |= SC_CLKCTRL_CLK_ETHER | SC_CLKCTRL_CLK_MIO | SC_CLKCTRL_CLK_UMC
-            | SC_CLKCTRL_CLK_NAND | SC_CLKCTRL_CLK_SBC | SC_CLKCTRL_CLK_PERI;
+#ifdef CONFIG_UNIPHIER_ETH
+       tmp |= SC_CLKCTRL_CEN_ETHER;
+#endif
+#ifdef CONFIG_USB_EHCI_UNIPHIER
+       tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC;
+#endif
+#ifdef CONFIG_NAND_DENALI
+       tmp |= SC_CLKCTRL_CEN_NAND;
+#endif
        writel(tmp, SC_CLKCTRL);
        readl(SC_CLKCTRL); /* dummy read */
 }
        writel(tmp, SC_CLKCTRL);
        readl(SC_CLKCTRL); /* dummy read */
 }
index cc74907f6a6139c8c77e03473af4fa942ee7aced..8e25792b501e97e9b4df17ea23c992aa3f3dbd8e 100644 (file)
@@ -18,33 +18,32 @@ void sbc_init(void)
        tmp &= 0xfffffcff;
        writel(tmp, PC0CTRL);
 
        tmp &= 0xfffffcff;
        writel(tmp, PC0CTRL);
 
-       /* XECS1: sub/boot memory (boot swap = off/on) */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL10);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL11);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL12);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL14);
+       /*
+        * Only CS1 is connected to support card.
+        * BKSZ[1:0] should be set to "01".
+        */
+       writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL10);
+       writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL11);
+       writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL12);
+       writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL14);
 
 
-#if !defined(CONFIG_SPL_BUILD)
-       /* XECS0: boot/sub memory (boot swap = off/on) */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL00);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL01);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL02);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL04);
-#endif
-       /* XECS3: peripherals */
-       writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL30);
-       writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL31);
-       writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL32);
-       writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL34);
-
-       /* base address regsiters */
-       writel(0x0000bc01, SBBASE0);
-       writel(0x0400bc01, SBBASE1);
-       writel(0x0800bf01, SBBASE3);
-
-#if !defined(CONFIG_SPL_BUILD)
-       /* enable access to sub memory when boot swap is on */
-       sg_set_pinsel(155, 1); /* PORT24 -> XECS0 */
-#endif
-       sg_set_pinsel(156, 1); /* PORT25 -> XECS3 */
+       if (boot_is_swapped()) {
+               /*
+                * Boot Swap On: boot from external NOR/SRAM
+                * 0x02000000-0x03ffffff is a mirror of 0x00000000-0x01ffffff.
+                *
+                * 0x00000000-0x01efffff, 0x02000000-0x03efffff: memory bank
+                * 0x01f00000-0x01ffffff, 0x03f00000-0x03ffffff: peripherals
+                */
+               writel(0x0000bc01, SBBASE0);
+       } else {
+               /*
+                * Boot Swap Off: boot from mask ROM
+                * 0x00000000-0x01ffffff: mask ROM
+                * 0x02000000-0x03efffff: memory bank (31MB)
+                * 0x03f00000-0x03ffffff: peripherals (1MB)
+                */
+               writel(0x0000be01, SBBASE0); /* dummy */
+               writel(0x0200be01, SBBASE1);
+       }
 }
 }
index de83962cb27932ec865223dfdcce9810486c419d..dab56e949c1de2f9b8a8faab4fc66e1c71bf5d9a 100644 (file)
@@ -11,14 +11,6 @@ void sg_init(void)
 {
        u32 tmp;
 
 {
        u32 tmp;
 
-       /* Set DDR size */
-       tmp = sg_memconf_val_ch0(CONFIG_SDRAM0_SIZE, CONFIG_DDR_NUM_CH0);
-       tmp |= sg_memconf_val_ch1(CONFIG_SDRAM1_SIZE, CONFIG_DDR_NUM_CH1);
-#if CONFIG_SDRAM0_BASE + CONFIG_SDRAM0_SIZE < CONFIG_SDRAM1_BASE
-       tmp |= SG_MEMCONF_SPARSEMEM;
-#endif
-       writel(tmp, SG_MEMCONF);
-
        /* Input ports must be enabled before deasserting reset of cores */
        tmp = readl(SG_IECTRL);
        tmp |= 0x1;
        /* Input ports must be enabled before deasserting reset of cores */
        tmp = readl(SG_IECTRL);
        tmp |= 0x1;
index 78b438904ac54f174a6c7830a5b927211766133f..229f4432ffb8a538ded0edf67e3a321bbd86fa8f 100644 (file)
@@ -9,8 +9,7 @@ obj-y += sg_init.o pll_init.o early_clkrst_init.o \
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
 else
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
 else
-obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o
-obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
+obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o
 endif
 
 obj-y += boot-mode.o
 endif
 
 obj-y += boot-mode.o
index 1bbd9440deb4ac1a20661087d595ed9241bce5fa..46cace77e54127ccda9dda0bcbecfa862864d82f 100644 (file)
@@ -13,15 +13,44 @@ void clkrst_init(void)
 
        /* deassert reset */
        tmp = readl(SC_RSTCTRL);
 
        /* deassert reset */
        tmp = readl(SC_RSTCTRL);
-       tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1
-               | SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND;
+#ifdef CONFIG_USB_XHCI_UNIPHIER
+       tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_USB3C0 |
+               SC_RSTCTRL_NRST_GIO;
+#endif
+#ifdef CONFIG_UNIPHIER_ETH
+       tmp |= SC_RSTCTRL_NRST_ETHER;
+#endif
+#ifdef CONFIG_USB_EHCI_UNIPHIER
+       tmp |= SC_RSTCTRL_NRST_STDMAC;
+#endif
+#ifdef CONFIG_NAND_DENALI
+       tmp |= SC_RSTCTRL_NRST_NAND;
+#endif
        writel(tmp, SC_RSTCTRL);
        readl(SC_RSTCTRL); /* dummy read */
 
        writel(tmp, SC_RSTCTRL);
        readl(SC_RSTCTRL); /* dummy read */
 
+#ifdef CONFIG_USB_XHCI_UNIPHIER
+       tmp = readl(SC_RSTCTRL2);
+       tmp |= SC_RSTCTRL2_NRST_USB3B1 | SC_RSTCTRL2_NRST_USB3C1;
+       writel(tmp, SC_RSTCTRL2);
+       readl(SC_RSTCTRL2); /* dummy read */
+#endif
+
        /* privide clocks */
        tmp = readl(SC_CLKCTRL);
        /* privide clocks */
        tmp = readl(SC_CLKCTRL);
-       tmp |= SC_CLKCTRL_CLK_ETHER | SC_CLKCTRL_CLK_MIO | SC_CLKCTRL_CLK_UMC
-            | SC_CLKCTRL_CLK_NAND | SC_CLKCTRL_CLK_SBC | SC_CLKCTRL_CLK_PERI;
+#ifdef CONFIG_USB_XHCI_UNIPHIER
+       tmp |= SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 |
+               SC_CLKCTRL_CEN_GIO;
+#endif
+#ifdef CONFIG_UNIPHIER_ETH
+       tmp |= SC_CLKCTRL_CEN_ETHER;
+#endif
+#ifdef CONFIG_USB_EHCI_UNIPHIER
+       tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC;
+#endif
+#ifdef CONFIG_NAND_DENALI
+       tmp |= SC_CLKCTRL_CEN_NAND;
+#endif
        writel(tmp, SC_CLKCTRL);
        readl(SC_CLKCTRL); /* dummy read */
 }
        writel(tmp, SC_CLKCTRL);
        readl(SC_CLKCTRL); /* dummy read */
 }
index b195c9ddee83dc369213b0d90ab785b271156c41..533739c364d534850e83992856fce5ad649967c9 100644 (file)
@@ -11,7 +11,6 @@
 
 void sbc_init(void)
 {
 
 void sbc_init(void)
 {
-#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD)
        /*
         * Only CS1 is connected to support card.
         * BKSZ[1:0] should be set to "01".
        /*
         * Only CS1 is connected to support card.
         * BKSZ[1:0] should be set to "01".
@@ -34,41 +33,10 @@ void sbc_init(void)
                /*
                 * Boot Swap Off: boot from mask ROM
                 * 0x00000000-0x01ffffff: mask ROM
                /*
                 * Boot Swap Off: boot from mask ROM
                 * 0x00000000-0x01ffffff: mask ROM
-                * 0x02000000-0x3effffff: memory bank (31MB)
-                * 0x03f00000-0x3fffffff: peripherals (1MB)
+                * 0x02000000-0x03efffff: memory bank (31MB)
+                * 0x03f00000-0x03ffffff: peripherals (1MB)
                 */
                writel(0x0000be01, SBBASE0); /* dummy */
                writel(0x0200be01, SBBASE1);
        }
                 */
                writel(0x0000be01, SBBASE0); /* dummy */
                writel(0x0200be01, SBBASE1);
        }
-#elif defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
-#if !defined(CONFIG_SPL_BUILD)
-       /* XECS0: boot/sub memory (boot swap = off/on) */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL00);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL01);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL02);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL04);
-#endif
-       /* XECS1: sub/boot memory (boot swap = off/on) */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL10);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL11);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL12);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL14);
-
-       /* XECS3: peripherals */
-       writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL30);
-       writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL31);
-       writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL32);
-       writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL34);
-
-       writel(0x0000bc01, SBBASE0); /* boot memory */
-       writel(0x0400bc01, SBBASE1); /* sub memory */
-       writel(0x0800bf01, SBBASE3); /* peripherals */
-
-#if !defined(CONFIG_SPL_BUILD)
-       sg_set_pinsel(318, 5); /* PORT22 -> XECS0 */
-#endif
-       sg_set_pinsel(313, 5); /* PORT15 -> XECS3 */
-       writel(0x00000001, SG_LOADPINCTRL);
-
-#endif /* CONFIG_XXX_MICRO_SUPPORT_CARD */
 }
 }
index 18c4f1acecc055f7229425e0d05c69d5ace805b2..d6ccffbbc3e002af43978a632e844c5df11b9cdf 100644 (file)
@@ -11,14 +11,6 @@ void sg_init(void)
 {
        u32 tmp;
 
 {
        u32 tmp;
 
-       /* Set DDR size */
-       tmp = sg_memconf_val_ch0(CONFIG_SDRAM0_SIZE, CONFIG_DDR_NUM_CH0);
-       tmp |= sg_memconf_val_ch1(CONFIG_SDRAM1_SIZE, CONFIG_DDR_NUM_CH1);
-#if CONFIG_SDRAM0_BASE + CONFIG_SDRAM0_SIZE < CONFIG_SDRAM1_BASE
-       tmp |= SG_MEMCONF_SPARSEMEM;
-#endif
-       writel(tmp, SG_MEMCONF);
-
        /* Input ports must be enabled before deasserting reset of cores */
        tmp = readl(SG_IECTRL);
        tmp |= 1 << 6;
        /* Input ports must be enabled before deasserting reset of cores */
        tmp = readl(SG_IECTRL);
        tmp |= 1 << 6;
index 72f46636fd5d60aa39f689c9f3f2c3a5807b1147..8eb575e1d3864b4229491780d5157e3fc393d80d 100644 (file)
@@ -1,14 +1 @@
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
-obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o clkrst_init.o \
-       pll_spectrum.o umc_init.o ddrphy_init.o
-else
-obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o
-obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
-endif
-
-obj-y += boot-mode.o
+include $(src)/../ph1-ld4/Makefile
index 18965a94c5f06cbd5ac98c61fe0bb291d3268f9f..8d3435d63210f1135eeaa91075b54bdc5326364d 100644 (file)
@@ -1,29 +1 @@
-/*
- * Copyright (C) 2011-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/sc-regs.h>
-
-void clkrst_init(void)
-{
-       u32 tmp;
-
-       /* deassert reset */
-       tmp = readl(SC_RSTCTRL);
-       tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1
-               | SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND;
-       writel(tmp, SC_RSTCTRL);
-       readl(SC_RSTCTRL); /* dummy read */
-
-       /* privide clocks */
-       tmp = readl(SC_CLKCTRL);
-       tmp |= SC_CLKCTRL_CLK_ETHER | SC_CLKCTRL_CLK_MIO | SC_CLKCTRL_CLK_UMC
-            | SC_CLKCTRL_CLK_NAND | SC_CLKCTRL_CLK_SBC | SC_CLKCTRL_CLK_PERI;
-       writel(tmp, SC_CLKCTRL);
-       readl(SC_CLKCTRL); /* dummy read */
-}
+#include "../ph1-ld4/clkrst_init.c"
index 5efee9c505ce9a58c4e1d4da4d55ab30dde8ee80..225c0d24de3a9b0e637d2ae62e1b71fa36a9fed1 100644 (file)
@@ -1,58 +1 @@
-/*
- * Copyright (C) 2011-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/sbc-regs.h>
-#include <asm/arch/sg-regs.h>
-
-void sbc_init(void)
-{
-       u32 tmp;
-
-       /* system bus output enable */
-       tmp = readl(PC0CTRL);
-       tmp &= 0xfffffcff;
-       writel(tmp, PC0CTRL);
-
-#if !defined(CONFIG_SPL_BUILD)
-       /* XECS0 : dummy */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL00);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL01);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL02);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL04);
-#endif
-       /* XECS1 : boot memory (always boot swap = on) */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL10);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL11);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL12);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL14);
-
-       /* XECS4 : sub memory */
-       writel(SBCTRL0_SAVEPIN_MEM_VALUE, SBCTRL40);
-       writel(SBCTRL1_SAVEPIN_MEM_VALUE, SBCTRL41);
-       writel(SBCTRL2_SAVEPIN_MEM_VALUE, SBCTRL42);
-       writel(SBCTRL4_SAVEPIN_MEM_VALUE, SBCTRL44);
-
-       /* XECS5 : peripherals */
-       writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL50);
-       writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL51);
-       writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL52);
-       writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL54);
-
-       /* base address regsiters */
-       writel(0x0000bc01, SBBASE0); /* boot memory */
-       writel(0x0900bfff, SBBASE1); /* dummy */
-       writel(0x0400bc01, SBBASE4); /* sub memory */
-       writel(0x0800bf01, SBBASE5); /* peripherals */
-
-       sg_set_pinsel(134, 16); /* XIRQ6 -> XECS4 */
-       sg_set_pinsel(135, 16); /* XIRQ7 -> XECS5 */
-
-       /* dummy read to assure write process */
-       readl(SG_PINCTRL(33));
-}
+#include "../ph1-ld4/sbc_init.c"
diff --git a/arch/arm/mach-uniphier/smp.S b/arch/arm/mach-uniphier/smp.S
deleted file mode 100644 (file)
index 25ba981..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2013 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <config.h>
-#include <linux/linkage.h>
-#include <asm/system.h>
-#include <asm/arch/led.h>
-#include <asm/arch/sbc-regs.h>
-
-/* Entry point of U-Boot main program for the secondary CPU */
-LENTRY(secondary_entry)
-       mrc     p15, 0, r0, c1, c0, 0   @ SCTLR (System Contrl Register)
-       bic     r0, r0, #(CR_C | CR_M)  @ MMU and Dcache disable
-       mcr     p15, 0, r0, c1, c0, 0
-       mcr     p15, 0, r0, c8, c7, 0   @ invalidate TLBs
-       mcr     p15, 0, r0, c7, c5, 0   @ invalidate icache
-       dsb
-       led_write(C,0,,)
-       ldr     r1, =ROM_BOOT_ROMRSV2
-       mov     r0, #0
-       str     r0, [r1]
-0:     wfe
-       ldr     r4, [r1]                @ r4: entry point for secondary CPUs
-       cmp     r4, #0
-       beq     0b
-       led_write(C, P, U, 1)
-       bx      r4                      @ secondary CPUs jump to linux
-ENDPROC(secondary_entry)
-
-ENTRY(wakeup_secondary)
-       ldr     r1, =ROM_BOOT_ROMRSV2
-0:     ldr     r0, [r1]
-       cmp     r0, #0
-       bne     0b
-
-       /* set entry address and send event to the secondary CPU */
-       ldr     r0, =secondary_entry
-       str     r0, [r1]
-       ldr     r0, [r1]        @ make sure store is complete
-       mov     r0, #0x100
-0:     subs    r0, r0, #1      @ I don't know the reason, but without this wait
-       bne     0b              @ fails to wake up the secondary CPU
-       sev
-
-       /* wait until the secondary CPU reach to secondary_entry */
-0:     ldr     r0, [r1]
-       cmp     r0, #0
-       bne     0b
-       bx      lr
-ENDPROC(wakeup_secondary)
index a629b68d6190a1227afc57d85d15b5102710b4a0..3b3a7e88ab6077eb9de13dcbc4e0073b1787194b 100644 (file)
@@ -11,9 +11,6 @@ endif
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
 
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
 
-# Support generic board on m68k
-__HAVE_ARCH_GENERIC_BOARD := y
-
 PLATFORM_CPPFLAGS += -D__M68K__
 PLATFORM_LDFLAGS  += -n
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
 PLATFORM_CPPFLAGS += -D__M68K__
 PLATFORM_LDFLAGS  += -n
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
index d0e1a845dd1c5cf733d35d5d6317f39ebc728739..73d40bda8bdabdb1229324c85c8cad8d9065283f 100644 (file)
@@ -5,9 +5,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifndef CONFIG_SYS_GENERIC_BOARD
-obj-y   += board.o
-endif
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += interrupts.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += interrupts.o
index 7dbb7c86c3e21ac10a593d24c12b657f0711d6af..2b347cde3e728a968c3bcf268660995f3de397d1 100644 (file)
 #include <errno.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <errno.h>
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <environment.h>
 
 #include "karo.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 #include "karo.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_UBOOT_IGNORE_ENV
+void env_cleanup(void)
+{
+       set_default_env(NULL);
+}
+#else
 static const char const *cleanup_vars[] = {
        "bootargs",
        "fileaddr",
 static const char const *cleanup_vars[] = {
        "bootargs",
        "fileaddr",
@@ -40,3 +47,4 @@ void env_cleanup(void)
                setenv(cleanup_vars[i], NULL);
        }
 }
                setenv(cleanup_vars[i], NULL);
        }
 }
+#endif
index c6f4dcc4e421964acbc52d770bb62eb799be945e..d43a1170fc27a27748b55eadb131dcc7ec8df03d 100644 (file)
@@ -123,7 +123,7 @@ void karo_fdt_move_fdt(void)
                        fdt_addr, fdt_addr + fdt_totalsize(fdt) - 1);
                memmove((void *)fdt_addr, fdt, fdt_totalsize(fdt));
        }
                        fdt_addr, fdt_addr + fdt_totalsize(fdt) - 1);
                memmove((void *)fdt_addr, fdt, fdt_totalsize(fdt));
        }
-       set_working_fdt_addr((void *)fdt_addr);
+       set_working_fdt_addr(fdt_addr);
        gd->fdt_blob = fdt;
        karo_set_fdtsize(fdt);
 }
        gd->fdt_blob = fdt;
        karo_set_fdtsize(fdt);
 }
index 7c18a451e8a073592c8d19b4aef9e2e953355b96..aad93e6079444aaa92b5ae4c0c472f78dd1f3a6a 100644 (file)
@@ -15,50 +15,37 @@ config SYS_CONFIG_NAME
 config TX28
        bool
        default y
 config TX28
        bool
        default y
-       select SPL
        select SOC_MX28
        select SOC_MX28
+       select SPL
        select APBH_DMA
        select APBH_DMA_BURST
        select APBH_DMA_BURST8
        select CC_OPTIMIZE_LIBS_FOR_SPEED
        select APBH_DMA
        select APBH_DMA_BURST
        select APBH_DMA_BURST8
        select CC_OPTIMIZE_LIBS_FOR_SPEED
-       select CMD_BMP if LCD
        select CMD_NAND_TRIMFFS if CMD_NAND
        select CMD_NAND_TRIMFFS if CMD_NAND
-       select CMD_ROMUPDATE if !SPL_BUILD
-       select FDT_FIXUP_PARTITIONS if OF_LIBFDT
+       select FDT_FIXUP_PARTITIONS
        select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
        select LIB_RAND
        select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
        select LIB_RAND
-       select MTD_PARTITIONS if CMD_NAND
-       select MTD_DEVICE if CMD_NAND
-       select SYS_NAND_USE_FLASH_BBT if NAND
-
-config TARGET_TX28_40X1_NOENV
-       bool
-       select TX28
+       select MTD_DEVICE
+       select MTD_PARTITIONS
+       select MXS_MMC if MMC
+       select NAND
+       select NAND_MXS
+       select OF_BOARD_SETUP
+       select OF_LIBFDT
+       select SYS_NAND_USE_FLASH_BBT
 
 config TARGET_TX28_40X2
        bool
        select TX28
 
 
 config TARGET_TX28_40X2
        bool
        select TX28
 
-config TARGET_TX28_40X2_NOENV
-       bool
-       select TX28
-
 config TARGET_TX28_40X3
        bool
        select TX28
 
 config TARGET_TX28_40X3
        bool
        select TX28
 
-config TARGET_TX28_40X3_NOENV
-       bool
-       select TX28
-
 config TARGET_TX28_41X0
        bool
        select TX28
 
 config TARGET_TX28_41X0
        bool
        select TX28
 
-config TARGET_TX28_41X0_NOENV
-       bool
-       select TX28
-
 choice
        prompt "U-Boot image variant"
        default TX28_UBOOT
 choice
        prompt "U-Boot image variant"
        default TX28_UBOOT
@@ -68,6 +55,7 @@ config TX28_UBOOT
 
 config TX28_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
 
 config TX28_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
 
 endchoice
 
 
 endchoice
 
index 0d3b1fd2202ea9f33b924d8232243834591a9dd9..1f65d6964750cb0804504fff06e1455b826c8489 100644 (file)
@@ -2,8 +2,6 @@
 CONFIG_SYS_TEXT_BASE := 0x40100000
 CONFIG_SPL_TEXT_BASE := 0x00000000
 
 CONFIG_SYS_TEXT_BASE := 0x40100000
 CONFIG_SPL_TEXT_BASE := 0x00000000
 
-__HAVE_ARCH_GENERIC_BOARD := y
-
 LOGO_BMP = logos/karo.bmp
 
 PLATFORM_CPPFLAGS += -Werror
 LOGO_BMP = logos/karo.bmp
 
 PLATFORM_CPPFLAGS += -Werror
index ea17d4c87b4d39fe8721ca163194b06ea889e12a..87430d69b04c7c934ef67d09bf8aa8fdd21f6f40 100644 (file)
@@ -12,4 +12,10 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "tx48"
 
 config SYS_CONFIG_NAME
        default "tx48"
 
+config TX48
+       bool
+       default y
+       select PHYLIB
+       select SPL
+
 endif
 endif
index 51490f0d3b4267e8a6c50efbd8b03ba0e1d5d9e5..2d6ea0cf2575695e45d8e9e933109d33557bdead 100644 (file)
@@ -1,6 +1,7 @@
 CONFIG_SYS_TEXT_BASE = 0x80800000
 ifneq ($(CONFIG_SPL_BUILD),)
        CONFIG_SPL_TEXT_BASE = 0x402F0400
 CONFIG_SYS_TEXT_BASE = 0x80800000
 ifneq ($(CONFIG_SPL_BUILD),)
        CONFIG_SPL_TEXT_BASE = 0x402F0400
+       PLATFORM_CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE)
 endif
 PLATFORM_CPPFLAGS += -Werror
 
 endif
 PLATFORM_CPPFLAGS += -Werror
 
index 2d71d498d9d90189ec19cd61d692a8912e2c5cb9..70908170a60db0d65bf7f2ec6bd7a25ed56d6aac 100644 (file)
@@ -15,7 +15,7 @@
 #include <common.h>
 #include <errno.h>
 #include <miiphy.h>
 #include <common.h>
 #include <errno.h>
 #include <miiphy.h>
-#include <netdev.h>
+#include <cpsw.h>
 #include <serial.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <serial.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <linux/mtd/nand.h>
 #include <asm/gpio.h>
 #include <asm/cache.h>
 #include <linux/mtd/nand.h>
 #include <asm/gpio.h>
 #include <asm/cache.h>
-#include <asm/omap_common.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/arch/mux.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/mem.h>
 #include <video_fb.h>
 #include <asm/arch/da8xx-fb.h>
 
 #include "flash.h"
 
 #include <asm/arch/mem.h>
 #include <video_fb.h>
 #include <asm/arch/da8xx-fb.h>
 
 #include "flash.h"
 
-#define TX48_LED_GPIO          AM33XX_GPIO_NR(1, 26)
-#define TX48_ETH_PHY_RST_GPIO  AM33XX_GPIO_NR(3, 8)
-#define TX48_LCD_RST_GPIO      AM33XX_GPIO_NR(1, 19)
-#define TX48_LCD_PWR_GPIO      AM33XX_GPIO_NR(1, 22)
-#define TX48_LCD_BACKLIGHT_GPIO        AM33XX_GPIO_NR(3, 14)
-
-#define GMII_SEL               (CTRL_BASE + 0x650)
+DECLARE_GLOBAL_DATA_PTR;
 
 
-/* UART Defines */
-#define UART_SYSCFG_OFFSET     0x54
-#define UART_SYSSTS_OFFSET     0x58
+#define TX48_LCD_BACKLIGHT_GPIO        AM33XX_GPIO_NR(3, 14)
 
 
-#define UART_RESET             (0x1 << 1)
 #define UART_RESETDONE         (1 << 0)
 #define UART_IDLE_MODE(m)      (((m) << 3) & UART_IDLE_MODE_MASK)
 #define UART_IDLE_MODE_MASK    (0x3 << 3)
 
 #define UART_RESETDONE         (1 << 0)
 #define UART_IDLE_MODE(m)      (((m) << 3) & UART_IDLE_MODE_MASK)
 #define UART_IDLE_MODE_MASK    (0x3 << 3)
 
-/* Timer Defines */
-#define TSICR_REG              0x54
-#define TIOCP_CFG_REG          0x10
-#define TCLR_REG               0x38
-
-/* RGMII mode define */
-#define RGMII_MODE_ENABLE      0xA
-#define RMII_MODE_ENABLE       0x5
-#define MII_MODE_ENABLE                0x0
-
-#define NO_OF_MAC_ADDR         1
-#define ETH_ALEN               6
-
-/* PAD Control Fields */
-#define SLEWCTRL       (0x1 << 6)
-#define        RXACTIVE        (0x1 << 5)
-#define        PULLUP_EN       (0x1 << 4) /* Pull UP Selection */
-#define PULLUDEN       (0x0 << 3) /* Pull up enabled */
-#define PULLUDDIS      (0x1 << 3) /* Pull up disabled */
-#define MODE(val)      (val)
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * PAD CONTROL OFFSETS
- * Field names corresponds to the pad signal name
- */
-struct pad_signals {
-       int gpmc_ad0;
-       int gpmc_ad1;
-       int gpmc_ad2;
-       int gpmc_ad3;
-       int gpmc_ad4;
-       int gpmc_ad5;
-       int gpmc_ad6;
-       int gpmc_ad7;
-       int gpmc_ad8;
-       int gpmc_ad9;
-       int gpmc_ad10;
-       int gpmc_ad11;
-       int gpmc_ad12;
-       int gpmc_ad13;
-       int gpmc_ad14;
-       int gpmc_ad15;
-       int gpmc_a0;
-       int gpmc_a1;
-       int gpmc_a2;
-       int gpmc_a3;
-       int gpmc_a4;
-       int gpmc_a5;
-       int gpmc_a6;
-       int gpmc_a7;
-       int gpmc_a8;
-       int gpmc_a9;
-       int gpmc_a10;
-       int gpmc_a11;
-       int gpmc_wait0;
-       int gpmc_wpn;
-       int gpmc_be1n;
-       int gpmc_csn0;
-       int gpmc_csn1;
-       int gpmc_csn2;
-       int gpmc_csn3;
-       int gpmc_clk;
-       int gpmc_advn_ale;
-       int gpmc_oen_ren;
-       int gpmc_wen;
-       int gpmc_be0n_cle;
-       int lcd_data0;
-       int lcd_data1;
-       int lcd_data2;
-       int lcd_data3;
-       int lcd_data4;
-       int lcd_data5;
-       int lcd_data6;
-       int lcd_data7;
-       int lcd_data8;
-       int lcd_data9;
-       int lcd_data10;
-       int lcd_data11;
-       int lcd_data12;
-       int lcd_data13;
-       int lcd_data14;
-       int lcd_data15;
-       int lcd_vsync;
-       int lcd_hsync;
-       int lcd_pclk;
-       int lcd_ac_bias_en;
-       int mmc0_dat3;
-       int mmc0_dat2;
-       int mmc0_dat1;
-       int mmc0_dat0;
-       int mmc0_clk;
-       int mmc0_cmd;
-       int mii1_col;
-       int mii1_crs;
-       int mii1_rxerr;
-       int mii1_txen;
-       int mii1_rxdv;
-       int mii1_txd3;
-       int mii1_txd2;
-       int mii1_txd1;
-       int mii1_txd0;
-       int mii1_txclk;
-       int mii1_rxclk;
-       int mii1_rxd3;
-       int mii1_rxd2;
-       int mii1_rxd1;
-       int mii1_rxd0;
-       int rmii1_refclk;
-       int mdio_data;
-       int mdio_clk;
-       int spi0_sclk;
-       int spi0_d0;
-       int spi0_d1;
-       int spi0_cs0;
-       int spi0_cs1;
-       int ecap0_in_pwm0_out;
-       int uart0_ctsn;
-       int uart0_rtsn;
-       int uart0_rxd;
-       int uart0_txd;
-       int uart1_ctsn;
-       int uart1_rtsn;
-       int uart1_rxd;
-       int uart1_txd;
-       int i2c0_sda;
-       int i2c0_scl;
-       int mcasp0_aclkx;
-       int mcasp0_fsx;
-       int mcasp0_axr0;
-       int mcasp0_ahclkr;
-       int mcasp0_aclkr;
-       int mcasp0_fsr;
-       int mcasp0_axr1;
-       int mcasp0_ahclkx;
-       int xdma_event_intr0;
-       int xdma_event_intr1;
-       int nresetin_out;
-       int porz;
-       int nnmi;
-       int osc0_in;
-       int osc0_out;
-       int rsvd1;
-       int tms;
-       int tdi;
-       int tdo;
-       int tck;
-       int ntrst;
-       int emu0;
-       int emu1;
-       int osc1_in;
-       int osc1_out;
-       int pmic_power_en;
-       int rtc_porz;
-       int rsvd2;
-       int ext_wakeup;
-       int enz_kaldo_1p8v;
-       int usb0_dm;
-       int usb0_dp;
-       int usb0_ce;
-       int usb0_id;
-       int usb0_vbus;
-       int usb0_drvvbus;
-       int usb1_dm;
-       int usb1_dp;
-       int usb1_ce;
-       int usb1_id;
-       int usb1_vbus;
-       int usb1_drvvbus;
-       int ddr_resetn;
-       int ddr_csn0;
-       int ddr_cke;
-       int ddr_ck;
-       int ddr_nck;
-       int ddr_casn;
-       int ddr_rasn;
-       int ddr_wen;
-       int ddr_ba0;
-       int ddr_ba1;
-       int ddr_ba2;
-       int ddr_a0;
-       int ddr_a1;
-       int ddr_a2;
-       int ddr_a3;
-       int ddr_a4;
-       int ddr_a5;
-       int ddr_a6;
-       int ddr_a7;
-       int ddr_a8;
-       int ddr_a9;
-       int ddr_a10;
-       int ddr_a11;
-       int ddr_a12;
-       int ddr_a13;
-       int ddr_a14;
-       int ddr_a15;
-       int ddr_odt;
-       int ddr_d0;
-       int ddr_d1;
-       int ddr_d2;
-       int ddr_d3;
-       int ddr_d4;
-       int ddr_d5;
-       int ddr_d6;
-       int ddr_d7;
-       int ddr_d8;
-       int ddr_d9;
-       int ddr_d10;
-       int ddr_d11;
-       int ddr_d12;
-       int ddr_d13;
-       int ddr_d14;
-       int ddr_d15;
-       int ddr_dqm0;
-       int ddr_dqm1;
-       int ddr_dqs0;
-       int ddr_dqsn0;
-       int ddr_dqs1;
-       int ddr_dqsn1;
-       int ddr_vref;
-       int ddr_vtp;
-       int ddr_strben0;
-       int ddr_strben1;
-       int ain7;
-       int ain6;
-       int ain5;
-       int ain4;
-       int ain3;
-       int ain2;
-       int ain1;
-       int ain0;
-       int vrefp;
-       int vrefn;
-};
-
 struct pin_mux {
        short reg_offset;
        uint8_t val;
 };
 
 struct pin_mux {
        short reg_offset;
        uint8_t val;
 };
 
-#define PAD_CTRL_BASE  0x800
-#define OFFSET(x)      (unsigned int) (&((struct pad_signals *) \
-                               (PAD_CTRL_BASE))->x)
+/*
+ * Configure the pin mux for the module
+ */
+static inline void tx48_set_pin_mux(const struct pin_mux *pin_mux,
+                       int num_pins)
+{
+       int i;
+
+       for (i = 0; i < num_pins; i++)
+               writel(pin_mux[i].val, CTRL_BASE + pin_mux[i].reg_offset);
+}
 
 static struct pin_mux tx48_pins[] = {
 
 static struct pin_mux tx48_pins[] = {
-#ifdef CONFIG_CMD_NAND
+#ifdef CONFIG_NAND
        { OFFSET(gpmc_ad0), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD0 */
        { OFFSET(gpmc_ad1), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD1 */
        { OFFSET(gpmc_ad2), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD2 */
        { OFFSET(gpmc_ad0), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD0 */
        { OFFSET(gpmc_ad1), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD1 */
        { OFFSET(gpmc_ad2), MODE(0) | PULLUP_EN | RXACTIVE, },  /* NAND AD2 */
@@ -338,14 +102,6 @@ static struct pin_mux tx48_pins[] = {
        { OFFSET(emu0), MODE(7) | RXACTIVE},         /* nINT */
        { OFFSET(emu1), MODE(7), },                  /* nRST */
 #endif
        { OFFSET(emu0), MODE(7) | RXACTIVE},         /* nINT */
        { OFFSET(emu1), MODE(7), },                  /* nRST */
 #endif
-};
-
-static struct gpio tx48_gpios[] = {
-       /* configure this pin early to prevent flicker of the LCD */
-       { TX48_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
-};
-
-static struct pin_mux tx48_mmc_pins[] = {
 #ifdef CONFIG_OMAP_HSMMC
        /* MMC1 */
        { OFFSET(mii1_rxd2), MODE(4) | RXACTIVE | PULLUP_EN, }, /* MMC1_DAT3 */
 #ifdef CONFIG_OMAP_HSMMC
        /* MMC1 */
        { OFFSET(mii1_rxd2), MODE(4) | RXACTIVE | PULLUP_EN, }, /* MMC1_DAT3 */
@@ -358,19 +114,18 @@ static struct pin_mux tx48_mmc_pins[] = {
 #endif
 };
 
 #endif
 };
 
-/*
- * Configure the pin mux for the module
- */
-static inline void tx48_set_pin_mux(const struct pin_mux *pin_mux,
-                       int num_pins)
-{
-       int i;
+static struct gpio tx48_gpios[] = {
+       /* configure this pin early to prevent flicker of the LCD */
+       { TX48_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
+};
 
 
-       for (i = 0; i < num_pins; i++)
-               writel(pin_mux[i].val, CTRL_BASE + pin_mux[i].reg_offset);
+void set_mux_conf_regs(void)
+{
+       gpio_request_array(tx48_gpios, ARRAY_SIZE(tx48_gpios));
+       tx48_set_pin_mux(tx48_pins, ARRAY_SIZE(tx48_pins));
 }
 
 }
 
-static struct pin_mux tx48_uart0_pins[] = {
+static struct pin_mux tx48_uart_pins[] = {
 #ifdef CONFIG_SYS_NS16550_COM1
        /* UART0 for early boot messages */
        { OFFSET(uart0_rxd), MODE(0) | PULLUP_EN | RXACTIVE, }, /* UART0_RXD */
 #ifdef CONFIG_SYS_NS16550_COM1
        /* UART0 for early boot messages */
        { OFFSET(uart0_rxd), MODE(0) | PULLUP_EN | RXACTIVE, }, /* UART0_RXD */
@@ -397,14 +152,9 @@ static struct pin_mux tx48_uart0_pins[] = {
 /*
  * early system init of muxing and clocks.
  */
 /*
  * early system init of muxing and clocks.
  */
-static void enable_uart0_pin_mux(void)
-{
-       tx48_set_pin_mux(tx48_uart0_pins, ARRAY_SIZE(tx48_uart0_pins));
-}
-
-static void enable_mmc0_pin_mux(void)
+void set_uart_mux_conf(void)
 {
 {
-       tx48_set_pin_mux(tx48_mmc_pins, ARRAY_SIZE(tx48_mmc_pins));
+       tx48_set_pin_mux(tx48_uart_pins, ARRAY_SIZE(tx48_uart_pins));
 }
 
 static const u32 gpmc_nand_cfg[GPMC_MAX_REG] = {
 }
 
 static const u32 gpmc_nand_cfg[GPMC_MAX_REG] = {
@@ -582,23 +332,20 @@ static inline int cl(u32 sdram_clk)
                (80 << 0) /* refr periods between ZQCS commands */ |    \
                0)
 
                (80 << 0) /* refr periods between ZQCS commands */ |    \
                0)
 
+#if 1
 static struct ddr_data tx48_ddr3_data = {
        /* reset defaults */
        .datardsratio0 = 0x04010040,
        .datawdsratio0 = 0x0,
        .datafwsratio0 = 0x0,
        .datawrsratio0 = 0x04010040,
 static struct ddr_data tx48_ddr3_data = {
        /* reset defaults */
        .datardsratio0 = 0x04010040,
        .datawdsratio0 = 0x0,
        .datafwsratio0 = 0x0,
        .datawrsratio0 = 0x04010040,
-       .datadldiff0 = 0x4,
 };
 
 static struct cmd_control tx48_ddr3_cmd_ctrl_data = {
        /* reset defaults */
        .cmd0csratio = 0x80,
 };
 
 static struct cmd_control tx48_ddr3_cmd_ctrl_data = {
        /* reset defaults */
        .cmd0csratio = 0x80,
-       .cmd0dldiff = 0x04,
        .cmd1csratio = 0x80,
        .cmd1csratio = 0x80,
-       .cmd1dldiff = 0x04,
        .cmd2csratio = 0x80,
        .cmd2csratio = 0x80,
-       .cmd2dldiff = 0x04,
 };
 
 static void ddr3_calib_start(void)
 };
 
 static void ddr3_calib_start(void)
@@ -638,7 +385,7 @@ static void ddr3_calib_start(void)
        debug("DDR3 calibration done\n");
 }
 
        debug("DDR3 calibration done\n");
 }
 
-static void tx48_ddr_init(void)
+void sdram_init(void)
 {
        struct emif_regs r = {0};
 
 {
        struct emif_regs r = {0};
 
@@ -652,14 +399,15 @@ static void tx48_ddr_init(void)
        r.zq_config = ZQ_CONFIG_VAL;
        r.emif_ddr_phy_ctlr_1 = 0x0000030b;
 
        r.zq_config = ZQ_CONFIG_VAL;
        r.emif_ddr_phy_ctlr_1 = 0x0000030b;
 
-       config_ddr(SDRAM_CLK, 0x04, &tx48_ddr3_data,
+       config_ddr(SDRAM_CLK, NULL, &tx48_ddr3_data,
                &tx48_ddr3_cmd_ctrl_data, &r, 0);
 
        ddr3_calib_start();
 
        debug("%s: config_ddr done\n", __func__);
 }
                &tx48_ddr3_cmd_ctrl_data, &r, 0);
 
        ddr3_calib_start();
 
        debug("%s: config_ddr done\n", __func__);
 }
-
+#endif
+#if 0
 #ifdef CONFIG_HW_WATCHDOG
 static inline void tx48_wdog_disable(void)
 {
 #ifdef CONFIG_HW_WATCHDOG
 static inline void tx48_wdog_disable(void)
 {
@@ -680,58 +428,22 @@ static inline void tx48_wdog_disable(void)
                ;
 }
 #endif
                ;
 }
 #endif
+#endif
 
 
-void s_init(void)
-{
-       struct uart_sys *uart_base = (struct uart_sys *)DEFAULT_UART_BASE;
-       struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
-       int timeout = 1000;
-
-       gd = &gdata;
-
-       /*
-         * Save the boot parameters passed from romcode.
-         * We cannot delay the saving further than this,
-         * to prevent overwrites.
-         */
-       save_omap_boot_params();
-
-       /* Setup the PLLs and the clocks for the peripherals */
-       pll_init();
-
-       tx48_wdog_disable();
-
-       enable_uart0_pin_mux();
-
-       /* UART softreset */
-       writel(readl(&uart_base->uartsyscfg) | UART_RESET,
-               &uart_base->uartsyscfg);
-       while (!(readl(&uart_base->uartsyssts) & UART_RESETDONE)) {
-               udelay(1);
-               if (timeout-- <= 0)
-                       break;
-       }
-
-       /* Disable smart idle */
-       writel((readl(&uart_base->uartsyscfg) & ~UART_IDLE_MODE_MASK) |
-               UART_IDLE_MODE(1), &uart_base->uartsyscfg);
-
-       preloader_console_init();
-
-       if (timeout <= 0)
-               printf("Timeout waiting for UART RESET\n");
+#define OSC     (V_OSCK/1000000)
+static const struct dpll_params tx48_ddr_params = {
+       266, OSC-1, 1, -1, -1, -1, -1,
+};
 
 
-       timer_init();
+const struct dpll_params *get_dpll_ddr_params(void)
+{
+       return &tx48_ddr_params;
+}
 
 
-       tx48_ddr_init();
+void am33xx_spl_board_init(void)
+{
+       struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
 
 
-       gpmc_init();
        enable_gpmc_cs_config(gpmc_nand_cfg, &gpmc_cfg->cs[0],
                        CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_SIZE);
        enable_gpmc_cs_config(gpmc_nand_cfg, &gpmc_cfg->cs[0],
                        CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_SIZE);
-
-       /* Enable MMC0 */
-       enable_mmc0_pin_mux();
-
-       gpio_request_array(tx48_gpios, ARRAY_SIZE(tx48_gpios));
-       tx48_set_pin_mux(tx48_pins, ARRAY_SIZE(tx48_pins));
 }
 }
index 95a98a92362a7528805bcc14fc752a29705b2065..028cfa8a889f6d6b565cdc87d3d67d47c7cf7c88 100644 (file)
@@ -17,7 +17,7 @@
 #include <common.h>
 #include <errno.h>
 #include <miiphy.h>
 #include <common.h>
 #include <errno.h>
 #include <miiphy.h>
-#include <netdev.h>
+#include <cpsw.h>
 #include <serial.h>
 #include <libfdt.h>
 #include <lcd.h>
 #include <serial.h>
 #include <libfdt.h>
 #include <lcd.h>
 #include <linux/fb.h>
 #include <asm/gpio.h>
 #include <asm/cache.h>
 #include <linux/fb.h>
 #include <asm/gpio.h>
 #include <asm/cache.h>
-#include <asm/omap_common.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <video_fb.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <video_fb.h>
@@ -49,249 +49,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define TX48_LCD_BACKLIGHT_GPIO        AM33XX_GPIO_NR(3, 14)
 #define TX48_MMC_CD_GPIO       AM33XX_GPIO_NR(3, 15)
 
 #define TX48_LCD_BACKLIGHT_GPIO        AM33XX_GPIO_NR(3, 14)
 #define TX48_MMC_CD_GPIO       AM33XX_GPIO_NR(3, 15)
 
-#define GMII_SEL               (CTRL_BASE + 0x650)
-
-/* UART Defines */
-#define UART_SYSCFG_OFFSET     0x54
-#define UART_SYSSTS_OFFSET     0x58
-
-#define UART_RESET             (0x1 << 1)
-#define UART_CLK_RUNNING_MASK  0x1
-#define UART_SMART_IDLE_EN     (0x1 << 0x3)
-
-/* Timer Defines */
-#define TSICR_REG              0x54
-#define TIOCP_CFG_REG          0x10
-#define TCLR_REG               0x38
-
-/* RGMII mode define */
-#define RGMII_MODE_ENABLE      0xA
-#define RMII_MODE_ENABLE       0x5
-#define MII_MODE_ENABLE                0x0
-
 #define NO_OF_MAC_ADDR         1
 #define NO_OF_MAC_ADDR         1
+#ifndef ETH_ALEN
 #define ETH_ALEN               6
 #define ETH_ALEN               6
-
-/* PAD Control Fields */
-#define SLEWCTRL       (0x1 << 6)
-#define        RXACTIVE        (0x1 << 5)
-#define        PULLUP_EN       (0x1 << 4) /* Pull UP Selection */
-#define PULLUDEN       (0x0 << 3) /* Pull up enabled */
-#define PULLUDDIS      (0x1 << 3) /* Pull up disabled */
-#define MODE(val)      (val)
-
-/*
- * PAD CONTROL OFFSETS
- * Field names corresponds to the pad signal name
- */
-struct pad_signals {
-       int gpmc_ad0;
-       int gpmc_ad1;
-       int gpmc_ad2;
-       int gpmc_ad3;
-       int gpmc_ad4;
-       int gpmc_ad5;
-       int gpmc_ad6;
-       int gpmc_ad7;
-       int gpmc_ad8;
-       int gpmc_ad9;
-       int gpmc_ad10;
-       int gpmc_ad11;
-       int gpmc_ad12;
-       int gpmc_ad13;
-       int gpmc_ad14;
-       int gpmc_ad15;
-       int gpmc_a0;
-       int gpmc_a1;
-       int gpmc_a2;
-       int gpmc_a3;
-       int gpmc_a4;
-       int gpmc_a5;
-       int gpmc_a6;
-       int gpmc_a7;
-       int gpmc_a8;
-       int gpmc_a9;
-       int gpmc_a10;
-       int gpmc_a11;
-       int gpmc_wait0;
-       int gpmc_wpn;
-       int gpmc_be1n;
-       int gpmc_csn0;
-       int gpmc_csn1;
-       int gpmc_csn2;
-       int gpmc_csn3;
-       int gpmc_clk;
-       int gpmc_advn_ale;
-       int gpmc_oen_ren;
-       int gpmc_wen;
-       int gpmc_be0n_cle;
-       int lcd_data0;
-       int lcd_data1;
-       int lcd_data2;
-       int lcd_data3;
-       int lcd_data4;
-       int lcd_data5;
-       int lcd_data6;
-       int lcd_data7;
-       int lcd_data8;
-       int lcd_data9;
-       int lcd_data10;
-       int lcd_data11;
-       int lcd_data12;
-       int lcd_data13;
-       int lcd_data14;
-       int lcd_data15;
-       int lcd_vsync;
-       int lcd_hsync;
-       int lcd_pclk;
-       int lcd_ac_bias_en;
-       int mmc0_dat3;
-       int mmc0_dat2;
-       int mmc0_dat1;
-       int mmc0_dat0;
-       int mmc0_clk;
-       int mmc0_cmd;
-       int mii1_col;
-       int mii1_crs;
-       int mii1_rxerr;
-       int mii1_txen;
-       int mii1_rxdv;
-       int mii1_txd3;
-       int mii1_txd2;
-       int mii1_txd1;
-       int mii1_txd0;
-       int mii1_txclk;
-       int mii1_rxclk;
-       int mii1_rxd3;
-       int mii1_rxd2;
-       int mii1_rxd1;
-       int mii1_rxd0;
-       int rmii1_refclk;
-       int mdio_data;
-       int mdio_clk;
-       int spi0_sclk;
-       int spi0_d0;
-       int spi0_d1;
-       int spi0_cs0;
-       int spi0_cs1;
-       int ecap0_in_pwm0_out;
-       int uart0_ctsn;
-       int uart0_rtsn;
-       int uart0_rxd;
-       int uart0_txd;
-       int uart1_ctsn;
-       int uart1_rtsn;
-       int uart1_rxd;
-       int uart1_txd;
-       int i2c0_sda;
-       int i2c0_scl;
-       int mcasp0_aclkx;
-       int mcasp0_fsx;
-       int mcasp0_axr0;
-       int mcasp0_ahclkr;
-       int mcasp0_aclkr;
-       int mcasp0_fsr;
-       int mcasp0_axr1;
-       int mcasp0_ahclkx;
-       int xdma_event_intr0;
-       int xdma_event_intr1;
-       int nresetin_out;
-       int porz;
-       int nnmi;
-       int osc0_in;
-       int osc0_out;
-       int rsvd1;
-       int tms;
-       int tdi;
-       int tdo;
-       int tck;
-       int ntrst;
-       int emu0;
-       int emu1;
-       int osc1_in;
-       int osc1_out;
-       int pmic_power_en;
-       int rtc_porz;
-       int rsvd2;
-       int ext_wakeup;
-       int enz_kaldo_1p8v;
-       int usb0_dm;
-       int usb0_dp;
-       int usb0_ce;
-       int usb0_id;
-       int usb0_vbus;
-       int usb0_drvvbus;
-       int usb1_dm;
-       int usb1_dp;
-       int usb1_ce;
-       int usb1_id;
-       int usb1_vbus;
-       int usb1_drvvbus;
-       int ddr_resetn;
-       int ddr_csn0;
-       int ddr_cke;
-       int ddr_ck;
-       int ddr_nck;
-       int ddr_casn;
-       int ddr_rasn;
-       int ddr_wen;
-       int ddr_ba0;
-       int ddr_ba1;
-       int ddr_ba2;
-       int ddr_a0;
-       int ddr_a1;
-       int ddr_a2;
-       int ddr_a3;
-       int ddr_a4;
-       int ddr_a5;
-       int ddr_a6;
-       int ddr_a7;
-       int ddr_a8;
-       int ddr_a9;
-       int ddr_a10;
-       int ddr_a11;
-       int ddr_a12;
-       int ddr_a13;
-       int ddr_a14;
-       int ddr_a15;
-       int ddr_odt;
-       int ddr_d0;
-       int ddr_d1;
-       int ddr_d2;
-       int ddr_d3;
-       int ddr_d4;
-       int ddr_d5;
-       int ddr_d6;
-       int ddr_d7;
-       int ddr_d8;
-       int ddr_d9;
-       int ddr_d10;
-       int ddr_d11;
-       int ddr_d12;
-       int ddr_d13;
-       int ddr_d14;
-       int ddr_d15;
-       int ddr_dqm0;
-       int ddr_dqm1;
-       int ddr_dqs0;
-       int ddr_dqsn0;
-       int ddr_dqs1;
-       int ddr_dqsn1;
-       int ddr_vref;
-       int ddr_vtp;
-       int ddr_strben0;
-       int ddr_strben1;
-       int ain7;
-       int ain6;
-       int ain5;
-       int ain4;
-       int ain3;
-       int ain2;
-       int ain1;
-       int ain0;
-       int vrefp;
-       int vrefn;
-};
+#endif
 
 struct pin_mux {
        short reg_offset;
 
 struct pin_mux {
        short reg_offset;
@@ -411,6 +172,10 @@ vidinfo_t panel_info = {
        .cmap = tx48_cmap,
 };
 
        .cmap = tx48_cmap,
 };
 
+static struct lcd_ctrl_config lcd_cfg = {
+       .bpp = 24,
+};
+
 #define FB_SYNC_OE_LOW_ACT     (1 << 31)
 #define FB_SYNC_CLK_LAT_FALL   (1 << 30)
 
 #define FB_SYNC_OE_LOW_ACT     (1 << 31)
 #define FB_SYNC_CLK_LAT_FALL   (1 << 30)
 
@@ -803,7 +568,7 @@ void lcd_ctrl_init(void *lcdbase)
 
                debug("Initializing FB driver\n");
                tx48_lcd_panel_setup(&da8xx_panel, p);
 
                debug("Initializing FB driver\n");
                tx48_lcd_panel_setup(&da8xx_panel, p);
-               da8xx_video_init(&da8xx_panel, color_depth);
+               da8xx_video_init(&da8xx_panel, &lcd_cfg, color_depth);
 
                debug("Initializing LCD controller\n");
                video_hw_init();
 
                debug("Initializing LCD controller\n");
                video_hw_init();
@@ -1032,7 +797,7 @@ static struct cpsw_slave_data cpsw_slaves[] = {
        {
                .slave_reg_ofs  = 0x208,
                .sliver_reg_ofs = 0xd80,
        {
                .slave_reg_ofs  = 0x208,
                .sliver_reg_ofs = 0xd80,
-               .phy_id         = 0,
+               .phy_addr       = 0,
                .phy_if         = PHY_INTERFACE_MODE_RMII,
        },
 };
                .phy_if         = PHY_INTERFACE_MODE_RMII,
        },
 };
@@ -1056,7 +821,6 @@ static struct cpsw_platform_data cpsw_data = {
        .hw_stats_reg_ofs       = 0x900,
        .mac_control            = (1 << 5) /* MIIEN */,
        .control                = cpsw_control,
        .hw_stats_reg_ofs       = 0x900,
        .mac_control            = (1 << 5) /* MIIEN */,
        .control                = cpsw_control,
-       .gigabit_en             = 0,
        .host_port_num          = 0,
        .version                = CPSW_CTRL_VERSION_2,
 };
        .host_port_num          = 0,
        .version                = CPSW_CTRL_VERSION_2,
 };
@@ -1064,7 +828,6 @@ static struct cpsw_platform_data cpsw_data = {
 int board_eth_init(bd_t *bis)
 {
        __raw_writel(RMII_MODE_ENABLE, MAC_MII_SEL);
 int board_eth_init(bd_t *bis)
 {
        __raw_writel(RMII_MODE_ENABLE, MAC_MII_SEL);
-       __raw_writel(0x5D, GMII_SEL);
        tx48_phy_init();
        return cpsw_register(&cpsw_data);
 }
        tx48_phy_init();
        return cpsw_register(&cpsw_data);
 }
index 493cc559a852063272e45edbb65e9f9e1bff3e69..44e24d286225fb2eef403f3c111b27c1b09646d2 100644 (file)
@@ -74,8 +74,6 @@ SECTIONS
                *(.__rel_dyn_end)
        }
 
                *(.__rel_dyn_end)
        }
 
-       _end = .;
-
 /*
  * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
  * __bss_base and __bss_limit are for linker only (overlay ordering)
 /*
  * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
  * __bss_base and __bss_limit are for linker only (overlay ordering)
index 8f0105199d91f45efe8365c5a3de981053237a30..cfdc540bf9f2776787532aab4054928849709ba2 100644 (file)
@@ -1,4 +1,4 @@
-if TARGET_TX51_8XX0
+if TARGET_TX51
 
 config SYS_BOARD
        default "tx51"
 
 config SYS_BOARD
        default "tx51"
@@ -10,22 +10,66 @@ config SYS_SOC
        default "mx5"
 
 config SYS_CONFIG_NAME
        default "mx5"
 
 config SYS_CONFIG_NAME
-       default "tx51-8xx0"
+       default "tx51"
 
 
-endif
+config TX51
+       bool
+       default y
+       select CC_OPTIMIZE_LIBS_FOR_SPEED
+       select CMD_BMP if LCD
+       select CMD_BOOTCE
+       select CMD_BOOTZ
+       select CMD_CACHE
+       select CMD_MEMINFO
+       select CMD_MEMTEST
+       select CMD_MMC
+       select CMD_NAND
+       select CMD_NAND_TRIMFFS
+       select CMD_ROMUPDATE
+       select CMD_TIME
+       select DM
+       select DM_GPIO
+       select FDT_FIXUP_PARTITIONS if OF_LIBFDT
+       select GET_FEC_MAC_ADDR_FROM_IIM
+       select IMX_WATCHDOG
+       select LIB_RAND
+       select MMC
+       select MTD_PARTITIONS
+       select MTD_DEVICE
+       select NAND
+       select NAND_MXC
+       select OF_LIBFDT
+       select OF_BOARD_SETUP
+       select PHYLIB
+       select PHY_SMSC
+       select SOC_MX51
+       select SYS_NAND_USE_FLASH_BBT if NAND_MXC
 
 
-if TARGET_TX51_8XX1_2
+choice
+       prompt "TX51 module variant"
 
 
-config SYS_BOARD
-       default "tx51"
+config TARGET_TX51_8XX0
+       bool "TX51-8010 and TX51-8110"
 
 
-config SYS_VENDOR
-       default "karo"
+config TARGET_TX51_8XX1_2
+       bool "TX51-8021, TX51-8021, TX51-8022 and TX51-8122"
 
 
-config SYS_SOC
-       default "mx5"
+endchoice
 
 
-config SYS_CONFIG_NAME
-       default "tx51-8xx1_2"
+config NR_DRAM_BANKS
+       int
+       default 1
+
+choice
+       prompt "U-Boot image variant"
+
+config TX51_UBOOT
+       bool "Standard U-Boot image"
+
+config TX51_UBOOT_NOENV
+       bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
+
+endchoice
 
 endif
 
 endif
index 7c9ca893642c0b9c772e04bf53c37aa232db0921..1ede960cf11eb85e53bc769adf6ef2d047c3aa42 100644 (file)
@@ -68,8 +68,6 @@ SECTIONS
                *(.__rel_dyn_end)
        }
 
                *(.__rel_dyn_end)
        }
 
-       _end = .;
-
 /*
  * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
  * __bss_base and __bss_limit are for linker only (overlay ordering)
 /*
  * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
  * __bss_base and __bss_limit are for linker only (overlay ordering)
index 2c30f58cc10ca393b2759d25b8a4e2dee1f76745..631ac67068a8fbaa5c234eb09e5fd785e82f3be2 100644 (file)
@@ -87,7 +87,7 @@ config TX53_UBOOT
 
 config TX53_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
 
 config TX53_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
-       select ENV_IS_NOWHERE
+       select UBOOT_IGNORE_ENV
 
 endchoice
 
 
 endchoice
 
index 091efde26c9b8289c6cf07911b8faa6a1093a779..702fc0c4f845ba8072ffec6fdea772bdb2aaf146 100644 (file)
@@ -15,44 +15,41 @@ config SYS_CONFIG_NAME
 config TX6
        bool
        default y
 config TX6
        bool
        default y
-       select CMD_BMP if LCD
-       select CMD_BOOTCE
-       select CMD_BOOTZ
-       select CMD_CACHE
-       select CMD_I2C if I2C
-       select CMD_MEMTEST
-       select CMD_MMC
-       select CMD_TIME
+       select APBH_DMA
+       select APBH_DMA_BURST
+       select APBH_DMA_BURST8
+       select CC_OPTIMIZE_LIBS_FOR_SPEED
        select DM
        select DM_GPIO
        select DM
        select DM_GPIO
+       select DM_THERMAL
+       select FSL_ESDHC if MMC
+       select FSL_USDHC if MMC
        select LIB_RAND
        select PHYLIB
        select SYS_I2C
        select SYS_I2C_MXC
        select LIB_RAND
        select PHYLIB
        select SYS_I2C
        select SYS_I2C_MXC
-       select GET_FEC_MAC_ADDR_FROM_IIM
+       select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
+       select MXC_OCOTP if CMD_FUSE
        select OF_BOARD_SETUP
        select OF_LIBFDT
 
 config TX6_NAND
        bool
        default ! TX6_EMMC
        select OF_BOARD_SETUP
        select OF_LIBFDT
 
 config TX6_NAND
        bool
        default ! TX6_EMMC
-       select CMD_NAND
-       select CMD_NAND_TRIMFFS
-       select CMD_MTDPARTS
+       select CMD_NAND_TRIMFFS if CMD_NAND
        select CMD_ROMUPDATE
        select CMD_ROMUPDATE
-       select FDT_FIXUP_PARTITIONS if OF_LIBFDT
+       select FDT_FIXUP_PARTITIONS
+       select MTD_DEVICE
        select MTD_PARTITIONS
        select NAND
        select NAND_MXS
        select NAND_MXS_NO_BBM_SWAP
        select SYS_NAND_USE_FLASH_BBT
        select MTD_PARTITIONS
        select NAND
        select NAND_MXS
        select NAND_MXS_NO_BBM_SWAP
        select SYS_NAND_USE_FLASH_BBT
-       select APBH_DMA
-       select APBH_DMA_BURST
-       select APBH_DMA_BURST8
-       select MTD_DEVICE
 
 config TX6_EMMC
        bool
 
 config TX6_EMMC
        bool
+       select CMD_MMC
+       select MMC
        select SUPPORT_EMMC_BOOT
 
 #
        select SUPPORT_EMMC_BOOT
 
 #
@@ -71,15 +68,20 @@ config SYS_SDRAM_BUS_WIDTH_32
 choice
        prompt "TX6 module variant"
 
 choice
        prompt "TX6 module variant"
 
-config TARGET_TX6Q_10X0
-       bool "TX6Q-1010 and TX6Q-1030"
-       select SOC_MX6Q
-
 config TARGET_TX6Q_1020
        bool "TX6Q-1020"
        select SOC_MX6Q
        select TX6_EMMC
 
 config TARGET_TX6Q_1020
        bool "TX6Q-1020"
        select SOC_MX6Q
        select TX6_EMMC
 
+config TARGET_TX6Q_1033
+       bool "TX6Q-1033"
+       select SOC_MX6Q
+       select TX6_EMMC
+
+config TARGET_TX6Q_10X0
+       bool "TX6Q-1010 and TX6Q-1030"
+       select SOC_MX6Q
+
 config TARGET_TX6Q_11X0
        bool "TX6Q-1110 and TX6Q-1130"
        select SOC_MX6Q
 config TARGET_TX6Q_11X0
        bool "TX6Q-1110 and TX6Q-1130"
        select SOC_MX6Q
@@ -96,10 +98,6 @@ config TARGET_TX6S_8035
        select TX6_EMMC
        select SYS_SDRAM_BUS_WIDTH_32
 
        select TX6_EMMC
        select SYS_SDRAM_BUS_WIDTH_32
 
-config TARGET_TX6U_80X0
-       bool "TX6U-8010 and TX6U-8030"
-       select SOC_MX6DL
-
 config TARGET_TX6U_8011
        bool "TX6U-8011"
        select SOC_MX6DL
 config TARGET_TX6U_8011
        bool "TX6U-8011"
        select SOC_MX6DL
@@ -109,10 +107,14 @@ config TARGET_TX6U_8012
        bool "TX6U-8012"
        select SOC_MX6DL
 
        bool "TX6U-8012"
        select SOC_MX6DL
 
-config TARGET_TX6U_81X0
-       bool "TX6U-8110 and TX6U-8130"
+config TARGET_TX6U_8033
+       bool "TX6U-8033"
+       select SOC_MX6DL
+       select TX6_EMMC
+
+config TARGET_TX6U_80X0
+       bool "TX6U-8010 and TX6U-8030"
        select SOC_MX6DL
        select SOC_MX6DL
-       select SYS_LVDS_IF
 
 config TARGET_TX6U_8111
        bool "TX6U-8111"
 
 config TARGET_TX6U_8111
        bool "TX6U-8111"
@@ -120,10 +122,10 @@ config TARGET_TX6U_8111
        select SYS_SDRAM_BUS_WIDTH_32
        select SYS_LVDS_IF
 
        select SYS_SDRAM_BUS_WIDTH_32
        select SYS_LVDS_IF
 
-config TARGET_TX6U_8033
-       bool "TX6U-8033"
+config TARGET_TX6U_81X0
+       bool "TX6U-8110 and TX6U-8130"
        select SOC_MX6DL
        select SOC_MX6DL
-       select TX6_EMMC
+       select SYS_LVDS_IF
 
 endchoice
 
 
 endchoice
 
@@ -139,6 +141,7 @@ config TX6_UBOOT_MFG
 
 config TX6_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
 
 config TX6_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
 
 endchoice
 
 
 endchoice
 
index acb0cd0d51e4e6a1409b6f23911e5940858f4290..42a4b1afdccb2cb9a5b14c1a46e887eab3ad140e 100644 (file)
@@ -1,7 +1,9 @@
 # stack is allocated below CONFIG_SYS_TEXT_BASE
 # stack is allocated below CONFIG_SYS_TEXT_BASE
-#CONFIG_SYS_TEXT_BASE := 0x10100000
-#CONFIG_SYS_TEXT_BASE := 0x177ff000
-CONFIG_SYS_TEXT_BASE := 0x100ff000
+ifeq ($(CONFIG_SOC_MX6SX)$(CONFIG_SOC_MX6SL)$(CONFIG_SOC_MX6UL),)
+       CONFIG_SYS_TEXT_BASE := 0x100ff000
+else
+       CONFIG_SYS_TEXT_BASE := 0x800ff000
+endif
 
 OBJCOPYFLAGS += -j .pad
 
 
 OBJCOPYFLAGS += -j .pad
 
@@ -9,9 +11,11 @@ LOGO_BMP = logos/karo.bmp
 #PLATFORM_CPPFLAGS += -DDEBUG
 #PLATFORM_CPPFLAGS += -Wno-unused-but-set-variable
 PLATFORM_CPPFLAGS += -Werror
 #PLATFORM_CPPFLAGS += -DDEBUG
 #PLATFORM_CPPFLAGS += -Wno-unused-but-set-variable
 PLATFORM_CPPFLAGS += -Werror
+
 ifneq ($(CONFIG_SECURE_BOOT),)
        PLATFORM_CPPFLAGS += -DCONFIG_SECURE_BOOT
 endif
 ifneq ($(CONFIG_SECURE_BOOT),)
        PLATFORM_CPPFLAGS += -DCONFIG_SECURE_BOOT
 endif
+#PLATFORM_CPPFLAGS += -DDEBUG
 
 ifeq ($(CONFIG_TX6_NAND),y)
 # calculate U_BOOT_IMG_SIZE to be at least 3 eraseblocks larger than the maximum expected image size
 
 ifeq ($(CONFIG_TX6_NAND),y)
 # calculate U_BOOT_IMG_SIZE to be at least 3 eraseblocks larger than the maximum expected image size
index 561a1d14570358833862148b30e5f57e65b6ac5e..599911382060b55fd38006d91414e6dd0696a69a 100644 (file)
@@ -596,7 +596,7 @@ ivt_end:
 
 #define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0898
 #define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e089c
 
 #define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0898
 #define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e089c
-#define TX6_I2C1_SEL_INP_VAL                   1
+#define TX6_I2C1_SEL_INP_VAL                   0
 #endif
 
 #if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
 #endif
 
 #if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
index 1a5026dc5172509af30578d447f23c58005e7eff..090ade17a589c14f367d28bb781dc526c98d32f4 100644 (file)
@@ -125,6 +125,17 @@ static const iomux_v3_cfg_t const tx6qdl_fec_pads[] = {
        MX6_PAD_ENET_TXD0__ENET_TX_DATA0,
 };
 
        MX6_PAD_ENET_TXD0__ENET_TX_DATA0,
 };
 
+#define TX6_I2C_GPIO_PAD_CTRL  (PAD_CTL_PUS_22K_UP |   \
+                               PAD_CTL_SPEED_MED |     \
+                               PAD_CTL_DSE_34ohm |     \
+                               PAD_CTL_SRE_FAST)
+
+static const iomux_v3_cfg_t const tx6_i2c_gpio_pads[] = {
+       /* internal I2C */
+       MX6_PAD_EIM_D28__GPIO3_IO28 | MUX_CFG_SION | MUX_PAD_CTRL(TX6_I2C_GPIO_PAD_CTRL),
+       MX6_PAD_EIM_D21__GPIO3_IO21 | MUX_CFG_SION | MUX_PAD_CTRL(TX6_I2C_GPIO_PAD_CTRL),
+};
+
 static const iomux_v3_cfg_t const tx6_i2c_pads[] = {
        /* internal I2C */
        MX6_PAD_EIM_D28__I2C1_SDA,
 static const iomux_v3_cfg_t const tx6_i2c_pads[] = {
        /* internal I2C */
        MX6_PAD_EIM_D28__I2C1_SDA,
@@ -142,9 +153,93 @@ static const struct gpio const tx6qdl_gpios[] = {
        { TX6_FEC_INT_GPIO, GPIOFLAG_INPUT, "FEC PHY INT", },
 };
 
        { TX6_FEC_INT_GPIO, GPIOFLAG_INPUT, "FEC PHY INT", },
 };
 
-/*
- * Functions
- */
+static int pmic_addr __data;
+
+#if defined(CONFIG_SOC_MX6Q)
+#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21       0x020e00a4
+#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28       0x020e00c4
+#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21       0x020e03b8
+#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28       0x020e03d8
+#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0898
+#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e089c
+#define I2C1_SEL_INPUT_VAL                     0
+#endif
+#if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
+#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21       0x020e0158
+#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28       0x020e0174
+#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21       0x020e0528
+#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28       0x020e0544
+#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0868
+#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e086c
+#define I2C1_SEL_INPUT_VAL                     1
+#endif
+
+#define GPIO_DR 0
+#define GPIO_DIR 4
+#define GPIO_PSR 8
+
+static void tx6_i2c_recover(void)
+{
+       int i;
+       int bad = 0;
+#define SCL_BIT                (1 << (TX6_I2C1_SCL_GPIO % 32))
+#define SDA_BIT                (1 << (TX6_I2C1_SDA_GPIO % 32))
+
+       if ((readl(GPIO3_BASE_ADDR + GPIO_PSR) &
+                       (SCL_BIT | SDA_BIT)) == (SCL_BIT | SDA_BIT))
+               return;
+
+       debug("Clearing I2C bus\n");
+       if (!(readl(GPIO3_BASE_ADDR + GPIO_PSR) & SCL_BIT)) {
+               printf("I2C SCL stuck LOW\n");
+               bad++;
+
+               writel(readl(GPIO3_BASE_ADDR + GPIO_DR) | SCL_BIT,
+                       GPIO3_BASE_ADDR + GPIO_DR);
+               writel(readl(GPIO3_BASE_ADDR + GPIO_DIR) | SCL_BIT,
+                       GPIO3_BASE_ADDR + GPIO_DIR);
+       }
+       if (!(readl(GPIO3_BASE_ADDR + GPIO_PSR) & SDA_BIT)) {
+               printf("I2C SDA stuck LOW\n");
+               bad++;
+
+               writel(readl(GPIO3_BASE_ADDR + GPIO_DIR) & ~SDA_BIT,
+                       GPIO3_BASE_ADDR + GPIO_DIR);
+               writel(readl(GPIO3_BASE_ADDR + GPIO_DR) | SCL_BIT,
+                       GPIO3_BASE_ADDR + GPIO_DR);
+               writel(readl(GPIO3_BASE_ADDR + GPIO_DIR) | SCL_BIT,
+                       GPIO3_BASE_ADDR + GPIO_DIR);
+
+               imx_iomux_v3_setup_multiple_pads(tx6_i2c_gpio_pads,
+                                               ARRAY_SIZE(tx6_i2c_gpio_pads));
+               udelay(10);
+
+               for (i = 0; i < 18; i++) {
+                       u32 reg = readl(GPIO3_BASE_ADDR + GPIO_DR) ^ SCL_BIT;
+
+                       debug("%sing SCL\n", (reg & SCL_BIT) ? "Sett" : "Clear");
+                       writel(reg, GPIO3_BASE_ADDR + GPIO_DR);
+                       udelay(10);
+                       if (reg & SCL_BIT &&
+                               readl(GPIO3_BASE_ADDR + GPIO_PSR) & SDA_BIT)
+                               break;
+               }
+       }
+       if (bad) {
+               u32 reg = readl(GPIO3_BASE_ADDR + GPIO_PSR);
+
+               if ((reg & (SCL_BIT | SDA_BIT)) == (SCL_BIT | SDA_BIT)) {
+                       printf("I2C bus recovery succeeded\n");
+               } else {
+                       printf("I2C bus recovery FAILED: %08x:%08x\n", reg,
+                               SCL_BIT | SDA_BIT);
+               }
+       }
+       debug("Setting up I2C Pads\n");
+       imx_iomux_v3_setup_multiple_pads(tx6_i2c_pads,
+                                       ARRAY_SIZE(tx6_i2c_pads));
+}
+
 /* placed in section '.data' to prevent overwriting relocation info
  * overlayed with bss
  */
 /* placed in section '.data' to prevent overwriting relocation info
  * overlayed with bss
  */
@@ -208,7 +303,7 @@ static void print_reset_cause(void)
 
 static const char __data *tx6_mod_suffix;
 
 
 static const char __data *tx6_mod_suffix;
 
-static void tx6qdl_print_cpuinfo(void)
+int checkboard(void)
 {
        u32 cpurev = get_cpu_rev();
        char *cpu_str = "?";
 {
        u32 cpurev = get_cpu_rev();
        char *cpu_str = "?";
@@ -242,10 +337,14 @@ static void tx6qdl_print_cpuinfo(void)
 #ifdef CONFIG_MX6_TEMPERATURE_HOT
        check_cpu_temperature(1);
 #endif
 #ifdef CONFIG_MX6_TEMPERATURE_HOT
        check_cpu_temperature(1);
 #endif
+       tx6_i2c_recover();
+       return 0;
 }
 
 int board_early_init_f(void)
 {
 }
 
 int board_early_init_f(void)
 {
+       debug("%s@%d: \n", __func__, __LINE__);
+
        return 0;
 }
 
        return 0;
 }
 
@@ -254,155 +353,129 @@ static bool tx6_temp_check_enabled = true;
 #else
 #define tx6_temp_check_enabled 0
 #endif
 #else
 #define tx6_temp_check_enabled 0
 #endif
-static int pmic_addr __data;
 
 
-#if defined(CONFIG_SOC_MX6Q)
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21       0x020e00a4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28       0x020e00c4
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21       0x020e03b8
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28       0x020e03d8
-#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0898
-#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e089c
-#define I2C1_SEL_INPUT_VAL                     0
-#endif
-#if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21       0x020e0158
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28       0x020e0174
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21       0x020e0528
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28       0x020e0544
-#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21     0x020e0868
-#define IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28     0x020e086c
-#define I2C1_SEL_INPUT_VAL                     1
+#ifdef CONFIG_TX6_NAND
+#define TX6_FLASH_SZ   (CONFIG_SYS_NAND_BLOCKS / 1024 - 1)
+#else
+#ifdef CONFIG_MMC_BOOT_SIZE
+#define TX6_FLASH_SZ   (CONFIG_MMC_BOOT_SIZE / 4096 + 2)
+#else
+#define TX6_FLASH_SZ   2
 #endif
 #endif
+#endif /* CONFIG_TX6_NAND */
 
 
-#define GPIO_DR 0
-#define GPIO_DIR 4
-#define GPIO_PSR 8
+#define TX6_DDR_SZ     (ffs(PHYS_SDRAM_1_WIDTH / 16) - 1)
 
 
-static const struct i2c_gpio_regs {
-       const char *label;
-       u32 gpio;
-       unsigned long gpio_base;
-       unsigned long muxctl;
-       unsigned long padctl;
-       unsigned long sel_input;
-} tx6_i2c_iomux_regs[] = {
-       {
-               .label = "PMIC SCL",
-               .gpio = TX6_I2C1_SCL_GPIO,
-               .gpio_base = GPIO3_BASE_ADDR,
-               .muxctl = IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21,
-               .padctl = IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21,
-               .sel_input = IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA21,
-       }, {
-               .label = "PMIC SDA",
-               .gpio = TX6_I2C1_SDA_GPIO,
-               .gpio_base = GPIO3_BASE_ADDR,
-               .muxctl = IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28,
-               .padctl = IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28,
-               .sel_input = IOMUXC_SW_SEL_INPUT_PAD_EIM_DATA28,
-       },
+static char tx6_mem_table[] = {
+       '4', /* 256MiB SDRAM 16bit; 128MiB NAND */
+       '1', /* 512MiB SDRAM 32bit; 128MiB NAND */
+       '0', /* 1GiB SDRAM 64bit; 128MiB NAND */
+       '?', /* 256MiB SDRAM 16bit; 256MiB NAND */
+       '?', /* 512MiB SDRAM 32bit; 256MiB NAND */
+       '2', /* 1GiB SDRAM 64bit; 256MiB NAND */
+       '?', /* 256MiB SDRAM 16bit; 4GiB eMMC */
+       '5', /* 512MiB SDRAM 32bit; 4GiB eMMC */
+       '3', /* 1GiB SDRAM 64bit; 4GiB eMMC */
+       '?', /* 256MiB SDRAM 16bit; 8GiB eMMC */
+       '?', /* 512MiB SDRAM 32bit; 8GiB eMMC */
+       '0', /* 1GiB SDRAM 64bit; 8GiB eMMC */
 };
 
 };
 
-static inline u32 __tx6_readl(void *addr,
-                       const char *fn, int ln)
+static struct {
+       uchar addr;
+       uchar rev;
+} tx6_mod_revs[] = {
+       { 0x3c, 1, },
+       { 0x32, 2, },
+       { 0x33, 3, },
+};
+
+static inline char tx6_mem_suffix(void)
 {
 {
-       u32 val = readl(addr);
-       debug("%s@%d: read %08x from %p\n", fn, ln, val, addr);
-       return val;
-}
-#undef readl
-#define readl(a)       __tx6_readl((void *)(a), __func__, __LINE__)
+       size_t mem_idx = (TX6_FLASH_SZ * 3) + TX6_DDR_SZ;
+
+       debug("TX6_DDR_SZ=%d TX6_FLASH_SZ=%d idx=%d\n",
+               TX6_DDR_SZ, TX6_FLASH_SZ, mem_idx);
+
+       if (mem_idx >= ARRAY_SIZE(tx6_mem_table))
+               return '?';
 
 
-static inline void __tx6_writel(u32 val, void *addr,
-                               const char *fn, int ln)
+       return tx6_mem_table[mem_idx];
+};
+
+static int tx6_get_mod_rev(unsigned int pmic_id)
 {
 {
-       debug("%s@%d: writing %08x to %p\n", fn, ln, val, addr);
-       writel(val, addr);
+       if (pmic_id < ARRAY_SIZE(tx6_mod_revs))
+               return tx6_mod_revs[pmic_id].rev;
+
+       return 0;
 }
 }
-#undef writel
-#define writel(v, a)   __tx6_writel(v, (void *)(a), __func__, __LINE__)
 
 
-static void tx6_i2c_recover(void)
+static int tx6_pmic_probe(void)
 {
        int i;
 {
        int i;
-       int bad = 0;
-       int failed = 0;
-#define MAX_TRIES 100
 
 
-       debug("Clearing I2C bus\n");
+       debug("%s@%d: \n", __func__, __LINE__);
 
 
-       for (i = 0; i < ARRAY_SIZE(tx6_i2c_iomux_regs); i++) {
-               int gpio = tx6_i2c_iomux_regs[i].gpio;
-               u32 gpio_mask = 1 << (gpio % 32);
-
-               void *gpio_base = (void *)tx6_i2c_iomux_regs[i].gpio_base;
-
-               if ((readl(gpio_base + GPIO_PSR) & gpio_mask) == 0) {
-                       int retries = MAX_TRIES;
-
-                       bad++;
-                       printf("%s (GPIO%u_%u) is not HIGH\n",
-                               tx6_i2c_iomux_regs[i].label,
-                               gpio / 32 + 1, gpio % 32);
-                       writel(readl(gpio_base + GPIO_DR) | gpio_mask,
-                               gpio_base + GPIO_DR);
-                       writel(readl(gpio_base + GPIO_DIR) | gpio_mask,
-                               gpio_base + GPIO_DIR);
-                       writel(0x15, tx6_i2c_iomux_regs[i].muxctl);
-                       writel(0x0f079, tx6_i2c_iomux_regs[i].padctl);
-                       writel(I2C1_SEL_INPUT_VAL, tx6_i2c_iomux_regs[i].sel_input);
-                       if ((readl(gpio_base + GPIO_DR) & gpio_mask) == 0)
-                               hang();
-                       if ((readl(gpio_base + GPIO_DIR) & gpio_mask) == 0)
-                               hang();
-                       while ((readl(gpio_base + GPIO_PSR) & gpio_mask) == 0 &&
-                               retries-- > 0) {
-                               udelay(100);
-                       }
-                       writel(readl(gpio_base + GPIO_DIR) & ~gpio_mask,
-                               gpio_base + GPIO_DIR);
-
-                       if ((readl(gpio_base + GPIO_PSR) & gpio_mask) == 0) {
-                               printf("Failed to force %s (GPIO%u_%u) HIGH\n",
-                                       tx6_i2c_iomux_regs[i].label,
-                                       gpio / 32 + 1, gpio % 32);
-                               failed++;
-                       } else if (retries < MAX_TRIES) {
-                               printf("%s (GPIO%u_%u) forced HIGH after %u loops\n",
-                                       tx6_i2c_iomux_regs[i].label,
-                                       gpio / 32 + 1, gpio % 32,
-                                       MAX_TRIES - retries);
-                       }
-               } else {
-                       debug("%s (GPIO%u_%u) is HIGH\n",
-                               tx6_i2c_iomux_regs[i].label,
-                               gpio / 32 + 1, gpio % 32);
+//     i2c_init_all();
+
+       for (i = 0; i < ARRAY_SIZE(tx6_mod_revs); i++) {
+               u8 i2c_addr = tx6_mod_revs[i].addr;
+               int ret = i2c_probe(i2c_addr);
+
+               if (ret == 0) {
+                       debug("I2C probe succeeded for addr 0x%02x\n", i2c_addr);
+                       return i;
                }
                }
+               debug("I2C probe returned %d for addr 0x%02x\n", ret, i2c_addr);
        }
        }
-       debug("Setting up I2C Pads\n");
-       imx_iomux_v3_setup_multiple_pads(tx6_i2c_pads,
-                                       ARRAY_SIZE(tx6_i2c_pads));
-       if (bad) {
-               if (failed)
-                       printf("I2C bus recovery FAILED\n");
-               else
-                       printf("I2C bus recovery succeeded\n");
-       }
+       return -EINVAL;
 }
 
 }
 
-#define pr_reg(b, n)   debug("%12s@%p=%08x\n", #n, (void *)(b) + (n), readl((b) + (n)))
-
-static inline void dump_regs(void)
+static inline int __checkboard(void)
 {
 {
-       pr_reg(GPIO3_BASE_ADDR, GPIO_DR);
-       pr_reg(GPIO3_BASE_ADDR, GPIO_DIR);
-       pr_reg(GPIO3_BASE_ADDR, GPIO_PSR);
+       u32 cpurev = get_cpu_rev();
+       int cpu_variant = (cpurev >> 12) & 0xff;
+       int pmic_id;
+
+       debug("%s@%d: \n", __func__, __LINE__);
+
+       pmic_id = tx6_pmic_probe();
+       if (pmic_id >= 0)
+               pmic_addr = tx6_mod_revs[pmic_id].addr;
+
+       printf("Board: Ka-Ro TX6%s-%d%d%d%c\n",
+               tx6_mod_suffix,
+               cpu_variant == MXC_CPU_MX6Q ? 1 : 8,
+               is_lvds(), tx6_get_mod_rev(pmic_id),
+               tx6_mem_suffix());
+
+       get_hab_status();
+
+       debug("%s@%d: done\n", __func__, __LINE__);
+       return 0;
 }
 
 int board_init(void)
 {
        int ret;
 }
 
 int board_init(void)
 {
        int ret;
+       u32 cpurev = get_cpu_rev();
+       int cpu_variant = (cpurev >> 12) & 0xff;
+       int pmic_id;
+
+       debug("%s@%d: \n", __func__, __LINE__);
+
+       pmic_id = tx6_pmic_probe();
+       if (pmic_id >= 0)
+               pmic_addr = tx6_mod_revs[pmic_id].addr;
+
+       printf("Board: Ka-Ro TX6%s-%d%d%d%c\n",
+               tx6_mod_suffix,
+               cpu_variant == MXC_CPU_MX6Q ? 1 : 8,
+               is_lvds(), tx6_get_mod_rev(pmic_id),
+               tx6_mem_suffix());
+
+       get_hab_status();
 
        ret = gpio_request_array(tx6qdl_gpios, ARRAY_SIZE(tx6qdl_gpios));
        if (ret < 0) {
 
        ret = gpio_request_array(tx6qdl_gpios, ARRAY_SIZE(tx6qdl_gpios));
        if (ret < 0) {
@@ -435,6 +508,8 @@ int board_init(void)
 
 int dram_init(void)
 {
 
 int dram_init(void)
 {
+       debug("%s@%d: \n", __func__, __LINE__);
+
        /* dram_init must store complete ramsize in gd->ram_size */
        gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
                                PHYS_SDRAM_1_SIZE * CONFIG_NR_DRAM_BANKS);
        /* dram_init must store complete ramsize in gd->ram_size */
        gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
                                PHYS_SDRAM_1_SIZE * CONFIG_NR_DRAM_BANKS);
@@ -443,6 +518,8 @@ int dram_init(void)
 
 void dram_init_banksize(void)
 {
 
 void dram_init_banksize(void)
 {
+       debug("%s@%d: \n", __func__, __LINE__);
+
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = get_ram_size((void *)PHYS_SDRAM_1,
                        PHYS_SDRAM_1_SIZE);
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = get_ram_size((void *)PHYS_SDRAM_1,
                        PHYS_SDRAM_1_SIZE);
@@ -558,6 +635,8 @@ int board_mmc_init(bd_t *bis)
 {
        int i;
 
 {
        int i;
 
+       debug("%s@%d: \n", __func__, __LINE__);
+
        for (i = 0; i < ARRAY_SIZE(tx6qdl_esdhc_cfg); i++) {
                struct mmc *mmc;
                struct tx6_esdhc_cfg *cfg = &tx6qdl_esdhc_cfg[i];
        for (i = 0; i < ARRAY_SIZE(tx6qdl_esdhc_cfg); i++) {
                struct mmc *mmc;
                struct tx6_esdhc_cfg *cfg = &tx6qdl_esdhc_cfg[i];
@@ -591,11 +670,6 @@ int board_mmc_init(bd_t *bis)
 
 #ifdef CONFIG_FEC_MXC
 
 
 #ifdef CONFIG_FEC_MXC
 
-#define FEC_PAD_CTL    (PAD_CTL_DVS | PAD_CTL_DSE_HIGH | \
-                       PAD_CTL_SRE_FAST)
-#define FEC_PAD_CTL2   (PAD_CTL_DVS | PAD_CTL_SRE_FAST)
-#define GPIO_PAD_CTL   (PAD_CTL_DVS | PAD_CTL_DSE_HIGH)
-
 #ifndef ETH_ALEN
 #define ETH_ALEN 6
 #endif
 #ifndef ETH_ALEN
 #define ETH_ALEN 6
 #endif
@@ -604,6 +678,8 @@ int board_eth_init(bd_t *bis)
 {
        int ret;
 
 {
        int ret;
 
+       debug("%s@%d: \n", __func__, __LINE__);
+
        /* delay at least 21ms for the PHY internal POR signal to deassert */
        udelay(22000);
 
        /* delay at least 21ms for the PHY internal POR signal to deassert */
        udelay(22000);
 
@@ -1301,6 +1377,8 @@ int board_late_init(void)
        writel(0x12, &fuse->cfg5);
 #endif
 
        writel(0x12, &fuse->cfg5);
 #endif
 
+       debug("%s@%d: \n", __func__, __LINE__);
+
        env_cleanup();
 
        if (tx6_temp_check_enabled)
        env_cleanup();
 
        if (tx6_temp_check_enabled)
@@ -1352,106 +1430,6 @@ exit:
        return ret;
 }
 
        return ret;
 }
 
-#ifdef CONFIG_TX6_NAND
-#define TX6_FLASH_SZ   (CONFIG_SYS_NAND_BLOCKS / 1024 - 1)
-#else
-#ifdef CONFIG_MMC_BOOT_SIZE
-#define TX6_FLASH_SZ   (CONFIG_MMC_BOOT_SIZE / 4096 + 2)
-#else
-#define TX6_FLASH_SZ   2
-#endif
-#endif /* CONFIG_TX6_NAND */
-
-#define TX6_DDR_SZ     (ffs(PHYS_SDRAM_1_WIDTH / 16) - 1)
-
-static char tx6_mem_table[] = {
-       '4', /* 256MiB SDRAM 16bit; 128MiB NAND */
-       '1', /* 512MiB SDRAM 32bit; 128MiB NAND */
-       '0', /* 1GiB SDRAM 64bit; 128MiB NAND */
-       '?', /* 256MiB SDRAM 16bit; 256MiB NAND */
-       '?', /* 512MiB SDRAM 32bit; 256MiB NAND */
-       '2', /* 1GiB SDRAM 64bit; 256MiB NAND */
-       '?', /* 256MiB SDRAM 16bit; 4GiB eMMC */
-       '5', /* 512MiB SDRAM 32bit; 4GiB eMMC */
-       '3', /* 1GiB SDRAM 64bit; 4GiB eMMC */
-       '?', /* 256MiB SDRAM 16bit; 8GiB eMMC */
-       '?', /* 512MiB SDRAM 32bit; 8GiB eMMC */
-       '0', /* 1GiB SDRAM 64bit; 8GiB eMMC */
-};
-
-static inline char tx6_mem_suffix(void)
-{
-       size_t mem_idx = (TX6_FLASH_SZ * 3) + TX6_DDR_SZ;
-
-       debug("TX6_DDR_SZ=%d TX6_FLASH_SZ=%d idx=%d\n",
-               TX6_DDR_SZ, TX6_FLASH_SZ, mem_idx);
-
-       if (mem_idx >= ARRAY_SIZE(tx6_mem_table))
-               return '?';
-
-       return tx6_mem_table[mem_idx];
-};
-
-static struct {
-       uchar addr;
-       uchar rev;
-} tx6_mod_revs[] = {
-       { 0x3c, 1, },
-       { 0x32, 2, },
-       { 0x33, 3, },
-};
-
-static int tx6_get_mod_rev(unsigned int pmic_id)
-{
-       if (pmic_id < ARRAY_SIZE(tx6_mod_revs))
-               return tx6_mod_revs[pmic_id].rev;
-
-       return 0;
-}
-
-static int tx6_pmic_probe(void)
-{
-       int i;
-
-       tx6_i2c_recover();
-       i2c_init_all();
-
-       for (i = 0; i < ARRAY_SIZE(tx6_mod_revs); i++) {
-               u8 i2c_addr = tx6_mod_revs[i].addr;
-               int ret = i2c_probe(i2c_addr);
-
-               if (ret == 0) {
-                       debug("I2C probe succeeded for addr 0x%02x\n", i2c_addr);
-                       return i;
-               }
-               debug("I2C probe returned %d for addr 0x%02x\n", ret, i2c_addr);
-       }
-       return -EINVAL;
-}
-
-int checkboard(void)
-{
-       u32 cpurev = get_cpu_rev();
-       int cpu_variant = (cpurev >> 12) & 0xff;
-       int pmic_id;
-
-       tx6qdl_print_cpuinfo();
-
-       pmic_id = tx6_pmic_probe();
-       if (pmic_id >= 0)
-               pmic_addr = tx6_mod_revs[pmic_id].addr;
-
-       printf("Board: Ka-Ro TX6%s-%d%d%d%c\n",
-               tx6_mod_suffix,
-               cpu_variant == MXC_CPU_MX6Q ? 1 : 8,
-               is_lvds(), tx6_get_mod_rev(pmic_id),
-               tx6_mem_suffix());
-
-       get_hab_status();
-
-       return 0;
-}
-
 #ifdef CONFIG_SERIAL_TAG
 void get_board_serial(struct tag_serialnr *serialnr)
 {
 #ifdef CONFIG_SERIAL_TAG
 void get_board_serial(struct tag_serialnr *serialnr)
 {
index c4e0e2158c127fd3a5066756d8daf2279e6449da..2f0b8860010b88cf6ada9475b0527495241530ed 100644 (file)
@@ -87,7 +87,7 @@ SECTIONS
        }
 
 #ifdef CONFIG_SECURE_BOOT
        }
 
 #ifdef CONFIG_SECURE_BOOT
-       . = CONFIG_SYS_TEXT_BASE + 0x70000;
+       . = CONFIG_SYS_TEXT_BASE + 0x71000;
        .csf_data :
        {
                *(.__csf_data)
        .csf_data :
        {
                *(.__csf_data)
index 5daac1f25852f2621a530cb05b13e92a46ff2159..54a10ee1684760f5bf97acec683844b8ab5b1cb1 100644 (file)
@@ -43,7 +43,7 @@ config TXA5_NAND
        select CMD_NAND
        select CMD_NAND_TRIMFFS
        select CMD_ROMUPDATE
        select CMD_NAND
        select CMD_NAND_TRIMFFS
        select CMD_ROMUPDATE
-       select ENV_IS_IN_NAND if !TXA5_UBOOT_NOENV
+       select ENV_IS_IN_NAND
        select FDT_FIXUP_PARTITIONS if OF_LIBFDT
        select MTD_PARTITIONS
        select MTD_DEVICE
        select FDT_FIXUP_PARTITIONS if OF_LIBFDT
        select MTD_PARTITIONS
        select MTD_DEVICE
@@ -55,7 +55,7 @@ config TXA5_EMMC
        bool
        select TXA5
        select SUPPORT_EMMC_BOOT
        bool
        select TXA5
        select SUPPORT_EMMC_BOOT
-       select ENV_IS_IN_MMC if !TXA5_UBOOT_NOENV
+       select ENV_IS_IN_MMC
 
 choice
        prompt "TXA5 module variant"
 
 choice
        prompt "TXA5 module variant"
@@ -86,7 +86,7 @@ config TXA5_UBOOT
 
 config TXA5_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
 
 config TXA5_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
-       select ENV_IS_NOWHERE
+       select UBOOT_IGNORE_ENV
 
 endchoice
 
 
 endchoice
 
index 147fb45db8018f3e864ee1d9f52e60eaacd09d47..bc6760e055fe81c56a9171e943928de5e17d18cd 100644 (file)
@@ -236,6 +236,12 @@ config CMD_ENV_EXISTS
          Check if a variable is defined in the environment for use in
          shell scripting.
 
          Check if a variable is defined in the environment for use in
          shell scripting.
 
+config UBOOT_IGNORE_ENV
+       bool
+       help
+         Ignore non-volatile environment settings and use default
+         environment only.
+
 endmenu
 
 menu "Memory commands"
 endmenu
 
 menu "Memory commands"
index 8e4ad20788b804db9af60afb7173a2cfbb3376d1..9ba4884e17461039f39a0fe369091653bf17207d 100644 (file)
@@ -134,8 +134,8 @@ static void ce_setup_std_drv_globals(ce_std_driver_globals *std_drv_glb)
                "Triton%02X", eth_get_dev()->enetaddr[5]);
 
        net_copy_ip(&std_drv_glb->kitl.ipAddress, &net_ip);
                "Triton%02X", eth_get_dev()->enetaddr[5]);
 
        net_copy_ip(&std_drv_glb->kitl.ipAddress, &net_ip);
-       std_drv_glb->kitl.ipMask = getenv_ip("netmask");
-       std_drv_glb->kitl.ipRoute = getenv_ip("gatewayip");
+       std_drv_glb->kitl.ipMask = getenv_ip("netmask").s_addr;
+       std_drv_glb->kitl.ipRoute = getenv_ip("gatewayip").s_addr;
 
        if (mtdparts) {
                strncpy(std_drv_glb->mtdparts, mtdparts, max_len);
 
        if (mtdparts) {
                strncpy(std_drv_glb->mtdparts, mtdparts, max_len);
index 22dcd097961a3ec68c14a79978e2a6c3d455aca4..23c502106cba1cea78c9feb156c84741350ec4fc 100644 (file)
@@ -26,7 +26,7 @@
 #ifdef CONFIG_LCD_LOGO
 #include <bmp_logo.h>
 #include <bmp_logo_data.h>
 #ifdef CONFIG_LCD_LOGO
 #include <bmp_logo.h>
 #include <bmp_logo_data.h>
-#if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16)
+#if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP < LCD_COLOR16)
 #error Default Color Map overlaps with Logo Color Map
 #endif
 #endif
 #error Default Color Map overlaps with Logo Color Map
 #endif
 #endif
@@ -706,8 +706,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                                        *(uint16_t *)fb = val;
                                        bmap++;
                                        fb += sizeof(uint16_t) / sizeof(*fb);
                                        *(uint16_t *)fb = val;
                                        bmap++;
                                        fb += sizeof(uint16_t) / sizeof(*fb);
-                               } else {
-                                       FB_PUT_BYTE(fb, bmap);
                                }
                        }
                        if (bpix > 8) {
                                }
                        }
                        if (bpix > 8) {
index 42d302cfd1fff9fa013650b26fd72a04ed2b565f..6f17c01aec892295c501c11e12e0779605554b88 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_MMC"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index d27f572a8bfef305ea16f118bea6b23b6055df54..732327993a2dff30b8714cf9a6d3cad3a75e32ed 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_NANDFLASH"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index e5d026a33f2cdf0dbd208c81019a0d0071420653..ed991433a12b8f77d9c1ed871f25bdd44b77ac45 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_SERIALFLASH"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index 82fa9d46bb6a1a1bca3180f722f6402fcf8582ab..86b3d7ae0465ca35519c66848a384dea98395ebf 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_MMC"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index a333e06507e01799e3e512e02b7d54d6f28081a6..d5f5fc6cea457abea6698cb2e9dcecd4c9917a1b 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_NANDFLASH"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index fc6dbb0b254f1425b89d7533396684b237a0e017..96899ee1ed16a1f3558ab2ed18f44069f5ea98db 100644 (file)
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SOC_SAMA5D4,SYS_USE_SERIALFLASH"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
index 74184a00ffc7b3adc4b936fdd57ab2b5ca7b3285..cb460e86e05ba6f0f68313357f0eab97061c621f 100644 (file)
@@ -1,26 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_ARRIA5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_SPL=y
 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
index 954c936dcc0aa0d78e7a6c50a0d36119b9b49bce..8a7f8ccb9509b88bdc089f229cbda4aded4d6490 100644 (file)
@@ -1,26 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
index 19eccc31408fff5b7b80febcbb568f8ab1dcc747..d7675791da6a2a39ab2c2dfefa89753fe130a4d9 100644 (file)
@@ -1,26 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
index 3fe50dab736c5aa14013d9f720b9008f58d5f08f..c590354aa84d795b7e76e82df053eb59775577b2 100644 (file)
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_SPI_FLASH=y
index 74981bb0b8fd0ed3504cb29272c4edf09d82c9cb..7de3f995287e9a4882f8bd2391d40d3ce20d9d1f 100644 (file)
@@ -2,5 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6X_SPI_BOOT=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_SPI_FLASH=y
index 5cc2234a0635073d0c6a70fb8c3ed097b79acb37..7bf15d174e1feb3041eb279aa470e641379f7696 100644 (file)
@@ -2,5 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_SPI_FLASH=y
index a97671c486452f1fe26c39ad1f607800055eb5bd..ff38d0b914a8a0d11c05f8493f4697d530671f22 100644 (file)
@@ -3,5 +3,6 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
 CONFIG_TQMA6X_SPI_BOOT=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
 CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_SPI_FLASH=y
index c24af64f733bfd9c1f828338daf628cc58096dc9..150b6884902035cbc928302fb3ac773ecf44bdba 100644 (file)
@@ -1,11 +1,12 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
@@ -18,21 +19,14 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
 CONFIG_LCD=y
 CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index 84b045429281c27d00772f73b68fc1d014b184fc..65a421b756d5ebdcce164f568fed481b6b6eccc1 100644 (file)
@@ -1,8 +1,8 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT_NOENV=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -18,19 +18,13 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
-CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index f84c66ec627e5beb7b09142e1abe4d24d286d134..9eeefca52da378707f0988c671ccd77120ff462b 100644 (file)
@@ -1,11 +1,12 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
@@ -18,21 +19,14 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
 CONFIG_LCD=y
 CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index 942c540f9f572e3cc8eda683d9336e831db6c9a9..5136c51d4b4c0afe60442cd08e8b92d38667681b 100644 (file)
@@ -1,8 +1,8 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT_NOENV=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -18,19 +18,13 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
-CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index 311022df085423db6acd7f76885459b08964608c..d92c8e2734657ed022ec5b673df3edde2a03c5a3 100644 (file)
@@ -1,11 +1,12 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
@@ -18,21 +19,14 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
 CONFIG_LCD=y
 CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index 28fa3a2aa11767519dfcc8ea2ff3b655bb591f65..29a4f1098f1425e827d970ac3a639eabcf6e6bb6 100644 (file)
@@ -1,8 +1,8 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT_NOENV=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -18,19 +18,13 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
-CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index c5861bc09715377deb2d8b8f576861902e749bf6..a4da654f495dda689b7465598abbf9da160f5d0d 100644 (file)
@@ -1,11 +1,12 @@
 CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M"
 CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_41X0=y
-+S:CONFIG_TX28_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_41X0=y
+CONFIG_TX28_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
@@ -18,21 +19,14 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
 CONFIG_LCD=y
 CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index a707d599a4d4068cbdeab16be182cb416e1d6705..79d642d5deff35e3a011f465e983b3cc35ddc917 100644 (file)
@@ -1,8 +1,8 @@
 CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M"
 CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_41X0=y
-+S:CONFIG_TX28_UBOOT_NOENV=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_41X0=y
+CONFIG_TX28_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -18,19 +18,13 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
-CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "
index 9105d2a36a212f904e63139ad1f910c4160d7a9d..bab5178485641051f5323976f368bb3c0da4c83a 100644 (file)
@@ -1,7 +1,7 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MPU_CLK=720,SYS_DDR_CLK=400"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MPU_CLK=720,SYS_DDR_CLK=400"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX48=y
-+S:CONFIG_TX48_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX48=y
+CONFIG_TX48_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -17,17 +17,18 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
+CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_LCD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_LCD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONS=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_OMAP_GPMC=y
+CONFIG_NAND=y
+CONFIG_NAND_OMAP_GPMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_OMAP_HSMMC=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX48 U-Boot > "
index a29602ba80f2f5aeaaa024d362a0f3409c916bd5..10e2091f167d210d63eea042f3cf57bd1a165ce1 100644 (file)
@@ -18,3 +18,4 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX51 U-Boot > "
index 7b6ff0d0408e61d5b8deb40c25c7d0acd8a42679..efe981f6b5399de4fe33b13ac75e79a26f19c84f 100644 (file)
@@ -17,4 +17,5 @@ CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX51 U-Boot > "
index 97ba9786cee59f422541b8b13a2ec3c7f770a407..9457ea47f82372de920624c2684ae8dc296f3fa3 100644 (file)
@@ -18,3 +18,4 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX51 U-Boot > "
index 0af017c88390f935649143bf487ac4f48f68c16d..99fb36b19cc8587a394d1764081c1920733d64e9 100644 (file)
@@ -17,4 +17,5 @@ CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_DOS_PARTITION=y
-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX51 U-Boot > "
index 0fcb12c450765ee5e544c4ed4903efc0b86e2819..d471f2814f7a6a51961896e301b8fa300d9055d0 100644 (file)
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
diff --git a/configs/tx53-1232_noenv_defconfig b/configs/tx53-1232_noenv_defconfig
new file mode 100644 (file)
index 0000000..abbbe8b
--- /dev/null
@@ -0,0 +1,23 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_2G"
+CONFIG_ARM=y
+CONFIG_TARGET_TX53=y
+CONFIG_TARGET_TX53_1232=y
+CONFIG_TX53_UBOOT_NOENV=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_DNS=y
+CONFIG_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
+CONFIG_LCD=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_CMD_I2C=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index 6fe8485392a328d52ea1c4a853ff29772905a203..13139856a7f7283c24ab5361995b704b377d584e 100644 (file)
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index 25dcf97d921bd6d23fce9bed2a389fbf83bd58bc..a93032ef7781911b856ab18332dfacfa8e9b5378 100644 (file)
@@ -19,3 +19,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
diff --git a/configs/tx53-x030_noenv_defconfig b/configs/tx53-x030_noenv_defconfig
new file mode 100644 (file)
index 0000000..97b8179
--- /dev/null
@@ -0,0 +1,22 @@
+CONFIG_ARM=y
+CONFIG_TARGET_TX53=y
+CONFIG_TARGET_TX53_X030=y
+CONFIG_TX53_UBOOT_NOENV=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_DNS=y
+CONFIG_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
+CONFIG_LCD=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_CMD_I2C=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index f39b3e53986d56818cc35a3c2f2cf0385509978e..b2d7580ffc3ae80caaf8ac42977add7ff01a61a0 100644 (file)
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index 9e8eb1a40b00b7c45fe7eae891791cd02e061e58..a9a276876b25a9d3f174b1b5b784a0ef6e6d67fc 100644 (file)
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
diff --git a/configs/tx53-x130_noenv_defconfig b/configs/tx53-x130_noenv_defconfig
new file mode 100644 (file)
index 0000000..0d44afa
--- /dev/null
@@ -0,0 +1,23 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_ARM=y
+CONFIG_TARGET_TX53=y
+CONFIG_TARGET_TX53_X130=y
+CONFIG_TX53_UBOOT_NOENV=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_DNS=y
+CONFIG_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
+CONFIG_LCD=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_CMD_I2C=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index e7af1aa8376dff994bf829cac0bb2f2da5fc3e54..f76a01f7a8d3b91a591bd767bb8ecfe4c276bd98 100644 (file)
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SECURE_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_TARGET_TX53=y
 CONFIG_TARGET_TX53_X130=y
 CONFIG_ARM=y
 CONFIG_TARGET_TX53=y
 CONFIG_TARGET_TX53_X130=y
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index b74eb354fda5be164ef8d1fce594b77e812bfecd..1b8dfa26ce29149531534e19f511ab7b5f57eed5 100644 (file)
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
diff --git a/configs/tx53-x131_noenv_defconfig b/configs/tx53-x131_noenv_defconfig
new file mode 100644 (file)
index 0000000..22db676
--- /dev/null
@@ -0,0 +1,23 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
+CONFIG_ARM=y
+CONFIG_TARGET_TX53=y
+CONFIG_TARGET_TX53_X131=y
+CONFIG_TX53_UBOOT_NOENV=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_DNS=y
+CONFIG_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
+CONFIG_LCD=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_CMD_I2C=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index 41adf6902375f1c92ff05b853a5ad022bf5a896b..9c920e2ee9d3ef76c80bfadb204d0dc1820ada5b 100644 (file)
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SECURE_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_TARGET_TX53=y
 CONFIG_TARGET_TX53_X131=y
 CONFIG_ARM=y
 CONFIG_TARGET_TX53=y
 CONFIG_TARGET_TX53_X131=y
@@ -20,3 +20,4 @@ CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TX53 U-Boot > "
index b03729a19cf54de0e3a68fd13ca69ebf92c1d767..6a236ef54a8008c4b48a69d3bdc937d2c7b2772c 100644 (file)
@@ -1,28 +1,31 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_PING=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index d354c782d01a3733aa2fce1a24844c065cb94ed1..5f10b957a8632dc6f84270b565085bca1d2b6a49 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -25,3 +24,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index f8d3f4d81ea1af5e30c874dbf4a0b63d977c0c6a..1a3d56018b8305430406048fa76afa2c84dc4fed 100644 (file)
@@ -1,27 +1,31 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_PING=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=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_NETDEVICES=y
 CONFIG_LCD=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 66dc59b18045cc17bf18d2fd9f43be99953c8383..76b24e6f23bc76d307f13aec0419f9209d6ac6d8 100644 (file)
@@ -1,28 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1020=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_DOS_PARTITION=y
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index cae5aea649c2fbbb140dfa82097d655cfde9964e..32f1fe51cd8f66842536853c83d1edbdb73ae7f2 100644 (file)
@@ -1,28 +1,32 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_PING=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index d10572e62094344111df228c7e9c7d3e2f7581e9..1ba92be16e9fb978bb3c253058b208a11f8b3a1c 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -25,3 +24,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 3462dfafe4fac95942efa55b69cfa97e1a976a1c..f4237ba31a72fea1b9835a605f868754aec73640 100644 (file)
@@ -1,27 +1,32 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_PING=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 2a42645d765fd354ae22c1eb7077eaf83c68d8dd..346e4d49291338bb7ddc7ffe747d8b4fabd56b56 100644 (file)
@@ -1,28 +1,34 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_1033=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_LCD=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_DOS_PARTITION=y
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 91960a8fb9661ce18b6916c6f2cffc04c7c6a2fd..f0c76b3f93ba18627dc3a88801a0e55dddea24ac 100644 (file)
@@ -1,29 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 77da179e863a147c20c7c7a21e188e2f87c5c106..f0a02afbcc814a880e49bca679cd06c81cec8511 100644 (file)
@@ -1,28 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT_MFG=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index b896343293345fec40067a41539e8501937a26c1..7995c644967db1c75a20864138855276664f6bc6 100644 (file)
@@ -1,28 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 8afcb7ec418184abff59fd657f9ec1b588cd3ca6..b0e5233221619139882e2d57c171a9c02f51a93a 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_10X0=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index adb4622370092fc4279f7a0adb9a85111fba93bd..18479c6bac8cd737663584d1751cd987d6184787 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 91e13853db081df84afdaa1b67acf27ae6370d54..d36f135ad2a1e414914cdffd410a1028b507f9c2 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 6068f63e9ae54e229ae21ecb19698d6333d52f39..cf3b034d4c9ec67a52ca7e08875f3a20931b965a 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
diff --git a/configs/tx6q-11x0_sec_defconfig b/configs/tx6q-11x0_sec_defconfig
new file mode 100644 (file)
index 0000000..dc1ec3b
--- /dev/null
@@ -0,0 +1,35 @@
+CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
+CONFIG_ARM=y
+CONFIG_TARGET_TX6=y
+CONFIG_TARGET_TX6Q_11X0=y
+CONFIG_TX6_UBOOT=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+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_PING=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "
index 8e65cbf0d00c14c8ff2772e39069967cc658f21d..a45cd33e39911f3e756575671f882cc62303947f 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index cca31029198e15170a6c558bb6026ce0ecbc6d1f..6113b6760deb57f5c637725b2dd21d1b2fa0f362 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index b9f773518bd89820e34209be8f4f7bcf0d65d086..766b4af5040eabaf13837e9c7c0be63b600c6474 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index 3462556905e4354f4bb3c26590bf5e0ef5ba3bf9..951549137182d99d6f19f5dd6ae67e6aa389ea9e 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8034=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index 874704a249bb49e55b9ae7404a83ec3a4f42b7ae..110062d13b9c6fc7fef29a5b3d166d2743cf513b 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT=y
@@ -26,3 +25,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index 7b652890c4e8026ab9f208c5eebf00c76f25fe60..9acb7080db7df9f904461657b07a179472ab205f 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -25,3 +24,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index f704e1772df8ff3ff7117c05abc4fa6047d0e688..74d2e8e31f6d4f01517bd0703f700d1fa32a8d69 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT_NOENV=y
@@ -21,7 +20,9 @@ CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index 0e6beb6d9fa555dec8d7d2b944fe00a0d69e84d8..68bfe85245591ab41a17b240befdf089db2b597f 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6S=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6S_8035=y
 CONFIG_TX6_UBOOT=y
@@ -26,3 +25,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6S U-Boot > "
index c055fb15d2d735f5fe987e68be77e1ce667e0f99..a922a7e6ebe5f7b1d96de5e288035cca537bc28e 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index d682277ab9ba2968f8ba4543a05c88d4abef8ddd..8c39e4def020d53d22e7960389fee2fceadbeead 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index c1cc683e2dc940d8d210de825a749054d0c740f5..5c7779d41efcb3a85d0668471afc3cecb22ee406 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 74799ad2276bcb0fb90896a6e09f43fe4d2a7626..ec04f4e2b8436ef8676f10186916b0ed44c83910 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8011=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 86e8ce8424ad748479e421e33c049f882ace4835..1b9322a9c0c266a23c5ccbdf2f17a133a93e9ad0 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index fba2b06a269b50f8b57a51fbc64ab0d6322b4e3b..37946f77e57417fab7f1473591f30e5ef31a24ae 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index e2c48190051381ca946c54d11962cd5d6872d757..7660732380da21ff708ce55763345fce580ff651 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 2fae6118deae5fe4c53ff74a285679f720c52542..32cf8c82652efbbd1c605b452071cae6d39a8ac1 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8012=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 6e37e6b16ed3eb022be2b542f74c9f845fc32fa3..cd98a83f0fb5988d79c77d760f8f1ff4a7ba7379 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT=y
@@ -26,3 +25,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 414617e175d0a7edaa6bde3317313c9f8ada9ce5..e5d05b49a9297903731bd3040f8c278dd5767081 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -25,3 +24,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index eeb1615aecf4ffcda41151a16992105cfc109a70..5cfd39fd389820fb035a94bef07a3ccbba2104fc 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT_NOENV=y
@@ -21,7 +20,9 @@ CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 3042b301723d9e967cf9628043f6a5d98a7c594f..6042e131e4043197d73016e0bb89f4ccdd9e30d1 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_8033=y
 CONFIG_TX6_UBOOT=y
@@ -26,3 +25,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index dd728acd74e4ed3327d6fe425005bb1810b406fa..844d295199076246c29363ecf46310824f59fd29 100644 (file)
@@ -1,29 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index bb825fbc69a889f2006327128d148d945a6627bc..063694fe95032fd95ab051cd7858aeae5aadd72f 100644 (file)
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -26,3 +25,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 39654718f0853c69a94997ece85e55d97e920a6a..4a43e3ce22f410dcc089c8a1d4f1418d9263959a 100644 (file)
@@ -1,28 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 339feae95cd76e04e65726faef939a52f14cc8ea..0f08e22d9e4c99cae1d996d7d670d58bb5fad553 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_80X0=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 0c61bc5524455c2180c7f629d725ff82ef08c397..61874b3ea80891cb12170eefc9f3e909e1069200 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_8111=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 428ed2a8e78ab5a92c1dfa76e1a93e13fc3318f2..547da7f69ddb23b11edb4d9fcff733a8712a1679 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 9dd4b893a673b12dbb4878e874ea4f51f97ba2ff..90e893196903b8913bf7598e8b96df6c68b888ff 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6=y
-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_8111=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 8a7a448d9c94bb86241844f33940e054ae822aaf..3d5c5fb55d62ef9d7fe73a00e7247b21f99e4709 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 88b267c4f5d7ef1e57426e391884a8d1e4eb953c..ce30a31639c4b5be8a69216df9b15ff9f8b6a158 100644 (file)
@@ -1,30 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
+CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_LCD=y
+CONFIG_MMC=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 74e5289ed1e84700db537c5788f12fa6fda91453..4f72f0f8075acd804201c3e011eac856631c38d9 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_MFG=y
@@ -27,3 +26,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 616429a3c7ced291d073fcb7e81866a638434164..fd87053e1a7965798024e270d58bc1eab28648c7 100644 (file)
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=y
+CONFIG_BOOTP_DNS=y
+CONFIG_BOOTP_GATEWAY=y
+CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_BOOTCE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=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_MMC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PING=y
-CONFIG_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 0659300f09a1a9c2f65424423c33b431879a8d22..42b9eb8b80e506f3f4f2e74b05afb63c2fd40e06 100644 (file)
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF,SECURE_BOOT"
 CONFIG_ARM=y
-CONFIG_SOC_MX6DL=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6U_81X0=y
 CONFIG_TX6_UBOOT=y
@@ -28,3 +27,4 @@ CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6DL U-Boot > "
index 78bec57fddc02b0d9dc9f8dc39d0164d9f52cc2f..289af00a57aa91e21395aa6090577445a086607f 100644 (file)
@@ -1,5 +1,6 @@
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
 CONFIG_TARGET_TXA5=y
 CONFIG_TARGET_TXA5_5010=y
 CONFIG_TXA5_UBOOT=y
 CONFIG_TARGET_TXA5=y
 CONFIG_TARGET_TXA5_5010=y
 CONFIG_TXA5_UBOOT=y
@@ -16,3 +17,4 @@ CONFIG_NETDEVICES=y
 #CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 #CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_PROMPT="TXA5 U-Boot > "
index a184de8eb9c9bdc50ecbcbbde51b4ab77b25be41..ec3b8cc430d1f304bd814a4be94cc1455c37ffa0 100644 (file)
@@ -1,5 +1,6 @@
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 CONFIG_ARM=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
 CONFIG_TARGET_TXA5=y
 CONFIG_TARGET_TXA5_5011=y
 CONFIG_TXA5_UBOOT=y
 CONFIG_TARGET_TXA5=y
 CONFIG_TARGET_TXA5_5011=y
 CONFIG_TXA5_UBOOT=y
@@ -16,3 +17,4 @@ CONFIG_NETDEVICES=y
 #CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
 #CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_PROMPT="TXA5 U-Boot > "
index 41f4e695e8af8a8035f605049771b96dc4462203..6ff49b613ad5c99f20058edb156c6024dab64a12 100644 (file)
@@ -1,5 +1,8 @@
 menu "Generic Driver Options"
 
 menu "Generic Driver Options"
 
+config BOUNCE_BUFFER
+       bool
+
 config DM
        bool "Enable Driver Model"
        help
 config DM
        bool "Enable Driver Model"
        help
index c9fb58da66608a2a55f28fb4d3a8dfa1d2724dc1..d559e90294976eb2dd73d0469c9e7b9dcfff53bc 100644 (file)
@@ -1,11 +1,10 @@
-menu "MMC Host controller Support"
+menuconfig MMC
+       bool "MMC Host controller Support"
 
 
-config MMC
-       bool
+if MMC
 
 config GENERIC_MMC
        bool
 
 config GENERIC_MMC
        bool
-       select MMC
 
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
 
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
@@ -29,16 +28,19 @@ config FSL_ESDHC
 
 config FSL_USDHC
        bool "Support USDHC"
 
 config FSL_USDHC
        bool "Support USDHC"
-       depends on SOC_MX6
-       depends on FSL_ESDHC
+       depends on FSL_ESDHC && SOC_MX6
 
 config MXS_MMC
        bool "i.MXS MMC/SDHC controller"
        depends on SOC_MXS || SOC_MX6
        select GENERIC_MMC
 
 config MXS_MMC
        bool "i.MXS MMC/SDHC controller"
        depends on SOC_MXS || SOC_MX6
        select GENERIC_MMC
+       select BOUNCE_BUFFER
+
+config OMAP_HSMMC
+       bool "OMAP HSMMC controller"
+       select GENERIC_MMC
 
 config SUPPORT_EMMC_BOOT
        bool "Support boot from eMMC"
 
 config SUPPORT_EMMC_BOOT
        bool "Support boot from eMMC"
-       depends on MMC
 
 
-endmenu
+endif
index f8b498572f6580e2e03e2e2e273a102fc9c8793c..a02b9c49734b7a7680b4f7e84d1a65dbe18cd422 100644 (file)
@@ -24,6 +24,7 @@
 
 #include <config.h>
 #include <common.h>
 
 #include <config.h>
 #include <common.h>
+#include <errno.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <part.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <part.h>
@@ -672,11 +673,11 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 
        switch (dev_index) {
        case 0:
 
        switch (dev_index) {
        case 0:
-               base_addr = OMAP_HSMMC1_BASE;
+               priv_data->base_addr = (void *)OMAP_HSMMC1_BASE;
                break;
 #ifdef OMAP_HSMMC2_BASE
        case 1:
                break;
 #ifdef OMAP_HSMMC2_BASE
        case 1:
-               priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
+               priv_data->base_addr = (void *)OMAP_HSMMC2_BASE;
 #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
        defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) || \
        defined(CONFIG_AM43XX)) && defined(CONFIG_HSMMC2_8BIT)
 #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
        defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) || \
        defined(CONFIG_AM43XX)) && defined(CONFIG_HSMMC2_8BIT)
@@ -687,7 +688,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 #endif
 #ifdef OMAP_HSMMC3_BASE
        case 2:
 #endif
 #ifdef OMAP_HSMMC3_BASE
        case 2:
-               priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
+               priv_data->base_addr = (void *)OMAP_HSMMC3_BASE;
 #if (defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX)) && defined(CONFIG_HSMMC3_8BIT)
                /* Enable 8-bit interface for eMMC on DRA7XX */
                host_caps_val |= MMC_MODE_8BIT;
 #if (defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX)) && defined(CONFIG_HSMMC3_8BIT)
                /* Enable 8-bit interface for eMMC on DRA7XX */
                host_caps_val |= MMC_MODE_8BIT;
index 0d4f327ed71e2196b01e88eeaab1486f7ae0229f..8ce764bf95c9a507617278c4dde55b3c8adc5585 100644 (file)
@@ -1454,9 +1454,6 @@ int board_nand_init(struct nand_chip *nand)
        nand->dev_ready = at91_nand_wait_ready;
 #endif
        nand->chip_delay = 20;
        nand->dev_ready = at91_nand_wait_ready;
 #endif
        nand->chip_delay = 20;
-#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
-       nand->bbt_options |= NAND_BBT_USE_FLASH;
-#endif
 
 #ifdef CONFIG_ATMEL_NAND_HWECC
 #ifdef CONFIG_ATMEL_NAND_HW_PMECC
 
 #ifdef CONFIG_ATMEL_NAND_HWECC
 #ifdef CONFIG_ATMEL_NAND_HW_PMECC
@@ -1517,15 +1514,17 @@ int atmel_nand_chip_init(int devnum, ulong base_addr)
 #endif
 #ifdef CONFIG_SYS_NAND_DBW_16
        nand->options = NAND_BUSWIDTH_16;
 #endif
 #ifdef CONFIG_SYS_NAND_DBW_16
        nand->options = NAND_BUSWIDTH_16;
+#endif
+#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
+       nand->bbt_options |= NAND_BBT_USE_FLASH;
+       nand->bbt_td->options |= NAND_BBT_CREATE;
+       nand->bbt_md->options |= NAND_BBT_CREATE;
 #endif
        nand->cmd_ctrl = at91_nand_hwcontrol;
 #ifdef CONFIG_SYS_NAND_READY_PIN
        nand->dev_ready = at91_nand_ready;
 #endif
        nand->chip_delay = 75;
 #endif
        nand->cmd_ctrl = at91_nand_hwcontrol;
 #ifdef CONFIG_SYS_NAND_READY_PIN
        nand->dev_ready = at91_nand_ready;
 #endif
        nand->chip_delay = 75;
-#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
-       nand->bbt_options |= NAND_BBT_USE_FLASH;
-#endif
 
        ret = nand_scan_ident(mtd, CONFIG_SYS_NAND_MAX_CHIPS, NULL);
        if (ret)
 
        ret = nand_scan_ident(mtd, CONFIG_SYS_NAND_MAX_CHIPS, NULL);
        if (ret)
index e2bfd3e1159ced243d71dfcd1ecc0f1fe658b5a1..8a78dbae21c51a06de63e50d8b3ecfef5fe2c5f4 100644 (file)
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/mem.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/arch/mem.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <linux/mtd/nand_ecc.h>
@@ -94,147 +95,6 @@ static struct nand_bbt_descr bbt_mirror_descr = {
 
 #define PRINT_REG(x) debug("+++ %.15s (0x%08x)=0x%08x\n", #x, &gpmc_cfg->x, readl(&gpmc_cfg->x))
 
 
 #define PRINT_REG(x) debug("+++ %.15s (0x%08x)=0x%08x\n", #x, &gpmc_cfg->x, readl(&gpmc_cfg->x))
 
-#ifdef CONFIG_SYS_GPMC_PREFETCH_ENABLE
-/**
- * gpmc_prefetch_enable - configures and starts prefetch transfer
- * @cs: cs (chip select) number
- * @fifo_th: fifo threshold to be used for read/ write
- * @count: number of bytes to be transferred
- * @is_write: prefetch read(0) or write post(1) mode
- */
-static inline void gpmc_prefetch_enable(int cs, int fifo_th,
-                                       unsigned int count, int is_write)
-{
-       writel(count, &gpmc_cfg->pref_config2);
-
-       /* Set the prefetch read / post write and enable the engine.
-        * Set which cs is has requested for.
-        */
-       uint32_t val = (cs << CS_NUM_SHIFT) |
-               PREFETCH_ENABLEOPTIMIZEDACCESS |
-               PREFETCH_FIFOTHRESHOLD(fifo_th) |
-               ENABLE_PREFETCH |
-               !!is_write;
-       writel(val, &gpmc_cfg->pref_config1);
-
-       /*  Start the prefetch engine */
-       writel(0x1, &gpmc_cfg->pref_control);
-}
-
-/**
- * gpmc_prefetch_reset - disables and stops the prefetch engine
- */
-static inline void gpmc_prefetch_reset(void)
-{
-       /* Stop the PFPW engine */
-       writel(0x0, &gpmc_cfg->pref_control);
-
-       /* Reset/disable the PFPW engine */
-       writel(0x0, &gpmc_cfg->pref_config1);
-}
-
-//#define FIFO_IOADDR          (nand->IO_ADDR_R)
-#define FIFO_IOADDR            PISMO1_NAND_BASE
-
-/**
- * read_buf_pref - read data from NAND controller into buffer
- * @mtd: MTD device structure
- * @buf: buffer to store date
- * @len: number of bytes to read
- */
-static void read_buf_pref(struct mtd_info *mtd, u_char *buf, int len)
-{
-       gpmc_prefetch_enable(cs, PREFETCH_FIFOTHRESHOLD_MAX, len, 0);
-       do {
-               // Get number of bytes waiting in the FIFO
-               uint32_t read_bytes = GPMC_PREFETCH_STATUS_FIFO_CNT(readl(&gpmc_cfg->pref_status));
-
-               if (read_bytes == 0)
-                       continue;
-               // Alignment of Destination Buffer
-               while (read_bytes && ((unsigned int)buf & 3)) {
-                       *buf++ = readb(FIFO_IOADDR);
-                       read_bytes--;
-                       len--;
-               }
-               // Use maximum word size (32bit) inside this loop, because speed is limited by
-               // GPMC bus arbitration with a maximum transfer rate of 3.000.000/sec.
-               len -= read_bytes & ~3;
-               while (read_bytes >= 4) {
-                       *((uint32_t*)buf) = readl(FIFO_IOADDR);
-                       buf += 4;
-                       read_bytes -= 4;
-               }
-               // Transfer the last (non-aligned) bytes only at the last iteration,
-               // to maintain full speed up to the end of the transfer.
-               if (read_bytes == len) {
-                       while (read_bytes) {
-                               *buf++ = readb(FIFO_IOADDR);
-                               read_bytes--;
-                       }
-                       len = 0;
-               }
-       } while (len > 0);
-       gpmc_prefetch_reset();
-}
-
-/*
- * write_buf_pref - write buffer to NAND controller
- * @mtd: MTD device structure
- * @buf: data buffer
- * @len: number of bytes to write
- */
-static void write_buf_pref(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       /*  configure and start prefetch transfer */
-       gpmc_prefetch_enable(cs, PREFETCH_FIFOTHRESHOLD_MAX, len, 1);
-
-       while (len) {
-               // Get number of free bytes in the FIFO
-               uint32_t write_bytes = GPMC_PREFETCH_STATUS_FIFO_CNT(readl(&gpmc_cfg->pref_status));
-
-               // don't write more bytes than requested
-               if (write_bytes > len)
-                       write_bytes = len;
-
-               // Alignment of Source Buffer
-               while (write_bytes && ((unsigned int)buf & 3)) {
-                       writeb(*buf++, FIFO_IOADDR);
-                       write_bytes--;
-                       len--;
-               }
-
-               // Use maximum word size (32bit) inside this loop, because speed is limited by
-               // GPMC bus arbitration with a maximum transfer rate of 3.000.000/sec.
-               len -= write_bytes & ~3;
-               while (write_bytes >= 4) {
-                       writel(*((uint32_t*)buf), FIFO_IOADDR);
-                       buf += 4;
-                       write_bytes -= 4;
-               }
-
-               // Transfer the last (non-aligned) bytes only at the last iteration,
-               // to maintain full speed up to the end of the transfer.
-               if (write_bytes == len) {
-                       while (write_bytes) {
-                               writeb(*buf++, FIFO_IOADDR);
-                               write_bytes--;
-                       }
-                       len = 0;
-               }
-       }
-
-       /* wait for data to be flushed out before resetting the prefetch */
-       while ((len = GPMC_PREFETCH_STATUS_COUNT(readl(&gpmc_cfg->pref_status)))) {
-               debug("%u bytes still in FIFO\n", PREFETCH_FIFOTHRESHOLD_MAX - len);
-               ndelay(1);
-       }
-
-       /* disable and stop the PFPW engine */
-       gpmc_prefetch_reset();
-}
-#endif /* CONFIG_SYS_GPMC_PREFETCH_ENABLE */
-
 /*
  * omap_nand_hwcontrol - Set the address pointers corretly for the
  *                     following address/data/command operation
 /*
  * omap_nand_hwcontrol - Set the address pointers corretly for the
  *                     following address/data/command operation
@@ -269,6 +129,8 @@ static void omap_nand_hwcontrol(struct mtd_info *mtd, int32_t cmd,
 /* Check wait pin as dev ready indicator */
 static int omap_dev_ready(struct mtd_info *mtd)
 {
 /* Check wait pin as dev ready indicator */
 static int omap_dev_ready(struct mtd_info *mtd)
 {
+       struct nand_chip *this = mtd->priv;
+       struct omap_nand_info *info = this->priv;
        return !!(readl(&gpmc_cfg->status) & (1 << (8 + info->ws)));
 }
 
        return !!(readl(&gpmc_cfg->status) & (1 << (8 + info->ws)));
 }
 
index eb8224d8da02597d263894b5b569eb53634d039e..5fd2b08cfca99a0b487c14a2bea86b4fd79e2ec6 100644 (file)
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <command.h>
 
 #include <common.h>
 #include <command.h>
+#include <cpsw.h>
 #include <net.h>
 #include <miiphy.h>
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
 #include <malloc.h>
@@ -227,7 +228,7 @@ struct cpdma_chan {
 #define chan_read_ptr(chan, fld)       ((void *)__raw_readl((chan)->fld))
 
 #define for_active_slave(slave, priv) \
 #define chan_read_ptr(chan, fld)       ((void *)__raw_readl((chan)->fld))
 
 #define for_active_slave(slave, priv) \
-       slave = (priv)->slaves + (priv)->data.active_slave; if (slave)
+       slave = (priv)->slaves + (priv)->data->active_slave; if (slave)
 #define for_each_slave(slave, priv) \
        for (slave = (priv)->slaves; slave != (priv)->slaves + \
                                (priv)->data->slaves; slave++)
 #define for_each_slave(slave, priv) \
        for (slave = (priv)->slaves; slave != (priv)->slaves + \
                                (priv)->data->slaves; slave++)
@@ -599,7 +600,7 @@ static void cpsw_set_slave_mac(struct cpsw_slave *slave,
 static void cpsw_slave_update_link(struct cpsw_slave *slave,
                                   struct cpsw_priv *priv, int *link)
 {
 static void cpsw_slave_update_link(struct cpsw_slave *slave,
                                   struct cpsw_priv *priv, int *link)
 {
-       struct phy_device *phy;
+       struct phy_device *phy = priv->phydev;
        u32 mac_control = 0;
        int retries = NUM_TRIES;
 
        u32 mac_control = 0;
        int retries = NUM_TRIES;
 
@@ -1007,7 +1008,7 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave)
        struct phy_device *phydev;
        u32 supported = PHY_GBIT_FEATURES;
 
        struct phy_device *phydev;
        u32 supported = PHY_GBIT_FEATURES;
 
-       if (slave->data->phy_id < 0) {
+       if (slave->data->phy_addr < 0) {
                u32 phy_addr;
 
                for (phy_addr = 0; phy_addr < 32; phy_addr++) {
                u32 phy_addr;
 
                for (phy_addr = 0; phy_addr < 32; phy_addr++) {
@@ -1020,7 +1021,7 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave)
                }
        } else {
                phydev = phy_connect(priv->bus,
                }
        } else {
                phydev = phy_connect(priv->bus,
-                               slave->data->phy_id,
+                               slave->data->phy_addr,
                                dev,
                                slave->data->phy_if);
        }
                                dev,
                                slave->data->phy_if);
        }
@@ -1048,7 +1049,6 @@ int cpsw_register(struct cpsw_platform_data *data)
        struct cpsw_slave       *slave;
        void                    *regs = (void *)data->cpsw_base;
        struct eth_device       *dev;
        struct cpsw_slave       *slave;
        void                    *regs = (void *)data->cpsw_base;
        struct eth_device       *dev;
-       int i;
        int idx = 0;
 
        debug("%s@%d\n", __func__, __LINE__);
        int idx = 0;
 
        debug("%s@%d\n", __func__, __LINE__);
@@ -1078,7 +1078,6 @@ int cpsw_register(struct cpsw_platform_data *data)
        priv->host_port_regs    = regs + data->host_port_reg_ofs;
        priv->dma_regs          = regs + data->cpdma_reg_ofs;
        priv->ale_regs          = regs + data->ale_reg_ofs;
        priv->host_port_regs    = regs + data->host_port_reg_ofs;
        priv->dma_regs          = regs + data->cpdma_reg_ofs;
        priv->ale_regs          = regs + data->ale_reg_ofs;
-       priv->descs             = (void *)regs + data->bd_ram_ofs;
 
        for_each_slave(slave, priv) {
                cpsw_slave_setup(slave, idx, priv);
 
        for_each_slave(slave, priv) {
                cpsw_slave_setup(slave, idx, priv);
@@ -1097,10 +1096,8 @@ int cpsw_register(struct cpsw_platform_data *data)
 
        cpsw_mdio_init(dev->name, data->mdio_base, data->mdio_div);
        priv->bus = miiphy_get_dev_by_name(dev->name);
 
        cpsw_mdio_init(dev->name, data->mdio_base, data->mdio_div);
        priv->bus = miiphy_get_dev_by_name(dev->name);
-       for_active_slave(slave, priv) {
+       for_active_slave(slave, priv)
                ret = cpsw_phy_init(dev, slave);
                ret = cpsw_phy_init(dev, slave);
-               if (ret < 0)
-                       break;
-       }
+
        return ret;
 }
        return ret;
 }
index 027c6123ad6487945912b306efcb84f32b93c03c..1ef3456630e0dd335b44ec20cdd5ed406de52d88 100644 (file)
@@ -256,7 +256,7 @@ static int miiphy_wait_aneg(struct eth_device *dev)
 
 static inline void fec_rx_task_enable(struct fec_priv *fec)
 {
 
 static inline void fec_rx_task_enable(struct fec_priv *fec)
 {
-       writel(1 << 24, &fec->eth->r_des_active);
+       writel(FEC_X_DES_ACTIVE_TDAR, &fec->eth->r_des_active);
 }
 
 static inline void fec_rx_task_disable(struct fec_priv *fec)
 }
 
 static inline void fec_rx_task_disable(struct fec_priv *fec)
@@ -265,7 +265,7 @@ static inline void fec_rx_task_disable(struct fec_priv *fec)
 
 static inline void fec_tx_task_enable(struct fec_priv *fec)
 {
 
 static inline void fec_tx_task_enable(struct fec_priv *fec)
 {
-       writel(1 << 24, &fec->eth->x_des_active);
+       writel(FEC_X_DES_ACTIVE_TDAR, &fec->eth->x_des_active);
 }
 
 static inline void fec_tx_task_disable(struct fec_priv *fec)
 }
 
 static inline void fec_tx_task_disable(struct fec_priv *fec)
@@ -783,6 +783,7 @@ static int fec_recv(struct eth_device *dev)
        uint16_t bd_status;
        uint32_t addr, size, end;
        int i;
        uint16_t bd_status;
        uint32_t addr, size, end;
        int i;
+       ALLOC_CACHE_ALIGN_BUFFER(uchar, buff, FEC_MAX_PKT_SIZE);
 
        /*
         * Check if any critical events have happened
 
        /*
         * Check if any critical events have happened
index 39b4753c660437ea40669d072b41010d2eddfb22..935f85cdf849a6d08a4d60d552efd7e12ccce2d4 100644 (file)
@@ -1,7 +1,7 @@
-menu "SPI Support"
+menuconfig SPI
+       bool "SPI support"
 
 
-config SPI
-       bool "Enable SPI support"
+if SPI
 
 config DM_SPI
        bool "Enable Driver Model for SPI drivers"
 
 config DM_SPI
        bool "Enable Driver Model for SPI drivers"
@@ -141,4 +141,4 @@ config TI_QSPI
          Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
          This driver support spi flash single, quad and memory reads.
 
          Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
          This driver support spi flash single, quad and memory reads.
 
-endmenu # menu "SPI Support"
+endif
index 2666351391431e091a761fb92f7879777bde2625..8933a6f47c0664ecc6bed70614ee1c8d13e17b5a 100644 (file)
@@ -56,7 +56,7 @@
 #define UCMD_RUN_STOP           (1 << 0) /* controller run/stop */
 #define UCMD_RESET             (1 << 1) /* controller reset */
 
 #define UCMD_RUN_STOP           (1 << 0) /* controller run/stop */
 #define UCMD_RESET             (1 << 1) /* controller reset */
 
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_SOC_MX6)
 static const unsigned phy_bases[] = {
        USB_PHY0_BASE_ADDR,
        USB_PHY1_BASE_ADDR,
 static const unsigned phy_bases[] = {
        USB_PHY0_BASE_ADDR,
        USB_PHY1_BASE_ADDR,
@@ -211,7 +211,7 @@ struct usbnc_regs {
        u32     otg_phy_ctrl_0;
        u32     uh1_phy_ctrl_0;
 };
        u32     otg_phy_ctrl_0;
        u32     uh1_phy_ctrl_0;
 };
-#elif defined(CONFIG_MX7)
+#elif defined(CONFIG_SOC_MX7)
 struct usbnc_regs {
        u32 ctrl1;
        u32 ctrl2;
 struct usbnc_regs {
        u32 ctrl1;
        u32 ctrl2;
@@ -253,11 +253,11 @@ int usb_phy_mode(int port)
 
 static void usb_oc_config(int index)
 {
 
 static void usb_oc_config(int index)
 {
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_SOC_MX6)
        struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
                        USB_OTHERREGS_OFFSET);
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
        struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
                        USB_OTHERREGS_OFFSET);
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
-#elif defined(CONFIG_MX7)
+#elif defined(CONFIG_SOC_MX7)
        struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
                        (0x10000 * index) + USBNC_OFFSET);
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
        struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
                        (0x10000 * index) + USBNC_OFFSET);
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
@@ -270,9 +270,9 @@ static void usb_oc_config(int index)
        setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
 #endif
 
        setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
 #endif
 
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_SOC_MX6)
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
-#elif defined(CONFIG_MX7)
+#elif defined(CONFIG_SOC_MX7)
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
 #endif
 }
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
 #endif
 }
@@ -327,9 +327,9 @@ int ehci_hcd_init(int index, enum usb_init_type init,
                struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
        enum usb_init_type type;
                struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
        enum usb_init_type type;
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_SOC_MX6)
        u32 controller_spacing = 0x200;
        u32 controller_spacing = 0x200;
-#elif defined(CONFIG_MX7)
+#elif defined(CONFIG_SOC_MX7)
        u32 controller_spacing = 0x10000;
 #endif
        struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
        u32 controller_spacing = 0x10000;
 #endif
        struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
@@ -346,7 +346,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
        usb_power_config(index);
        usb_oc_config(index);
 
        usb_power_config(index);
        usb_oc_config(index);
 
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_SOC_MX6)
        usb_internal_phy_clock_gate(index, 1);
        usb_phy_enable(index, ehci);
 #endif
        usb_internal_phy_clock_gate(index, 1);
        usb_phy_enable(index, ehci);
 #endif
index d8496f20cb7afb921874b58d3d944f429afa66ab..30c8ccb3a5bf2a33aa6fd97e6dc7c3589cfca29b 100644 (file)
@@ -50,15 +50,6 @@ ushort *configuration_get_cmap(void)
 #endif
 }
 
 #endif
 }
 
-ushort *configuration_get_cmap(void)
-{
-#if defined(CONFIG_LCD_LOGO)
-       return bmp_logo_palette;
-#else
-       return NULL;
-#endif
-}
-
 void lcd_ctrl_init(void *lcdbase)
 {
        unsigned long value;
 void lcd_ctrl_init(void *lcdbase)
 {
        unsigned long value;
index e2b2144d88020b9d73d2f2529da13d70f6bfe801..7dd1c43727902b9633fe1bba984cac9afe2cac04 100644 (file)
 #include <video_fb.h>
 #include <linux/list.h>
 #include <linux/fb.h>
 #include <video_fb.h>
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <lcd.h>
 
 #include <asm/errno.h>
 #include <asm/io.h>
 
 #include <asm/errno.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/da8xx-fb.h>
 
 #include "videomodes.h"
 
 #include "videomodes.h"
-#include "da8xx-fb.h"
 
 #if !defined(DA8XX_LCD_CNTL_BASE)
 #define DA8XX_LCD_CNTL_BASE    DAVINCI_LCD_CNTL_BASE
 
 #if !defined(DA8XX_LCD_CNTL_BASE)
 #define DA8XX_LCD_CNTL_BASE    DAVINCI_LCD_CNTL_BASE
 #define LCD_VERSION_1  1
 #define LCD_VERSION_2  2
 
 #define LCD_VERSION_1  1
 #define LCD_VERSION_2  2
 
+#define BIT(x) (1 << (x))
+
 /* LCD Status Register */
 /* LCD Status Register */
-#define LCD_END_OF_FRAME1              (1 << 9)
-#define LCD_END_OF_FRAME0              (1 << 8)
-#define LCD_PL_LOAD_DONE               (1 << 6)
-#define LCD_FIFO_UNDERFLOW             (1 << 5)
-#define LCD_SYNC_LOST                  (1 << 2)
+#define LCD_END_OF_FRAME1              BIT(9)
+#define LCD_END_OF_FRAME0              BIT(8)
+#define LCD_PL_LOAD_DONE               BIT(6)
+#define LCD_FIFO_UNDERFLOW             BIT(5)
+#define LCD_SYNC_LOST                  BIT(2)
 
 /* LCD DMA Control Register */
 #define LCD_DMA_BURST_SIZE(x)          ((x) << 4)
 
 /* LCD DMA Control Register */
 #define LCD_DMA_BURST_SIZE(x)          ((x) << 4)
+#define LCD_DMA_BURST_SIZE_MASK                (0x7 << 4)
 #define LCD_DMA_BURST_1                        0x0
 #define LCD_DMA_BURST_2                        0x1
 #define LCD_DMA_BURST_4                        0x2
 #define LCD_DMA_BURST_8                        0x3
 #define LCD_DMA_BURST_16               0x4
 #define LCD_DMA_BURST_1                        0x0
 #define LCD_DMA_BURST_2                        0x1
 #define LCD_DMA_BURST_4                        0x2
 #define LCD_DMA_BURST_8                        0x3
 #define LCD_DMA_BURST_16               0x4
-#define LCD_V1_END_OF_FRAME_INT_ENA    (1 << 2)
-#define LCD_V2_END_OF_FRAME0_INT_ENA   (1 << 8)
-#define LCD_V2_END_OF_FRAME1_INT_ENA   (1 << 9)
-#define LCD_DUAL_FRAME_BUFFER_ENABLE   (1 << 0)
-
-#define LCD_V2_TFT_24BPP_MODE          (1 << 25)
-#define LCD_V2_TFT_24BPP_UNPACK                (1 << 26)
+#define LCD_V1_END_OF_FRAME_INT_ENA    BIT(2)
+#define LCD_V2_END_OF_FRAME0_INT_ENA   BIT(8)
+#define LCD_V2_END_OF_FRAME1_INT_ENA   BIT(9)
+#define LCD_DUAL_FRAME_BUFFER_ENABLE   BIT(0)
 
 /* LCD Control Register */
 #define LCD_CLK_DIVISOR(x)             ((x) << 8)
 
 /* LCD Control Register */
 #define LCD_CLK_DIVISOR(x)             ((x) << 8)
 #define PALETTE_ONLY                   0x01
 #define DATA_ONLY                      0x02
 
 #define PALETTE_ONLY                   0x01
 #define DATA_ONLY                      0x02
 
-#define LCD_MONO_8BIT_MODE             (1 << 9)
-#define LCD_RASTER_ORDER               (1 << 8)
-#define LCD_TFT_MODE                   (1 << 7)
-#define LCD_V1_UNDERFLOW_INT_ENA       (1 << 6)
-#define LCD_V2_UNDERFLOW_INT_ENA       (1 << 5)
-#define LCD_V1_PL_INT_ENA              (1 << 4)
-#define LCD_V2_PL_INT_ENA              (1 << 6)
-#define LCD_MONOCHROME_MODE            (1 << 1)
-#define LCD_RASTER_ENABLE              (1 << 0)
-#define LCD_TFT_ALT_ENABLE             (1 << 23)
-#define LCD_STN_565_ENABLE             (1 << 24)
-#define LCD_V2_DMA_CLK_EN              (1 << 2)
-#define LCD_V2_LIDD_CLK_EN             (1 << 1)
-#define LCD_V2_CORE_CLK_EN             (1 << 0)
+#define LCD_MONO_8BIT_MODE             BIT(9)
+#define LCD_RASTER_ORDER               BIT(8)
+#define LCD_TFT_MODE                   BIT(7)
+#define LCD_V1_UNDERFLOW_INT_ENA       BIT(6)
+#define LCD_V2_UNDERFLOW_INT_ENA       BIT(5)
+#define LCD_V1_PL_INT_ENA              BIT(4)
+#define LCD_V2_PL_INT_ENA              BIT(6)
+#define LCD_MONOCHROME_MODE            BIT(1)
+#define LCD_RASTER_ENABLE              BIT(0)
+#define LCD_TFT_ALT_ENABLE             BIT(23)
+#define LCD_STN_565_ENABLE             BIT(24)
+#define LCD_TFT24                      BIT(25)
+#define LCD_TFT24_UNPACKED             BIT(26)
+#define LCD_V2_DMA_CLK_EN              BIT(2)
+#define LCD_V2_LIDD_CLK_EN             BIT(1)
+#define LCD_V2_CORE_CLK_EN             BIT(0)
 #define LCD_V2_LPP_B10                 26
 #define LCD_V2_TFT_24BPP_MODE          (1 << 25)
 #define LCD_V2_TFT_24BPP_UNPACK                (1 << 26)
 #define LCD_V2_LPP_B10                 26
 #define LCD_V2_TFT_24BPP_MODE          (1 << 25)
 #define LCD_V2_TFT_24BPP_UNPACK                (1 << 26)
 /* LCD Raster Timing 2 Register */
 #define LCD_AC_BIAS_TRANSITIONS_PER_INT(x)     ((x) << 16)
 #define LCD_AC_BIAS_FREQUENCY(x)               ((x) << 8)
 /* LCD Raster Timing 2 Register */
 #define LCD_AC_BIAS_TRANSITIONS_PER_INT(x)     ((x) << 16)
 #define LCD_AC_BIAS_FREQUENCY(x)               ((x) << 8)
-#define LCD_SYNC_CTRL                          (1 << 25)
-#define LCD_SYNC_EDGE                          (1 << 24)
-#define LCD_INVERT_PIXEL_CLOCK                 (1 << 22)
-#define LCD_INVERT_LINE_CLOCK                  (1 << 21)
-#define LCD_INVERT_FRAME_CLOCK                 (1 << 20)
+#define LCD_SYNC_CTRL                          BIT(25)
+#define LCD_SYNC_EDGE                          BIT(24)
+#define LCD_INVERT_PIXEL_CLOCK                 BIT(22)
+#define LCD_INVERT_LINE_CLOCK                  BIT(21)
+#define LCD_INVERT_FRAME_CLOCK                 BIT(20)
+
+/* Clock reset register */
+#define  LCD_CLK_MAIN_RESET                    BIT(3)
 
 /* Clock registers available only on Version 2 */
 
 /* Clock registers available only on Version 2 */
-#define  LCD_CLK_MAIN_RESET                    (1 << 3)
 /* LCD Block */
 struct da8xx_lcd_regs {
 /* LCD Block */
 struct da8xx_lcd_regs {
-       u32     revid;
-       u32     ctrl;
-       u32     stat;
-       u32     lidd_ctrl;
-       u32     lidd_cs0_conf;
-       u32     lidd_cs0_addr;
-       u32     lidd_cs0_data;
-       u32     lidd_cs1_conf;
-       u32     lidd_cs1_addr;
-       u32     lidd_cs1_data;
-       u32     raster_ctrl;
-       u32     raster_timing_0;
-       u32     raster_timing_1;
-       u32     raster_timing_2;
-       u32     raster_subpanel;
-       u32     reserved;
-       u32     dma_ctrl;
-       u32     dma_frm_buf_base_addr_0;
-       u32     dma_frm_buf_ceiling_addr_0;
-       u32     dma_frm_buf_base_addr_1;
-       u32     dma_frm_buf_ceiling_addr_1;
-       u32     resv1;
-       u32     raw_stat;
-       u32     masked_stat;
-       u32     int_ena_set;
-       u32     int_ena_clr;
-       u32     end_of_int_ind;
+       u32     revid;                          /* 0x00 */
+       u32     ctrl;                           /* 0x04 */
+       u32     stat;                           /* 0x08 */
+       u32     lidd_ctrl;                      /* 0x0c */
+       u32     lidd_cs0_conf;                  /* 0x10 */
+       u32     lidd_cs0_addr;                  /* 0x14 */
+       u32     lidd_cs0_data;                  /* 0x18 */
+       u32     lidd_cs1_conf;                  /* 0x1c */
+       u32     lidd_cs1_addr;                  /* 0x20 */
+       u32     lidd_cs1_data;                  /* 0x24 */
+       u32     raster_ctrl;                    /* 0x28 */
+       u32     raster_timing_0;                /* 0x2c */
+       u32     raster_timing_1;                /* 0x30 */
+       u32     raster_timing_2;                /* 0x34 */
+       u32     raster_subpanel;                /* 0x38 */
+       u32     reserved;                       /* 0x3c */
+       u32     dma_ctrl;                       /* 0x40 */
+       u32     dma_frm_buf_base_addr_0;        /* 0x44 */
+       u32     dma_frm_buf_ceiling_addr_0;     /* 0x48 */
+       u32     dma_frm_buf_base_addr_1;        /* 0x4c */
+       u32     dma_frm_buf_ceiling_addr_1;     /* 0x50 */
+       u32     rsrvd1;                         /* 0x54 */
+       u32     raw_stat;                       /* 0x58 */
+       u32     masked_stat;                    /* 0x5c */
+       u32     int_ena_set;                    /* 0x60 */
+       u32     int_ena_clr;                    /* 0x64 */
+       u32     end_of_int_ind;                 /* 0x68 */
+       u32     clk_ena;                        /* 0x6c */
+       u32     clk_reset;                      /* 0x70 */
        /* Clock registers available only on Version 2 */
        /* Clock registers available only on Version 2 */
-       u32     clk_ena;
-       u32     clk_reset;
 };
 
 #define LCD_NUM_BUFFERS        1
 };
 
 #define LCD_NUM_BUFFERS        1
@@ -141,7 +147,6 @@ struct da8xx_lcd_regs {
 #define WAIT_FOR_FRAME_DONE    true
 #define NO_WAIT_FOR_FRAME_DONE false
 
 #define WAIT_FOR_FRAME_DONE    true
 #define NO_WAIT_FOR_FRAME_DONE false
 
-#define calc_fbsize() (panel.plnSizeX * panel.plnSizeY * panel.gdfBytesPP)
 
 static struct da8xx_lcd_regs *da8xx_fb_reg_base;
 
 
 static struct da8xx_lcd_regs *da8xx_fb_reg_base;
 
@@ -153,11 +158,12 @@ static const struct da8xx_panel *lcd_panel;
 static struct fb_info *da8xx_fb_info;
 static int bits_x_pixel;
 static unsigned int lcd_revision;
 static struct fb_info *da8xx_fb_info;
 static int bits_x_pixel;
 static unsigned int lcd_revision;
+static u32 (*lcdc_irq_handler)(void);
 const struct lcd_ctrl_config *da8xx_lcd_cfg;
 
 static inline unsigned int lcdc_read(u32 *addr)
 {
 const struct lcd_ctrl_config *da8xx_lcd_cfg;
 
 static inline unsigned int lcdc_read(u32 *addr)
 {
-       return (unsigned int)readl(addr);
+       return readl(addr);
 }
 
 static inline void lcdc_write(unsigned int val, u32 *addr)
 }
 
 static inline void lcdc_write(unsigned int val, u32 *addr)
@@ -166,14 +172,14 @@ static inline void lcdc_write(unsigned int val, u32 *addr)
 }
 
 struct da8xx_fb_par {
 }
 
 struct da8xx_fb_par {
-       u32                      p_palette_base;
-       unsigned char *v_palette_base;
+       unsigned long           p_palette_base;
+       void                    *v_palette_base;
        dma_addr_t              vram_phys;
        unsigned long           vram_size;
        void                    *vram_virt;
        unsigned int            dma_start;
        unsigned int            dma_end;
        dma_addr_t              vram_phys;
        unsigned long           vram_size;
        void                    *vram_virt;
        unsigned int            dma_start;
        unsigned int            dma_end;
-       struct clk *lcdc_clk;
+       struct clk              *lcdc_clk;
        int irq;
        unsigned short pseudo_palette[16];
        unsigned int palette_sz;
        int irq;
        unsigned short pseudo_palette[16];
        unsigned int palette_sz;
@@ -183,7 +189,6 @@ struct da8xx_fb_par {
        int                     vsync_timeout;
 };
 
        int                     vsync_timeout;
 };
 
-
 /* Variable Screen Information */
 static struct fb_var_screeninfo da8xx_fb_var = {
        .xoffset = 0,
 /* Variable Screen Information */
 static struct fb_var_screeninfo da8xx_fb_var = {
        .xoffset = 0,
@@ -227,9 +232,7 @@ static inline void lcd_enable_raster(void)
        udelay(1000);
        /* Bring LCDC out of reset */
        if (lcd_revision == LCD_VERSION_2)
        udelay(1000);
        /* Bring LCDC out of reset */
        if (lcd_revision == LCD_VERSION_2)
-               lcdc_write(0,
-                          &da8xx_fb_reg_base->clk_reset);
-
+               lcdc_write(0, &da8xx_fb_reg_base->clk_reset);
        udelay(1000);
 
        reg = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
        udelay(1000);
 
        reg = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
@@ -281,7 +284,6 @@ static void lcd_blit(int load_mode, struct da8xx_fb_par *par)
        u32 end;
        u32 reg_ras;
        u32 reg_dma;
        u32 end;
        u32 reg_ras;
        u32 reg_dma;
-       u32 reg_int;
 
        /* init reg to clear PLM (loading mode) fields */
        reg_ras = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
 
        /* init reg to clear PLM (loading mode) fields */
        reg_ras = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
@@ -297,11 +299,10 @@ static void lcd_blit(int load_mode, struct da8xx_fb_par *par)
                if (lcd_revision == LCD_VERSION_1) {
                        reg_dma |= LCD_V1_END_OF_FRAME_INT_ENA;
                } else {
                if (lcd_revision == LCD_VERSION_1) {
                        reg_dma |= LCD_V1_END_OF_FRAME_INT_ENA;
                } else {
-                       reg_int = lcdc_read(&da8xx_fb_reg_base->int_ena_set) |
-                               LCD_V2_END_OF_FRAME0_INT_ENA |
+                       lcdc_write(LCD_V2_END_OF_FRAME0_INT_ENA |
                                LCD_V2_END_OF_FRAME1_INT_ENA |
                                LCD_V2_END_OF_FRAME1_INT_ENA |
-                               LCD_V2_UNDERFLOW_INT_ENA | LCD_SYNC_LOST;
-                       lcdc_write(reg_int, &da8xx_fb_reg_base->int_ena_set);
+                               LCD_V2_UNDERFLOW_INT_ENA | LCD_SYNC_LOST,
+                               &da8xx_fb_reg_base->int_ena_set);
                }
 
 #if (LCD_NUM_BUFFERS == 2)
                }
 
 #if (LCD_NUM_BUFFERS == 2)
@@ -317,18 +318,17 @@ static void lcd_blit(int load_mode, struct da8xx_fb_par *par)
                lcdc_write(0, &da8xx_fb_reg_base->dma_frm_buf_base_addr_1);
                lcdc_write(0, &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
 #endif
                lcdc_write(0, &da8xx_fb_reg_base->dma_frm_buf_base_addr_1);
                lcdc_write(0, &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
 #endif
-
        } else if (load_mode == LOAD_PALETTE) {
                start    = par->p_palette_base;
                end      = start + par->palette_sz - 1;
 
                reg_ras |= LCD_PALETTE_LOAD_MODE(PALETTE_ONLY);
        } else if (load_mode == LOAD_PALETTE) {
                start    = par->p_palette_base;
                end      = start + par->palette_sz - 1;
 
                reg_ras |= LCD_PALETTE_LOAD_MODE(PALETTE_ONLY);
+
                if (lcd_revision == LCD_VERSION_1) {
                        reg_ras |= LCD_V1_PL_INT_ENA;
                } else {
                if (lcd_revision == LCD_VERSION_1) {
                        reg_ras |= LCD_V1_PL_INT_ENA;
                } else {
-                       reg_int = lcdc_read(&da8xx_fb_reg_base->int_ena_set) |
-                               LCD_V2_PL_INT_ENA;
-                       lcdc_write(reg_int, &da8xx_fb_reg_base->int_ena_set);
+                       lcdc_write(LCD_V2_PL_INT_ENA,
+                               &da8xx_fb_reg_base->int_ena_set);
                }
 
                lcdc_write(start, &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
                }
 
                lcdc_write(start, &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
@@ -350,7 +350,8 @@ static int lcd_cfg_dma(int burst_size)
 {
        u32 reg;
 
 {
        u32 reg;
 
-       reg = lcdc_read(&da8xx_fb_reg_base->dma_ctrl) & 0x00000001;
+       reg = lcdc_read(&da8xx_fb_reg_base->dma_ctrl);
+       reg &= ~LCD_DMA_BURST_SIZE_MASK;
        switch (burst_size) {
        case 1:
                reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_1);
        switch (burst_size) {
        case 1:
                reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_1);
@@ -413,11 +414,12 @@ static void lcd_cfg_vertical_sync(int back_porch, int pulse_width,
 static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
 {
        u32 reg;
 static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
 {
        u32 reg;
-       u32 reg_int;
 
        reg = lcdc_read(&da8xx_fb_reg_base->raster_ctrl) & ~(LCD_TFT_MODE |
                                                LCD_MONO_8BIT_MODE |
 
        reg = lcdc_read(&da8xx_fb_reg_base->raster_ctrl) & ~(LCD_TFT_MODE |
                                                LCD_MONO_8BIT_MODE |
-                                               LCD_MONOCHROME_MODE);
+                                               LCD_MONOCHROME_MODE |
+                                               LCD_TFT24 |
+                                               LCD_TFT24_UNPACKED);
 
        switch (cfg->p_disp_panel->panel_shade) {
        case MONOCHROME:
 
        switch (cfg->p_disp_panel->panel_shade) {
        case MONOCHROME:
@@ -444,9 +446,13 @@ static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
        if (lcd_revision == LCD_VERSION_1) {
                reg |= LCD_V1_UNDERFLOW_INT_ENA;
        } else {
        if (lcd_revision == LCD_VERSION_1) {
                reg |= LCD_V1_UNDERFLOW_INT_ENA;
        } else {
-               reg_int = lcdc_read(&da8xx_fb_reg_base->int_ena_set) |
-                       LCD_V2_UNDERFLOW_INT_ENA;
-               lcdc_write(reg_int, &da8xx_fb_reg_base->int_ena_set);
+               if (bits_x_pixel >= 24)
+                       reg |= LCD_TFT24;
+               if (cfg->bpp == 32)
+                       reg |= LCD_TFT24_UNPACKED;
+
+               lcdc_write(LCD_V2_UNDERFLOW_INT_ENA,
+                       &da8xx_fb_reg_base->int_ena_set);
        }
 
        lcdc_write(reg, &da8xx_fb_reg_base->raster_ctrl);
        }
 
        lcdc_write(reg, &da8xx_fb_reg_base->raster_ctrl);
@@ -487,8 +493,8 @@ static int lcd_cfg_frame_buffer(struct da8xx_fb_par *par, u32 width, u32 height,
        /* Pixels per line = (PPL + 1)*16 */
        if (lcd_revision == LCD_VERSION_1) {
                /*
        /* Pixels per line = (PPL + 1)*16 */
        if (lcd_revision == LCD_VERSION_1) {
                /*
-                * 0x3F in bits 4..9 gives max horisontal resolution = 1024
-                * pixels
+                * 0x3F in bits 4..9 gives max horizontal resolution = 1024
+                * pixels.
                 */
                width &= 0x3f0;
        } else {
                 */
                width &= 0x3f0;
        } else {
@@ -498,6 +504,7 @@ static int lcd_cfg_frame_buffer(struct da8xx_fb_par *par, u32 width, u32 height,
                 */
                width &= 0x7f0;
        }
                 */
                width &= 0x7f0;
        }
+
        reg = lcdc_read(&da8xx_fb_reg_base->raster_timing_0);
        reg &= 0xfffffc00;
        if (lcd_revision == LCD_VERSION_1) {
        reg = lcdc_read(&da8xx_fb_reg_base->raster_timing_0);
        reg &= 0xfffffc00;
        if (lcd_revision == LCD_VERSION_1) {
@@ -560,7 +567,7 @@ static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
                              struct fb_info *info)
 {
        struct da8xx_fb_par *par = info->par;
                              struct fb_info *info)
 {
        struct da8xx_fb_par *par = info->par;
-       unsigned short *palette = (unsigned short *) par->v_palette_base;
+       unsigned short *palette = par->v_palette_base;
        u_short pal;
        int update_hw = 0;
 
        u_short pal;
        int update_hw = 0;
 
@@ -635,7 +642,6 @@ static void lcd_reset(struct da8xx_fb_par *par)
        lcdc_write(0, &da8xx_fb_reg_base->raster_ctrl);
 
        if (lcd_revision == LCD_VERSION_2) {
        lcdc_write(0, &da8xx_fb_reg_base->raster_ctrl);
 
        if (lcd_revision == LCD_VERSION_2) {
-               lcdc_write(0, &da8xx_fb_reg_base->int_ena_set);
                /* Write 1 to reset */
                lcdc_write(LCD_CLK_MAIN_RESET, &da8xx_fb_reg_base->clk_reset);
                lcdc_write(0, &da8xx_fb_reg_base->clk_reset);
                /* Write 1 to reset */
                lcdc_write(LCD_CLK_MAIN_RESET, &da8xx_fb_reg_base->clk_reset);
                lcdc_write(0, &da8xx_fb_reg_base->clk_reset);
@@ -646,16 +652,27 @@ static void lcd_calc_clk_divider(struct da8xx_fb_par *par)
 {
        unsigned int lcd_clk, div;
 
 {
        unsigned int lcd_clk, div;
 
+#ifndef CONFIG_AM33XX
        /* Get clock from sysclk2 */
        lcd_clk = clk_get(2);
        /* Get clock from sysclk2 */
        lcd_clk = clk_get(2);
-
-       div = lcd_clk / par->pxl_clk;
-       debug("LCD Clock: %d Divider: %d PixClk: %d\n",
-             lcd_clk, div, par->pxl_clk);
+#else
+       lcd_clk = lcdc_clk_rate();
+#endif
+       /* calculate divisor so that the resulting clock is rounded down */
+       div = (lcd_clk + par->pxl_clk - 1)/ par->pxl_clk;
+       if (div > 255)
+               div = 255;
+       if (div < 2)
+               div = 2;
+
+       debug("LCD Clock: %u.%03uMHz Divider: 0x%08x PixClk requested: %u.%03uMHz actual: %u.%03uMHz\n",
+               lcd_clk / 1000000, lcd_clk / 1000 % 1000, div,
+               par->pxl_clk / 1000000, par->pxl_clk / 1000 % 1000,
+               lcd_clk / div / 1000000, lcd_clk / div / 1000 % 1000);
 
        /* Configure the LCD clock divisor. */
 
        /* Configure the LCD clock divisor. */
-       lcdc_write(LCD_CLK_DIVISOR(div) |
-                       (LCD_RASTER_MODE & 0x1), &da8xx_fb_reg_base->ctrl);
+       lcdc_write(LCD_CLK_DIVISOR(div) | LCD_RASTER_MODE,
+               &da8xx_fb_reg_base->ctrl);
 
        if (lcd_revision == LCD_VERSION_2)
                lcdc_write(LCD_V2_DMA_CLK_EN | LCD_V2_LIDD_CLK_EN |
 
        if (lcd_revision == LCD_VERSION_2)
                lcdc_write(LCD_V2_DMA_CLK_EN | LCD_V2_LIDD_CLK_EN |
@@ -695,7 +712,7 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
        lcd_cfg_vertical_sync(panel->vbp, panel->vsw, panel->vfp);
        lcd_cfg_horizontal_sync(panel->hbp, panel->hsw, panel->hfp);
 
        lcd_cfg_vertical_sync(panel->vbp, panel->vsw, panel->vfp);
        lcd_cfg_horizontal_sync(panel->hbp, panel->hsw, panel->hfp);
 
-       /* Configure for disply */
+       /* Configure for display */
        ret = lcd_cfg_display(cfg);
        if (ret < 0)
                return ret;
        ret = lcd_cfg_display(cfg);
        if (ret < 0)
                return ret;
@@ -737,18 +754,21 @@ static void lcdc_dma_start(void)
                &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
 }
 
                &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
 }
 
-static u32 lcdc_irq_handler_rev01(void)
+/* IRQ handler for version 2 of LCDC */
+static u32 lcdc_irq_handler_rev02(void)
 {
 {
+       u32 ret = 0;
        struct da8xx_fb_par *par = da8xx_fb_info->par;
        struct da8xx_fb_par *par = da8xx_fb_info->par;
-       u32 stat = lcdc_read(&da8xx_fb_reg_base->stat);
-       u32 reg_ras;
+       u32 stat = lcdc_read(&da8xx_fb_reg_base->masked_stat);
+
+       debug("%s: stat=%08x\n", __func__, stat);
 
        if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
                debug("LCD_SYNC_LOST\n");
                lcd_disable_raster(NO_WAIT_FOR_FRAME_DONE);
                lcdc_write(stat, &da8xx_fb_reg_base->stat);
                lcd_enable_raster();
 
        if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
                debug("LCD_SYNC_LOST\n");
                lcd_disable_raster(NO_WAIT_FOR_FRAME_DONE);
                lcdc_write(stat, &da8xx_fb_reg_base->stat);
                lcd_enable_raster();
-               return LCD_SYNC_LOST;
+               ret = LCD_SYNC_LOST;
        } else if (stat & LCD_PL_LOAD_DONE) {
                debug("LCD_PL_LOAD_DONE\n");
                /*
        } else if (stat & LCD_PL_LOAD_DONE) {
                debug("LCD_PL_LOAD_DONE\n");
                /*
@@ -762,34 +782,44 @@ static u32 lcdc_irq_handler_rev01(void)
                lcdc_write(stat, &da8xx_fb_reg_base->stat);
 
                /* Disable PL completion inerrupt */
                lcdc_write(stat, &da8xx_fb_reg_base->stat);
 
                /* Disable PL completion inerrupt */
-               reg_ras  = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
-               reg_ras &= ~LCD_V1_PL_INT_ENA;
-               lcdc_write(reg_ras, &da8xx_fb_reg_base->raster_ctrl);
+               lcdc_write(LCD_V2_PL_INT_ENA,
+                       &da8xx_fb_reg_base->int_ena_clr);
 
                /* Setup and start data loading mode */
                lcd_blit(LOAD_DATA, par);
 
                /* Setup and start data loading mode */
                lcd_blit(LOAD_DATA, par);
-               return LCD_PL_LOAD_DONE;
-       } else {
-               lcdc_write(stat, &da8xx_fb_reg_base->stat);
+               ret = LCD_PL_LOAD_DONE;
+       } else if (stat & (LCD_END_OF_FRAME0 | LCD_END_OF_FRAME1)) {
+               par->vsync_flag = 1;
+               lcdc_write(stat, &da8xx_fb_reg_base->masked_stat);
 
 
-               if (stat & LCD_END_OF_FRAME0)
+               if (stat & LCD_END_OF_FRAME0) {
                        debug("LCD_END_OF_FRAME0\n");
 
                        debug("LCD_END_OF_FRAME0\n");
 
-               lcdc_write(par->dma_start,
-                       &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
-               lcdc_write(par->dma_end,
-                       &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_0);
-               par->vsync_flag = 1;
-               return LCD_END_OF_FRAME0;
+                       lcdc_write(par->dma_start,
+                               &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
+                       lcdc_write(par->dma_end,
+                               &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_0);
+               }
+               if (stat & LCD_END_OF_FRAME1) {
+                       debug("LCD_END_OF_FRAME1\n");
+                       lcdc_write(par->dma_start,
+                               &da8xx_fb_reg_base->dma_frm_buf_base_addr_1);
+                       lcdc_write(par->dma_end,
+                               &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
+                       par->vsync_flag = 1;
+               }
+               ret = (stat & LCD_END_OF_FRAME0) ?
+                       LCD_END_OF_FRAME0 : LCD_END_OF_FRAME1;
        }
        }
-       return stat;
+       lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
+       return ret;
 }
 
 }
 
-static u32 lcdc_irq_handler_rev02(void)
+static u32 lcdc_irq_handler_rev01(void)
 {
        struct da8xx_fb_par *par = da8xx_fb_info->par;
 {
        struct da8xx_fb_par *par = da8xx_fb_info->par;
-       u32 stat = lcdc_read(&da8xx_fb_reg_base->masked_stat);
-       u32 reg_int;
+       u32 stat = lcdc_read(&da8xx_fb_reg_base->stat);
+       u32 reg_ras;
 
        if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
                debug("LCD_SYNC_LOST\n");
 
        if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
                debug("LCD_SYNC_LOST\n");
@@ -811,49 +841,53 @@ static u32 lcdc_irq_handler_rev02(void)
                lcdc_write(stat, &da8xx_fb_reg_base->masked_stat);
 
                /* Disable PL completion inerrupt */
                lcdc_write(stat, &da8xx_fb_reg_base->masked_stat);
 
                /* Disable PL completion inerrupt */
-               reg_int  = lcdc_read(&da8xx_fb_reg_base->int_ena_clr) |
-                       (LCD_V2_PL_INT_ENA);
-               lcdc_write(reg_int, &da8xx_fb_reg_base->int_ena_clr);
+               reg_ras  = lcdc_read(&da8xx_fb_reg_base->raster_ctrl);
+               reg_ras &= ~LCD_V1_PL_INT_ENA;
+               lcdc_write(reg_ras, &da8xx_fb_reg_base->raster_ctrl);
 
                /* Setup and start data loading mode */
                lcd_blit(LOAD_DATA, par);
                lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
                return LCD_PL_LOAD_DONE;
 
                /* Setup and start data loading mode */
                lcd_blit(LOAD_DATA, par);
                lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
                return LCD_PL_LOAD_DONE;
-       } else {
-               lcdc_write(stat, &da8xx_fb_reg_base->masked_stat);
+       } else if (stat & (LCD_END_OF_FRAME0 | LCD_END_OF_FRAME1)) {
+               par->vsync_flag = 1;
+               lcdc_write(stat, &da8xx_fb_reg_base->stat);
 
 
-               if (stat & LCD_END_OF_FRAME0)
+               if (stat & LCD_END_OF_FRAME0) {
                        debug("LCD_END_OF_FRAME0\n");
 
                        debug("LCD_END_OF_FRAME0\n");
 
-               lcdc_write(par->dma_start,
-                          &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
-               lcdc_write(par->dma_end,
-                          &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_0);
-               par->vsync_flag = 1;
-               lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
-               return LCD_END_OF_FRAME0;
+                       lcdc_write(par->dma_start,
+                               &da8xx_fb_reg_base->dma_frm_buf_base_addr_0);
+                       lcdc_write(par->dma_end,
+                               &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_0);
+               }
+
+               if (stat & LCD_END_OF_FRAME1) {
+                       debug("LCD_END_OF_FRAME1\n");
+                       lcdc_write(par->dma_start,
+                               &da8xx_fb_reg_base->dma_frm_buf_base_addr_1);
+                       lcdc_write(par->dma_end,
+                               &da8xx_fb_reg_base->dma_frm_buf_ceiling_addr_1);
+               }
+
+               return (stat & LCD_END_OF_FRAME0) ?
+                       LCD_END_OF_FRAME0 : LCD_END_OF_FRAME1;
        }
        lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
        return stat;
 }
 
        }
        lcdc_write(0, &da8xx_fb_reg_base->end_of_int_ind);
        return stat;
 }
 
-static u32 lcdc_irq_handler(void)
-{
-       if (lcd_revision == LCD_VERSION_1)
-               return lcdc_irq_handler_rev01();
-       else
-               return lcdc_irq_handler_rev02();
-}
-
 static u32 wait_for_event(u32 event)
 {
 static u32 wait_for_event(u32 event)
 {
-       u32 timeout = 50000;
+       int timeout = 100;
        u32 ret;
 
        do {
                ret = lcdc_irq_handler();
        u32 ret;
 
        do {
                ret = lcdc_irq_handler();
+               if (ret & event)
+                       break;
                udelay(1000);
                udelay(1000);
-       } while (!(ret & event));
+       } while (--timeout > 0);
 
        if (timeout <= 0) {
                printf("%s: event %d not hit\n", __func__, event);
 
        if (timeout <= 0) {
                printf("%s: event %d not hit\n", __func__, event);
@@ -868,13 +902,13 @@ void *video_hw_init(void)
 {
        struct da8xx_fb_par *par;
        u32 size;
 {
        struct da8xx_fb_par *par;
        u32 size;
-       u32 rev;
        char *p;
 
        if (!lcd_panel) {
                printf("Display not initialized\n");
                return NULL;
        }
        char *p;
 
        if (!lcd_panel) {
                printf("Display not initialized\n");
                return NULL;
        }
+
        gpanel.winSizeX = lcd_panel->width;
        gpanel.winSizeY = lcd_panel->height;
        gpanel.plnSizeX = lcd_panel->width;
        gpanel.winSizeX = lcd_panel->width;
        gpanel.winSizeY = lcd_panel->height;
        gpanel.plnSizeX = lcd_panel->width;
@@ -896,36 +930,36 @@ void *video_hw_init(void)
        default:
                gpanel.gdfBytesPP = 1;
                gpanel.gdfIndex = GDF__8BIT_INDEX;
        default:
                gpanel.gdfBytesPP = 1;
                gpanel.gdfIndex = GDF__8BIT_INDEX;
-               break;
        }
 
        da8xx_fb_reg_base = (struct da8xx_lcd_regs *)DA8XX_LCD_CNTL_BASE;
 
        /* Determine LCD IP Version */
        }
 
        da8xx_fb_reg_base = (struct da8xx_lcd_regs *)DA8XX_LCD_CNTL_BASE;
 
        /* Determine LCD IP Version */
-       rev = lcdc_read(&da8xx_fb_reg_base->revid);
-       switch (rev) {
-       case 0x4C100102:
+
+       lcd_revision = lcdc_read(&da8xx_fb_reg_base->revid);
+       switch (lcd_revision & 0xfff00000) {
+       case 0x4C100000:
                lcd_revision = LCD_VERSION_1;
                break;
                lcd_revision = LCD_VERSION_1;
                break;
-       case 0x4F200800:
-       case 0x4F201000:
+
+       case 0x4F200000:
                lcd_revision = LCD_VERSION_2;
                break;
                lcd_revision = LCD_VERSION_2;
                break;
+
        default:
        default:
-               printf("Unknown PID Reg value 0x%x, defaulting to LCD revision 1\n",
-                      rev);
+               printf("Unknown PID Reg value 0x%08x, defaulting to LCD revision 1\n",
+                               lcd_revision);
                lcd_revision = LCD_VERSION_1;
                lcd_revision = LCD_VERSION_1;
-               break;
        }
 
        }
 
-       debug("rev: 0x%x Resolution: %dx%d %d\n", rev,
-             gpanel.winSizeX,
-             gpanel.winSizeY,
+       debug("Resolution: %dx%d %d\n",
+               gpanel.winSizeX,
+               gpanel.winSizeY,
              da8xx_lcd_cfg->bpp);
 
        size = sizeof(struct fb_info) + sizeof(struct da8xx_fb_par);
        da8xx_fb_info = malloc(size);
              da8xx_lcd_cfg->bpp);
 
        size = sizeof(struct fb_info) + sizeof(struct da8xx_fb_par);
        da8xx_fb_info = malloc(size);
-       debug("da8xx_fb_info at %x\n", (unsigned int)da8xx_fb_info);
+       debug("da8xx_fb_info at %p\n", da8xx_fb_info);
 
        if (!da8xx_fb_info) {
                printf("Memory allocation failed for fb_info\n");
 
        if (!da8xx_fb_info) {
                printf("Memory allocation failed for fb_info\n");
@@ -934,7 +968,7 @@ void *video_hw_init(void)
        memset(da8xx_fb_info, 0, size);
        p = (char *)da8xx_fb_info;
        da8xx_fb_info->par = p +  sizeof(struct fb_info);
        memset(da8xx_fb_info, 0, size);
        p = (char *)da8xx_fb_info;
        da8xx_fb_info->par = p +  sizeof(struct fb_info);
-       debug("da8xx_par at %x\n", (unsigned int)da8xx_fb_info->par);
+       debug("da8xx_par at %p\n", da8xx_fb_info->par);
 
        par = da8xx_fb_info->par;
        par->pxl_clk = lcd_panel->pxl_clk;
 
        par = da8xx_fb_info->par;
        par->pxl_clk = lcd_panel->pxl_clk;
@@ -949,24 +983,27 @@ void *video_hw_init(void)
                        da8xx_lcd_cfg->bpp;
        par->vram_size = par->vram_size * LCD_NUM_BUFFERS / 8;
 
                        da8xx_lcd_cfg->bpp;
        par->vram_size = par->vram_size * LCD_NUM_BUFFERS / 8;
 
+#ifdef CONFIG_LCD
+       par->vram_virt = (void *)gd->fb_base;
+#else
        par->vram_virt = malloc(par->vram_size);
        par->vram_virt = malloc(par->vram_size);
-
+#endif
        par->vram_phys = (dma_addr_t) par->vram_virt;
        par->vram_phys = (dma_addr_t) par->vram_virt;
-       debug("Requesting 0x%x bytes for framebuffer at 0x%x\n",
-               (unsigned int)par->vram_size,
-               (unsigned int)par->vram_virt);
+       debug("Requesting 0x%lx bytes for framebuffer at 0x%p\n",
+               par->vram_size, par->vram_virt);
        if (!par->vram_virt) {
                printf("GLCD: malloc for frame buffer failed\n");
                goto err_release_fb;
        }
        if (!par->vram_virt) {
                printf("GLCD: malloc for frame buffer failed\n");
                goto err_release_fb;
        }
-       gd->fb_base = (int)par->vram_virt;
 
        gpanel.frameAdrs = (unsigned int)par->vram_virt;
 
        gpanel.frameAdrs = (unsigned int)par->vram_virt;
-       da8xx_fb_info->screen_base = (char *) par->vram_virt;
+       da8xx_fb_info->screen_base = par->vram_virt;
        da8xx_fb_fix.smem_start = gpanel.frameAdrs;
        da8xx_fb_fix.smem_len = par->vram_size;
        da8xx_fb_fix.line_length = (lcd_panel->width * da8xx_lcd_cfg->bpp) / 8;
        da8xx_fb_fix.smem_start = gpanel.frameAdrs;
        da8xx_fb_fix.smem_len = par->vram_size;
        da8xx_fb_fix.line_length = (lcd_panel->width * da8xx_lcd_cfg->bpp) / 8;
-
+       debug("%s: vram_virt: %p size %ux%u=%lu bpp %u\n", __func__,
+               par->vram_virt, lcd_panel->width, lcd_panel->height,
+               par->vram_size, da8xx_lcd_cfg->bpp);
        par->dma_start = par->vram_phys;
        par->dma_end   = par->dma_start + lcd_panel->height *
                da8xx_fb_fix.line_length - 1;
        par->dma_start = par->vram_phys;
        par->dma_end   = par->dma_start + lcd_panel->height *
                da8xx_fb_fix.line_length - 1;
@@ -978,11 +1015,11 @@ void *video_hw_init(void)
                goto err_release_fb_mem;
        }
        memset(par->v_palette_base, 0, PALETTE_SIZE);
                goto err_release_fb_mem;
        }
        memset(par->v_palette_base, 0, PALETTE_SIZE);
-       par->p_palette_base = (unsigned int)par->v_palette_base;
-
+       par->p_palette_base = (unsigned long)par->v_palette_base;
        /* Initialize par */
        da8xx_fb_info->var.bits_per_pixel = da8xx_lcd_cfg->bpp;
 
        /* Initialize par */
        da8xx_fb_info->var.bits_per_pixel = da8xx_lcd_cfg->bpp;
 
+       /* Initialize var */
        da8xx_fb_var.xres = lcd_panel->width;
        da8xx_fb_var.xres_virtual = lcd_panel->width;
 
        da8xx_fb_var.xres = lcd_panel->width;
        da8xx_fb_var.xres_virtual = lcd_panel->width;
 
@@ -1005,13 +1042,18 @@ void *video_hw_init(void)
                                FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
 
        /* Clear interrupt */
                                FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
 
        /* Clear interrupt */
-       memset((void *)par->vram_virt, 0, par->vram_size);
+       memset(par->vram_virt, 0, par->vram_size);
        lcd_disable_raster(NO_WAIT_FOR_FRAME_DONE);
        if (lcd_revision == LCD_VERSION_1)
        lcd_disable_raster(NO_WAIT_FOR_FRAME_DONE);
        if (lcd_revision == LCD_VERSION_1)
-               lcdc_write(0xFFFF, &da8xx_fb_reg_base->stat);
+               lcdc_irq_handler = lcdc_irq_handler_rev01;
        else
        else
-               lcdc_write(0xFFFF, &da8xx_fb_reg_base->masked_stat);
-       debug("Palette at 0x%x size %d\n", par->p_palette_base,
+               lcdc_irq_handler = lcdc_irq_handler_rev02;
+
+       /* Clear interrupt */
+       memset(par->vram_virt, 0, par->vram_size);
+       lcd_disable_raster(NO_WAIT_FOR_FRAME_DONE);
+       lcdc_write(0xFFFF, &da8xx_fb_reg_base->stat);
+       debug("Palette at 0x%08lx size %u\n", par->p_palette_base,
                par->palette_sz);
        lcdc_dma_start();
 
                par->palette_sz);
        lcdc_dma_start();
 
@@ -1024,10 +1066,12 @@ void *video_hw_init(void)
        /* Wait until DMA is working */
        wait_for_event(LCD_END_OF_FRAME0);
 
        /* Wait until DMA is working */
        wait_for_event(LCD_END_OF_FRAME0);
 
-       return (void *)&gpanel;
+       return &gpanel;
 
 err_release_fb_mem:
 
 err_release_fb_mem:
+#ifndef CONFIG_LCD
        free(par->vram_virt);
        free(par->vram_virt);
+#endif
 
 err_release_fb:
        free(da8xx_fb_info);
 
 err_release_fb:
        free(da8xx_fb_info);
@@ -1035,6 +1079,19 @@ err_release_fb:
        return NULL;
 }
 
        return NULL;
 }
 
+void da8xx_fb_disable(void)
+{
+       lcd_reset(da8xx_fb_info->par);
+}
+
+void video_set_lut(unsigned int index, /* color number */
+                   unsigned char r,    /* red */
+                   unsigned char g,    /* green */
+                   unsigned char b     /* blue */
+                   )
+{
+}
+
 void da8xx_video_init(const struct da8xx_panel *panel,
                      const struct lcd_ctrl_config *lcd_cfg, int bits_pixel)
 {
 void da8xx_video_init(const struct da8xx_panel *panel,
                      const struct lcd_ctrl_config *lcd_cfg, int bits_pixel)
 {
diff --git a/drivers/video/da8xx-fb.h b/drivers/video/da8xx-fb.h
deleted file mode 100644 (file)
index 6447a40..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Porting to u-boot:
- *
- * (C) Copyright 2011
- * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
- *
- * Copyright (C) 2008-2009 MontaVista Software Inc.
- * Copyright (C) 2008-2009 Texas Instruments Inc
- *
- * Based on the LCD driver for TI Avalanche processors written by
- * Ajay Singh and Shalom Hai.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef DA8XX_FB_H
-#define DA8XX_FB_H
-
-enum panel_type {
-       QVGA = 0,
-       WVGA
-};
-
-enum panel_shade {
-       MONOCHROME = 0,
-       COLOR_ACTIVE,
-       COLOR_PASSIVE,
-};
-
-enum raster_load_mode {
-       LOAD_DATA = 1,
-       LOAD_PALETTE,
-};
-
-struct display_panel {
-       enum panel_type panel_type; /* QVGA */
-       int max_bpp;
-       int min_bpp;
-       enum panel_shade panel_shade;
-};
-
-struct da8xx_panel {
-       const char      name[25];       /* Full name <vendor>_<model> */
-       unsigned short  width;
-       unsigned short  height;
-       int             hfp;            /* Horizontal front porch */
-       int             hbp;            /* Horizontal back porch */
-       int             hsw;            /* Horizontal Sync Pulse Width */
-       int             vfp;            /* Vertical front porch */
-       int             vbp;            /* Vertical back porch */
-       int             vsw;            /* Vertical Sync Pulse Width */
-       unsigned int    pxl_clk;        /* Pixel clock */
-       unsigned char   invert_pxl_clk; /* Invert Pixel clock */
-};
-
-struct da8xx_lcdc_platform_data {
-       const char manu_name[10];
-       void *controller_data;
-       const char type[25];
-       void (*panel_power_ctrl)(int);
-};
-
-struct lcd_ctrl_config {
-       const struct display_panel *p_disp_panel;
-
-       /* AC Bias Pin Frequency */
-       int ac_bias;
-
-       /* AC Bias Pin Transitions per Interrupt */
-       int ac_bias_intrpt;
-
-       /* DMA burst size */
-       int dma_burst_sz;
-
-       /* Bits per pixel */
-       int bpp;
-
-       /* FIFO DMA Request Delay */
-       int fdd;
-
-       /* TFT Alternative Signal Mapping (Only for active) */
-       unsigned char tft_alt_mode;
-
-       /* 12 Bit Per Pixel (5-6-5) Mode (Only for passive) */
-       unsigned char stn_565_mode;
-
-       /* Mono 8-bit Mode: 1=D0-D7 or 0=D0-D3 */
-       unsigned char mono_8bit_mode;
-
-       /* Invert line clock */
-       unsigned char invert_line_clock;
-
-       /* Invert frame clock  */
-       unsigned char invert_frm_clock;
-
-       /* Horizontal and Vertical Sync Edge: 0=rising 1=falling */
-       unsigned char sync_edge;
-
-       /* Horizontal and Vertical Sync: Control: 0=ignore */
-       unsigned char sync_ctrl;
-
-       /* Raster Data Order Select: 1=Most-to-least 0=Least-to-most */
-       unsigned char raster_order;
-};
-
-struct lcd_sync_arg {
-       int back_porch;
-       int front_porch;
-       int pulse_width;
-};
-
-void da8xx_video_init(const struct da8xx_panel *panel,
-                     const struct lcd_ctrl_config *lcd_cfg,
-                     int bits_pixel);
-
-#endif  /* ifndef DA8XX_FB_H */
index 6993128b1b4c37df8d6c544cb2e06e0f220269c0..782e8862e772d17a77c0d33ccb964fd1db144c58 100644 (file)
@@ -33,7 +33,7 @@ typedef struct vidinfo {
        u_long vl_upper_margin; /* Time from sync to picture */
        u_long vl_lower_margin; /* Time from picture to sync */
 
        u_long vl_upper_margin; /* Time from sync to picture */
        u_long vl_lower_margin; /* Time from picture to sync */
 
-       u_long  mmio;           /* Memory mapped registers */
+       void __iomem *mmio;     /* Memory mapped registers */
 } vidinfo_t;
 
 #endif
 } vidinfo_t;
 
 #endif
index 4e3bab2a5852401f9e3ddb931a70ceda8210ef9f..bbab8b2f48171252dbcb1c566e94ff3c07c1ddfb 100644 (file)
@@ -12,9 +12,6 @@
 #define CONFIG_AMCORE
 #define CONFIG_HOSTNAME                        AMCORE
 
 #define CONFIG_AMCORE
 #define CONFIG_HOSTNAME                        AMCORE
 
-#define CONFIG_MCF530x
-#define CONFIG_M5307
-
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
index 2de5aeb4602a5e473227d2266963027140873b35..c8b15fb534217c7261f8d4a6cd45bafa99565671 100644 (file)
@@ -24,6 +24,8 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_CALIMAIN
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_CALIMAIN
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA850               /* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          calimain_get_osc_freq()
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          calimain_get_osc_freq()
index 2df598716c0082c2053d244455b0a5b725ffe336..7ac3224e6e9f2df2959759ddb0fc45f54fa00894 100644 (file)
@@ -21,6 +21,8 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA830_EVM
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA830_EVM
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA830               /* TI DA830 SoC */
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
index 4a5b33ae421cbb244b2b9c4d42317f8660b8c582..1cd11c0ded246fba84bcb0b41220b77426f281e3 100644 (file)
@@ -25,6 +25,8 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA850               /* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
index 0ac66fcb6ed2ebc0d5c94d89b2d7c2cda878eb45..72296a03ddb601c4220f952d202473fa7a5f12cb 100644 (file)
@@ -17,6 +17,7 @@
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
+#define CONFIG_SOC_DM355
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
index 952d2c35347a82fe8c6358e50f3fcc838073ce1c..e3ff9431dc9e10f5d40ca7ce9f84a6e62ffacaae 100644 (file)
@@ -16,6 +16,7 @@
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
+#define CONFIG_SOC_DM355                               /* DM355 based board */
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
index 4e17b47e3d7096f3b7e440a4d75a014ecc4c4bb8..bbc801b4db93ba9d64ff2ac2614dbe25f0c18f3c 100644 (file)
@@ -17,6 +17,7 @@
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
+#define CONFIG_SOC_DM365
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
 
 /* Memory Info */
 #define CONFIG_NR_DRAM_BANKS           1
index 194c722e9a3de4fda153bc977b3d2d31ec7b484c..6346422b498c87055b2ea39552ba0d467d99adb0 100644 (file)
@@ -26,6 +26,7 @@ extern unsigned int davinci_arm_clk_get(void);
 /* Timer Input clock freq */
 #define CONFIG_SYS_HZ_CLOCK            (CONFIG_SYS_CLK_FREQ/2)
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 /* Timer Input clock freq */
 #define CONFIG_SYS_HZ_CLOCK            (CONFIG_SYS_CLK_FREQ/2)
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
+#define CONFIG_SOC_DM646X
 
 /* EEPROM definitions for EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         2
 
 /* EEPROM definitions for EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         2
index 542b11c7aa24d64b4be8cbc9afcb1c80c86c7969..15d815084b4a4e3195390a44f581b1016ab82d85 100644 (file)
@@ -43,6 +43,7 @@
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
+#define CONFIG_SOC_DM644X
 /*====================================================*/
 /* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
 /* on Sonata/DV_EVM board. No EEPROM on schmoogie.    */
 /*====================================================*/
 /* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
 /* on Sonata/DV_EVM board. No EEPROM on schmoogie.    */
index 9f0663ce9d777e7796c10e7b229e68dc89e089a5..bc5e1ca69729d4a3155af85553d7aa38f0f46cb0 100644 (file)
@@ -21,6 +21,7 @@
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
+#define CONFIG_SOC_DM644X
 /*=============*/
 /* Memory Info */
 /*=============*/
 /*=============*/
 /* Memory Info */
 /*=============*/
index 622fdeb0bf7b9ad237b3476637d5813803b6df75..e719388722523018052d3fc6aed6775cfd27b16b 100644 (file)
@@ -18,6 +18,7 @@
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
 /* SoC Configuration */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
+#define CONFIG_SOC_DM644X
 /* EEPROM definitions for Atmel 24LC64 EEPROM chip */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         2
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50
 /* EEPROM definitions for Atmel 24LC64 EEPROM chip */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         2
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50
index 0ddc96cefc5e0c99d4baac26fe0d9003c7749fca..b85c988b5d84f3744808cca16aa193c1c5029761 100644 (file)
@@ -45,6 +45,7 @@
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
 /*===================*/
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            27000000        /* Timer Input clock freq */
+#define CONFIG_SOC_DM644X
 /*====================================================*/
 /* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
 /* on Sonata/DV_EVM board. No EEPROM on schmoogie.    */
 /*====================================================*/
 /* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
 /* on Sonata/DV_EVM board. No EEPROM on schmoogie.    */
index 34030e3add422b1b208899789dda0e338aca29a7..46e3a6ce38c483056cfb7710fdfbd25050bf4c24 100644 (file)
 #define __CONFIG_H
 
 #define CONFIG_DBAU1X00                1
 #define __CONFIG_H
 
 #define CONFIG_DBAU1X00                1
+#define CONFIG_SOC_AU1X00      1  /* alchemy series cpu */
 
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_DBAU1000
 /* Also known as Merlot */
 
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_DBAU1000
 /* Also known as Merlot */
+#define CONFIG_SOC_AU1000      1
 #else
 #ifdef CONFIG_DBAU1100
 #else
 #ifdef CONFIG_DBAU1100
+#define CONFIG_SOC_AU1100      1
 #else
 #ifdef CONFIG_DBAU1500
 #else
 #ifdef CONFIG_DBAU1500
+#define CONFIG_SOC_AU1500      1
 #else
 #ifdef CONFIG_DBAU1550
 /* Cabernet */
 #else
 #ifdef CONFIG_DBAU1550
 /* Cabernet */
+#define CONFIG_SOC_AU1550      1
 #else
 #error "No valid board set"
 #endif
 #else
 #error "No valid board set"
 #endif
index 7d79edbcded8f4bd6bc9d8d34869b3dd98a07713..9a70aaecbf47589a5584c7313c5b16b49723375f 100644 (file)
@@ -28,6 +28,8 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA850               /* TI DA850 SoC */
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
index 7162e9e09426d3e13553644279966f5437b29a20..12744a61432dc89ac8b3506f57fac6d6e6d34a66 100644 (file)
@@ -15,7 +15,7 @@
 
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc1"
 
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc1"
-#define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
+#define CONFIG_MMCROOT                 "/dev/mmcblk1p2"
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* RiOTboard */
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* RiOTboard */
-#define CONFIG_DEFAULT_FDT_FILE        "imx6dl-riotboard.dtb"
+#define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* SDHC2 */
+#define CONFIG_SYS_MMC_ENV_DEV         2       /* SDHC4 */
 #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
-#define CONFIG_DEFAULT_FDT_FILE        "imx6q-marsboard.dtb"
+#define CONFIG_FDTFILE "imx6q-marsboard.dtb"
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (8 * 1024)
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (8 * 1024)
 #include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include <config_distro_defaults.h>
 #include "mx6_common.h"
 
+/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
+ * 1M script, 1M pxe and the ramdisk at the end */
+#define MEM_LAYOUT_ENV_SETTINGS \
+       "bootm_size=0x10000000\0" \
+       "kernel_addr_r=0x12000000\0" \
+       "fdt_addr_r=0x13000000\0" \
+       "scriptaddr=0x13100000\0" \
+       "pxefile_addr_r=0x13200000\0" \
+       "ramdisk_addr_r=0x13300000\0"
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(USB, usb, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#define CONSOLE_STDIN_SETTINGS \
+       "stdin=serial\0"
+
+#define CONSOLE_STDOUT_SETTINGS \
+       "stdout=serial\0" \
+       "stderr=serial\0"
+
+#define CONSOLE_ENV_SETTINGS \
+       CONSOLE_STDIN_SETTINGS \
+       CONSOLE_STDOUT_SETTINGS
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       CONSOLE_ENV_SETTINGS \
+       MEM_LAYOUT_ENV_SETTINGS \
+       "fdtfile=" CONFIG_FDTFILE "\0" \
+       BOOTENV
+
 #endif                         /* __RIOTBOARD_CONFIG_H */
 #endif                         /* __RIOTBOARD_CONFIG_H */
index fea7aefb4a1b365ce9489a465682b1a7b9de803c..141489d179d964740ebf0e02b172ae52f530c9b2 100644 (file)
@@ -25,6 +25,8 @@
 /*
  * SoC Configuration
  */
 /*
  * SoC Configuration
  */
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA850               /* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
index b907a9821b38be5ab63c5b9e6bc51c654fe13850..5b4b0119573f3b80a767ab554242bc388aba612b 100644 (file)
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
 #include <asm/arch/imx-regs.h>
 
  /* High Level Configuration Options */
+#define CONFIG_MX35
 
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_CACHELINE_SIZE      32
index 9bb87a797f054261458ad120aed0def93ecb316f..b1cd7dfdc28fb4d4feb1ba882ae87f19fc961a7a 100644 (file)
@@ -26,6 +26,8 @@
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
  * SoC Configuration
  */
 #define CONFIG_MACH_DAVINCI_DA850_EVM
+#define CONFIG_SOC_DA8XX               /* TI DA8xx SoC */
+#define CONFIG_SOC_DA850               /* TI DA850 SoC */
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 #define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ          24000000
index 78b42a0d8dc0f112081a34ebc6b079defab77603..4f4ebf53ec5932f424a5947b277ae661a2ec6707 100644 (file)
@@ -11,6 +11,7 @@
 #define __CONFIG_K2E_EVM_H
 
 /* Platform type */
 #define __CONFIG_K2E_EVM_H
 
 /* Platform type */
+#define CONFIG_SOC_K2E
 #define CONFIG_K2E_EVM
 
 /* U-Boot general configuration */
 #define CONFIG_K2E_EVM
 
 /* U-Boot general configuration */
index 562e721b17c081a52fd86521feb8d6129b522862..6c6dcb1e5ed3165200681bb1f775ee0b3d5ef407 100644 (file)
@@ -11,6 +11,7 @@
 #define __CONFIG_K2HK_EVM_H
 
 /* Platform type */
 #define __CONFIG_K2HK_EVM_H
 
 /* Platform type */
+#define CONFIG_SOC_K2HK
 #define CONFIG_K2HK_EVM
 
 /* U-Boot general configuration */
 #define CONFIG_K2HK_EVM
 
 /* U-Boot general configuration */
index 97f71b3ba29f5a76b28dd102730eeb0addc3daf0..9bacfa49c430b3f3550e4a27f33770a19b005add 100644 (file)
@@ -11,6 +11,7 @@
 #define __CONFIG_K2L_EVM_H
 
 /* Platform type */
 #define __CONFIG_K2L_EVM_H
 
 /* Platform type */
+#define CONFIG_SOC_K2L
 #define CONFIG_K2L_EVM
 
 /* U-Boot general configuration */
 #define CONFIG_K2L_EVM
 
 /* U-Boot general configuration */
index dce172fd9edc3341bf0b0ad2411ecc9cd4625b4b..516d38144a07dd6d3aa9cccfa40375e78f9f6e12 100644 (file)
 #define __CONFIG_H
 
 #define CONFIG_PB1X00          1
 #define __CONFIG_H
 
 #define CONFIG_PB1X00          1
+#define CONFIG_SOC_AU1X00      1  /* alchemy series cpu */
 
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_PB1000
 
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_PB1000
+#define CONFIG_SOC_AU1000      1
 #else
 #ifdef CONFIG_PB1100
 #else
 #ifdef CONFIG_PB1100
+#define CONFIG_SOC_AU1100      1
 #else
 #ifdef CONFIG_PB1500
 #else
 #ifdef CONFIG_PB1500
+#define CONFIG_SOC_AU1500      1
 #else
 #error "No valid board set"
 #endif
 #else
 #error "No valid board set"
 #endif
index db38de7fe2931a39d795b47507a5a5161a6f462e..9e733e5c48750f6befbc79eca85abbf9f7e54809 100644 (file)
@@ -3,6 +3,8 @@
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
+#ifndef __CONFIG_SOCFPGA_CYCLONE5_H__
+#define __CONFIG_SOCFPGA_CYCLONE5_H__
 
 #include <asm/arch/socfpga_base_addrs.h>
 
 
 #include <asm/arch/socfpga_base_addrs.h>
 
@@ -36,6 +38,7 @@
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTFILE                "zImage"
 #define CONFIG_BOOTARGS                "console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTFILE                "zImage"
 #define CONFIG_BOOTARGS                "console=ttyS0," __stringify(CONFIG_BAUDRATE)
+#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
 #define CONFIG_BOOTCOMMAND     "run ramboot"
 #else
 #define CONFIG_BOOTCOMMAND     "run mmcload; run mmcboot"
 #define CONFIG_BOOTCOMMAND     "run ramboot"
 #else
 #define CONFIG_BOOTCOMMAND     "run mmcload; run mmcboot"
@@ -91,3 +94,4 @@
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
+#endif /* __CONFIG_SOCFPGA_CYCLONE5_H__ */
index d8163b6b32c5cc53109763dd21a571fe6b1f654a..58c98ce660c04ba15d3a9da76f0de99cb57220e2 100644 (file)
@@ -10,6 +10,7 @@
 #ifndef __CONFIG_KS2_EVM_H
 #define __CONFIG_KS2_EVM_H
 
 #ifndef __CONFIG_KS2_EVM_H
 #define __CONFIG_KS2_EVM_H
 
+#define CONFIG_SOC_KEYSTONE
 
 /* U-Boot Build Configuration */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage loader */
 
 /* U-Boot Build Configuration */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage loader */
index 2098071f0ffaa2f5962828df0023103c64ed3994..6828b704c3eace3f424487504647d77073ca3508 100644 (file)
@@ -24,7 +24,7 @@
 /* #endif */
 
 /* place code in last 4 MiB of RAM */
 /* #endif */
 
 /* place code in last 4 MiB of RAM */
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+#if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
 #define CONFIG_SYS_TEXT_BASE           0x2fc00000
 #elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
 #define CONFIG_SYS_TEXT_BASE           0x4fc00000
 #define CONFIG_SYS_TEXT_BASE           0x2fc00000
 #elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
 #define CONFIG_SYS_TEXT_BASE           0x4fc00000
@@ -32,7 +32,9 @@
 
 #include "mx6_common.h"
 
 
 #include "mx6_common.h"
 
+#if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
 #define PHYS_SDRAM_SIZE                        (512u * SZ_1M)
 #define PHYS_SDRAM_SIZE                        (512u * SZ_1M)
+#elif defined(CONFIG_SOC_MX6Q) || defined(CONFIG_SOC_MX6D)
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
index 565f7610c3beb8f0808469c3efd1ad1cca948c9e..cdbdb3ae16d5303397edbec4ecf2a03a8b65c9c4 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/arch/regs-base.h>
 
 #include <linux/sizes.h>
 #include <asm/arch/regs-base.h>
 
@@ -62,7 +63,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "TX28 U-Boot > "
 #define CONFIG_SYS_CBSIZE              2048            /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_CBSIZE              2048            /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 /*
  * Extra Environment Settings
  */
 /*
  * Extra Environment Settings
  */
-#ifdef CONFIG_ENV_IS_NOWHERE
+#ifdef CONFIG_TX28_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "autoload=no\0"                                                 \
        "bootdelay=-1\0"                                                \
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "autoload=no\0"                                                 \
        "bootdelay=-1\0"                                                \
+       "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/mmcblk0p3 rootwait\0"                               \
        " root=/dev/mmcblk0p3 rootwait\0"                               \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"\
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs"           \
+       ";nboot linux\0"                                                \
+       "bootcmd_net=setenv autoload y;setenv autostart n"              \
+       ";run bootargs_nfs"                                             \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
 #define CONFIG_FEC_XCV_TYPE            RMII
 #endif
 
 #define CONFIG_FEC_XCV_TYPE            RMII
 #endif
 
-#ifndef CONFIG_ENV_IS_NOWHERE
-/* define one of the following options:
-*/
-#endif
-#define CONFIG_ENV_OVERWRITE
-
 /*
  * NAND flash driver
  */
 /*
  * NAND flash driver
  */
 #define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_BASE           0x00000000
 #define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_BASE           0x00000000
-#else
-#undef CONFIG_ENV_IS_IN_NAND
 #endif /* CONFIG_CMD_NAND */
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 #endif /* CONFIG_CMD_NAND */
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * MMC Driver
  */
 /*
  * MMC Driver
  */
+#ifdef CONFIG_MXS_MMC
 #ifdef CONFIG_CMD_MMC
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
+#endif
 
 /*
  * Environments on MMC
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
 
 /*
  * Environments on MMC
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
+#define CONFIG_ENV_OVERWRITE
 /* Associated with the MMC layout defined in mmcops.c */
 #define CONFIG_ENV_OFFSET              SZ_1K
 #define CONFIG_ENV_SIZE                        (SZ_128K - CONFIG_ENV_OFFSET)
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
 /* Associated with the MMC layout defined in mmcops.c */
 #define CONFIG_ENV_OFFSET              SZ_1K
 #define CONFIG_ENV_SIZE                        (SZ_128K - CONFIG_ENV_OFFSET)
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
-#else
-#undef CONFIG_ENV_IS_IN_MMC
-#endif /* CONFIG_CMD_MMC */
-
-#ifdef CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE                        SZ_4K
-#endif
+#endif /* CONFIG_MXS_MMC */
 
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"             \
 
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"             \
 #define CONFIG_SYS_SPL_VDDA_BO_VAL     100
 #define CONFIG_SYS_SPL_VDDMEM_VAL      0       /* VDDMEM is not utilized on TX28 */
 
 #define CONFIG_SYS_SPL_VDDA_BO_VAL     100
 #define CONFIG_SYS_SPL_VDDMEM_VAL      0       /* VDDMEM is not utilized on TX28 */
 
-#endif /* __CONFIGS_TX28_H */
+#endif /* __CONFIG_H */
index 392879410d58cb5dde519b2f0988943b1053d8ba..95dc4812e3d5ef64a7a8abed39909b395fc6bbff 100644 (file)
@@ -14,7 +14,9 @@
 #define __CONFIG_H
 
 #define CONFIG_AM33XX                  /* must be set before including omap.h */
 #define __CONFIG_H
 
 #define CONFIG_AM33XX                  /* must be set before including omap.h */
+#define CONFIG_SYS_L2CACHE_OFF
 
 
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/arch/omap.h>
 
 #include <linux/sizes.h>
 #include <asm/arch/omap.h>
 
@@ -71,7 +73,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "TX48 U-Boot > "
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs"              \
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs"           \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_net=setenv autoload y"                                 \
+       ";setenv autostart n;run bootargs_nfs"                          \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_OMAP_MMC_DEV_1
-
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
index 55ad3da20da0783f9295f09a2aeee9d99e5b8c76..ce5a6f9ca84680b8c0fc67d16360c11a9ae08a4f 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
@@ -67,7 +67,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "TX51 U-Boot > "
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 /*
  * Extra Environment Settings
  */
 /*
  * Extra Environment Settings
  */
-#define CONFIG_SYS_CPU_CLK_STR         xstr(CONFIG_SYS_CPU_CLK)
+#ifdef CONFIG_TX51_UBOOT_NOENV
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       "autostart=no\0"                                                \
+       "autoload=no\0"                                                 \
+       "bootdelay=-1\0"                                                \
+       "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
+       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
+       "mtdparts=" MTDPARTS_DEFAULT "\0"
+#else
+#define CONFIG_SYS_CPU_CLK_STR         xstr(CONFIG_SYS_MPU_CLK)
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs"              \
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs"           \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_net=setenv autoload y"                                 \
+       ";setenv autostart n;run bootargs_nfs"                          \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
        "video_mode=VGA\0"
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
        "video_mode=VGA\0"
+#endif /*  CONFIG_TX51_UBOOT_NOENV */
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
  */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
  */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
-#define CONFIG_MXC_GPIO
 #define CONFIG_BAUDRATE                        115200          /* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, }
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 #define CONFIG_BAUDRATE                        115200          /* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, }
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
+/*
+ * GPIO driver
+ */
+#define CONFIG_MXC_GPIO
+
 /*
  * Ethernet Driver
  */
 /*
  * Ethernet Driver
  */
 /*
  * MMC Driver
  */
 /*
  * MMC Driver
  */
-#ifdef CONFIG_CMD_MMC
-#ifndef CONFIG_ENV_IS_IN_NAND
-#endif
+#ifdef CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 #define CONFIG_CMD_FAT
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 #define CONFIG_CMD_FAT
index 1e03ed719c7b391252221ff0850b1202e40260a3..eddab57fdb47c79a511909899d47531abaef5f08 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
@@ -60,7 +61,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "TX53 U-Boot > "
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 /*
  * Extra Environment Settings
  */
 /*
  * Extra Environment Settings
  */
+#ifdef CONFIG_TX53_UBOOT_NOENV
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       "autostart=no\0"                                                \
+       "autoload=no\0"                                                 \
+       "bootdelay=-1\0"                                                \
+       "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
+       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
+       "mtdparts=" MTDPARTS_DEFAULT "\0"
+#else
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
        " root=/dev/mmcblk0p2 rootwait\0"                               \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs"              \
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs"           \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_net=setenv autoload y"                                 \
+       ";setenv autostart n;run bootargs_nfs"                          \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=800\0"                                                 \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=nand\0"                                              \
        "cpu_clk=800\0"                                                 \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
        "video_mode=" DEFAULT_VIDEO_MODE "\0"
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
        "video_mode=" DEFAULT_VIDEO_MODE "\0"
+#endif /*  CONFIG_TX53_UBOOT_NOENV */
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
index aa0e7af33462f1c76bc51f3b1ac1aad9a9e50338..9faf554fe34734dcabef4f3c3b264a58f199987c 100644 (file)
@@ -8,6 +8,24 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#ifndef CONFIG_SOC_MX6UL
+#define CONFIG_ARM_ERRATA_743622
+#define CONFIG_ARM_ERRATA_751472
+#define CONFIG_ARM_ERRATA_794072
+#define CONFIG_ARM_ERRATA_761320
+
+#ifndef CONFIG_SYS_L2CACHE_OFF
+#define CONFIG_SYS_L2_PL310
+#define CONFIG_SYS_PL310_BASE   L2_PL310_BASE
+#endif
+
+#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
+#define CONFIG_MP
+#endif
+#define CONFIG_BOARD_POSTCLK_INIT
+#define CONFIG_MXC_GPT_HCLK
+
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
  */
 #define CONFIG_SYS_LONGHELP
 #if defined(CONFIG_SOC_MX6Q)
  */
 #define CONFIG_SYS_LONGHELP
 #if defined(CONFIG_SOC_MX6Q)
-#define CONFIG_SYS_PROMPT              "TX6Q U-Boot > "
 #elif defined(CONFIG_SOC_MX6DL)
 #elif defined(CONFIG_SOC_MX6DL)
-#define CONFIG_SYS_PROMPT              "TX6DL U-Boot > "
 #elif defined(CONFIG_SOC_MX6S)
 #elif defined(CONFIG_SOC_MX6S)
-#define CONFIG_SYS_PROMPT              "TX6S U-Boot > "
 #else
 #error Unsupported i.MX6 processor variant
 #endif
 #else
 #error Unsupported i.MX6 processor variant
 #endif
 
 #define CONFIG_SYS_64BIT_VSPRINTF
 
 
 #define CONFIG_SYS_64BIT_VSPRINTF
 
-/*
- * Flattened Device Tree (FDT) support
-*/
-#ifdef CONFIG_OF_LIBFDT
-#ifdef CONFIG_TX6_NAND
-#endif
-#endif /* CONFIG_OF_LIBFDT */
-
 /*
  * Boot Linux
  */
 /*
  * Boot Linux
  */
 #ifndef CONFIG_TX6_UBOOT_MFG
 #define CONFIG_BOOTCOMMAND             DEFAULT_BOOTCMD
 #else
 #ifndef CONFIG_TX6_UBOOT_MFG
 #define CONFIG_BOOTCOMMAND             DEFAULT_BOOTCMD
 #else
-#define CONFIG_BOOTCOMMAND             "set bootcmd '" DEFAULT_BOOTCMD "';" \
+#define CONFIG_BOOTCOMMAND             "setenv bootcmd '" DEFAULT_BOOTCMD "';" \
        "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
        "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
+#if (defined(CONFIG_SOC_MX6SX) || defined(CONFIG_SOC_MX6SL) || defined(CONFIG_SOC_MX6UL))
+#define CONFIG_BOOTCMD_MFG_LOADADDR    80500000
+#else
 #define CONFIG_BOOTCMD_MFG_LOADADDR    10500000
 #define CONFIG_BOOTCMD_MFG_LOADADDR    10500000
+#endif
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_TX6_UBOOT_MFG */
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_TX6_UBOOT_MFG */
+#if (defined(CONFIG_SOC_MX6SX) || defined(CONFIG_SOC_MX6SL) || defined(CONFIG_SOC_MX6UL))
+#define CONFIG_LOADADDR                        82000000
+#define CONFIG_FDTADDR                 81000000
+#else
 #define CONFIG_LOADADDR                        18000000
 #define CONFIG_FDTADDR                 11000000
 #define CONFIG_LOADADDR                        18000000
 #define CONFIG_FDTADDR                 11000000
+#endif
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #ifndef CONFIG_SYS_LVDS_IF
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #ifndef CONFIG_SYS_LVDS_IF
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        MMC_ROOT_STR                                                    \
        MMC_ROOT_STR                                                    \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        CONFIG_SYS_BOOT_CMD_NAND                                        \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        CONFIG_SYS_BOOT_CMD_NAND                                        \
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_net=setenv autoload y;setenv autostart n"              \
+       ";run bootargs_nfs"                                             \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=" CONFIG_SYS_DEFAULT_BOOT_MODE "\0"                  \
        "cpu_clk=800\0"                                                 \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=" CONFIG_SYS_DEFAULT_BOOT_MODE "\0"                  \
        "cpu_clk=800\0"                                                 \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        EMMC_BOOT_PART_STR                                              \
        EMMC_BOOT_ACK_STR                                               \
        " ${append_bootargs}\0"                                         \
        EMMC_BOOT_PART_STR                                              \
        EMMC_BOOT_ACK_STR                                               \
 #ifdef CONFIG_TX6_NAND
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND                                       \
 #ifdef CONFIG_TX6_NAND
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND                                       \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs;nboot linux\0"
 #define CONFIG_SYS_FDTSAVE_CMD                                         \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define CONFIG_SYS_FDTSAVE_CMD                                         \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define CONFIG_BAUDRATE                        115200          /* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, }
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_BAUDRATE                        115200          /* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, }
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
+#define CONFIG_CONS_INDEX              1
 
 /*
  * GPIO driver
 
 /*
  * GPIO driver
 /*
  * I2C Configs
  */
 /*
  * I2C Configs
  */
-#ifdef CONFIG_SYS_I2C
+#ifdef CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           400000
 #if defined(CONFIG_TX6_REV)
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           400000
 #if defined(CONFIG_TX6_REV)
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE                        SZ_128K
 #define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE                        SZ_128K
 #define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
-#else
-#undef CONFIG_ENV_IS_IN_NAND
 #endif /* CONFIG_TX6_NAND */
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #endif /* CONFIG_TX6_NAND */
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #define CONFIG_SYS_MMC_ENV_PART                0x1
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #define CONFIG_SYS_MMC_ENV_PART                0x1
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
-#else
-#undef CONFIG_ENV_IS_IN_MMC
 #endif /* CONFIG_CMD_MMC */
 
 #endif /* CONFIG_CMD_MMC */
 
-#ifdef CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE                        SZ_4K
-#endif
-
 #ifdef CONFIG_TX6_NAND
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        xstr(CONFIG_SYS_U_BOOT_PART_SIZE)                               \
 #ifdef CONFIG_TX6_NAND
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        xstr(CONFIG_SYS_U_BOOT_PART_SIZE)                               \
index fff51d95ad49223c46703a9a5d5290267a84838f..668242fd9e614a9f5d8255d92c86fe01e3c47cd7 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/kconfig.h>
 #include <linux/sizes.h>
 #include <asm/hardware.h>
 
 #include <linux/sizes.h>
 #include <asm/hardware.h>
 
@@ -120,7 +121,7 @@ extern int lcd_output_bpp;
 #ifdef CONFIG_TXA5_NAND
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND                                       \
 #ifdef CONFIG_TXA5_NAND
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND                                       \
-       "bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"
+       "bootcmd_nand=setenv autostart no;run bootargs_ubifs;nboot linux\0"
 #define CONFIG_SYS_FDTSAVE_CMD                                         \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define CONFIG_SYS_FDTSAVE_CMD                                         \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"
@@ -185,25 +186,28 @@ extern int lcd_output_bpp;
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_jffs2=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_mmc=run default_bootargs;setenv bootargs ${bootargs}" \
        MMC_ROOT_STR                                                    \
        MMC_ROOT_STR                                                    \
-       "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
+       "bootargs_nfs=run default_bootargs;setenv bootargs ${bootargs}" \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
        " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
        " ip=dhcp\0"                                                    \
-       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       "bootargs_ubifs=run default_bootargs"                           \
+       ";setenv bootargs ${bootargs}"                                  \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
        " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       "bootcmd_jffs2=setenv autostart no;run bootargs_jffs2"          \
        ";nboot linux\0"                                                \
        ";nboot linux\0"                                                \
-       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       "bootcmd_mmc=setenv autostart no;run bootargs_mmc"              \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        CONFIG_SYS_BOOT_CMD_NAND                                        \
        ";fatload mmc 0 ${loadaddr} uImage\0"                           \
        CONFIG_SYS_BOOT_CMD_NAND                                        \
-       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       "bootcmd_net=setenv autoload y;setenv autostart n"              \
+       ";run bootargs_nfs"                                             \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=" CONFIG_SYS_DEFAULT_BOOT_MODE "\0"                  \
        ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "boot_mode=" CONFIG_SYS_DEFAULT_BOOT_MODE "\0"                  \
-       "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
+       "default_bootargs=setenv bootargs " CONFIG_BOOTARGS             \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        CONFIG_SYS_FDTSAVE_CMD                                          \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        CONFIG_SYS_FDTSAVE_CMD                                          \
@@ -220,7 +224,6 @@ extern int lcd_output_bpp;
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "TXA5 U-Boot > "
 #define CONFIG_SYS_CBSIZE              2048
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_CBSIZE              2048
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
index 5b182014b4a463af7439eb0ecc42f09b4ecc5416..f4e9cf20c53c3520758b8d7dd4fde6e80351c55d 100644 (file)
@@ -98,7 +98,7 @@
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
-       "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
+       "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
        "update_sd_firmware_filename=u-boot.imx\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
        "update_sd_firmware_filename=u-boot.imx\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
index 6cbae450221ffc9bec9d63b190bf3cfd77963010..34dee944dcad6e5fe01e53638c6f2d5de15e3819 100644 (file)
@@ -91,7 +91,4 @@ struct gpmc {
        struct bch_res_4_6 bch_result_4_6[GPMC_MAX_SECTORS]; /* 0x300,0x310, */
 };
 
        struct bch_res_4_6 bch_result_4_6[GPMC_MAX_SECTORS]; /* 0x300,0x310, */
 };
 
-/* Used for board specific gpmc initialization */
-extern struct gpmc *gpmc_cfg;
-
 #endif /* __ASM_OMAP_GPMC_H */
 #endif /* __ASM_OMAP_GPMC_H */
index f9559249f6b4baf52973eeab17058f1ab6b704d0..662d1735db0808fb418adbc266524ac58b00f698 100644 (file)
@@ -219,40 +219,4 @@ int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
 int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int));
 #endif
 
 int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int));
 #endif
 
-#ifdef CONFIG_DRIVER_TI_CPSW
-enum {
-       CPSW_CTRL_VERSION_1 = 0, /* version1 devices */
-       CPSW_CTRL_VERSION_2      /* version2 devices */
-};
-
-struct cpsw_slave_data {
-       u32             slave_reg_ofs;
-       u32             sliver_reg_ofs;
-       int             phy_id;
-       int             phy_if;
-};
-
-struct cpsw_platform_data {
-       u32     mdio_base;
-       u32     cpsw_base;
-       int     mdio_div;
-       int     channels;       /* number of cpdma channels (symmetric) */
-       u32     cpdma_reg_ofs;  /* cpdma register offset                */
-       int     slaves;         /* number of slave cpgmac ports         */
-       u32     ale_reg_ofs;    /* address lookup engine reg offset     */
-       int     ale_entries;    /* ale table size                       */
-       u32     host_port_reg_ofs;      /* cpdma host port registers    */
-       u32     hw_stats_reg_ofs;       /* cpsw hw stats counters       */
-       u32     mac_control;
-       struct cpsw_slave_data  *slave_data;
-       void    (*control)(int enabled);
-       void    (*phy_init)(char *name, int addr);
-       u32     gigabit_en;     /* gigabit capable AND enabled          */
-       u32     host_port_num;
-       u8      version;
-};
-
-int cpsw_register(struct cpsw_platform_data *data);
-#endif /* CONFIG_DRIVER_TI_CPSW */
-
 #endif /* _NETDEV_H_ */
 #endif /* _NETDEV_H_ */
index ef6195e0f590d58035a7f5ee9917103f4605b222..928734688b4db83f77a7d0fa8b5d3d1345a5511b 100644 (file)
@@ -53,10 +53,10 @@ static void __attribute__((unused)) ce_dump_block(const void *ptr, int length)
                }
 
                printf("%02x ", p[i]);
                }
 
                printf("%02x ", p[i]);
-               if (!((i + 1) % 16)){
+               if (!((i + 1) % 16)) {
                        printf("      ");
                        for (j = i - 15; j <= i; j++){
                        printf("      ");
                        for (j = i - 15; j <= i; j++){
-                               if((p[j] > 0x1f) && (p[j] < 0x7f)) {
+                               if ((p[j] > 0x1f) && (p[j] < 0x7f)) {
                                        printf("%c", p[j]);
                                } else {
                                        printf(".");
                                        printf("%c", p[j]);
                                } else {
                                        printf(".");
@@ -98,9 +98,9 @@ static int is_broadcast(struct in_addr ip)
        static struct in_addr netmask;
        static struct in_addr our_ip;
 
        static struct in_addr netmask;
        static struct in_addr our_ip;
 
-       return (ip == ~0 ||                             /* 255.255.255.255 */
-           ((netmask & our_ip) == (netmask & ip) &&    /* on the same net */
-           (netmask | ip) == ~0));             /* broadcast to our net */
+       return (ip.s_addr == ~0 ||                      /* 255.255.255.255 */
+           ((netmask.s_addr & our_ip.s_addr) == (netmask.s_addr & ip.s_addr) && /* on the same net */
+           (netmask.s_addr | ip.s_addr) == ~0));       /* broadcast to our net */
 }
 
 static int check_net_config(void)
 }
 
 static int check_net_config(void)
@@ -110,11 +110,11 @@ static int check_net_config(void)
                char *bip;
 
                bootme_dst_port = EDBG_DOWNLOAD_PORT;
                char *bip;
 
                bootme_dst_port = EDBG_DOWNLOAD_PORT;
-               if (bootme_ip == 0) {
+               if (bootme_ip.s_addr == 0) {
                        bip = getenv("bootmeip");
                        if (bip) {
                                bootme_ip = getenv_ip("bootmeip");
                        bip = getenv("bootmeip");
                        if (bip) {
                                bootme_ip = getenv_ip("bootmeip");
-                               if (!bootme_ip)
+                               if (!bootme_ip.s_addr)
                                        return -EINVAL;
                                p = strchr(bip, ':');
                                if (p) {
                                        return -EINVAL;
                                p = strchr(bip, ':');
                                if (p) {
@@ -190,7 +190,7 @@ static void bootme_handler(uchar *pkt, unsigned dest_port, struct in_addr src_ip
        printf("%c\x08", cursor);
        cursor = next_cursor(cursor);
 
        printf("%c\x08", cursor);
        cursor = next_cursor(cursor);
 
-       if (!is_broadcast(bootme_ip) && src_ip != bootme_ip) {
+       if (!is_broadcast(bootme_ip) && src_ip.s_addr != bootme_ip.s_addr) {
                debug("src_ip %pI4 does not match destination IP %pI4\n",
                        &src_ip, &bootme_ip);
                return; /* not from our server */
                debug("src_ip %pI4 does not match destination IP %pI4\n",
                        &src_ip, &bootme_ip);
                return; /* not from our server */
@@ -231,7 +231,7 @@ static void bootme_handler(uchar *pkt, unsigned dest_port, struct in_addr src_ip
                if (last_state == BOOTME_INIT ||
                        last_state == BOOTME_DEBUG_INIT)
                        bootme_timeout = 3 * 1000;
                if (last_state == BOOTME_INIT ||
                        last_state == BOOTME_DEBUG_INIT)
                        bootme_timeout = 3 * 1000;
-               NetSetTimeout(bootme_timeout, bootme_timeout_handler);
+               net_set_timeout_handler(bootme_timeout, bootme_timeout_handler);
                break;
 
        case BOOTME_DONE:
                break;
 
        case BOOTME_DONE:
@@ -255,7 +255,7 @@ void BootmeStart(void)
                /* wait for incoming packet */
                net_set_udp_handler(bootme_handler);
                bootme_timed_out = 0;
                /* wait for incoming packet */
                net_set_udp_handler(bootme_handler);
                bootme_timed_out = 0;
-               NetSetTimeout(bootme_timeout, bootme_timeout_handler);
+               net_set_timeout_handler(bootme_timeout, bootme_timeout_handler);
        } else {
                /* send ARP request */
                uchar *pkt;
        } else {
                /* send ARP request */
                uchar *pkt;
@@ -289,11 +289,11 @@ int bootme_send_frame(const void *buf, size_t len)
                __func__, buf, len, &net_ip, bootme_src_port, &bootme_ip,
                bootme_dst_port);
 
                __func__, buf, len, &net_ip, bootme_src_port, &bootme_ip,
                bootme_dst_port);
 
-       if (is_zero_ether_addr(bootme_ether)) {
+       if (is_zero_ethaddr(bootme_ether)) {
                output_packet = buf;
                output_packet_len = len;
                /* wait for arp reply and send packet */
                output_packet = buf;
                output_packet_len = len;
                /* wait for arp reply and send packet */
-               ret = NetLoop(BOOTME);
+               ret = net_loop(BOOTME);
                if (ret < 0) {
                        /* drop packet */
                        output_packet_len = 0;
                if (ret < 0) {
                        /* drop packet */
                        output_packet_len = 0;
@@ -306,12 +306,12 @@ int bootme_send_frame(const void *buf, size_t len)
 
        if (eth->state != ETH_STATE_ACTIVE) {
                if (eth_is_on_demand_init()) {
 
        if (eth->state != ETH_STATE_ACTIVE) {
                if (eth_is_on_demand_init()) {
-                       ret = eth_init(gd->bd);
+                       ret = eth_init();
                        if (ret < 0)
                                return ret;
                        eth_set_last_protocol(BOOTME);
                } else {
                        if (ret < 0)
                                return ret;
                        eth_set_last_protocol(BOOTME);
                } else {
-                       eth_init_state_only(gd->bd);
+                       eth_init_state_only();
                }
        }
 
                }
        }
 
@@ -343,7 +343,7 @@ int BootMeDownload(bootme_hand_f *handler)
 
        bootme_packet_handler = handler;
 
 
        bootme_packet_handler = handler;
 
-       ret = NetLoop(BOOTME);
+       ret = net_loop(BOOTME);
        if (ret < 0)
                return BOOTME_ERROR;
        if (bootme_timed_out && bootme_state != BOOTME_INIT)
        if (ret < 0)
                return BOOTME_ERROR;
        if (bootme_timed_out && bootme_state != BOOTME_INIT)
@@ -364,9 +364,9 @@ int BootMeDebugStart(bootme_hand_f *handler)
        bootme_state = BOOTME_DEBUG_INIT;
 
        bootme_timeout = 3 * 1000;
        bootme_state = BOOTME_DEBUG_INIT;
 
        bootme_timeout = 3 * 1000;
-       NetSetTimeout(bootme_timeout, bootme_timeout_handler);
+       net_set_timeout_handler(bootme_timeout, bootme_timeout_handler);
 
 
-       ret = NetLoop(BOOTME);
+       ret = net_loop(BOOTME);
        if (ret < 0)
                return BOOTME_ERROR;
        if (bootme_timed_out)
        if (ret < 0)
                return BOOTME_ERROR;
        if (bootme_timed_out)
@@ -379,6 +379,6 @@ int BootMeRequest(struct in_addr server_ip, const void *buf, size_t len, int tim
        bootme_init(server_ip);
        bootme_timeout = timeout * 1000;
        bootme_timed_out = 0;
        bootme_init(server_ip);
        bootme_timeout = timeout * 1000;
        bootme_timed_out = 0;
-       NetSetTimeout(bootme_timeout, bootme_timeout_handler);
+       net_set_timeout_handler(bootme_timeout, bootme_timeout_handler);
        return bootme_send_frame(buf, len);
 }
        return bootme_send_frame(buf, len);
 }
index 18ce84c20214ccec75036d135ed0da246e485c5b..dd880af30f8f9f461a5d40ea30e7aebd3e83d3a5 100644 (file)
@@ -19,7 +19,7 @@
 /* Well known TFTP port # */
 #define WELL_KNOWN_PORT        69
 /* Millisecs to timeout for lost pkt */
 /* Well known TFTP port # */
 #define WELL_KNOWN_PORT        69
 /* Millisecs to timeout for lost pkt */
-#define TIMEOUT                100UL
+#define TIMEOUT                1000UL
 #ifndef        CONFIG_NET_RETRY_COUNT
 /* # of timeouts before giving up */
 # define TIMEOUT_COUNT 1000
 #ifndef        CONFIG_NET_RETRY_COUNT
 /* # of timeouts before giving up */
 # define TIMEOUT_COUNT 1000
@@ -361,7 +361,7 @@ static void tftp_send(void)
                pkt += 5 /*strlen("octet")*/ + 1;
                strcpy((char *)pkt, "timeout");
                pkt += 7 /*strlen("timeout")*/ + 1;
                pkt += 5 /*strlen("octet")*/ + 1;
                strcpy((char *)pkt, "timeout");
                pkt += 7 /*strlen("timeout")*/ + 1;
-               sprintf((char *)pkt, "%lu", timeout_ms / 1000);
+               sprintf((char *)pkt, "%lu", DIV_ROUND_UP(timeout_ms, 1000));
                debug("send option \"timeout %s\"\n", (char *)pkt);
                pkt += strlen((char *)pkt) + 1;
 #ifdef CONFIG_TFTP_TSIZE
                debug("send option \"timeout %s\"\n", (char *)pkt);
                pkt += strlen((char *)pkt) + 1;
 #ifdef CONFIG_TFTP_TSIZE
@@ -709,12 +709,12 @@ void tftp_start(enum proto_t protocol)
 
        ep = getenv("tftptimeout");
        if (ep != NULL)
 
        ep = getenv("tftptimeout");
        if (ep != NULL)
-               timeout_ms = simple_strtol(ep, NULL, 10);
+               timeout_ms = simple_strtol(ep, NULL, 10) * 1000;
 
 
-       if (timeout_ms < 10) {
-               printf("TFTP timeout (%ld ms) too low, set min = 10 ms\n",
-                      timeout_ms);
-               timeout_ms = 10;
+       if (timeout_ms < TIMEOUT) {
+               printf("TFTP timeout (%lu s) too low, set min = %lu s\n",
+                       timeout_ms / 1000, TIMEOUT / 1000);
+               timeout_ms = TIMEOUT;
        }
 
        debug("TFTP blocksize = %i, timeout = %ld ms\n",
        }
 
        debug("TFTP blocksize = %i, timeout = %ld ms\n",
index 1e78aeed5e814bdf55eae88f368a4637d37ef8e7..ce46fe35e5b57f5fc0d5f40ef59c8db0255477e7 100644 (file)
@@ -98,8 +98,8 @@ public:
        };
        
        enum {
        };
        
        enum {
-               ROM_IMAGE_HEADER_SIGNATURE = 'STMP',    //!< Signature in #elftosb::EncoreBootImage::boot_image_header_t::m_signature.
-               ROM_IMAGE_HEADER_SIGNATURE2 = 'sgtl',   //!< Value for #elftosb::EncoreBootImage::boot_image_header_t::m_signature2;
+               ROM_IMAGE_HEADER_SIGNATURE = 0x504d5453, // 'STMP' Signature in #elftosb::EncoreBootImage::boot_image_header_t::m_signature.
+               ROM_IMAGE_HEADER_SIGNATURE2 = 0x6c746773, // 'sgtl' Value for #elftosb::EncoreBootImage::boot_image_header_t::m_signature2;
                ROM_BOOT_IMAGE_MAJOR_VERSION = 1,               //!< Current boot image major version.
                ROM_BOOT_IMAGE_MINOR_VERSION = 1                //!< Current boot image minor version.
        };
                ROM_BOOT_IMAGE_MAJOR_VERSION = 1,               //!< Current boot image major version.
                ROM_BOOT_IMAGE_MINOR_VERSION = 1                //!< Current boot image minor version.
        };
index a98e71b4a250232999240a69318fae7833205650..f4e77bd05a67c16425042474e7d1c517126f6b1f 100644 (file)
@@ -12,13 +12,13 @@ UNAMES = $(shell uname -s)
 ifeq ("${UNAMES}", "Linux")
 
 SRC_DIR = $(shell pwd)
 ifeq ("${UNAMES}", "Linux")
 
 SRC_DIR = $(shell pwd)
-BUILD_DIR = bld/linux
+BUILD_DIR = $(KBUILD_OUTPUT)/tools/elftosb/bld/linux
 
 else 
 ifeq ("${UNAMES}", "CYGWIN_NT-5.1")
 
 SRC_DIR = $(shell pwd)
 
 else 
 ifeq ("${UNAMES}", "CYGWIN_NT-5.1")
 
 SRC_DIR = $(shell pwd)
-BUILD_DIR = bld/cygwin
+BUILD_DIR = $(KBUILD_OUTPUT)/tools/elftosb/bld/cygwin
 
 endif
 endif
 
 endif
 endif
@@ -28,5 +28,5 @@ endif
 #                                 Targets
 
 all clean elftosb sbtool keygen:
 #                                 Targets
 
 all clean elftosb sbtool keygen:
-       @mkdir -p ${BUILD_DIR};
-       make -C ${BUILD_DIR} -f ${SRC_DIR}/makefile.rules SRC_DIR=${SRC_DIR} $@;
+       @mkdir -p $(BUILD_DIR);
+       make -C $(BUILD_DIR) -f $(SRC_DIR)/makefile.rules SRC_DIR=$(SRC_DIR) $@;
index 9cd649e9514c10e6477fb519673befc8121ebc71..e3e009da2a4a4ce2a427d781fe8aedd6e401acb2 100644 (file)
@@ -129,7 +129,7 @@ exec_always:
        @echo "SRC_DIR = ${SRC_DIR}"
        @echo "OBJ_FILES = ${OBJ_FILES_ELFTOSB2}"
        @echo "LIBS = ${LIBS}"
        @echo "SRC_DIR = ${SRC_DIR}"
        @echo "OBJ_FILES = ${OBJ_FILES_ELFTOSB2}"
        @echo "LIBS = ${LIBS}"
-       @echo "EXEC_FILE = ${EXEC_FILE}"
+       @echo "EXEC_FILE_ELFTOSB2 = ${EXEC_FILE_ELFTOSB2}"
        @echo "BUILD_DIR = ${BUILD_DIR}"
 
 clean:
        @echo "BUILD_DIR = ${BUILD_DIR}"
 
 clean:
@@ -146,16 +146,15 @@ keygen: ${OBJ_FILES_KEYGEN}
        gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
 
 
        gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
 
 
-#ifeq ("${UNAMES}", "Linux")
 #ifeq ("${UNAMES}", "Linux")
 # Use default rules for creating all the .o files from the .c files.  Only
 # for linux
 #ifeq ("${UNAMES}", "Linux")
 # Use default rules for creating all the .o files from the .c files.  Only
 # for linux
-.SUFFIXES : .c .cpp
+.SUFFIXES : .c .cpp .o .h
 
 
-.c.o :
+.c.o:
        gcc ${CFLAGS} -c $<
 
        gcc ${CFLAGS} -c $<
 
-.cpp.o :
+.cpp.o:
        gcc ${CFLAGS} -c $<
 
 #endif
        gcc ${CFLAGS} -c $<
 
 #endif