diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.flash | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 15 | ||||
| -rw-r--r-- | target/linux/patches/4.1.15/j2-core.patch (renamed from target/linux/patches/4.1.13/j2-core.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.15/mtd-rootfs.patch | 26 | ||||
| -rw-r--r-- | target/linux/patches/4.1.15/use-libgcc-for-sh.patch (renamed from target/linux/patches/4.1.13/use-libgcc-for-sh.patch) | 0 |
5 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index ded3dfe6f..7f2886a3e 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -73,6 +73,7 @@ config ADK_KERNEL_MTD_OF_PARTS config ADK_KERNEL_MTD_M25P80 bool "MTD M25P80 driver" + select ADK_KERNEL_BLOCK select ADK_KERNEL_MTD select ADK_KERNEL_MTD_PARTITIONS select ADK_KERNEL_MTD_CHAR @@ -93,6 +94,7 @@ config ADK_KERNEL_MTD_M25P80 config ADK_KERNEL_MTD_NAND_PLATFORM bool "NAND platform driver" + select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_MTD select ADK_KERNEL_MTD_PARTITIONS @@ -108,6 +110,7 @@ config ADK_KERNEL_MTD_NAND_PLATFORM config ADK_KERNEL_MTD_PLATRAM bool "MTD RAM driver" + select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_MTD select ADK_KERNEL_MTD_BLOCK diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 71816245b..7c5008b70 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -22,6 +22,9 @@ config ADK_KERNEL_SERIAL_OF_PLATFORM config ADK_KERNEL_SERIAL_OMAP_CONSOLE bool +config ADK_KERNEL_SERIAL_UARTLITE_CONSOLE + bool + config ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE bool @@ -67,6 +70,7 @@ config ADK_KERNEL_SERIAL_8250 bool "8250 serial driver" select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ || ADK_TARGET_SYSTEM_QEMU_XTENSA \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_OR1K \ || ADK_TARGET_SYSTEM_OR1K_SIM select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU @@ -74,6 +78,7 @@ config ADK_KERNEL_SERIAL_8250 depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ || ADK_TARGET_SYSTEM_PCENGINES_APU \ || ADK_TARGET_SYSTEM_PCENGINES_ALIX \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_MIPS \ || ADK_TARGET_SYSTEM_QEMU_OR1K \ || ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \ @@ -89,6 +94,7 @@ config ADK_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default y if ADK_TARGET_SYSTEM_PCENGINES_APU default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_OR1K default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO @@ -192,4 +198,13 @@ config ADK_KERNEL_SERIAL_OMAP help Serial driver for Beaglebone Black +config ADK_KERNEL_SERIAL_UARTLITE + bool "uartlite serial driver" + select ADK_KERNEL_SERIAL_UARTLITE_CONSOLE + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + default n + help + Serial driver for Microblaze S3ADSP1800 + endmenu diff --git a/target/linux/patches/4.1.13/j2-core.patch b/target/linux/patches/4.1.15/j2-core.patch index 38136df2c..38136df2c 100644 --- a/target/linux/patches/4.1.13/j2-core.patch +++ b/target/linux/patches/4.1.15/j2-core.patch diff --git a/target/linux/patches/4.1.15/mtd-rootfs.patch b/target/linux/patches/4.1.15/mtd-rootfs.patch new file mode 100644 index 000000000..5f6d82b5c --- /dev/null +++ b/target/linux/patches/4.1.15/mtd-rootfs.patch @@ -0,0 +1,26 @@ +diff -Nur linux-4.1.15.orig/drivers/mtd/mtdpart.c linux-4.1.15/drivers/mtd/mtdpart.c +--- linux-4.1.15.orig/drivers/mtd/mtdpart.c 2015-12-15 06:24:51.000000000 +0100 ++++ linux-4.1.15/drivers/mtd/mtdpart.c 2015-12-26 21:02:02.766905805 +0100 +@@ -30,6 +30,7 @@ + #include <linux/mtd/mtd.h> + #include <linux/mtd/partitions.h> + #include <linux/err.h> ++#include <linux/root_dev.h> + #include <linux/kconfig.h> + + #include "mtdcore.h" +@@ -667,6 +668,14 @@ + if (IS_ERR(slave)) + return PTR_ERR(slave); + ++ if (strcmp(parts[i].name, "rootfs") == 0) { ++ if (ROOT_DEV == 0) { ++ printk(KERN_NOTICE "mtd: partition \"rootfs\" " ++ "set to be root filesystem\n"); ++ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i); ++ } ++ } ++ + mutex_lock(&mtd_partitions_mutex); + list_add(&slave->list, &mtd_partitions); + mutex_unlock(&mtd_partitions_mutex); diff --git a/target/linux/patches/4.1.13/use-libgcc-for-sh.patch b/target/linux/patches/4.1.15/use-libgcc-for-sh.patch index 6420219b0..6420219b0 100644 --- a/target/linux/patches/4.1.13/use-libgcc-for-sh.patch +++ b/target/linux/patches/4.1.15/use-libgcc-for-sh.patch |