projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f50e4e
)
some platform support path name cleanup
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 18 Dec 2006 18:30:29 +0000
(18:30 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 18 Dec 2006 18:30:29 +0000
(18:30 +0000)
SVN-Revision: 5846
include/kernel-build.mk
patch
|
blob
|
history
include/kernel.mk
patch
|
blob
|
history
target/linux/aruba-2.6/image/Makefile
patch
|
blob
|
history
target/linux/au1000-2.6/image/Makefile
patch
|
blob
|
history
target/linux/brcm63xx-2.6/image/Makefile
patch
|
blob
|
history
target/linux/rb532-2.6/image/Makefile
patch
|
blob
|
history
diff --git
a/include/kernel-build.mk
b/include/kernel-build.mk
index 55e1b82ebdc9046bf2060af9633748d20b0b3c10..03b4769f4bb1ba095084358f8dbdfa75dbc1bce1 100644
(file)
--- a/
include/kernel-build.mk
+++ b/
include/kernel-build.mk
@@
-63,7
+63,7
@@
endif
define Kernel/Prepare/Default
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
define Kernel/Prepare/Default
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
endef
define Kernel/Prepare
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
endef
define Kernel/Prepare
@@
-110,7
+110,7
@@
ifeq ($(KERNEL),2.6)
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
mkdir -p $(BUILD_DIR)/root/etc/init.d
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
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
else
define Kernel/SetInitramfs
endef
else
define Kernel/SetInitramfs
diff --git
a/include/kernel.mk
b/include/kernel.mk
index b5950c3f5da444219a361603f8ef671d11ad36a0..1f34f00ca4888bd6b6def9c45e643fd89c7ab019 100644
(file)
--- a/
include/kernel.mk
+++ b/
include/kernel.mk
@@
-27,6
+27,7
@@
else
endif
PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
endif
PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+ GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git
a/target/linux/aruba-2.6/image/Makefile
b/target/linux/aruba-2.6/image/Makefile
index 37dd6fccb04ae63c29d014aa431fd858386c2dfb..e486b30ef2058251afd4d47d364afee6527d7f36 100644
(file)
--- a/
target/linux/aruba-2.6/image/Makefile
+++ b/
target/linux/aruba-2.6/image/Makefile
@@
-18,12
+18,12
@@
LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE)
define Build/Clean
RAMSIZE=$(RAMSIZE)
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
define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
endef
define Image/Prepare
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
define Image/BuildKernel
endef
define Image/BuildKernel
diff --git
a/target/linux/au1000-2.6/image/Makefile
b/target/linux/au1000-2.6/image/Makefile
index c9ab7caca9e87856c64a8c3cbe12133e2d3d1d13..b5ba3d45423086e66f29933789fb14c029cd2f62 100644
(file)
--- a/
target/linux/au1000-2.6/image/Makefile
+++ b/
target/linux/au1000-2.6/image/Makefile
@@
-21,7
+21,7
@@
LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE)
define Build/Clean
RAMSIZE=$(RAMSIZE)
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
DROP_SECTIONS := .reginfo .mdebug .comment .note .pdr .options .MIPS.options
endef
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
# Build RAM image
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
# Build RAM image
- $(MAKE) -C
../../generic-2.6
/image/lzma-loader \
+ $(MAKE) -C
$(GENERIC_PLATFORM_DIR)
/image/lzma-loader \
$(LOADER_MAKEOPTS) \
clean compile
$(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec
# Build Flash image
$(LOADER_MAKEOPTS) \
clean compile
$(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec
# Build Flash image
- $(MAKE) -C
../../generic-2.6
/image/lzma-loader \
+ $(MAKE) -C
$(GENERIC_PLATFORM_DIR)
/image/lzma-loader \
$(LOADER_MAKEOPTS) \
IMAGE_COPY=1 \
LOADER_ENTRY=$(FLASH_KERNEL) \
$(LOADER_MAKEOPTS) \
IMAGE_COPY=1 \
LOADER_ENTRY=$(FLASH_KERNEL) \
diff --git
a/target/linux/brcm63xx-2.6/image/Makefile
b/target/linux/brcm63xx-2.6/image/Makefile
index 27c7b49c39a4676fa5a2337a255546cb95a8b79d..5c16f0541c6d034b9396653fcb4d49a3c701e04e 100644
(file)
--- a/
target/linux/brcm63xx-2.6/image/Makefile
+++ b/
target/linux/brcm63xx-2.6/image/Makefile
@@
-18,12
+18,12
@@
LOADER_MAKEOPTS= \
RAMSIZE=$(RAMSIZE)
define Build/Clean
RAMSIZE=$(RAMSIZE)
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
define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
endef
define Image/Prepare
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
define Image/Build
endef
define Image/Build
diff --git
a/target/linux/rb532-2.6/image/Makefile
b/target/linux/rb532-2.6/image/Makefile
index 1f3a88ba4049a5240a99e7032a70d84b47c764ef..4e1c1addd15518a18b1d9bea8f104805358f0eef 100644
(file)
--- a/
target/linux/rb532-2.6/image/Makefile
+++ b/
target/linux/rb532-2.6/image/Makefile
@@
-25,7
+25,7
@@
define Build/Compile
endef
define Build/Clean
endef
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
define Image/Prepare
endef
define Image/Prepare
@@
-35,7
+35,7
@@
endef
define Image/BuildKernel
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
define Image/BuildKernel
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
endef
$(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux
endef