summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.audio49
-rw-r--r--target/linux/config/Config.in.block13
-rw-r--r--target/linux/config/Config.in.cpu9
-rw-r--r--target/linux/config/Config.in.fs1
-rw-r--r--target/linux/config/Config.in.graphics9
-rw-r--r--target/linux/config/Config.in.kernel3
-rw-r--r--target/linux/config/Config.in.systems17
-rw-r--r--target/linux/kernel.config1
-rw-r--r--target/linux/patches/3.10.33/startup.patch32
-rw-r--r--target/linux/patches/3.11.10/startup.patch32
-rw-r--r--target/linux/patches/3.12.13/startup.patch32
-rw-r--r--target/linux/patches/3.13.6/startup.patch25
-rw-r--r--target/linux/patches/3.4.82/startup.patch30
13 files changed, 162 insertions, 91 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index e924902e3..cc84914d2 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -13,23 +13,14 @@ config ADK_KERNEL_SND_USB
config ADK_KERNEL_SND_PXA2XX_AC97
boolean
-config ADK_KERNEL_SND_TIMER
+config ADK_KPACKAGE_KMOD_SND_TIMER
boolean
-config ADK_KERNEL_SND_PCM
+config ADK_KPACKAGE_KMOD_SND_PCM
boolean
-config ADK_KERNEL_SND_HWDEP
- boolean
-
-config ADK_KERNEL_SND_OSSEMUL
- boolean
-
-config ADK_KERNEL_SND_MIXER_OSS
- boolean
-
-config ADK_KERNEL_SND_PCM_OSS
- boolean
+config ADK_KPACKAGE_KMOD_SND_HWDEP
+ tristate
config ADK_KPACKAGE_KMOD_SOUND
tristate
@@ -40,32 +31,24 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
tristate
-config ADK_KPACKAGE_KMOD_SND
- prompt "kmod-snd...................... ALSA sound support"
+config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
tristate
- select ADK_KPACKAGE_KMOD_SOUND
- select ADK_KERNEL_SND_OSSEMUL
- select ADK_KERNEL_SND_TIMER
- select ADK_KERNEL_SND_PCM
- select ADK_KERNEL_SND_HWDEP
- default n
- help
- Basic ALSA sound support.
-config ADK_KPACKAGE_KMOD_SND_OSSEMUL
- prompt "kmod-snd-ossemul.............. ALSA OSS Emulation"
+config ADK_KPACKAGE_KMOD_SND_COMPRESS
tristate
- select ADK_KERNEL_SND_MIXER_OSS
- select ADK_KERNEL_SND_PCM_OSS
- select ADK_KPACKAGE_KMOD_SND
- default y if ADK_TARGET_SYSTEM_IBM_X40
+
+config ADK_KPACKAGE_KMOD_SND
+ tristate
+ select ADK_KPACKAGE_KMOD_SOUND
+ select ADK_KPACKAGE_KMOD_SND_PCM
+ select ADK_KPACKAGE_KMOD_SND_TIMER
+ select ADK_KPACKAGE_KMOD_SND_HWDEP
default n
- help
- ALSA OSS Emulation
config ADK_KPACKAGE_KMOD_SND_INTEL8X0
prompt "kmod-snd-intel8x0............. Intel AC97 driver"
tristate
+ select ADK_KERNEL_SND_PCI
select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
select ADK_KPACKAGE_KMOD_SND
default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -136,10 +119,12 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
default n
config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
- prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI"
+ prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI"
select ADK_KPACKAGE_KMOD_SND
select ADK_KERNEL_SND_ARM
select ADK_KPACKAGE_KMOD_SND_SOC
+ select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
+ select ADK_KPACKAGE_KMOD_SND_COMPRESS
boolean
default n
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 9297031c2..0d1a28125 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -1,6 +1,3 @@
-config ADK_KERNEL_BLOCK
- boolean
-
config ADK_KERNEL_MD
boolean
@@ -82,7 +79,6 @@ config ADK_KERNEL_PATA_PCMCIA
config ADK_KERNEL_PATA_PXA
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
@@ -95,7 +91,6 @@ config ADK_KERNEL_PATA_PXA
config ADK_KERNEL_MMC_AT91
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_MMC
select ADK_KERNEL_MMC_BLOCK
@@ -106,7 +101,6 @@ config ADK_KERNEL_MMC_AT91
config ADK_KERNEL_MMC_SDHCI_BCM2708
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_MMC
select ADK_KERNEL_MMC_BLOCK
@@ -121,7 +115,6 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
config ADK_KERNEL_PATA_RB532
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
@@ -133,7 +126,6 @@ config ADK_KERNEL_PATA_RB532
config ADK_KERNEL_PATA_AMD
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
@@ -148,7 +140,6 @@ config ADK_KERNEL_PATA_AMD
config ADK_KERNEL_PATA_SC1200
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
@@ -160,7 +151,6 @@ config ADK_KERNEL_PATA_SC1200
config ADK_KERNEL_PATA_JMICRON
boolean
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
@@ -171,7 +161,6 @@ config ADK_KERNEL_PATA_JMICRON
config ADK_KERNEL_SATA_AHCI
tristate
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_BLK_DEV
@@ -185,7 +174,6 @@ menu "Block devices support"
config ADK_KPACKAGE_KMOD_SATA_AHCI
prompt "kmod-sata-ahci.................... AHCI SATA driver"
tristate
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_ATA
select ADK_KERNEL_BLK_DEV_SD
depends on !ADK_KERNEL_SATA_AHCI
@@ -197,7 +185,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
prompt "kmod-blk-dev-loop................. Loop mount support"
tristate
- select ADK_KERNEL_BLOCK
select ADK_KERNEL_BLK_DEV
default n
help
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index a8dfd5188..1d36c0b36 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -1,12 +1,3 @@
-config ADK_KERNEL_MATOM
- boolean
-
-config ADK_KERNEL_MPENTIUMM
- boolean
-
-config ADK_KERNEL_MGEODE_LX
- boolean
-
config ADK_KERNEL_MTRR
boolean
default y if ADK_TARGET_CPU_WITH_MTRR
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 85065c093..377122dc5 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -62,6 +62,7 @@ config ADK_KERNEL_EXT2_FS
boolean
default y if ADK_TARGET_WITH_CF
default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
config ADK_KPACKAGE_KMOD_EXT2_FS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dc748e6c0..48cd3ea73 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -13,7 +13,6 @@ config ADK_KERNEL_VT_CONSOLE
config ADK_KERNEL_VGA_CONSOLE
boolean
default y if ADK_HARDWARE_VBOX
- default y if ADK_TARGET_SYSTEM_ARANYM_M68K
default n
config ADK_KERNEL_FONTS
@@ -27,11 +26,19 @@ config ADK_KERNEL_FB
boolean
config ADK_KERNEL_FRAMEBUFFER_CONSOLE
+ default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+ default n
boolean
config ADK_KERNEL_MFD_SM501
boolean
+config ADK_KERNEL_FB_ATARI
+ boolean
+ select ADK_KERNEL_FB
+ default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+ default n
+
config ADK_KERNEL_FB_CIRRUS
boolean
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index d928cea09..221a373df 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -7,6 +7,9 @@ config ADK_KERNEL_EXPERIMENTAL
config ADK_KERNEL_BLK_DEV_INITRD
boolean
+config ADK_KERNEL_BLK_DEV_RAM
+ boolean
+
config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
boolean
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
deleted file mode 100644
index 61284f0fb..000000000
--- a/target/linux/config/Config.in.systems
+++ /dev/null
@@ -1,17 +0,0 @@
-# page size
-config ADK_KERNEL_PAGE_SIZE_4KB
- boolean
-
-config ADK_KERNEL_PAGE_SIZE_16KB
- boolean
-
-# ABI
-config ADK_KERNEL_AEABI
- boolean
-
-# endianess
-config ADK_KERNEL_CPU_BIG_ENDIAN
- boolean
-
-config ADK_KERNEL_CPU_LITTLE_ENDIAN
- boolean
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index d69b28908..3afd5bdf5 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -15,6 +15,7 @@ CONFIG_INET=y
CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
CONFIG_BLOCK=y
+CONFIG_BLK_DEV=y
CONFIG_FILE_LOCKING=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
diff --git a/target/linux/patches/3.10.33/startup.patch b/target/linux/patches/3.10.33/startup.patch
index 4dccae8c1..3ebc5db1e 100644
--- a/target/linux/patches/3.10.33/startup.patch
+++ b/target/linux/patches/3.10.33/startup.patch
@@ -1,12 +1,34 @@
-diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100
-+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100
-@@ -879,6 +880,8 @@
+diff -Nur linux-3.10.33.orig/init/initramfs.c linux-3.10.33/init/initramfs.c
+--- linux-3.10.33.orig/init/initramfs.c 2014-03-07 06:58:45.000000000 +0100
++++ linux-3.10.33/init/initramfs.c 2014-03-15 18:32:07.240436750 +0100
+@@ -622,6 +622,9 @@
+ */
+ load_default_modules();
+ }
++#ifdef CONFIG_DEVTMPFS_MOUNT
++ devtmpfs_mount("dev");
++#endif
+ return 0;
+ }
+ rootfs_initcall(populate_rootfs);
+diff -Nur linux-3.10.33.orig/init/main.c linux-3.10.33/init/main.c
+--- linux-3.10.33.orig/init/main.c 2014-03-07 06:58:45.000000000 +0100
++++ linux-3.10.33/init/main.c 2014-03-15 18:32:07.240436750 +0100
+@@ -885,6 +885,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ pr_err("Warning: unable to open an initial console.\n");
+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n");
+
(void) sys_dup(0);
(void) sys_dup(0);
/*
+@@ -893,7 +895,7 @@
+ */
+
+ if (!ramdisk_execute_command)
+- ramdisk_execute_command = "/init";
++ ramdisk_execute_command = "/sbin/init";
+
+ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch
index 4dccae8c1..e7285873d 100644
--- a/target/linux/patches/3.11.10/startup.patch
+++ b/target/linux/patches/3.11.10/startup.patch
@@ -1,12 +1,34 @@
-diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100
-+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100
-@@ -879,6 +880,8 @@
+diff -Nur linux-3.11.10.orig/init/initramfs.c linux-3.11.10/init/initramfs.c
+--- linux-3.11.10.orig/init/initramfs.c 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/init/initramfs.c 2014-03-15 18:42:01.586249887 +0100
+@@ -622,6 +622,9 @@
+ */
+ load_default_modules();
+ }
++#ifdef CONFIG_DEVTMPFS_MOUNT
++ devtmpfs_mount("dev");
++#endif
+ return 0;
+ }
+ rootfs_initcall(populate_rootfs);
+diff -Nur linux-3.11.10.orig/init/main.c linux-3.11.10/init/main.c
+--- linux-3.11.10.orig/init/main.c 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/init/main.c 2014-03-15 18:42:01.590249897 +0100
+@@ -886,6 +886,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ pr_err("Warning: unable to open an initial console.\n");
+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n");
+
(void) sys_dup(0);
(void) sys_dup(0);
/*
+@@ -894,7 +896,7 @@
+ */
+
+ if (!ramdisk_execute_command)
+- ramdisk_execute_command = "/init";
++ ramdisk_execute_command = "/sbin/init";
+
+ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch
index 4dccae8c1..4cd477da1 100644
--- a/target/linux/patches/3.12.13/startup.patch
+++ b/target/linux/patches/3.12.13/startup.patch
@@ -1,12 +1,34 @@
-diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100
-+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100
-@@ -879,6 +880,8 @@
+diff -Nur linux-3.12.13.orig/init/initramfs.c linux-3.12.13/init/initramfs.c
+--- linux-3.12.13.orig/init/initramfs.c 2014-02-22 22:32:50.000000000 +0100
++++ linux-3.12.13/init/initramfs.c 2014-03-15 18:09:39.040618589 +0100
+@@ -622,6 +622,9 @@
+ */
+ load_default_modules();
+ }
++#ifdef CONFIG_DEVTMPFS_MOUNT
++ devtmpfs_mount("dev");
++#endif
+ return 0;
+ }
+ rootfs_initcall(populate_rootfs);
+diff -Nur linux-3.12.13.orig/init/main.c linux-3.12.13/init/main.c
+--- linux-3.12.13.orig/init/main.c 2014-02-22 22:32:50.000000000 +0100
++++ linux-3.12.13/init/main.c 2014-03-15 18:09:39.044618600 +0100
+@@ -888,6 +888,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ pr_err("Warning: unable to open an initial console.\n");
+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n");
+
(void) sys_dup(0);
(void) sys_dup(0);
/*
+@@ -896,7 +898,7 @@
+ */
+
+ if (!ramdisk_execute_command)
+- ramdisk_execute_command = "/init";
++ ramdisk_execute_command = "/sbin/init";
+
+ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
diff --git a/target/linux/patches/3.13.6/startup.patch b/target/linux/patches/3.13.6/startup.patch
index be4ea469d..d396b75e4 100644
--- a/target/linux/patches/3.13.6/startup.patch
+++ b/target/linux/patches/3.13.6/startup.patch
@@ -10,3 +10,28 @@ diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
(void) sys_dup(0);
(void) sys_dup(0);
/*
+diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c
+--- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100
++++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100
+@@ -622,6 +622,9 @@
+ */
+ load_default_modules();
+ }
++#ifdef CONFIG_DEVTMPFS_MOUNT
++ devtmpfs_mount("dev");
++#endif
+ return 0;
+ }
+ rootfs_initcall(populate_rootfs);
+diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c
+--- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100
++++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100
+@@ -924,7 +924,7 @@
+ */
+
+ if (!ramdisk_execute_command)
+- ramdisk_execute_command = "/init";
++ ramdisk_execute_command = "/sbin/init";
+
+ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch
index 4f47eddcb..c26430bcb 100644
--- a/target/linux/patches/3.4.82/startup.patch
+++ b/target/linux/patches/3.4.82/startup.patch
@@ -1,7 +1,20 @@
-diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c
---- linux-2.6.34.orig/init/main.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/init/main.c 2010-05-20 20:13:26.321613615 +0200
-@@ -889,6 +890,8 @@
+diff -Nur linux-3.4.82.orig/init/initramfs.c linux-3.4.82/init/initramfs.c
+--- linux-3.4.82.orig/init/initramfs.c 2014-02-22 19:33:35.000000000 +0100
++++ linux-3.4.82/init/initramfs.c 2014-03-15 18:46:22.674928245 +0100
+@@ -606,6 +606,9 @@
+ free_initrd();
+ #endif
+ }
++#ifdef CONFIG_DEVTMPFS_MOUNT
++ devtmpfs_mount("dev");
++#endif
+ return 0;
+ }
+ rootfs_initcall(populate_rootfs);
+diff -Nur linux-3.4.82.orig/init/main.c linux-3.4.82/init/main.c
+--- linux-3.4.82.orig/init/main.c 2014-02-22 19:33:35.000000000 +0100
++++ linux-3.4.82/init/main.c 2014-03-15 18:46:22.674928245 +0100
+@@ -873,6 +873,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
printk(KERN_WARNING "Warning: unable to open an initial console.\n");
@@ -10,3 +23,12 @@ diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c
(void) sys_dup(0);
(void) sys_dup(0);
/*
+@@ -881,7 +883,7 @@
+ */
+
+ if (!ramdisk_execute_command)
+- ramdisk_execute_command = "/init";
++ ramdisk_execute_command = "/sbin/init";
+
+ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 17:54:16 +0000