u-boot/board/freescale
Albert ARIBAUD 3e11350255 Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	Makefile
	drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
2014-02-20 13:16:05 +01:00
..
b4860qds powerpc/b4860/pbl: fix rcw cfg 2014-01-02 14:10:14 -08:00
bsc9131rdb board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL 2014-01-02 14:10:13 -08:00
bsc9132qds board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL 2014-01-02 14:10:13 -08:00
c29xpcie powerpc/mpc85xx:Increase binary size for P, B & T series boards. 2014-01-21 14:06:30 -08:00
common kbuild: add dummy obj-y to create built-in.o 2014-02-19 11:07:50 -05:00
corenet_ds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
imx/ddr Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
m547xevb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m548xevb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5208evbe m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5235evb board: Do not add -DCONFIG_SYS_TEXT_BASE in board config.mk 2013-11-17 14:11:29 -05:00
m5249evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5253demo m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5253evbe m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5271evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5272c3 m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5275evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5282evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5329evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m5373evb m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m52277evb Makefile: rename all libraries to built-in.o 2013-11-17 14:11:32 -05:00
m53017evb Makefile: rename all libraries to built-in.o 2013-11-17 14:11:32 -05:00
m54418twr m68k: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
m54451evb board: Do not add -DCONFIG_SYS_TEXT_BASE in board config.mk 2013-11-17 14:11:29 -05:00
m54455evb board: Do not add -DCONFIG_SYS_TEXT_BASE in board config.mk 2013-11-17 14:11:29 -05:00
mpc832xemds board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc837xemds board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc837xerdb board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc5121ads board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc7448hpc2 board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8260ads cosmetic: remove empty lines at the top of file 2013-11-08 09:41:37 -05:00
mpc8266ads board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8308rdb board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8313erdb board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8315erdb board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8323erdb board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8349emds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8349itx board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8360emds board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8360erdk board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mpc8536ds Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mpc8540ads Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mpc8541cds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8544ds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8548cds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8555cds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8560ads Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8568mds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
mpc8569mds Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mpc8572ds Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mpc8610hpcd Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mpc8641hpcn Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
mx6qarm2 mx6qarm2: Remove unneeded error message when cpu_eth_init() fails 2014-01-13 11:52:27 +01:00
mx6qsabreauto mx6qsabreauto: Update imximage.cfg 2014-02-11 11:24:12 +01:00
mx6sabresd mx6sabresd: Return from cpu_eth_init() directly 2014-01-13 11:52:27 +01:00
mx6slevk mx6: clock: Pass the frequency as argument of enable_fec_anatop_clock() 2014-01-15 10:33:25 +01:00
mx23evk board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mx25pdk imx: Explicitly pass the I2C bus number in pmic_init() 2013-12-17 16:54:16 +01:00
mx28evk board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mx31ads Merge branch 'u-boot/master' into 'u-boot-arm/master' 2013-12-10 22:23:59 +01:00
mx31pdk mx31pdk: Fix pmic_init() argument 2013-11-27 09:39:21 +01:00
mx35pdk imx: Explicitly pass the I2C bus number in pmic_init() 2013-12-17 16:54:16 +01:00
mx51evk mx51evk: Fix pmic_init() argument 2013-11-27 09:39:21 +01:00
mx53ard board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
mx53evk imx: Explicitly pass the I2C bus number in pmic_init() 2013-12-17 16:54:16 +01:00
mx53loco Move #ifdef(CONFIG_DISPLAY_CPUINFO) from caller to callee 2014-02-19 11:10:05 -05:00
mx53smd board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
p1_p2_rdb powerpc/mpc85xx:Increase binary size for P, B & T series boards. 2014-01-21 14:06:30 -08:00
p1_p2_rdb_pc powerpc/p1_p2_rdb_pc: Fix warnings for __iomem pointers 2013-12-11 11:12:29 -08:00
p1_twr Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
p1010rdb powerpc/mpc85xx:Increase binary size for P, B & T series boards. 2014-01-21 14:06:30 -08:00
p1022ds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
p1023rdb Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
p1023rds powerpc/mpc85xx:Increase binary size for P, B & T series boards. 2014-01-21 14:06:30 -08:00
p2020come Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
p2020ds Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx 2013-11-25 11:43:46 -08:00
p2041rdb powerpc/mpc85xx:Increase binary size for P, B & T series boards. 2014-01-21 14:06:30 -08:00
t4qds Driver/DDR: Moving Freescale DDR driver to a common driver 2013-11-25 11:43:43 -08:00
t104xrdb powerpc/t104xrdb: Add basic ethernet support 2014-02-03 08:38:49 -08:00
t1040qds boards/t1040qds: Adds ethernet support for T1040 2014-02-03 08:38:48 -08:00
t2080qds t2080qds/ddr: update ddr parameters 2014-01-21 14:02:21 -08:00
vf610twr board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00