diff options
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/Makefile | 61 | ||||
| -rw-r--r-- | target/mips/sys-available/fon-fon2100 | 2 | ||||
| -rw-r--r-- | target/mips/sys-available/mikrotik-rb411 | 2 | ||||
| -rw-r--r-- | target/mips/sys-available/mikrotik-rb433 | 2 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips | 1 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mipsel | 1 |
6 files changed, 46 insertions, 23 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile index ba6284611..7fc44a976 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -7,12 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -ifeq (${ADK_TARGET_SYSTEM_BROADCOM_BCM47XX},y) -CUSTOM_ROOTFSSQUASHFS_BUILD=1 -endif - ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) KERNEL:=$(LINUX_DIR)/vmlinuz +else ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) +KERNEL:=$(LINUX_DIR)/vmlinuz else KERNEL:=$(LINUX_DIR)/vmlinux endif @@ -55,33 +53,45 @@ kernel-install: endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB411),y) kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y) kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) -kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel +kernel-install: tools-compile + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + +${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux $(BUILD_DIR)/vmlinux.strip + dd if=$(BUILD_DIR)/vmlinux.strip of=${BUILD_DIR}/vmlinux bs=65536 conv=sync + lzma -9efzc ${BUILD_DIR}/vmlinux > $(BIN_DIR)/${TARGET_KERNEL} + cp ${BUILD_DIR}/root.squashfs ${BUILD_DIR}/${ROOTFSSQUASHFS} endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y) kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPSEL),y) kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) + @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(BIN_DIR)/${TARGET_KERNEL} @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' +ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) + @echo 'Type the following in Redboot:' + @echo 'RedBoot> load $(TARGET_KERNEL)' + @echo 'RedBoot> go' +endif endif ifeq ($(ADK_TARGET_FS),yaffs) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) @@ -92,27 +102,32 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @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)/$(ROOTFSTARBALL)" +ifneq ($(ADK_HARDWARE_QEMU),) @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)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' +endif endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @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-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' +ifneq ($(ADK_HARDWARE_QEMU),) + @echo "Start qemu with following command line:" + @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' +endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' +ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL)' +endif endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -138,10 +153,14 @@ imageinstall: kernel-install ${BUILD_DIR}/${ROOTFSSQUASHFS} else \ ${CP} ${BUILD_DIR}/${ROOTFSSQUASHFS} ${BIN_DIR}/${ROOTFSSQUASHFS}; \ echo The image file is $(ROOTFSSQUASHFS); \ - echo 'You can flash the image via tftp:'; \ - echo 'tftp 192.168.1.1'; \ - echo 'tftp> binary'; \ - echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin"; \ fi +ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) + echo The kernel file is $(TARGET_KERNEL) +endif +ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) + echo 'You can flash the image via tftp:' + echo 'tftp 192.168.1.1' + echo 'tftp> binary' + echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin" +endif endif - diff --git a/target/mips/sys-available/fon-fon2100 b/target/mips/sys-available/fon-fon2100 index 378beb11e..31ab06045 100644 --- a/target/mips/sys-available/fon-fon2100 +++ b/target/mips/sys-available/fon-fon2100 @@ -4,6 +4,8 @@ config ADK_TARGET_SYSTEM_FON_FON2100 select ADK_big select ADK_fon_fon2100 select ADK_KERNEL_ATHEROS_AR231X + select ADK_TARGET_WITH_MTD + select ADK_TARGET_WITH_AHB help Support for FON's FON2100. diff --git a/target/mips/sys-available/mikrotik-rb411 b/target/mips/sys-available/mikrotik-rb411 index 6ec780f12..6e1f597b1 100644 --- a/target/mips/sys-available/mikrotik-rb411 +++ b/target/mips/sys-available/mikrotik-rb411 @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB411 select ADK_big select ADK_mikrotik_rb411 select ADK_KERNEL_ATHEROS_AR71XX - select ADK_KERNEL_AR71XX_MACH_RB4XX + select ADK_KERNEL_ATHEROS_MACH_RB4XX select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND diff --git a/target/mips/sys-available/mikrotik-rb433 b/target/mips/sys-available/mikrotik-rb433 index 92a418f60..107f317a6 100644 --- a/target/mips/sys-available/mikrotik-rb433 +++ b/target/mips/sys-available/mikrotik-rb433 @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB433 select ADK_big select ADK_mikrotik_rb433 select ADK_KERNEL_ATHEROS_AR71XX - select ADK_KERNEL_AR71XX_MACH_RB4XX + select ADK_KERNEL_ATHEROS_MACH_RB4XX select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 9d2ecc7ef..59d31d38c 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS select ADK_big select ADK_qemu_mips select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_CPU_BIG_ENDIAN select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel index 6d3054cfd..fe64a6db2 100644 --- a/target/mips/sys-available/qemu-mipsel +++ b/target/mips/sys-available/qemu-mipsel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL select ADK_qemu_mipsel select ADK_little select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_CPU_LITTLE_ENDIAN select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT |