LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: keystone2: Use dtb images by default 

Now that OF_CONTROL is enabled on all keystone2 platforms,
build the default images with DT.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Lokesh Vutla 2015-09-19 15:00:23 +05:30 committed by Tom Rini
parent 16d7f5b51a
commit 1985abe207
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-keystone/config.mk
View File

@ -16,13 +16,13 @@ spl/u-boot-spl.gph: spl/u-boot-spl.bin FORCE
OBJCOPYFLAGS_u-boot-spi.gph = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ OBJCOPYFLAGS_u-boot-spi.gph = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \
--gap-fill=0 --gap-fill=0
u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE u-boot-spi.gph: spl/u-boot-spl.gph u-boot-dtb.img FORCE
$(call if_changed,pad_cat) $(call if_changed,pad_cat)
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
MKIMAGEFLAGS_MLO = -A $(ARCH) -T gpimage -C none \ MKIMAGEFLAGS_MLO = -A $(ARCH) -T gpimage -C none \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -n U-Boot -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -n U-Boot
MLO: u-boot.bin FORCE MLO: u-boot-dtb.bin FORCE
$(call if_changed,mkimage) $(call if_changed,mkimage)
@dd if=/dev/zero bs=8 count=1 2>/dev/null >> $@ @dd if=/dev/zero bs=8 count=1 2>/dev/null >> $@
endif endif

14
board/ti/ks2_evm/README
View File

@ -59,8 +59,8 @@ Supported boot modes:
- UART boot - UART boot
Supported image formats: Supported image formats:
- u-boot.bin: for loading and running u-boot.bin through Texas instruments - u-boot-dtb.bin: for loading and running u-boot-dtb.bin through
code composure studio (CCS) and for UART boot. Texas Instruments code composure studio (CCS) and for UART boot.
- u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot - u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot
- MLO: gpimage for programming AEMIF NAND flash for NAND boot - MLO: gpimage for programming AEMIF NAND flash for NAND boot
@ -69,18 +69,18 @@ Build instructions:
Examples for k2hk, for k2e and k2l just replace k2hk prefix accordingly. Examples for k2hk, for k2e and k2l just replace k2hk prefix accordingly.
Don't forget to add ARCH=arm and CROSS_COMPILE. Don't forget to add ARCH=arm and CROSS_COMPILE.
To build u-boot.bin, u-boot-spi.gph, MLO: To build u-boot-dtb.bin, u-boot-spi.gph, MLO:
>make k2hk_evm_defconfig >make k2hk_evm_defconfig
>make >make
Load and Run U-Boot on keystone EVMs using CCS Load and Run U-Boot on keystone EVMs using CCS
========================================= =========================================
Need Code Composer Studio (CCS) installed on a PC to load and run u-boot.bin Need Code Composer Studio (CCS) installed on a PC to load and run u-boot-dtb.bin
on EVM. See instructions at below link for installing CCS on a Windows PC. on EVM. See instructions at below link for installing CCS on a Windows PC.
http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Getting_Started# http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Getting_Started#
Installing_Code_Composer_Studio Installing_Code_Composer_Studio
Use u-boot.bin from the build folder for loading and running u-boot binary Use u-boot-dtb.bin from the build folder for loading and running u-boot binary
on EVM. Follow instructions at on EVM. Follow instructions at
K2HK http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup K2HK http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup
K2E http://processors.wiki.ti.com/index.php/EVMK2E_Hardware_Setup K2E http://processors.wiki.ti.com/index.php/EVMK2E_Hardware_Setup
@ -100,7 +100,7 @@ loading the u-boot binary on the target EVM. Instead do the following:-
is connected: Unknown)" at the debug window (This is created once Target is connected: Unknown)" at the debug window (This is created once Target
configuration is launched) and select "Connect Target". configuration is launched) and select "Connect Target".
2. Once target connect is successful, choose Tools->Load Memory option from the 2. Once target connect is successful, choose Tools->Load Memory option from the
top level menu. At the Load Memory window, choose the file u-boot.bin top level menu. At the Load Memory window, choose the file u-boot-dtb.bin
through "Browse" button and click "next >" button. In the next window, enter through "Browse" button and click "next >" button. In the next window, enter
Start address as 0xc001000, choose Type-size "32 bits" and click "Finish" Start address as 0xc001000, choose Type-size "32 bits" and click "Finish"
button. button.
@ -167,7 +167,7 @@ Load and Run U-Boot on keystone EVMs using UART download
Open BMC and regular UART terminals. Open BMC and regular UART terminals.
1. On the regular UART port start xmodem transfer of the u-boot.bin 1. On the regular UART port start xmodem transfer of the u-boot-dtb.bin
2. Using BMC terminal set the ARM-UART bootmode and reboot the EVM 2. Using BMC terminal set the ARM-UART bootmode and reboot the EVM
BMC> bootmode #4 BMC> bootmode #4
MBC> reboot MBC> reboot