diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-04-16 22:45:47 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-04-16 22:45:47 +0000 |
| commit | f5e9fe17b227d8aab47dd95595cee24a71e206ec (patch) | |
| tree | f6830e5296a8a2f7037a2d74e749c5ca129ac7de | |
| parent | ed638f6feb504ce23602af5b3d8db34ab12da0fa (diff) | |
Fix bad linux kernel name
| -rw-r--r-- | target/device/Atmel/Makefile.in | 2 | ||||
| -rw-r--r-- | target/linux/Makefile.in.advanced | 25 |
2 files changed, 6 insertions, 21 deletions
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index 6a998d0df..8ad35c62c 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -37,7 +37,7 @@ LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config # This should be part of target/linux/Makefile.in LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR) -LINUX26_BINLOC=$(LINUX26_FORMAT) +#LINUX26_BINLOC=$(LINUX26_FORMAT) #LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL) ifeq ($(strip $(BR2_avr32)),y) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT) diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index c686d384b..a96288d18 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -134,11 +134,7 @@ endif # -------------- # UIMAGE ifeq ($(LINUX26_FORMAT),uImage) -ifeq ($(BR2_avr32),y) -LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_FORMAT) -else LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) -endif KERNEL_EXT:=.gz endif @@ -153,28 +149,15 @@ endif # BZIMAGE ifeq ($(LINUX26_FORMAT),bzImage) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage -KERNEL_EXT:= +KERNEL_EXT:=.bz endif endif # ----------------------------------------------------------------------------- # File name for the Linux kernel binary -ifeq ($(LINUX26_FORMAT),uImage) -LINUX26_KERNEL_NAME:="uImage" -endif -ifeq ($(LINUX26_FORMAT),bzImage) -LINUX26_KERNEL_NAME:="bzImage" -endif -ifeq ($(LINUX26_FORMAT),vmlinux) -LINUX26_KERNEL_NAME:="vmlinux" -endif -ifeq ($(LINUX26_FORMAT),zImage) -LINUX26_KERNEL_NAME:="zImage" -endif -ifeq ($(LINUX26_FORMAT),custom) LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT) -endif + ifeq ($(BOARD_NAME),) BOARD_NAME=$(ARCH) @@ -387,10 +370,12 @@ $(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $@ -$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \ +$(LINUX26_DIR)/$(LINUX26_BINLOC): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \ $(LINUX26_DIR)/.depend_done $(MAKE) $(LINUX26_MAKE_FLAGS) \ -C $(LINUX26_DIR) $(LINUX26_FORMAT) + +$(LINUX26_KERNEL): $(LINUX26_DIR)/$(LINUX26_BINLOC) cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL) touch -c $@ |