diff options
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/Makefile | 13 | ||||
| -rw-r--r-- | target/mips/imgtec-ci20/genimage.cfg | 33 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips | 1 | ||||
| -rw-r--r-- | target/mips/systems/imgtec-ci20 | 2 | ||||
| -rw-r--r-- | target/mips/uclibc-ng.config | 3 |
5 files changed, 42 insertions, 10 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile index db66205bd..2255ffa42 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y) KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage endif +ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y) +KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz +endif OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id @@ -76,12 +79,12 @@ targethelp: endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: - @echo "The disk image is: $(FW_DIR)/disk.img" + @echo "The disk image is: $(FW_DIR)/sdcard.img" ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' endif endif ifeq ($(ADK_TARGET_FS),ubifs) @@ -90,13 +93,9 @@ targethelp: @echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}' endif -# image creation and kernel install +# dummy kernel-strip: -ifeq ($(ADK_TARGET_KERNEL_UIMAGE),) - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -else @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} diff --git a/target/mips/imgtec-ci20/genimage.cfg b/target/mips/imgtec-ci20/genimage.cfg new file mode 100644 index 000000000..8b55766ec --- /dev/null +++ b/target/mips/imgtec-ci20/genimage.cfg @@ -0,0 +1,33 @@ +image sdcard.img { + hdimage { + } + + partition uboot-spl { + in-partition-table = "no" + image = "u-boot-spl.bin" + offset = 512 + } + + partition uboot { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 14K + } + + partition uboot-env { + in-partition-table = "no" + image = "uboot-env.bin" + offset = 526K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext" + offset = 2M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } +} diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 85ad371b6..94a0a0175 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,4 +3,3 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 82ea79683..bd2f750d1 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_WITH_COMPRESSION - select ADK_TARGET_KERNEL_UIMAGE + select ADK_TARGET_KERNEL_UIMAGEGZ select ADK_PACKAGE_U_BOOT select ADK_HOST_BUILD_U_BOOT help diff --git a/target/mips/uclibc-ng.config b/target/mips/uclibc-ng.config index 55f5c4ea3..64c805f03 100644 --- a/target/mips/uclibc-ng.config +++ b/target/mips/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.47 C Library Configuration +# uClibc-ng 1.0.51 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -64,6 +64,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y DO_XSI_MATH=y +UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y |