Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: keystone2: Rename u-boot-nand.gph to MLO

Browse source 
NAND boot mode, ROM expects an image with a gp header in the
beginning and an 8bytes filled with zeros at the end. The same is
true for SD boot on K2G platforms but the file name should be MLO.

Renaming u-boot-nand.gph to MLO, so that same image can be used for
NAND and SD boots. And also not including all the u-boot only images
under CONFIG_SPL_BUILD.

Reported-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Lokesh Vutla 2015-08-17 19:54:50 +05:30 committed by Tom Rini
parent cd43ddc019
commit 5f586e9fa1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-keystone/config.mk
View file

@ -15,8 +15,10 @@ OBJCOPYFLAGS_u-boot-spi.gph = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE
$(call if_changed,pad_cat) $(call if_changed,pad_cat)
MKIMAGEFLAGS_u-boot-nand.gph = -A $(ARCH) -T gpimage -C none \ ifndef CONFIG_SPL_BUILD
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
u-boot-nand.gph: u-boot.bin FORCE MLO: u-boot.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

10
board/ti/ks2_evm/README
View file

@ -61,7 +61,7 @@ Supported image formats:
- u-boot.bin: for loading and running u-boot.bin through Texas instruments - u-boot.bin: for loading and running u-boot.bin through Texas instruments
code composure studio (CCS) code composure studio (CCS)
- 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
- u-boot-nand.gph: gpimage for programming AEMIF NAND flash for NAND boot - MLO: gpimage for programming AEMIF NAND flash for NAND boot
Build instructions: Build instructions:
=================== ===================
@ -76,9 +76,9 @@ To build u-boot-spi.gph
>make k2hk_evm_defconfig >make k2hk_evm_defconfig
>make u-boot-spi.gph >make u-boot-spi.gph
To build u-boot-nand.gph To build MLO
>make k2hk_evm_defconfig >make k2hk_evm_defconfig
>make u-boot-nand.gph >make MLO
Load and Run U-Boot on keystone EVMs using CCS Load and Run U-Boot on keystone EVMs using CCS
========================================= =========================================
@ -157,12 +157,12 @@ instructions:
1. Start CCS and run U-boot as described above. 1. Start CCS and run U-boot as described above.
2. Suspend Target. Select Run -> Suspend from top level menu 2. Suspend Target. Select Run -> Suspend from top level menu
CortexA15_1 (Free Running)" CortexA15_1 (Free Running)"
3. Load u-boot-nand.gph binary from build folder on to DDR address 0x87000000 3. Load MLO binary from build folder on to DDR address 0x87000000
through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM
using CCS", but using address 0x87000000. using CCS", but using address 0x87000000.
4. Free Run the target as described earlier (step 4) to get u-boot prompt 4. Free Run the target as described earlier (step 4) to get u-boot prompt
5. At the U-Boot console type following to setup u-boot environment variables. 5. At the U-Boot console type following to setup u-boot environment variables.
setenv filesize <size in hex of u-boot-nand.gph rounded to hex 0x10000> setenv filesize <size in hex of MLO rounded to hex 0x10000>
run burn_uboot_nand run burn_uboot_nand
Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
to "ARM NAND Boot mode" as per instruction at to "ARM NAND Boot mode" as per instruction at