diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-08-02 09:54:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-08-02 09:54:33 +0000 |
| commit | 7a6d8bdc0a919b6b2f3fb48af3f72c3100450ba1 (patch) | |
| tree | 9de893250eaaa5a42fd9925ee2680d42ce0db71b /target/linux/ar71xx/image | |
| parent | 18315094a07c9504c18e2c54b8ddbc197f686e28 (diff) | |
| download | upstream-7a6d8bdc0a919b6b2f3fb48af3f72c3100450ba1.tar.gz upstream-7a6d8bdc0a919b6b2f3fb48af3f72c3100450ba1.tar.bz2 upstream-7a6d8bdc0a919b6b2f3fb48af3f72c3100450ba1.zip | |
ar71xx: image: allow to use board specific code in the lzma-loader
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/image')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/lzma-loader/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/lzma-loader/src/Makefile | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 3897dd49bf..26ac0ab102 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -113,7 +113,7 @@ define Image/BuildLoader -rm -rf $(KDIR)/lzma-loader $(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)"\ LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \ - LOADER_DATA="$(KDIR)/vmlinux.bin.lzma" \ + LOADER_DATA="$(KDIR)/vmlinux.bin.lzma" BOARD="$(1)" \ compile loader.$(2) endef @@ -121,7 +121,7 @@ define Image/BuildLoaderAlone -rm -rf $(KDIR)/lzma-loader $(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)" \ LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \ - FLASH_OFFS=$(4) FLASH_MAX=$(5) \ + BOARD="$(1)" FLASH_OFFS=$(4) FLASH_MAX=$(5) \ compile loader.$(2) endef diff --git a/target/linux/ar71xx/image/lzma-loader/Makefile b/target/linux/ar71xx/image/lzma-loader/Makefile index 8d36691cb5..2e0b9111f2 100644 --- a/target/linux/ar71xx/image/lzma-loader/Makefile +++ b/target/linux/ar71xx/image/lzma-loader/Makefile @@ -15,6 +15,7 @@ LOADER_DATA := TARGET_DIR := FLASH_OFFS := FLASH_MAX := +BOARD := ifeq ($(TARGET_DIR),) TARGET_DIR := $(KDIR) @@ -40,6 +41,7 @@ loader-compile: $(PKG_BUILD_DIR)/.prepared LOADER_DATA=$(LOADER_DATA) \ FLASH_OFFS=$(FLASH_OFFS) \ FLASH_MAX=$(FLASH_MAX) \ + BOARD="$(BOARD)" \ clean all loader.gz: $(PKG_BUILD_DIR)/loader.bin diff --git a/target/linux/ar71xx/image/lzma-loader/src/Makefile b/target/linux/ar71xx/image/lzma-loader/src/Makefile index c5965c9bde..3e6839c7c3 100644 --- a/target/linux/ar71xx/image/lzma-loader/src/Makefile +++ b/target/linux/ar71xx/image/lzma-loader/src/Makefile @@ -18,7 +18,7 @@ LOADADDR := LZMA_TEXT_START := 0x80a00000 LOADER_DATA := -CONFIG_BOARD := +BOARD := FLASH_OFFS := FLASH_MAX := @@ -63,6 +63,11 @@ ifneq ($(strip $(FLASH_MAX)),) CFLAGS += -DCONFIG_FLASH_MAX=$(FLASH_MAX) endif +BOARD_DEF := $(shell echo $(strip $(BOARD)) | tr a-z A-Z | tr - _) +ifneq ($(BOARD_DEF),) +CFLAGS += -DCONFIG_BOARD_$(BOARD_DEF) +endif + all: loader.bin # Don't build dependencies, this may die if $(CC) isn't gcc |