diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/barebox/barebox.mk | 4 | ||||
| -rw-r--r-- | boot/u-boot/u-boot.mk | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 7c2cbc123..85224cae0 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -53,9 +53,11 @@ barebox: $(BAREBOX_DIR)/.installed ifeq ($(BR2_TARGET_BAREBOX),y) TARGETS+=barebox -# we NEED a board defconfig file +# we NEED a board defconfig file unless we're at make source +ifeq ($(filter source,$(MAKECMDGOALS)),) ifeq ($(BAREBOX_BOARD_DEFCONFIG),) $(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting) endif +endif endif diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 7b6b2ce63..971920751 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -88,7 +88,8 @@ ifeq ($(U_BOOT_BOARD_NAME),) endif $(TARGET_CONFIGURE_OPTS) \ $(U_BOOT_CONFIGURE_OPTS) \ - $(MAKE) -C $(U_BOOT_DIR) \ + $(MAKE) -C $(U_BOOT_DIR) \ + CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \ $(U_BOOT_BOARD_NAME)_config touch $@ @@ -192,9 +193,11 @@ u-boot-configured: $(U_BOOT_DIR)/.header_modified ifeq ($(BR2_TARGET_UBOOT),y) TARGETS+=u-boot -# we NEED a board name +# we NEED a board name unless we're at make source +ifeq ($(filter source,$(MAKECMDGOALS)),) ifeq ($(U_BOOT_BOARD_NAME),) $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting) endif +endif endif |