some platform support path name cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5846 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2006-12-18 18:30:29 +00:00
parent be6b488973
commit ad1b040137
6 changed files with 12 additions and 11 deletions

View File

@ -63,7 +63,7 @@ endif
define Kernel/Prepare/Default define Kernel/Prepare/Default
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
endef endef
define Kernel/Prepare define Kernel/Prepare
@ -110,7 +110,7 @@ ifeq ($(KERNEL),2.6)
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
mkdir -p $(BUILD_DIR)/root/etc/init.d mkdir -p $(BUILD_DIR)/root/etc/init.d
$(CP) $(TOPDIR)/target/linux/generic-2.6/files/init $(BUILD_DIR)/root/ $(CP) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/
endef endef
else else
define Kernel/SetInitramfs define Kernel/SetInitramfs

View File

@ -27,6 +27,7 @@ else
endif endif
PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)

View File

@ -18,12 +18,12 @@ LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE) RAMSIZE=$(RAMSIZE)
define Build/Clean define Build/Clean
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
endef endef
define Image/Prepare define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean compile $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile
endef endef
define Image/BuildKernel define Image/BuildKernel

View File

@ -21,7 +21,7 @@ LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE) RAMSIZE=$(RAMSIZE)
define Build/Clean define Build/Clean
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
endef endef
DROP_SECTIONS := .reginfo .mdebug .comment .note .pdr .options .MIPS.options DROP_SECTIONS := .reginfo .mdebug .comment .note .pdr .options .MIPS.options
@ -32,13 +32,13 @@ define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
# Build RAM image # Build RAM image
$(MAKE) -C ../../generic-2.6/image/lzma-loader \ $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader \
$(LOADER_MAKEOPTS) \ $(LOADER_MAKEOPTS) \
clean compile clean compile
$(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec $(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec
# Build Flash image # Build Flash image
$(MAKE) -C ../../generic-2.6/image/lzma-loader \ $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader \
$(LOADER_MAKEOPTS) \ $(LOADER_MAKEOPTS) \
IMAGE_COPY=1 \ IMAGE_COPY=1 \
LOADER_ENTRY=$(FLASH_KERNEL) \ LOADER_ENTRY=$(FLASH_KERNEL) \

View File

@ -18,12 +18,12 @@ LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE) RAMSIZE=$(RAMSIZE)
define Build/Clean define Build/Clean
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
endef endef
define Image/Prepare define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) compile $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) compile
endef endef
define Image/Build define Image/Build

View File

@ -25,7 +25,7 @@ define Build/Compile
endef endef
define Build/Clean define Build/Clean
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
endef endef
define Image/Prepare define Image/Prepare
@ -35,7 +35,7 @@ endef
define Image/BuildKernel define Image/BuildKernel
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean compile $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile
$(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux $(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux
endef endef