]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
projects / karo-tx-uboot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4eef93d 901ce27)
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 4 Sep 2013 12:06:56 +0000 (14:06 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 4 Sep 2013 12:06:56 +0000 (14:06 +0200)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
boards.cfg patch | diff1 | diff2 | blob | history
drivers/video/Makefile patch | diff1 | diff2 | blob | history
include/configs/omap5_uevm.h patch | diff1 | diff2 | blob | history
spl/Makefile patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index bd0f3a07637a4beed563d2ef5909f0a6e00eff1e,d4af7bc87e2f0e40f46021dd129503ee0a3b01d1..0807727703cf23f7928a2bed236297e25c2da5cf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -184,6 -184,7 +184,6 @@@ Matthias Fuchs <matthias.fuchs@esd-elec
        APC405          PPC405GP
        AR405           PPC405GP
        ASH405          PPC405EP
 -      CANBT           PPC405CR
        CPCI2DP         PPC405GP
        CPCI405         PPC405GP
        CPCI4052        PPC405GP
@@@ -472,10 -473,6 +472,10 @@@ Ira W. Snyder <iws@ovro.caltech.edu
  
        P2020COME       P2020
  
 +York Sun <yorksun@freescale.com>
 +
 +      T4240EMU        T4240
 +
  Timur Tabi <timur@freescale.com>
  
        MPC8349E-mITX   MPC8349
@@@ -543,10 -540,6 +543,10 @@@ Detlev Zundel <dzu@denx.de
  
        inka4x0         MPC5200
  
 +Po Liu <po.liu@freescale.com>
 +
 +      C29XPCIE        C29X
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1094,6 -1087,11 +1094,11 @@@ Sergey Yanovich <ynvich@gmail.com
  
        lp8x4x          xscale/pxa
  
+ Roger Meier <r.meier@siemens.com>
+       dxr2                    ARM ARMV7 (AM335x SoC)
+       pxm2                    ARM ARMV7 (AM335x SoC)
+       rut                     ARM ARMV7 (AM335x SoC)
+ 
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1370,7 -1368,7 +1375,7 @@@ Dimitar Penev <dpn@switchfin.org
  #     Board           CPU                                             #
  #########################################################################
  
 -Macpaul Lin <macpaul@andestech.com>
 +Andes <uboot@andestech.com>
  
        ADP-AG101       N1213 (AG101 SoC)
        ADP-AG101P      N1213 (AG101P XC5 FPGA)
diff --combined boards.cfg
index be810c78eda9df70edab05761fe24cf056274af0,7ccc7ce8120b260230aeb412620e2bcc78b37c9c..91e307200d89bc2d150afa3310947f6d7420451d
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -254,6 -254,9 +254,9 @@@ am335x_evm_uart5             ar
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT
  am335x_boneblack             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT
  am43xx_evm                   arm         armv7       am43xx              ti             am33xx      am43xx_evm:SERIAL1,CONS_INDEX=1
+ dxr2                         arm         armv7       dxr2                siemens        am33xx
+ pxm2                         arm         armv7       pxm2                siemens        am33xx
+ rut                          arm         armv7       rut                 siemens        am33xx
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  ti816x_evm                   arm         armv7       ti816x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
@@@ -781,8 -784,6 +784,8 @@@ MPC8569MDS_NAND              powerp
  MPC8572DS                    powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS
  MPC8572DS_36BIT              powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:36BIT
  MPC8572DS_NAND               powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:NAND
 +C29XPCIE                     powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT
 +C29XPCIE_SPIFLASH            powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT,SPIFLASH
  P1010RDB_36BIT_NAND          powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND
  P1010RDB_36BIT_NAND_SECBOOT  powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT
  P1010RDB_36BIT_NOR           powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT
@@@ -813,20 -814,16 +816,20 @@@ P1020RDB_36BIT               powerp
  P1020RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SDCARD
  P1020RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SPIFLASH
  P1020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,NAND
 -P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB
 -P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT
 -P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,NAND
 -P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SDCARD
 -P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SPIFLASH
 -P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,NAND
 -P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SDCARD
 -P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SPIFLASH
 +P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC
 +P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT
 +P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,NAND
 +P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SDCARD
 +P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SPIFLASH
 +P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,NAND
 +P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SDCARD
 +P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SPIFLASH
  P1020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SDCARD
  P1020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SPIFLASH
 +P1020RDB-PD                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD
 +P1020RDB-PD_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,NAND
 +P1020RDB-PD_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SDCARD
 +P1020RDB-PD_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SPIFLASH
  P1020UTM-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM
  P1020UTM-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT
  P1020UTM-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD
@@@ -860,7 -857,6 +863,7 @@@ P1025RDB_36BIT               powerp
  P1025RDB_NAND                powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,NAND
  P1025RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SDCARD
  P1025RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SPIFLASH
 +TWR-P1025                    powerpc     mpc85xx     p1_twr              freescale      -           p1_twr:TWR_P1025
  P2010RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB
  P2010RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT
  P2010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT,SDCARD
@@@ -937,7 -933,6 +940,7 @@@ stxgp3                       powerp
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
  T4240QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240
 +T4240EMU                     powerpc     mpc85xx     t4qds               freescale      -           T4240EMU:PPC_T4240
  T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SRIO_PCIE_BOOT            powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
@@@ -1122,6 -1117,7 +1125,6 @@@ PPChameleonEVB_ME_33         powerp
  APC405                       powerpc     ppc4xx      apc405              esd
  AR405                        powerpc     ppc4xx      ar405               esd
  ASH405                       powerpc     ppc4xx      ash405              esd
 -CANBT                        powerpc     ppc4xx      canbt               esd
  CMS700                       powerpc     ppc4xx      cms700              esd
  CPCI2DP                      powerpc     ppc4xx      cpci2dp             esd
  CPCI405                      powerpc     ppc4xx      cpci405             esd
diff --combined drivers/video/Makefile
index 6dee1e930e4f9451ccb85a3c99a7b6b34ab3fed2,ede1d1a5311771c75d3599f8d28e437ac8053370..6c208c596e1eb0722c80bd84cbc645552ff07a1d
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -19,7 -19,6 +19,7 @@@ COBJS-$(CONFIG_EXYNOS_MIPI_DSIM) += exy
                                exynos_mipi_dsi_lowlevel.o
  COBJS-$(CONFIG_EXYNOS_PWM_BL) += exynos_pwm_bl.o
  COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o
 +COBJS-$(CONFIG_L5F31188) += l5f31188.o
  COBJS-$(CONFIG_MPC8XX_LCD) += mpc8xx_lcd.o
  COBJS-$(CONFIG_PXA_LCD) += pxa_lcd.o
  COBJS-$(CONFIG_S6E8AX0) += s6e8ax0.o
@@@ -41,6 -40,7 +41,7 @@@ COBJS-$(CONFIG_VIDEO_SM501) += sm501.
  COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
  COBJS-$(CONFIG_VIDEO_TEGRA) += tegra.o
  COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
+ COBJS-$(CONFIG_FORMIKE) += formike.o
  
  COBJS := $(sort $(COBJS-y))
  SRCS  := $(COBJS:.o=.c)
diff --combined include/configs/omap5_uevm.h
index 3c4249bddae6cba749ceb7e9394611713ad83213,39487097981b81c904f02edcc09262e4af18596c..0d1c43c2eb570dbdce1749c30000f65eaca8e7ac
--- 1/include/configs/omap5_uevm.h
--- 2/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@@ -17,8 -17,6 +17,8 @@@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
  
 +#include <configs/omap5_common.h>
 +
  #define CONFIG_CONS_INDEX             3
  #define CONFIG_SYS_NS16550_COM3               UART3_BASE
  #define CONFIG_BAUDRATE                       115200
@@@ -37,33 -35,17 +37,36 @@@
  #define CONFIG_PARTITION_UUIDS
  #define CONFIG_CMD_PART
  
+ /* Required support for the TCA642X GPIO we have on the uEVM */
  #define CONFIG_TCA642X
  #define CONFIG_CMD_TCA642X
  #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
  #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
  
 +/* USB UHH support options */
 +#define CONFIG_CMD_USB
 +#define CONFIG_USB_HOST
 +#define CONFIG_USB_EHCI
 +#define CONFIG_USB_EHCI_OMAP
 +#define CONFIG_USB_STORAGE
 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 +
 +#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80
 +#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
 +
 +/* Enabled commands */
 +#define CONFIG_CMD_DHCP               /* DHCP Support                 */
 +#define CONFIG_CMD_NET                /* bootp, tftpboot, rarpboot    */
 +#define CONFIG_CMD_NFS                /* NFS support                  */
 +
 +/* USB Networking options */
 +#define CONFIG_USB_HOST_ETHER
 +#define CONFIG_USB_ETHER_SMSC95XX
 +
  #define CONSOLEDEV            "ttyO2"
+ 
+ /* Max time to hold reset on this board, see doc/README.omap-reset-time */
  #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC      16296
  
 -#include <configs/omap5_common.h>
 -
  #endif /* __CONFIG_OMAP5_EVM_H */
diff --combined spl/Makefile
index 339e5e897115815162ba999790f168a3a58ea80f,003558c74a91ea5ade6883be84d9db5d7dc87a9a..174d0a7fc47fe60d16b2613a57cd97055dca0970
--- 1/spl/Makefile
--- 2/spl/Makefile
+++ b/spl/Makefile
@@@ -17,22 -17,10 +17,22 @@@
  CONFIG_SPL_BUILD := y
  export CONFIG_SPL_BUILD
  
 +ifeq ($(CONFIG_TPL_BUILD),y)
 +export CONFIG_TPL_BUILD
 +SPL_BIN := u-boot-tpl
 +else
 +SPL_BIN := u-boot-spl
 +endif
 +
  include $(TOPDIR)/config.mk
  
  # We want the final binaries in this directory
 +ifeq ($(CONFIG_TPL_BUILD),y)
 +obj := $(OBJTREE)/tpl/
 +SPLTREE := $(TPLTREE)
 +else
  obj := $(OBJTREE)/spl/
 +endif
  
  HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n)
  
@@@ -62,9 -50,6 +62,9 @@@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8
  endif
  ifeq ($(CPU),mpc85xx)
  LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 +ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
 +endif
  endif
  ifeq ($(CPU),mpc86xx)
  LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
@@@ -95,9 -80,9 +95,10 @@@ LIBS-$(CONFIG_SPL_POST_MEM_SUPPORT) += 
  LIBS-$(CONFIG_SPL_NET_SUPPORT) += net/libnet.o
  LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/libnet.o
  LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o
 +LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/libphy.o
  LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
  LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
+ LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o
  
  ifneq ($(CONFIG_OMAP_COMMON),)
  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
@@@ -173,7 -158,7 +174,7 @@@ $(OBJTREE)/MLO.byteswap: $(obj)u-boot-s
  $(OBJTREE)/SPL : $(obj)u-boot-spl.bin depend
                $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
  
 -ALL-y += $(obj)u-boot-spl.bin
 +ALL-y += $(obj)$(SPL_BIN).bin
  
  ifdef CONFIG_SAMSUNG
  ALL-y += $(obj)$(BOARD)-spl.bin
@@@ -187,15 -172,15 +188,15 @@@ $(obj)$(BOARD)-spl.bin: $(obj)u-boot-sp
                $(obj)u-boot-spl.bin $(obj)$(BOARD)-spl.bin
  endif
  
 -$(obj)u-boot-spl.bin: $(obj)u-boot-spl
 +$(obj)$(SPL_BIN).bin: $(obj)$(SPL_BIN)
        $(OBJCOPY) $(OBJCFLAGS) -O binary $< $@
  
  GEN_UBOOT = \
        cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $(__START) \
                --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
 -              -Map u-boot-spl.map -o u-boot-spl
 +              -Map $(SPL_BIN).map -o $(SPL_BIN)
  
 -$(obj)u-boot-spl:     depend $(START) $(LIBS) $(obj)u-boot-spl.lds
 +$(obj)$(SPL_BIN):     depend $(START) $(LIBS) $(obj)u-boot-spl.lds
        $(GEN_UBOOT)
  
  $(START):     depend
UBoot for KaRo TX COM modules