#
96764df1 |
| 22-Dec-2012 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge samsung, imx, tegra into u-boot-arm/master This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as wel
Merge samsung, imx, tegra into u-boot-arm/master This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manual merge fixes.
show more ...
|
#
ba6d4b64 |
| 21-Dec-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-usb
|
#
a098cf41 |
| 19-Dec-2012 |
Allen Martin <amartin@nvidia.com> |
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged Conflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/unive
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged Conflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h
show more ...
|
#
09572880 |
| 17-Dec-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-net
|
#
e3bb3254 |
| 04-Nov-2012 |
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
net: sh_eth: add support for SH7752 SH7752 has two fast ethernet controllers and two gigabit ethernet controllers. It is similar to SH7757. Signed-off-by: Yoshihiro Shimoda <yos
net: sh_eth: add support for SH7752 SH7752 has two fast ethernet controllers and two gigabit ethernet controllers. It is similar to SH7757. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
show more ...
|
#
1c27059a |
| 30-Sep-2012 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot/master'
|
#
cec2655c |
| 27-Sep-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-net
|
#
dcd5a593 |
| 02-Aug-2012 |
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
net: sh_eth: Add support R8A7740 of rmobile (arm core) R8A7740 of rmobile has ethernet device, and this is same IP of sh-ether. This support R8A7740 of rmobile. Signed-off-by: H
net: sh_eth: Add support R8A7740 of rmobile (arm core) R8A7740 of rmobile has ethernet device, and this is same IP of sh-ether. This support R8A7740 of rmobile. Signed-off-by: Hideyuki Sano <hideyuki.sano.dn@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
d978780b |
| 31-Jul-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze * 'master' of git://git.denx.de/u-boot-microblaze: microblaze: Wire up SPI driver spi: microblaze: Adds driver for Xi
Merge branch 'master' of git://git.denx.de/u-boot-microblaze * 'master' of git://git.denx.de/u-boot-microblaze: microblaze: Wire up SPI driver spi: microblaze: Adds driver for Xilinx SPI controller microblaze: intc: Clear interrupt code microblaze: Call serial multi initialization microblaze: Move __udelay implementation microblaze: Remove extern from board.c microblaze: Wire up dts configuration fdt: Add board specific dts inclusion microblaze: Move individual board linker scripts to common script in cpu tree. microblaze: Add gpio.h microblaze: Add missing undefs for UBI and UBIFS microblaze: Expand and correct configuration comments microblaze: Enable ubi support microblaze: Avoid compile error on systems without cfi flash microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
b98b6115 |
| 30-Jul-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'next' of git://git.denx.de/u-boot * 'next' of git://git.denx.de/u-boot: MPC8xx: Fixup warning in arch/powerpc/cpu/mpc8xx/cpu.c doc: cleanup - move board READMEs int
Merge branch 'next' of git://git.denx.de/u-boot * 'next' of git://git.denx.de/u-boot: MPC8xx: Fixup warning in arch/powerpc/cpu/mpc8xx/cpu.c doc: cleanup - move board READMEs into respective board directories net: sh_eth: add support for SH7757's GETHER net: sh_eth: modify the definitions of regsiter net: sh_eth: add SH_ETH_TYPE_ condition net: sh_eth: clean up for the SH7757's code net: fec_mxc: Fix MDC for xMII net: fec_mxc: Fix setting of RCR for xMII net: nfs: make NFS_TIMEOUT configurable net: Inline the new eth_setenv_enetaddr_by_index function net: allow setting env enetaddr from net device setting net/designware: Consecutive writes to the same register to be avoided CACHE: net: asix: Fix asix driver to work with data cache on net: phy: micrel: make ksz9021 phy accessible net: abort network initialization if the PHY driver fails phylib: phy_startup() should return an error code on failure net: tftp: fix type of block arg to store_block Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
631fea8f |
| 26-Jun-2012 |
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
net: sh_eth: add support for SH7757's GETHER SH7757 has 2 ETHERs and 2 GETHERs. This patch supports the SH7757's GETHER. If CONFIG_SH_ETHER_USE_GETHER is defined using SH7757, the dr
net: sh_eth: add support for SH7757's GETHER SH7757 has 2 ETHERs and 2 GETHERs. This patch supports the SH7757's GETHER. If CONFIG_SH_ETHER_USE_GETHER is defined using SH7757, the driver handles the GETHER. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
49afb8ca |
| 26-Jun-2012 |
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
net: sh_eth: modify the definitions of regsiter The previous code had many similar definitions in each CPU. This patch borrows from the sh_eth driver of Linux kernel. Signe
net: sh_eth: modify the definitions of regsiter The previous code had many similar definitions in each CPU. This patch borrows from the sh_eth driver of Linux kernel. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
26235093 |
| 26-Jun-2012 |
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
net: sh_eth: add SH_ETH_TYPE_ condition At the moment, the driver supports the following CPUs: - GETHER (Gigabit Ethernet) : SH7763, SH7734 - ETHER (Fast Ethernet) : SH7724, SH
net: sh_eth: add SH_ETH_TYPE_ condition At the moment, the driver supports the following CPUs: - GETHER (Gigabit Ethernet) : SH7763, SH7734 - ETHER (Fast Ethernet) : SH7724, SH7757 And the driver had the following "#if": #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) #if !defined(CONFIG_CPU_SH7757) && !defined(CONFIG_CPU_SH7724) - Those are for GETHER #if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) - This is for ETHER So, for clean up the code, this patch adds SH_ETH_TYPE_GETHER and SH_ETH_TYPE_ETHER. And then, the patch modifies the above "#if". Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
58bef2a5 |
| 26-Jun-2012 |
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
net: sh_eth: clean up for the SH7757's code The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimod
net: sh_eth: clean up for the SH7757's code The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
66714b1a |
| 18-Jul-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'next' of git://git.denx.de/u-boot-video * 'next' of git://git.denx.de/u-boot-video: ipu_common: Add ldb_clk for use in parenting the pixel clock ipu_common: Do not
Merge branch 'next' of git://git.denx.de/u-boot-video * 'next' of git://git.denx.de/u-boot-video: ipu_common: Add ldb_clk for use in parenting the pixel clock ipu_common: Do not hardcode the ipu_clk frequency ipu_common: Rename MXC_CCM_BASE ipu_common: Let clk_ipu_enable/disable only run on MX51 and MX53 ipu_common: Only apply the erratum to MX51 video: Rename CONFIG_VIDEO_MX5 mx6: Allow mx6 to access the IPUv3 registers common lcd: minor coding style changes Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
0878222f |
| 12-Jul-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'next' of git://git.denx.de/u-boot-net into next * 'next' of git://git.denx.de/u-boot-net: net: Inline the new eth_setenv_enetaddr_by_index function net: allow setti
Merge branch 'next' of git://git.denx.de/u-boot-net into next * 'next' of git://git.denx.de/u-boot-net: net: Inline the new eth_setenv_enetaddr_by_index function net: allow setting env enetaddr from net device setting net/designware: Consecutive writes to the same register to be avoided CACHE: net: asix: Fix asix driver to work with data cache on net: phy: micrel: make ksz9021 phy accessible net: abort network initialization if the PHY driver fails phylib: phy_startup() should return an error code on failure net: tftp: fix type of block arg to store_block Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
0b15d51e |
| 12-Jul-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-i2c * 'master' of git://git.denx.de/u-boot-i2c: mx28evk: Add I2C support mxs-i2c: Fix internal address byte order mxc_i2c:
Merge branch 'master' of git://git.denx.de/u-boot-i2c * 'master' of git://git.denx.de/u-boot-i2c: mx28evk: Add I2C support mxs-i2c: Fix internal address byte order mxc_i2c: remove setting speed at each start mx6qsabrelite: add i2c support mxc_i2c: specify i2c base address in config file Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
a6616efb |
| 05-Jun-2012 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
net/sh-ether: Fix build by removing ECSIPR_BRCRXIP and other When support sh7734 of sh-ether, ECSIPR_BRCRXIP and other were removed. Therefore SH7757 and SH7724 can not build. This revis
net/sh-ether: Fix build by removing ECSIPR_BRCRXIP and other When support sh7734 of sh-ether, ECSIPR_BRCRXIP and other were removed. Therefore SH7757 and SH7724 can not build. This revise this probelem. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
show more ...
|
#
4398d559 |
| 15-May-2012 |
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
net: sh-eth: Add support Gigabit of SH7734 SH7734 support GMII. This add register infomation and the function which enable GMII. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwama
net: sh-eth: Add support Gigabit of SH7734 SH7734 support GMII. This add register infomation and the function which enable GMII. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
ee6ec5d4 |
| 02-Feb-2012 |
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
net: sh_eth: Add support SH7734 Ethernet device SH7734 has one channel ethernet device. This support 10/100/1000Base, and RMII/MII/GMII. And this has the same structure as SH7763.
net: sh_eth: Add support SH7734 Ethernet device SH7734 has one channel ethernet device. This support 10/100/1000Base, and RMII/MII/GMII. And this has the same structure as SH7763. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
show more ...
|
#
5c877b1a |
| 09-Apr-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-nios * 'master' of git://git.denx.de/u-boot-nios: nios2 - adjust gbl data off to account for bd_info nios2: implement get_ticks
Merge branch 'master' of git://git.denx.de/u-boot-nios * 'master' of git://git.denx.de/u-boot-nios: nios2 - adjust gbl data off to account for bd_info nios2: implement get_ticks and get_tbclk nios2: add flush_dcache_range function
show more ...
|
#
6e94125f |
| 17-Mar-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-avr32 * 'master' of git://git.denx.de/u-boot-avr32: atmel_mci.h: remove outdated register macros doc/git-mailrc: add <me> to avr
Merge branch 'master' of git://git.denx.de/u-boot-avr32 * 'master' of git://git.denx.de/u-boot-avr32: atmel_mci.h: remove outdated register macros doc/git-mailrc: add <me> to avr32 alias ATMEL: remove old atmel_mci driver ATMEL: use generic mmc framework
show more ...
|
#
6ae38b8c |
| 17-Mar-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin * 'sandbox' of git://git.denx.de/u-boot-blackfin: sandbox: mark os_exit as noreturn sandbox: add getopt support
Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin * 'sandbox' of git://git.denx.de/u-boot-blackfin: sandbox: mark os_exit as noreturn sandbox: add getopt support sandbox: allow processing before main loop sandbox: add concept of sandbox state sandbox: disable fortification sandbox: u-boot.lds: tweak style sandbox: add get_{tbclk,ticks} sandbox: enable GPIO driver sandbox: gpio: add basic driver for simulating GPIOs sandbox: add flags for open() call sandbox: config: enable fdt and snprintf() options sandbox: fdt: add support for CONFIG_OF_CONTROL sandbox: add lseek helper sandbox: add ifdef protection to os.h sandbox: add required header to os.c sandbox: sort header files in os.c
show more ...
|
#
df25d499 |
| 17-Mar-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-sh * 'master' of git://git.denx.de/u-boot-sh: sh: timer: Remove unnecessary variable 'ticks' sh: Fix sh7264 clock speed and rela
Merge branch 'master' of git://git.denx.de/u-boot-sh * 'master' of git://git.denx.de/u-boot-sh: sh: timer: Remove unnecessary variable 'ticks' sh: Fix sh7264 clock speed and related serial setting net: sh_eth: Remove unnecessary return net: sh_eth: Collect up EDMR_INIT_CNT to TIMEOUT_CNT net: sh_eth: Remove SH_ETH_PHY_DELAY sh: ecovec: Add support PHY of SMSC sh: sh_eth: Add support SH7724
show more ...
|
#
3bb4cc31 |
| 14-Nov-2011 |
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
sh: sh_eth: Add support SH7724 Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|