diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 11:16:42 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 11:16:42 +0100 |
commit | 1dd37e7c81ed5b4fa0e41b78ac6b460e8c0fd47b (patch) | |
tree | 3d82b41d45756a48a4e840761b554b7d28c912ab | |
parent | db7ee5f68d81651baa6d48e6bcd4eaf1662c4619 (diff) | |
parent | 8c81154871112b65b79834ccfa8ff43d28bb8203 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | BUGS | 2 | ||||
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | mk/build.mk | 3 | ||||
-rw-r--r-- | mk/image.mk | 2 | ||||
-rw-r--r-- | mk/rootfs.mk | 4 | ||||
-rw-r--r-- | package/libmodplug/Makefile | 8 | ||||
-rw-r--r-- | target/config/Config.in.tools | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.flash | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.spi | 6 | ||||
-rw-r--r-- | target/microblaze/Makefile | 14 | ||||
-rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 1 | ||||
-rw-r--r-- | target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 1 | ||||
-rw-r--r-- | target/microblaze/sys-available/qemu-microblaze | 1 | ||||
-rw-r--r-- | target/microblaze/sys-available/qemu-microblazeel | 3 |
15 files changed, 36 insertions, 19 deletions
@@ -2,4 +2,4 @@ - qemu-sh4: usb keyboard is broken - qemu-arm: thumb mode with glibc does not boot - qemu-sparc64: ide driver not working, only virtio (but unstable) -- qemu-microblaze: network card emulation fails, little endian works +- qemu-microblaze: ml605 early printk and network card emulation fails, little endian works @@ -1,4 +1,6 @@ +- ipkg.conf url fixen - hash-style=gnu for non-mips and non-musl +- fix libiberty.a mess - check gold for mozilla compile - check for gcc and SSP again - add daemon() function to functions.sh diff --git a/mk/build.mk b/mk/build.mk index 8f28b8e55..ba9c023a9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -79,6 +79,7 @@ DEFCONFIG= ADK_DEBUG=n \ BUSYBOX_FEATURE_VI_REGEX_SEARCH=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n \ + ADK_KERNEL_BUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ @@ -98,7 +99,7 @@ POSTCONFIG= -@\ touch .rebuild.busybox;\ rebuild=1;\ fi; \ - for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \ + for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \ if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \ touch .rebuild.base-files;\ rebuild=1;\ diff --git a/mk/image.mk b/mk/image.mk index 8ae7e087e..1e7a802a5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -157,7 +157,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} -nopad -noappend -root-owned $(MAKE_TRACE) ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} - ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -X zlib -r ${TARGET_DIR} \ + ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -X zlib -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 43cfaa821..3956306e9 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -50,10 +50,10 @@ $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) -$(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS))) +$(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) -$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) +$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) $(eval $(call rootfs_template,iso,ISO)) diff --git a/package/libmodplug/Makefile b/package/libmodplug/Makefile index f08435ee4..421243c03 100644 --- a/package/libmodplug/Makefile +++ b/package/libmodplug/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libmodplug -PKG_VERSION:= 0.8.8.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fddc3c704c5489de2a3cf0fedfec59db +PKG_VERSION:= 0.8.8.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5f30241db109d647781b784e62ddfaa1 PKG_DESCR:= a MOD player library PKG_SECTION:= libs PKG_URL:= http://modplug-xmms.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.4/} +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.5/} PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 7e37f5ec1..b232a3674 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -38,6 +38,10 @@ config ADK_HOST_NEED_CCACHE boolean default n +config ADK_HOST_NEED_MKIMAGE + boolean + default n + config ADK_HOST_NEED_PCRE boolean default y if ADK_HOST_DARWIN diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 03976a6d7..dda8ad4c9 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -99,6 +99,8 @@ config ADK_KERNEL_MTD_M25P80 select ADK_KERNEL_MTD_PHYSMAP select ADK_KERNEL_MTD_PHYSMAP_OF select ADK_KERNEL_MTD_OF_PARTS + select ADK_KERNEL_SPI + select ADK_KERNEL_SPI_MASTER boolean default n diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 40024fe97..3cb0517ac 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -235,7 +235,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS with the IRIX version of XFS. config ADK_KPACKAGE_KMOD_FUSE_FS - prompt "kmod-fs-fuse...................... Filesystem in Userspace support" + prompt "kmod-fuse-fs...................... Filesystem in Userspace support" tristate default n help diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 73db5e86d..c130523ef 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -1,6 +1,12 @@ config ADK_KERNEL_SPI boolean +config ADK_KERNEL_SPI_MASTER + boolean + +config ADK_KERNEL_SPI_XILINX + boolean + config ADK_KERNEL_SPI_AR71XX select ADK_KERNEL_SPI boolean diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index f05884442..58d02c5be 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -10,12 +10,10 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) -MODEL:=petalogix-ml605 -DTB:=-dtb target/microblaze/ml605.dtb +QEMU_ARGS+=-M petalogix-ml605 -dtb target/microblaze/ml605.dtb endif ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) -MODEL:=petalogix-s3adsp1800 -DTB:=-dtb target/microblaze/s3adsp1800.dtb +QEMU_ARGS+=-M petalogix-s3adsp1800 endif ifeq ($(ADK_TARGET_FS),squashfs) @@ -25,7 +23,7 @@ imageinstall: $(BUILD_DIR)/root.squashfs @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) @@ -33,7 +31,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -43,7 +41,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -52,7 +50,7 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 8d13c5ddd..cb8da0cec 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -22,3 +22,4 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index fc43ab5f1..3c3546b47 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -19,3 +19,4 @@ CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index ee9cb6a52..a5bdb65e8 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN + select ADK_HOST_NEED_MKIMAGE help Qemu support for microblaze big endian architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel index 88c1c25db..4d752a942 100644 --- a/target/microblaze/sys-available/qemu-microblazeel +++ b/target/microblaze/sys-available/qemu-microblazeel @@ -1,11 +1,12 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL bool "Qemu Emulator (little endian)" - select ADK_microblazeel + select ADK_microblaze select ADK_qemu_microblazeel select ADK_little select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN + select ADK_HOST_NEED_MKIMAGE help Qemu support for microblaze little endian architecture. |