Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: move uEnv.txt content to BoardSetup file

Browse Source 
That's really where it belongs. Not all boards will need it,
but for now it's always created.
This commit is contained in:
François Revol 2014-11-01 19:48:06 +01:00
parent 95e9515c4b
commit 564a073b01
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/jam/board/beagle/BoardSetup
View File

@ -52,6 +52,15 @@ mloFile = [ DownloadFile $(HAIKU_BOARD_MLO_IMAGE)
ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE)
: $(HAIKU_BOARD_UBOOT_IMAGE_URL) ] ;
# U-Boot environment
# We load the uImage 2MB above its final destination, bootm will decode
# it to the proper location. Our image is smaller than 2MB so this works.
#HAIKU_BOARD_SDIMAGE_UBOOT_UENV_NAME = uEnv.txt ;
HAIKU_BOARD_SDIMAGE_UBOOT_UENV = "uenvcmd=run loadImage; run mmcboot; \
loadImage=fatload mmc0 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_nbsd.ub \
mmcboot=bootm $(HAIKU_BOARD_LOADER_UIBASE)" ;
HAIKU_BOARD_SDIMAGE_FILES =
$(mloFile)
$(ubootFile)

6
src/system/boot/platform/u-boot/Jamfile
View File

@ -187,11 +187,7 @@ actions BuildUBootSDImage1
MTOOLSRC=$(1).mtools mformat -L 32 -v "Haiku" i:
# generate u-boot environment variables
# We load the uImage 2MB above its final destination, bootm will decode
# it to the proper location. Our image is smaller than 2MB so this works.
echo 'uenvcmd=run loadImage; run mmcboot;
loadImage=fatload mmc0 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_nbsd.ub
mmcboot=bootm $(HAIKU_BOARD_LOADER_UIBASE)' > uEnv.txt
echo '$(HAIKU_BOARD_SDIMAGE_UBOOT_UENV)' > uEnv.txt
# populate
MTOOLSRC=$(1).mtools mcopy $(2[1-]) i:
MTOOLSRC=$(1).mtools mcopy uEnv.txt i: