i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u-boot: Fix after multi-loader changes

Browse Source 
* Move MMU image to a real image define vs being crammed into
  the u-boot bootloader Jamfile
* ARM not working yet, but better!
* x86 still builds

Change-Id: I3fb873dbac06fe2db893915b667bf3ce1df44686
This commit is contained in:
Alexander von Gluck IV
2018-10-18 10:49:59 -05:00
parent 59bba8b9ec
commit dd45d433ed
6 changed files with 206 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+11 -1
View File
@@ -56,6 +56,15 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
= system ;
# boot MMC image
HAIKU_MMC_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-mmc-container ;
HAIKU_CONTAINER_GRIST on $(HAIKU_MMC_BOOT_IMAGE_CONTAINER_NAME) = MMCImage ;
# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_MMC_BOOT_IMAGE_CONTAINER_NAME)
= HAIKU_MMC_BOOT_IMAGE_INSTALL_TARGETS ;
HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_MMC_BOOT_IMAGE_CONTAINER_NAME)
= system ;
# Haiku image/install defaults
HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
@@ -75,7 +84,8 @@ HAIKU_DEFAULT_ANYBOOT_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
# Haiku MMC defaults
HAIKU_DEFAULT_MMC_IMAGE_NAME = haiku-mmc.image ;
#HAIKU_DEFAULT_MMC_NAME = haiku-$(TARGET_KERNEL_ARCH).mmc ;
HAIKU_DEFAULT_MMC_NAME = haiku.mmc ;
HAIKU_DEFAULT_MMC_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_MMC_LABEL ?= Haiku ;