Changes in README.am335x-network

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

Sat, 18 Jun 2016 08:24:54 +0000

Merge branch 'master' of git://git.denx.de/u-bootSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

3e584b94d207deca9663955b78c88d61fdfe8741 - doc, spl, am335x: update am335x-network

Tue, 07 Jun 2016 06:31:24 +0000

doc, spl, am335x: update am335x-networkon the shc board we see when booting in net boot mode,that the ROM bootloader sends "AM335x ROM" asvendor-class-identifier. U-Boots doc says "DM814x ROM".So, add the info to the doc, that there is also"AM335x ROM" possible.Signed-off-by: Heiko Schocher Reviewed-by: Tom Rini List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

a19b0dd62d7b8efc658fa1aa685ff5665878f3ee - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Thu, 30 May 2013 12:45:06 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

b1e6c4c3d4a2b394096766d959aaa9b51a38099b - Fix references to the documentation files

Tue, 30 Apr 2013 11:15:33 +0000

Fix references to the documentation filesMany boot image configuration files refer to theappropriate documentation file, but these referencescontain typos in the directory and file name. Fixthem. Also fix reference to doc/README.SPL file.Signed-off-by: Anatolij Gustschin Cc: Prafulla Wadaskar Cc: Stefano Babic Acked-by: Stefano Babic List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

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

Mon, 18 Mar 2013 16:31:00 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armAlbert's rework of the linker scripts conflicted with Simon's makingeveryone use __bss_end. We also had a minor conflict overREADME.scrapyard being added to in mainline and enhanced inu-boot-arm/master with proper formatting.Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.hBuild tested for all of ARM and run-time tested on am335x_evm.Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

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

Sat, 23 Feb 2013 09:13:40 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

a5627914daad144727655a72bd3c8a8958fbcdcf - Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

Thu, 21 Feb 2013 20:30:47 +0000

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network

427ac8cca34516c9e3845fee40d7fbd6f3293aec - doc/SPL/README.am335x-network: Document using ethernet (and USB) SPL

Fri, 08 Feb 2013 11:20:14 +0000

doc/SPL/README.am335x-network: Document using ethernet (and USB) SPLAdded README file with the description of required options and hostconfiguration to use network SPL with am335x targets. Briefly discusshow to use this configuration to program empty boards.Signed-off-by: Ilya Yanok Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/doc/SPL/README.am335x-network