mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-15 07:43:33 +08:00
85b8c5c4bf
Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h |
||
---|---|---|
.. | ||
Makefile | ||
README | ||
wandboard.c |
U-Boot for Wandboard -------------------- This file contains information for the port of U-Boot to the Wandboard. Wandboard is a development board that has three variants based on the following SoCs: mx6 quad, mx6 dual lite and mx6 solo. For more details about Wandboard, please refer to: http://www.wandboard.org/ Building U-boot for Wandboard ----------------------------- To build U-Boot for the Wandboard Dual Lite version: $ make wandboard_dl_config $ make To build U-Boot for the Wandboard Solo version: $ make wandboard_solo_config $ make To build U-Boot for the Wandboard Quad version: $ make wandboard_quad_config $ make Flashing U-boot into the SD card -------------------------------- - After the 'make' command completes, the generated 'u-boot.imx' binary must be flashed into the SD card; $ sudo dd if=u-boot.imx of=/dev/mmcblk0 bs=512 seek=2; sync (Note - the SD card node may vary, so adjust this as needed). - Insert the SD card into the slot located in the bottom of the board (same side as the mx6 processor) - Connect the serial cable to the host PC - Power up the board and U-boot messages will appear in the serial console.