From 8f219fb9f03a068a7d9e26f43affefa0b1c4b836 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 31 Dec 2010 20:29:39 +0100
Subject: should be without path, just the name of the kernel
---
target/mipsel/Makefile | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
(limited to 'target/mipsel')
diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile
index 02e6057ca..752d80019 100644
--- a/target/mipsel/Makefile
+++ b/target/mipsel/Makefile
@@ -11,7 +11,7 @@ KERNEL:=$(LINUX_DIR)/vmlinux
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
$(TOOLS_BUILD_DIR):
- mkdir -p $(TOOLS_BUILD_DIR)
+ @mkdir -p $(TOOLS_BUILD_DIR)
tools-compile: $(TOOLS_BUILD_DIR)
$(MAKE) -C ../tools/trx
@@ -23,7 +23,7 @@ ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_WRT54G),y)
kernel-install: tools-compile
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
$(LINUX_DIR)/vmlinuz
- @gzip -c9 $(LINUX_DIR)/vmlinuz > $(TARGET_KERNEL)
+ @gzip -c9 $(LINUX_DIR)/vmlinuz > $(BIN_DIR)/$(TARGET_KERNEL)
endif
ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y)
@@ -33,7 +33,7 @@ kernel-install: tools-compile
PATH='${TARGET_PATH}' srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin
(dd if=/dev/zero bs=16 count=1; cat $(LINUX_DIR)/vmlinux.bin) > $(LINUX_DIR)/vmlinux.tmp
PATH='${TARGET_PATH}' addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \
- -o $(TARGET_KERNEL) 2>/dev/null
+ -o $(BIN_DIR)/$(TARGET_KERNEL) 2>/dev/null
endif
ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
@@ -44,8 +44,8 @@ endif
ifeq ($(ADK_TARGET_FS),cf)
imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @cp $(TARGET_DIR)/boot/kernel $(TARGET_KERNEL)
- @echo 'The kernel file is: ${TARGET_KERNEL}'
+ @cp $(TARGET_DIR)/boot/kernel $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSUSERTARBALL)"
@echo "Boot the board via network (tftp+nfsroot) and use adkinstall."
@echo "If you just want to update, use adkupdate."
@@ -65,43 +65,43 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
endif
ifeq ($(ADK_TARGET_FS),nfsroot)
imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @echo 'The kernel file is: ${TARGET_KERNEL}'
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y)
@echo 'You can flash the kernel via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
- @echo 'tftp> put ${TARGET_KERNEL} upgrade_code.bin'
+ @echo 'tftp> put $(BIN_DIR)/${TARGET_KERNEL} upgrade_code.bin'
endif
ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_WRT54G),y)
@echo 'Type following on the CFE prompt to boot the kernel:'
- @echo 'CFE> boot -z -elf -tftp 192.168.1.254:${TARGET_KERNEL}'
+ @echo 'CFE> boot -z -elf -tftp 192.168.1.254:$(BIN_DIR)/${TARGET_KERNEL}'
endif
endif
ifeq ($(ADK_TARGET_FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @cp $(KERNEL) $(TARGET_KERNEL)
- @echo 'The kernel file is: ${TARGET_KERNEL}'
+ @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Be sure to change permissions after image creation."
@echo "Start qemu with following options:"
- @echo 'qemu-system-mipsel -nographic -M malta -kernel $(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+ @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
endif
ifeq ($(ADK_TARGET_FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @cp $(KERNEL) $(TARGET_KERNEL)
- @echo 'The kernel file is: ${TARGET_KERNEL}'
+ @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-mipsel -nographic -M malta -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
- @cp $(KERNEL) $(TARGET_KERNEL)
- @echo 'The kernel+initramfs file is: ${TARGET_KERNEL}'
+ @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo "Start qemu with following command line:"
- @echo 'qemu-system-mipsel -nographic -M malta -kernel $(TARGET_KERNEL)'
+ @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
ifeq ($(ADK_TARGET_FS),yaffs)
imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
--
cgit v1.2.3
From dfadb4d959da4c63d0c634f0d50713f3fa679e50 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 2 Jan 2011 13:22:45 +0100
Subject: make bulk fixes. fix toolchain building for sparc64/ppc
---
target/mipsel/Makefile | 9 ++++-----
target/mipsel/sys-available/qemu | 12 ------------
target/mipsel/sys-available/qemu-mipsel | 12 ++++++++++++
target/mipsel/sys-available/toolchain | 8 --------
target/mipsel/sys-available/toolchain-mipsel | 8 ++++++++
5 files changed, 24 insertions(+), 25 deletions(-)
delete mode 100644 target/mipsel/sys-available/qemu
create mode 100644 target/mipsel/sys-available/qemu-mipsel
delete mode 100644 target/mipsel/sys-available/toolchain
create mode 100644 target/mipsel/sys-available/toolchain-mipsel
(limited to 'target/mipsel')
diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile
index 752d80019..6578082b0 100644
--- a/target/mipsel/Makefile
+++ b/target/mipsel/Makefile
@@ -22,18 +22,17 @@ tools-compile: $(TOOLS_BUILD_DIR)
ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_WRT54G),y)
kernel-install: tools-compile
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
- $(LINUX_DIR)/vmlinuz
- @gzip -c9 $(LINUX_DIR)/vmlinuz > $(BIN_DIR)/$(TARGET_KERNEL)
+ $(LINUX_DIR)/vmlinux.stripped
+ @gzip -c9 $(LINUX_DIR)/vmlinux.stripped > $(BUILD_DIR)/$(TARGET_KERNEL)
endif
ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y)
kernel-install: tools-compile
- ${TARGET_CROSS}objcopy -S -O srec $(KERNEL) \
- $(LINUX_DIR)/vmlinux.srec
+ ${TARGET_CROSS}objcopy -S -O srec $(KERNEL) $(LINUX_DIR)/vmlinux.srec
PATH='${TARGET_PATH}' srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin
(dd if=/dev/zero bs=16 count=1; cat $(LINUX_DIR)/vmlinux.bin) > $(LINUX_DIR)/vmlinux.tmp
PATH='${TARGET_PATH}' addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \
- -o $(BIN_DIR)/$(TARGET_KERNEL) 2>/dev/null
+ -o $(BUILD_DIR)/$(TARGET_KERNEL) 2>/dev/null
endif
ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
diff --git a/target/mipsel/sys-available/qemu b/target/mipsel/sys-available/qemu
deleted file mode 100644
index d094ff602..000000000
--- a/target/mipsel/sys-available/qemu
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPSEL
- bool "Qemu Emulator"
- select ADK_mipsel
- select ADK_qemu
- select ADK_HARDWARE_QEMU
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_INPUT
- select ADK_TARGET_WITH_PCI
- select ADK_TARGET_WITH_HDD
- help
- Qemu support for mips little endian architecture.
-
diff --git a/target/mipsel/sys-available/qemu-mipsel b/target/mipsel/sys-available/qemu-mipsel
new file mode 100644
index 000000000..d29333c8d
--- /dev/null
+++ b/target/mipsel/sys-available/qemu-mipsel
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_QEMU_MIPSEL
+ bool "Qemu Emulator"
+ select ADK_mipsel
+ select ADK_qemu_mipsel
+ select ADK_HARDWARE_QEMU
+ select ADK_TARGET_WITH_VGA
+ select ADK_TARGET_WITH_INPUT
+ select ADK_TARGET_WITH_PCI
+ select ADK_TARGET_WITH_HDD
+ help
+ Qemu support for mips little endian architecture.
+
diff --git a/target/mipsel/sys-available/toolchain b/target/mipsel/sys-available/toolchain
deleted file mode 100644
index 80e40d6b0..000000000
--- a/target/mipsel/sys-available/toolchain
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
- bool "Toolchain only"
- select ADK_mipsel
- select ADK_toolchain
- select ADK_TOOLCHAIN_ONLY
- help
- mipsel toolchain.
-
diff --git a/target/mipsel/sys-available/toolchain-mipsel b/target/mipsel/sys-available/toolchain-mipsel
new file mode 100644
index 000000000..c4a1e1c9f
--- /dev/null
+++ b/target/mipsel/sys-available/toolchain-mipsel
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
+ bool "Toolchain only"
+ select ADK_mipsel
+ select ADK_toolchain_mipsel
+ select ADK_TOOLCHAIN_ONLY
+ help
+ mipsel toolchain.
+
--
cgit v1.2.3