yet more cleanup (make sure to honor TARGET_CC and not just TARGET_CROSS)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4433 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
ad8fe944b9
commit
1dac4c1d16
|
@ -33,11 +33,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
|
||||||
|
|
||||||
ifeq ($(KERNEL),2.4)
|
ifeq ($(KERNEL),2.4)
|
||||||
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
|
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
|
||||||
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
|
|
||||||
$(LINUX_DIR)/Makefile \
|
|
||||||
$(LINUX_DIR)/arch/*/Makefile
|
|
||||||
$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
|
$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
|
||||||
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
|
PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
|
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
|
||||||
|
@ -47,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
|
||||||
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
|
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
|
||||||
else
|
else
|
||||||
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
|
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
|
||||||
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
|
PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
|
||||||
touch $@
|
touch $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -66,16 +63,16 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
|
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
|
||||||
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)"
|
PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH)
|
||||||
|
|
||||||
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
|
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
|
||||||
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
|
PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
|
||||||
touch -c $(LINUX_KERNEL)
|
touch -c $(LINUX_KERNEL)
|
||||||
|
|
||||||
$(LINUX_DIR)/.modules_done:
|
$(LINUX_DIR)/.modules_done:
|
||||||
rm -rf $(KERNEL_BUILD_DIR)/modules
|
rm -rf $(KERNEL_BUILD_DIR)/modules
|
||||||
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
|
PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules
|
||||||
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
|
PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
|
||||||
touch $(LINUX_DIR)/.modules_done
|
touch $(LINUX_DIR)/.modules_done
|
||||||
|
|
||||||
modules: $(LINUX_DIR)/.modules_done
|
modules: $(LINUX_DIR)/.modules_done
|
||||||
|
|
|
@ -53,6 +53,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
|
||||||
PATH="$(TARGET_PATH)" \
|
PATH="$(TARGET_PATH)" \
|
||||||
ARCH="$(LINUX_KARCH)" \
|
ARCH="$(LINUX_KARCH)" \
|
||||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
|
CC="$(TARGET_CC)" \
|
||||||
TARGET="$(HAL_TARGET)" \
|
TARGET="$(HAL_TARGET)" \
|
||||||
TOOLPREFIX="$(KERNEL_CROSS)" \
|
TOOLPREFIX="$(KERNEL_CROSS)" \
|
||||||
TOOLPATH="$(KERNEL_CROSS)" \
|
TOOLPATH="$(KERNEL_CROSS)" \
|
||||||
|
|
|
@ -19,8 +19,8 @@ $(PKG_BUILD_DIR)/.prepared:
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma
|
$(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)" \
|
PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
LD="$(TARGET_CROSS)ld" CROSS_COMPILE="$(TARGET_CROSS)" \
|
CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
RAMSIZE=$(RAMSIZE) \
|
RAMSIZE=$(RAMSIZE) \
|
||||||
LOADADDR=$(LOADADDR) \
|
LOADADDR=$(LOADADDR) \
|
||||||
KERNEL_ENTRY=$(KERNEL_ENTRY) \
|
KERNEL_ENTRY=$(KERNEL_ENTRY) \
|
||||||
|
|
Loading…
Reference in New Issue