Changes in Makefile

e7f9350525d73233d4eaf1793f8fe618e9fd4910 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Thu, 15 May 2014 08:27:32 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/ids/ids8313/Makefile

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 - Merge branch 'u-boot/master'

Fri, 09 May 2014 08:47:05 +0000

Merge branch 'u-boot/master'Conflicts: drivers/net/Makefile(trivial merge) List of files: /rk3399_rockchip-uboot/board/ids/ids8313/Makefile

b71bf4add68a4a532196c0bead99ed1753014c2a - Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

Fri, 25 Apr 2014 18:57:58 +0000

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx List of files: /rk3399_rockchip-uboot/board/ids/ids8313/Makefile

eaf8c986d36e9fadd244093b17a7fe090b0b572a - mpc83xx: add ids8313 support

Sat, 25 Jan 2014 06:53:48 +0000

mpc83xx: add ids8313 supportadd support for the ids8313 board.CPU: e300c3, MPC8313, Rev: 2.1 at 396 MHz, CSB: 132 MHzI2C: readySPI: readyDRAM: 128 MiB (DDR2, 32-bit, ECC off, 264 MHz)Flash: 8 MiBNAND: 128 MiBNet: TSEC0, TSEC1 [PRIME]public key on NOR flash startSigned-off-by: Heiko Schocher Signed-off-by: Kim Phillips List of files: /rk3399_rockchip-uboot/board/ids/ids8313/Makefile