summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
committerU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
commit9115ff8b3139bab8ebc2d25f1ec03a98b2641c99 (patch)
tree2c7535d8970d7ebf5a7b5613fc3324b3200c0645
parent82009b8fa77db023dd186444e2698a5d9c01d496 (diff)
parent6b65886e809bdbfd7699e7fbbc8980f5eb4992c4 (diff)
Merge branch 'master' of git://openadk.org/git/openadk
-rw-r--r--mk/image.mk11
-rw-r--r--rules.mk1
-rw-r--r--target/Config.in24
-rw-r--r--target/ag241/Makefile6
-rw-r--r--target/alix1c/Makefile4
-rw-r--r--target/alix2d/Makefile4
-rw-r--r--target/foxboard/Makefile4
-rw-r--r--target/g1/Makefile2
-rw-r--r--target/lemote/Makefile14
-rw-r--r--target/linux/config/Config.in.network1
-rw-r--r--target/native/Makefile4
-rw-r--r--target/qemu-arm/Makefile12
-rw-r--r--target/qemu-cris/Makefile6
-rw-r--r--target/qemu-mips/Makefile8
-rw-r--r--target/qemu-mips64/Makefile8
-rw-r--r--target/qemu-mips64el/Makefile10
-rw-r--r--target/qemu-mipsel/Makefile9
-rw-r--r--target/qemu-x86/Makefile14
-rw-r--r--target/qemu-x86_64/Makefile12
-rw-r--r--target/rb411/Makefile8
-rw-r--r--target/rb433/Makefile8
-rw-r--r--target/rb532/Makefile6
-rw-r--r--target/rescue-x86/Makefile5
-rw-r--r--target/rescue-x86_64/Makefile10
-rw-r--r--target/shuttle/Makefile11
-rw-r--r--target/tomtom/Makefile3
-rw-r--r--target/wag54g/Makefile8
-rw-r--r--target/wrap/Makefile6
-rw-r--r--target/zaurus/Makefile3
-rw-r--r--toolchain/gcc/patches/mirbsd-compat.patch12
30 files changed, 136 insertions, 98 deletions
diff --git a/mk/image.mk b/mk/image.mk
index a720bb1ea..c6f5ce266 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -48,10 +48,10 @@ image-prepare-post:
chmod 4511 ${TARGET_DIR}/bin/busybox
chmod 1777 ${TARGET_DIR}/tmp
-INITRAMFS= ${ADK_TARGET}-${ARCH}-${FS}
-ROOTFSSQUASHFS= ${ADK_TARGET}-${ARCH}-${FS}.img
-ROOTFSTARBALL= ${ADK_TARGET}-${ARCH}-${FS}.tar.gz
-INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ARCH}-${FS}.cpio
+INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
+ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
+ROOTFSTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
+INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
@@ -68,7 +68,8 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
PATH='${TARGET_PATH}' \
mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \
-nopad -noappend -root-owned $(MAKE_TRACE)
- cat ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \
+ cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \
+ ${BUILD_DIR}/root.squashfs > \
${BUILD_DIR}/${ROOTFSSQUASHFS}
# padding of images is required, foxboard only?
#dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
diff --git a/rules.mk b/rules.mk
index 7bc0b44d9..bd4d47ed7 100644
--- a/rules.mk
+++ b/rules.mk
@@ -26,6 +26,7 @@ endif
# Strip off the annoying quoting
ADK_TARGET:= $(strip $(subst ",, $(ADK_TARGET)))
+ADK_LIBC:= $(strip $(subst ",, $(ADK_LIBC)))
ADK_TARGET_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_SUFFIX)))
ADK_COMPRESSION_TOOL:= $(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
diff --git a/target/Config.in b/target/Config.in
index 738d50b31..71a44b11d 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -128,6 +128,22 @@ config ADK_TARGET
default "tomtom" if ADK_tomtom
default "g1" if ADK_g1
+# c library
+config ADK_uclibc
+ tristate
+
+config ADK_eglibc
+ tristate
+
+config ADK_glibc
+ tristate
+
+config ADK_LIBC
+ string
+ default "uclibc" if ADK_uclibc
+ default "eglibc" if ADK_eglibc
+ default "glibc" if ADK_glibc
+
menu "Target system"
choice
@@ -239,6 +255,9 @@ config ADK_LINUX_MIPS_AG241
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_MII
+ select ADK_PACKAGE_KMOD_SANGAM_ATM
+ select ADK_KPACKAGE_KMOD_ATM_BR2684
+ select ADK_PACKAGE_BR2684CTL
select ADK_ag241
help
Linksys AG241 DSL router.
@@ -472,11 +491,13 @@ config ADK_TARGET_LIB_UCLIBC
bool "uClibc embedded C library"
# broken, because of 16kB pagesize
depends on !ADK_LINUX_MIPS64_LEMOTE
+ select ADK_uclibc
help
http://uclibc.org
config ADK_TARGET_LIB_EGLIBC
bool "Embedded GNU C library"
+ select ADK_eglibc
depends on ADK_LINUX_X86_QEMU || \
ADK_LINUX_ARM_QEMU || \
ADK_LINUX_MIPS_QEMU || \
@@ -500,6 +521,7 @@ config ADK_TARGET_LIB_EGLIBC
config ADK_TARGET_LIB_GLIBC
bool "GNU C library"
+ select ADK_glibc
depends on ADK_LINUX_X86_QEMU || \
ADK_LINUX_ARM_QEMU || \
ADK_LINUX_MIPS_QEMU || \
@@ -770,6 +792,4 @@ config ADK_TARGET_PACKAGE_RPM
endchoice
-
endmenu
-
diff --git a/target/ag241/Makefile b/target/ag241/Makefile
index 730b06bfa..e87a55d0d 100644
--- a/target/ag241/Makefile
+++ b/target/ag241/Makefile
@@ -27,7 +27,7 @@ kernel-install: tools-compile
$(LINUX_DIR)/vmlinux.tmp
PATH='${TARGET_PATH}' \
addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \
- -o $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),squashfs)
imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
@@ -47,11 +47,11 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'You can flash the kernel via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
- @echo 'tftp> put ag241-mips-kernel upgrade_code.bin'
+ @echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile
index 4278c90f9..691cf1a08 100644
--- a/target/alix1c/Makefile
+++ b/target/alix1c/Makefile
@@ -20,9 +20,9 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE)
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
@echo
- @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile
index 4278c90f9..691cf1a08 100644
--- a/target/alix2d/Makefile
+++ b/target/alix2d/Makefile
@@ -20,9 +20,9 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE)
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
@echo
- @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile
index 1ede6b378..f33dc813a 100644
--- a/target/foxboard/Makefile
+++ b/target/foxboard/Makefile
@@ -18,7 +18,7 @@ tools-compile: $(TOOLS_BUILD_DIR)
kernel-install: tools-compile
PATH='${TARGET_PATH}' mkfimage $(LINUX_DIR)/arch/cris/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE)
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
ifeq ($(FS),squashfs)
imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
@@ -30,7 +30,7 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: ${BIN_DIR}/${ROOTFSTARBALL}
@echo
- @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${ARCH}-kernel to flash the kernel
+ @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel
@echo Do not forget to set network boot jumper, before you start the foxboard
@echo ${ROOTFSTARBALL} is your nfs root and can be extracted on your nfs server
@echo 'Login as user root with password linux123 via ssh or console'
diff --git a/target/g1/Makefile b/target/g1/Makefile
index 6b6da3576..0e56f5e84 100644
--- a/target/g1/Makefile
+++ b/target/g1/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index fa2adc09e..9654e0c5e 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -11,7 +11,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build
kernel-install:
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
createinit:
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
@@ -20,11 +20,11 @@ createinit:
$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
$(CP) $(LINUX_DIR)/arch/mips/loongson/image/vmlinuz \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Boot your lemote and type following commands in PMON:'
@echo 'PMON> ifaddr rtl0 <ip-address-client>'
@@ -34,7 +34,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
endif
ifeq ($(FS),encrypted)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit
- @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo 'Boot your lemote via NFS or USB.'
@echo 'Then create at least three partitions with fdisk:'
@@ -55,7 +55,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit
@echo
@echo 'Copy $(ROOTFSTARBALL) via scp to /mnt/root and extract it'
@echo 'cd /mnt/root ; gunzip $(ROOTFSTARBALL); tar xpvf $(ROOTFSTARBALL)'
- @echo 'Copy ${ADK_TARGET}-${ARCH}-kernel via scp to /mnt/boot/boot'
+ @echo 'Copy ${ADK_TARGET}-${FS}-kernel via scp to /mnt/boot/boot'
@echo 'Move boot.cfg to /mnt/boot/boot'
@echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot'
@echo 'cd /mnt/root ; mknod -m 644 console c 5 1'
@@ -63,14 +63,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 68d8f2d8a..bbee048e7 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -61,6 +61,7 @@ config ADK_KPACKAGE_KMOD_ATM
config ADK_KPACKAGE_KMOD_ATM_BR2684
prompt "kmod-atm-br2684................... BR2684 ATM module"
tristate
+ select ADK_KPACKAGE_KMOD_ATM
default n
help
diff --git a/target/native/Makefile b/target/native/Makefile
index 471008094..2b279e4ff 100644
--- a/target/native/Makefile
+++ b/target/native/Makefile
@@ -12,8 +12,8 @@ kernel-install:
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile
index 4f7c7904a..cda4e95bb 100644
--- a/target/qemu-arm/Makefile
+++ b/target/qemu-arm/Makefile
@@ -8,10 +8,10 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
createinit:
- @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma
+ @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
@@ -20,7 +20,7 @@ createinit:
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
$(CP) $(LINUX_DIR)/arch/arm/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -30,14 +30,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile
index 64ae8e35a..30402fb67 100644
--- a/target/qemu-cris/Makefile
+++ b/target/qemu-cris/Makefile
@@ -16,7 +16,7 @@ tools-compile: $(TOOLS_BUILD_DIR)
kernel-install: tools-compile
PATH='${TARGET_PATH}' \
mkfimage $(LINUX_DIR)/arch/cris/arch-v32/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE)
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -25,13 +25,13 @@ imageinstall: $(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 "Start qemu with following command line:"
- @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile
index 1615ecc13..22ef9be19 100644
--- a/target/qemu-mips/Makefile
+++ b/target/qemu-mips/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -17,14 +17,14 @@ imageinstall: $(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 "Start qemu with following options:"
- @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+ @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}
+ @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile
index 864843c83..18f283d4a 100644
--- a/target/qemu-mips64/Makefile
+++ b/target/qemu-mips64/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -17,14 +17,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
- @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+ @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile
index 6d7d9881b..7445814be 100644
--- a/target/qemu-mips64el/Makefile
+++ b/target/qemu-mips64el/Makefile
@@ -8,24 +8,24 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo
@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 "Start qemu with following options:"
- @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"'
+ @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index b1c822611..dcbb46b31 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -8,24 +8,23 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
@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 $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+ @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index 75404b25c..d9828d77f 100644
--- a/target/qemu-x86/Makefile
+++ b/target/qemu-x86/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
createinit:
@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
@@ -20,7 +20,7 @@ createinit:
CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -28,27 +28,27 @@ imageinstall: $(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 "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index e3880de7a..fe980bdac 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
createinit:
@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
@@ -20,7 +20,7 @@ createinit:
CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -29,13 +29,13 @@ imageinstall: $(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 "Start qemu with following command line:"
- @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@@ -46,10 +46,10 @@ endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img'
+ @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb411/Makefile b/target/rb411/Makefile
index 4a17d048e..b9ee5932b 100644
--- a/target/rb411/Makefile
+++ b/target/rb411/Makefile
@@ -8,21 +8,21 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),yaffs)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Format your NAND with Routerboot, boot via NFS and'
@echo 'then install kernel and filesystem:'
@echo 'mount -t yaffs2 /dev/mtdblock0 /mnt'
- @echo 'cp ${ADK_TARGET}-${ARCH}-kernel /mnt/kernel'
+ @echo 'cp ${ADK_TARGET}-${FS}-kernel /mnt/kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb433/Makefile b/target/rb433/Makefile
index 4a17d048e..b9ee5932b 100644
--- a/target/rb433/Makefile
+++ b/target/rb433/Makefile
@@ -8,21 +8,21 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),yaffs)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Format your NAND with Routerboot, boot via NFS and'
@echo 'then install kernel and filesystem:'
@echo 'mount -t yaffs2 /dev/mtdblock0 /mnt'
- @echo 'cp ${ADK_TARGET}-${ARCH}-kernel /mnt/kernel'
+ @echo 'cp ${ADK_TARGET}-${FS}-kernel /mnt/kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index f1b2566b6..f0e6028ec 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -11,12 +11,12 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build
kernel-install:
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),ext2-cf)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo 'Login as user root with password linux123 via ssh or console'
endif
@@ -24,7 +24,7 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile
index 5fd608d45..81a529d14 100644
--- a/target/rescue-x86/Makefile
+++ b/target/rescue-x86/Makefile
@@ -8,11 +8,12 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage \
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile
index 58517d2fe..6e4f275ee 100644
--- a/target/rescue-x86_64/Makefile
+++ b/target/rescue-x86_64/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
kernel-install:
createinit:
- @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma
+ @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
@@ -20,18 +20,18 @@ createinit:
$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/shuttle/Makefile b/target/shuttle/Makefile
index 9cc8a0e95..53ab59227 100644
--- a/target/shuttle/Makefile
+++ b/target/shuttle/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
kernel-install:
createinit:
- @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma
+ @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
@@ -20,18 +20,19 @@ createinit:
$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage \
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/tomtom/Makefile b/target/tomtom/Makefile
index 1d331215c..dea4d3b9c 100644
--- a/target/tomtom/Makefile
+++ b/target/tomtom/Makefile
@@ -8,7 +8,8 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/arm/boot/zImage \
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile
index 90f63ceec..d86ada854 100644
--- a/target/wag54g/Makefile
+++ b/target/wag54g/Makefile
@@ -19,7 +19,7 @@ tools-compile: $(TOOLS_BUILD_DIR)
kernel-install: tools-compile
PATH='${TARGET_PATH}' \
- mipsel-linux-objcopy -S -O srec $(LINUX_DIR)/vmlinux \
+ $(TARGET_CROSS)objcopy -S -O srec $(LINUX_DIR)/vmlinux \
$(LINUX_DIR)/vmlinux.srec
PATH='${TARGET_PATH}' \
srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin
@@ -27,7 +27,7 @@ kernel-install: tools-compile
$(LINUX_DIR)/vmlinux.tmp
PATH='${TARGET_PATH}' \
addpattern -p WA21 -i $(LINUX_DIR)/vmlinux.tmp \
- -o $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),squashfs)
imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
@@ -44,11 +44,11 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'You can flash the kernel via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
- @echo 'tftp> put wag54g-mips-kernel upgrade_code.bin'
+ @echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/wrap/Makefile b/target/wrap/Makefile
index 006b09907..b7eff383e 100644
--- a/target/wrap/Makefile
+++ b/target/wrap/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk
+ @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk
ifeq ($(FS),ext2-cf)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -20,9 +20,9 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE)
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
@echo
- @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/zaurus/Makefile b/target/zaurus/Makefile
index 1d331215c..dea4d3b9c 100644
--- a/target/zaurus/Makefile
+++ b/target/zaurus/Makefile
@@ -8,7 +8,8 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/arm/boot/zImage \
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
diff --git a/toolchain/gcc/patches/mirbsd-compat.patch b/toolchain/gcc/patches/mirbsd-compat.patch
new file mode 100644
index 000000000..2f3ea0c87
--- /dev/null
+++ b/toolchain/gcc/patches/mirbsd-compat.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure
+--- gcc-4.4.2.orig/gcc/configure Tue Mar 24 18:45:39 2009
++++ gcc-4.4.2/gcc/configure Sat Dec 19 21:07:07 2009
+@@ -19381,7 +19381,7 @@
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd*)
++mirbsd*|openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no