From ade8f1154feea499c3743ab14e9ced6783812316 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Mar 2014 16:27:13 +0100 Subject: a bunch of microblaze fixes --- target/linux/config/Config.in.flash | 4 ++-- target/linux/config/Config.in.fs | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index d8f4faf0f..03976a6d7 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -145,6 +145,6 @@ config ADK_TARGET_MTD config ADK_TARGET_MTD_SIZE int - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "0" diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 377122dc5..db50c3a7f 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS boolean default y -config ADK_KERNEL_JFFS2_FS - boolean - config ADK_KERNEL_YAFFS_FS tristate @@ -51,6 +48,26 @@ config ADK_KERNEL_SQUASHFS_XZ boolean default n +config ADK_KERNEL_JFFS2_FS_DEBUG + int + default "1" + +config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + boolean + default n + +config ADK_KERNEL_JFFS2_ZLIB + boolean + default n + +config ADK_KERNEL_JFFS2_FS + prompt "jffs2............................. JFFS2 filesystem" + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + select ADK_KERNEL_JFFS2_ZLIB + select ADK_KERNEL_JFFS2_FS_DEBUG + boolean + config ADK_KERNEL_SQUASHFS prompt "squashfs.......................... SquashFS filesystem" boolean -- cgit v1.2.3 From dfa2addd5fac54784ee2cda02f89be8f30d32bf5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Mar 2014 21:52:59 +0100 Subject: remove debug symbol --- target/linux/config/Config.in.fs | 5 ----- 1 file changed, 5 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index db50c3a7f..40024fe97 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -48,10 +48,6 @@ config ADK_KERNEL_SQUASHFS_XZ boolean default n -config ADK_KERNEL_JFFS2_FS_DEBUG - int - default "1" - config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS boolean default n @@ -65,7 +61,6 @@ config ADK_KERNEL_JFFS2_FS select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS select ADK_KERNEL_JFFS2_ZLIB - select ADK_KERNEL_JFFS2_FS_DEBUG boolean config ADK_KERNEL_SQUASHFS -- cgit v1.2.3 From 57709533db2c49e29acdb5a3aa20de1920fd87a8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 09:01:29 +0100 Subject: fix comment --- target/linux/config/Config.in.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 377122dc5..a41a40263 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -223,7 +223,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 -- cgit v1.2.3 From 245336100e42a050809afd700a1b26e21b39466e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 10:32:21 +0100 Subject: fix jffs2 boot for qemu-microblaze, CMDLINE_FORCE required --- target/linux/config/Config.in.spi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/linux') 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 -- cgit v1.2.3 From 8c81154871112b65b79834ccfa8ff43d28bb8203 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 11:04:23 +0100 Subject: fix squashfs root for qemu-microblaze --- target/linux/config/Config.in.flash | 2 ++ 1 file changed, 2 insertions(+) (limited to 'target/linux') 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 -- cgit v1.2.3 From 15ce6d4a74407a920b82b0f7b7422a668a78f7c2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 20:52:10 +0100 Subject: use shell instead of getty for test-framework --- target/linux/config/Config.in.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 019c439d8..a1c7ae6c9 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y - #depends on !ADK_PKG_TEST + depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. -- cgit v1.2.3