diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:38 +0200 |
| commit | f1bfe711a283f2d98618c5eec73f2ba173c061c8 (patch) | |
| tree | 0509e2432688d1f3ef596cf0a770a657e7ed2e9c /Makefile | |
| parent | 30d6ac7c240e224287f495e9be203bc7d2c4bc74 (diff) | |
| parent | e06a8f0bf3151eafce695954109defbcfc4033f4 (diff) | |
| download | barebox-f1bfe711a283f2d98618c5eec73f2ba173c061c8.tar.gz barebox-f1bfe711a283f2d98618c5eec73f2ba173c061c8.tar.xz | |
Merge branch 'for-next/testing'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 27 insertions, 1 deletions
@@ -343,11 +343,23 @@ ifeq ($(ARCH),arm64) SRCARCH := arm endif +ifeq ($(ARCH),i386) + SRCARCH := x86 +endif + +ifeq ($(ARCH),x86_64) + SRCARCH := x86 +endif + # Support ARCH=ppc for backward compatibility ifeq ($(ARCH),ppc) SRCARCH := powerpc endif +ifeq ($(ARCH),um) + SRCARCH := sandbox +endif + KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG @@ -566,7 +578,7 @@ endif include $(srctree)/scripts/Makefile.lib # Objects we will link into barebox / subdirs we need to visit -common-y := common/ drivers/ commands/ lib/ crypto/ net/ fs/ firmware/ +common-y := common/ drivers/ commands/ lib/ crypto/ net/ fs/ firmware/ test/ include $(srctree)/arch/$(SRCARCH)/Makefile @@ -880,6 +892,20 @@ ifndef CONFIG_PBL_IMAGE $(call cmd,check_file_size,$@,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE)) endif +install: +ifeq ($(INSTALL_PATH),) + @echo 'error: INSTALL_PATH undefined' >&2 + @exit 1 +endif +ifdef CONFIG_PBL_IMAGE + $(Q)$(MAKE) $(build)=images __images_install + @install -t "$(INSTALL_PATH)" barebox.bin +else + @install -t "$(INSTALL_PATH)" $(KBUILD_IMAGE) +endif + +PHONY += install + # By default the uImage load address is 2MB below CONFIG_TEXT_BASE, # leaving space for the compressed PBL image at 1MB below CONFIG_TEXT_BASE. UIMAGE_BASE ?= $(shell printf "0x%08x" $$(($(CONFIG_TEXT_BASE) - 0x200000))) |