]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
1  2 
MAINTAINERS
Makefile
boards.cfg
drivers/mmc/mxsmmc.c
include/configs/apx4devkit.h

diff --combined MAINTAINERS
index e792a8b4f6557ffcc9595d2e215199b1775161f8,f490d62fb81c9c85f983b56c4897d0c2ea4dc3d3..d3f1beab023f2566ed2d482a2599f83cb560b8a8
@@@ -1037,6 -1037,14 +1037,14 @@@ Pali Rohár <pali.rohar@gmail.com
  
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
  
+ Eric Nelson <eric.nelson@boundarydevices.com>
+       nitrogen6dl             i.MX6DL         1GB
+       nitrogen6dl2g           i.MX6DL         2GB
+       nitrogen6q              i.MX6Q/6D       1GB
+       nitrogen6q2g            i.MX6Q/6D       2GB
+       nitrogen6s              i.MX6S          512MB
+       nitrogen6s1g            i.MX6S          1GB
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1227,7 -1235,7 +1235,7 @@@ Yoshihiro Shimoda <yoshihiro.shimoda.uh
  #     Board           CPU                                             #
  #########################################################################
  
 -Mike Frysinger <vapier@gentoo.org>
 +Sonic Zhang <sonic.adi@gmail.com>
  Blackfin Team <u-boot-devel@blackfin.uclinux.org>
  
        BF506F-EZKIT    BF506
        BF538F-EZKIT    BF538
        BF548-EZKIT     BF548
        BF561-EZKIT     BF561
 +      BF609-EZKIT     BF609
  
  M.Hasewinkel (MHA) <info@ssv-embedded.de>
  
diff --combined Makefile
index 6a4e364664f31e5c3a69a7d741c2f770b93856cc,33d4253e78ec179e75cdcd6939596115ed69034f..12763ce0f971f704862fbca6ef893323343426df
+++ b/Makefile
@@@ -22,9 -22,9 +22,9 @@@
  #
  
  VERSION = 2013
 -PATCHLEVEL = 01
 +PATCHLEVEL = 04
  SUBLEVEL =
 -EXTRAVERSION =
 +EXTRAVERSION = -rc1
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -264,7 -264,6 +264,7 @@@ LIBS-y += fs/libfs.o 
        fs/fdos/libfdos.o \
        fs/jffs2/libjffs2.o \
        fs/reiserfs/libreiserfs.o \
 +      fs/sandbox/libsandboxfs.o \
        fs/ubifs/libubifs.o \
        fs/yaffs2/libyaffs2.o \
        fs/zfs/libzfs.o
@@@ -464,8 -463,8 +464,8 @@@ $(obj)u-boot.img:  $(obj)u-boot.bi
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
  
- $(OBJTREE)/u-boot.imx : $(obj)u-boot.bin $(SUBDIR_TOOLS) depend
-               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
+ $(obj)u-boot.imx: $(obj)u-boot.bin depend
+               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $(OBJTREE)/u-boot.imx
  
  $(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
@@@ -556,8 -555,10 +556,8 @@@ GEN_UBOOT = 
                        $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
  else
  GEN_UBOOT = \
 -              UNDEF_LST=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
 -              sed  -n -e 's/.*\($(SYM_PREFIX)_u_boot_list_.*\)/-u\1/p'|sort|uniq`;\
                cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
 -                      $$UNDEF_LST $(__OBJS) \
 +                      $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
  endif
@@@ -590,7 -591,11 +590,7 @@@ $(SUBDIR_EXAMPLES): $(obj)u-boo
  $(LDSCRIPT):  depend
                $(MAKE) -C $(dir $@) $(notdir $@)
  
 -# The following line expands into whole rule which generates u-boot.lst,
 -# the file containing u-boots LG-array linker section. This is included into
 -# $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 -$(eval $(call make_u_boot_list, $(obj)include/u-boot.lst, $(LIBBOARD) $(LIBS)))
 -$(obj)u-boot.lds: $(LDSCRIPT) $(obj)include/u-boot.lst
 +$(obj)u-boot.lds: $(LDSCRIPT)
                $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
  
  nand_spl:     $(TIMESTAMP_FILE) $(VERSION_FILE) depend
@@@ -826,6 -831,7 +826,6 @@@ clean
               $(obj)board/matrix_vision/*/bootscript.img                 \
               $(obj)board/voiceblue/eeprom                               \
               $(obj)u-boot.lds                                           \
 -             $(obj)include/u-boot.lst                                   \
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
               $(obj)arch/blackfin/cpu/init.{lds,elf}
        @rm -f $(obj)include/bmp_logo.h
@@@ -863,7 -869,7 +863,7 @@@ clobber:   tid
        @rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
        @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
        @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map}
 -      @rm -f $(obj)spl/{u-boot-spl.lds,u-boot.lst}
 +      @rm -f $(obj)spl/u-boot-spl.lds
        @rm -f $(obj)MLO MLO.byteswap
        @rm -f $(obj)SPL
        @rm -f $(obj)tools/xway-swap-bytes
diff --combined boards.cfg
index fdb32c29a29692e5c5d95cfcd986b1e7feca3111,84f96e0270cc1aa9229f002f41cdd66a8439dd9a..272a5fc19e523f4b5dc7a7d520bafb47405a2351
@@@ -95,7 -95,6 +95,7 @@@ at91sam9g10ek_nandflash      ar
  at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
  at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
  at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
 +at91sam9g20ek_2mmc_nandflash arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
  at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
  at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
@@@ -240,7 -239,6 +240,7 @@@ am335x_evm_uart2             ar
  am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=4
  am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
  am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
 +am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
  highbank                     arm         armv7       highbank            -              highbank
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
@@@ -257,6 -255,12 +257,12 @@@ mx6qsabreauto                ar
  mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  mx6qsabresd                  arm         armv7       mx6qsabresd         freescale      mx6           mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  eco5pk                       arm         armv7       eco5pk              8dtech         omap3
+ nitrogen6dl                  arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
+ nitrogen6dl2g                arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048
+ nitrogen6q                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024
+ nitrogen6q2g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048
+ nitrogen6s                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
+ nitrogen6s1g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -286,7 -290,6 +292,7 @@@ nokia_rx51                   ar
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
  omap5_evm                    arm         armv7       omap5_evm           ti           omap5
 +dra7xx_evm                 arm         armv7       dra7xx              ti             omap5
  s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
  origen                             arm         armv7       origen              samsung        exynos
@@@ -367,7 -370,6 +373,7 @@@ bf538f-ezkit                 blackfi
  bf548-ezkit                  blackfin    blackfin
  bf561-acvilon                blackfin    blackfin
  bf561-ezkit                  blackfin    blackfin
 +bf609-ezkit                  blackfin    blackfin
  blackstamp                   blackfin    blackfin
  blackvme                     blackfin    blackfin
  br4                          blackfin    blackfin
@@@ -712,10 -714,9 +718,10 @@@ SIMPC8313_SP                 powerp
  TQM834x                      powerpc     mpc83xx     tqm834x             tqc
  suvd3                        powerpc     mpc83xx     km83xx              keymile        -           suvd3:SUVD3
  kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
 -tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
 -tuxx1                        powerpc     mpc83xx     km83xx              keymile
 -kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
 +tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUGE1
 +tuxx1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUXX1
 +kmopti2                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMOPTI2
 +kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMSUPX5
  sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
  sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
  sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE
diff --combined drivers/mmc/mxsmmc.c
index a87529dfc5d2deab2ec1fc4191643ace908a1926,b1537e24ac7bc163903e58056c24e98dabd0f225..a89660f130bd5509245400f7155ebf3ba6ca4d31
@@@ -53,12 -53,6 +53,6 @@@ struct mxsmmc_priv 
        struct mxs_dma_desc     *desc;
  };
  
- #if defined(CONFIG_MX23)
- static const unsigned int mxsmmc_id_offset = 1;
- #elif defined(CONFIG_MX28)
- static const unsigned int mxsmmc_id_offset = 0;
- #endif
  #define       MXSMMC_MAX_TIMEOUT      10000
  #define MXSMMC_SMALL_TRANSFER 512
  
@@@ -137,7 -131,7 +131,7 @@@ static int mxsmmc_send_cmd_dma(struct m
        priv->desc->cmd.data |= MXS_DMA_DESC_IRQ | MXS_DMA_DESC_DEC_SEM |
                                (data_count << MXS_DMA_DESC_BYTES_OFFSET);
  
-       dmach = MXS_DMA_CHANNEL_AHB_APBH_SSP0 + priv->id + mxsmmc_id_offset;
+       dmach = MXS_DMA_CHANNEL_AHB_APBH_SSP0 + priv->id;
        mxs_dma_desc_append(dmach, priv->desc);
        if (mxs_dma_go(dmach)) {
                bounce_buffer_stop(&bbstate);
@@@ -390,15 -384,9 +384,9 @@@ int mxsmmc_initialize(bd_t *bis, int id
        struct mmc *mmc = NULL;
        struct mxsmmc_priv *priv = NULL;
        int ret;
- #if defined(CONFIG_MX23)
-       const unsigned int mxsmmc_max_id = 2;
-       const unsigned int mxsmmc_clk_id = 0;
- #elif defined(CONFIG_MX28)
-       const unsigned int mxsmmc_max_id = 4;
-       const unsigned int mxsmmc_clk_id = id;
- #endif
+       const unsigned int mxsmmc_clk_id = mxs_ssp_clock_by_bus(id);
  
-       if (id >= mxsmmc_max_id)
+       if (!mxs_ssp_bus_id_valid(id))
                return -ENODEV;
  
        mmc = malloc(sizeof(struct mmc));
                return -ENOMEM;
        }
  
-       ret = mxs_dma_init_channel(id + mxsmmc_id_offset);
+       ret = mxs_dma_init_channel(MXS_DMA_CHANNEL_AHB_APBH_SSP0 + id);
        if (ret)
                return ret;
  
        mmc->set_ios = mxsmmc_set_ios;
        mmc->init = mxsmmc_init;
        mmc->getcd = NULL;
 +      mmc->getwp = NULL;
        mmc->priv = priv;
  
        mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
index ab4efa4b03cad23a2ad8c6ea5c3632736b1f632b,18c42413735b6447e4d3b75c51d13dafe20264af..32421339d5f6967aff5bd43fd2f0afd466a3d38f
  #ifdef CONFIG_CMD_USB
  #define CONFIG_USB_EHCI
  #define CONFIG_USB_EHCI_MXS
- #define CONFIG_EHCI_MXS_PORT          1
+ #define CONFIG_EHCI_MXS_PORT1
+ #define CONFIG_USB_MAX_CONTROLLER_COUNT       1
  #define CONFIG_EHCI_IS_TDI
  #define CONFIG_USB_STORAGE
  #endif
                "root=ubi0:rootfs rootfstype=ubifs ${mtdparts} rw\0" \
        "bootcmd_nand=" \
                "run bootargs_nand && ubi part root 2048 && " \
 -              "ubifsmount rootfs && ubifsload 41000000 boot/uImage && " \
 +              "ubifsmount ubi:rootfs && ubifsload 41000000 boot/uImage && " \
                "bootm 41000000\0" \
        "bootargs_mmc=" \
                "setenv bootargs ${kernelargs} " \