From bc561e500e22bc9d953fd9a80144f80295a4cbbd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 09:28:19 +0100 Subject: convert to miniconfig only miniconfig is used for all targets. aranym support is still broken/experimental. 32 bit kernel support for 64 targets need to be fixed. tested on usb boot on ibm-x40 --- target/linux/config/Config.in.audio | 8 ++++++++ target/linux/config/Config.in.block | 13 ------------- target/linux/config/Config.in.cpu | 9 --------- target/linux/config/Config.in.graphics | 6 ++++++ target/linux/config/Config.in.systems | 17 ----------------- 5 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 target/linux/config/Config.in.systems (limited to 'target/linux') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index e924902e3..d282ca91e 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -40,6 +40,12 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI config ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate +config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE + tristate + +config ADK_KPACKAGE_KMOD_SND_COMPRESS + tristate + config ADK_KPACKAGE_KMOD_SND prompt "kmod-snd...................... ALSA sound support" tristate @@ -140,6 +146,8 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S 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.graphics b/target/linux/config/Config.in.graphics index dc748e6c0..6c7127ae2 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -32,6 +32,12 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE 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.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 -- cgit v1.2.3 From 608f969e4d96cb1b2a361c2a3b6a32233a644e3b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 15:30:53 +0100 Subject: fix m68k support disable systems without thread local storage, not supported by OpenADK anymore. Remove m68k uclibc. fix kernel bootup in aranym. --- target/linux/config/Config.in.graphics | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 6c7127ae2..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,6 +26,8 @@ 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 -- cgit v1.2.3 From ec47c602c27ceef10f38afdf8e2e2adb953b9ed8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 19:46:58 +0100 Subject: a bunch of adk-test-framework fixes. --- target/linux/kernel.config | 1 + 1 file changed, 1 insertion(+) (limited to 'target/linux') 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 -- cgit v1.2.3 From eadad3e1d3a9163b2c9255db528c2fd0eab73d32 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 19:48:58 +0100 Subject: enable some packages for m68k, use initrd stuff for aranym --- target/linux/config/Config.in.kernel | 3 +++ 1 file changed, 3 insertions(+) (limited to 'target/linux') 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 -- cgit v1.2.3 From dd26294176a557e1deaca4666efa99ff4468be34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 21:24:05 +0100 Subject: remove oss emul support, no software in ADK needs oss. --- target/linux/config/Config.in.audio | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d282ca91e..d3a15d602 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -22,15 +22,6 @@ config ADK_KERNEL_SND_PCM 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_SOUND tristate @@ -47,27 +38,12 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS tristate config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" 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" - 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 - default n - help - ALSA OSS Emulation config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. Intel AC97 driver" @@ -142,7 +118,7 @@ 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 -- cgit v1.2.3 From e7540c9fa814f9b41f80e72bc160ce504e26cda6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 19:26:42 +0100 Subject: startup fixes - always use /sbin/init, even for initramfs - mount devtmpfs for initramfs automatically in kernel space - fix armhf for adk-test-framework - remove mdev -s on boot, I think it is unneeded, takes very long on Qemu systems - add alias for ro/rw remounts of / - remove old /init and rc.shutdown, both unused --- target/linux/patches/3.10.33/startup.patch | 32 +++++++++++++++++++++++++----- target/linux/patches/3.11.10/startup.patch | 32 +++++++++++++++++++++++++----- target/linux/patches/3.12.13/startup.patch | 32 +++++++++++++++++++++++++----- target/linux/patches/3.13.6/startup.patch | 25 +++++++++++++++++++++++ target/linux/patches/3.4.82/startup.patch | 30 ++++++++++++++++++++++++---- 5 files changed, 132 insertions(+), 19 deletions(-) (limited to 'target/linux') 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; -- cgit v1.2.3 From a1cb74821a3d4ccb708280ad1ed8297c67c4a54b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 22:16:11 +0100 Subject: fix kernel build on Darwin for x86 targets relocs tool uses some kind of regular expression, which does not work with the provided one. Use pcre in this case. Rework KERNEL_MAKE_OPTS while here. Use it in kernel-header, too. --- target/linux/config/Config.in.audio | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d3a15d602..cc84914d2 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -13,14 +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_KPACKAGE_KMOD_SND_HWDEP + tristate config ADK_KPACKAGE_KMOD_SOUND tristate @@ -40,14 +40,15 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS config ADK_KPACKAGE_KMOD_SND tristate select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP + select ADK_KPACKAGE_KMOD_SND_PCM + select ADK_KPACKAGE_KMOD_SND_TIMER + select ADK_KPACKAGE_KMOD_SND_HWDEP default n 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 -- cgit v1.2.3 From 36bd3b9bf6e9b23365f8206a71e96ff93c005637 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 21:02:45 +0100 Subject: fix some kernel symbol stuff,found via allmodconfig --- target/linux/config/Config.in.audio | 3 ++- target/linux/config/Config.in.block | 4 ++-- target/linux/config/Config.in.netdevice | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index cc84914d2..a1a5077e6 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -120,12 +120,13 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI" + tristate 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 + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 0d1a28125..69addd11f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -21,6 +21,7 @@ config ADK_KERNEL_IOSCHED_CFQ config ADK_KERNEL_SCSI boolean + default y if ADK_TARGET_SYSTEM_IBM_X40 config ADK_KERNEL_BLK_DEV_SD boolean @@ -252,7 +253,6 @@ config ADK_KPACKAGE_KMOD_SCSI select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS depends on !ADK_KERNEL_SCSI - depends on !ADK_KERNEL_SATA_AHCI tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or @@ -268,7 +268,7 @@ config ADK_KPACKAGE_KMOD_SCSI config ADK_KPACKAGE_KMOD_BLK_DEV_SD prompt "kmod-scsi-disk.................... SCSI disk support" - select ADK_KPACKAGE_KMOD_SCSI + select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI depends on !ADK_KERNEL_BLK_DEV_SD tristate help diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 7aabc0b7e..62479c2cb 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -7,6 +7,18 @@ config ADK_KERNEL_NETDEVICES config ADK_KERNEL_NET_ETHERNET boolean +config ADK_KERNEL_NET_VENDOR_NATSEMI + boolean + +config ADK_KERNEL_NET_VENDOR_8390 + boolean + +config ADK_KERNEL_NET_VENDOR_REALTEK + boolean + +config ADK_KERNEL_NET_VENDOR_MARVELL + boolean + config ADK_KERNEL_PHYLIB boolean @@ -151,6 +163,8 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_VENDOR_NATSEMI + select ADK_KERNEL_NET_VENDOR_8390 select ADK_KERNEL_MII default n help @@ -173,6 +187,7 @@ config ADK_KPACKAGE_KMOD_8139CP select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_MII default n help @@ -220,6 +235,7 @@ config ADK_KPACKAGE_KMOD_SKY2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 + select ADK_KERNEL_NET_VENDOR_MARVELL depends on !ADK_KERNEL_SKY2 default n help -- cgit v1.2.3 From a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 23:07:55 +0100 Subject: disable block driver for qemu emulators, can be activated via menuconfig --- target/linux/config/Config.in.block | 44 +++++++++++++++++++++++++++++++++++++ target/linux/config/Config.in.debug | 2 +- target/linux/config/Config.in.flash | 15 ++++++++++--- 3 files changed, 57 insertions(+), 4 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 69addd11f..dd7c96dc5 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -23,6 +23,9 @@ config ADK_KERNEL_SCSI boolean default y if ADK_TARGET_SYSTEM_IBM_X40 +config ADK_KERNEL_SCSI_DMA + boolean + config ADK_KERNEL_BLK_DEV_SD boolean @@ -72,7 +75,48 @@ config ADK_KERNEL_MMC_SDHCI_PLTFM config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean +config ADK_KERNEL_ATA_PIIX + select ADK_KERNEL_SCSI + select ADK_KERNEL_SCSI_DMA + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + config ADK_KERNEL_SCSI_SYM53C8XX_2 + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_SCSI_IBMVSCSI + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_SCSI_SUNESP + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_PATA_MACIO + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_PATA_PLATFORM + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD boolean config ADK_KERNEL_PATA_PCMCIA diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 80387c627..23c0bd8d2 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. diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 773c518e8..d8f4faf0f 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -87,8 +87,19 @@ config ADK_KERNEL_MTD_OF_PARTS default n config ADK_KERNEL_MTD_M25P80 + select ADK_KERNEL_BLOCK + select ADK_KERNEL_MTD + select ADK_KERNEL_MTD_PARTITIONS + select ADK_KERNEL_MTD_CHAR + select ADK_KERNEL_MTD_BLKDEVS + select ADK_KERNEL_MTD_BLOCK + select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV + select ADK_KERNEL_MTD_CFI + select ADK_KERNEL_MTD_GEN_PROBE + select ADK_KERNEL_MTD_PHYSMAP + select ADK_KERNEL_MTD_PHYSMAP_OF + select ADK_KERNEL_MTD_OF_PARTS boolean - default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default n config ADK_KERNEL_MTD_AR2315 @@ -129,8 +140,6 @@ config ADK_TARGET_MTD select ADK_KERNEL_MTD_CFI select ADK_KERNEL_MTD_GEN_PROBE select ADK_KERNEL_MTD_PHYSMAP - select ADK_KERNEL_MTD_PHYSMAP_OF if ADK_LINUX_MICROBLAZE - select ADK_KERNEL_MTD_OF_PARTS if ADK_LINUX_MICROBLAZE default y if ADK_TARGET_WITH_MTD default n -- cgit v1.2.3 From aff23dc7add4de58a59715941e1f2c2584d89edd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 09:03:49 +0100 Subject: enable utf8 and iso8859-1 by default --- target/linux/config/Config.in.nls | 10 +++------- target/linux/kernel.config | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls index 587d5a37b..61dd32752 100644 --- a/target/linux/config/Config.in.nls +++ b/target/linux/config/Config.in.nls @@ -1,12 +1,8 @@ menu "Native Language support" -config ADK_KERNEL_NLS - boolean - default y - config ADK_KERNEL_NLS_DEFAULT string - default "iso8859-1" + default "utf-8" config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437 prompt "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)" @@ -325,7 +321,7 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII config ADK_KPACKAGE_KMOD_NLS_ISO8859_1 prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)" tristate - default n + default y help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -499,7 +495,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U config ADK_KPACKAGE_KMOD_NLS_UTF8 prompt "kmod-nls-utf8................... NLS UTF8" tristate - default n + default y help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 3afd5bdf5..01bb061b3 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -20,7 +20,6 @@ CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_BINFMT_ELF=y -- cgit v1.2.3 From 521eddfc1e29218e26e3080c095a519ea3f8156d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 09:36:25 +0100 Subject: optimize miniconfigs, enable netstuff by default --- target/linux/config/Config.in.network | 8 -------- target/linux/kernel.config | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 00d05dcd4..71a510d69 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -1,13 +1,5 @@ menu "Network support" -config ADK_KERNEL_INET - boolean - default y - -config ADK_KERNEL_NET_CORE - boolean - default y - config ADK_KERNEL_IP_FIB_HASH boolean default y diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 01bb061b3..9c6c96c01 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -12,6 +12,9 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_INET=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_ETHERNET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_BLOCK=y -- cgit v1.2.3 From 2b78ac230fd5678a900a0607d1e67f9bb83e0df3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 16:45:46 +0100 Subject: fix wording --- target/linux/config/Config.in.debug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 23c0bd8d2..019c439d8 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -30,7 +30,7 @@ config ADK_KERNEL_EARLY_PRINTK default n config ADK_KERNEL_PRINTK - prompt "Enable printk to save space and quieten bootup" + prompt "printk support (disable to save space and quieten bootup)" boolean select ADK_KERNEL_EARLY_PRINTK default y @@ -39,7 +39,7 @@ config ADK_KERNEL_PRINTK Disable printk to save space and quieten bootup. config ADK_KERNEL_PRINTK_TIME - prompt "Enable timing information for printk" + prompt "timing information for printk" boolean depends on ADK_KERNEL_PRINTK default n -- cgit v1.2.3 From 803b9757e040cc1a9090de4ac5572290c83d31fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 19:04:45 +0100 Subject: remove kernel choice, always use 64 bit for 64bit target --- target/linux/config/Config.in.kernel | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 221a373df..650bc8729 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -98,7 +98,7 @@ config ADK_KERNEL_PCI config ADK_KERNEL_64BIT boolean - default y if ADK_TARGET_KERNEL64 + default y if ADK_LINUX_64 config ADK_KERNEL_CPU_MIPS64 boolean @@ -106,6 +106,9 @@ config ADK_KERNEL_CPU_MIPS64 config ADK_KERNEL_CPU_MIPS64_R1 boolean +config ADK_KERNEL_CPU_MIPS64_R2 + boolean + config ADK_KERNEL_PREEMPT boolean -- cgit v1.2.3 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 From c5cbce58aafc30b7269c978c462e1daed89b57e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 26 Mar 2014 13:32:52 +0100 Subject: bump all kernels --- target/linux/config/Config.in.netfilter.ip4 | 16 +- .../linux/patches/3.10.33/bsd-compatibility.patch | 2538 - target/linux/patches/3.10.33/startup.patch | 34 - .../linux/patches/3.10.34/bsd-compatibility.patch | 2538 + target/linux/patches/3.10.34/startup.patch | 34 + .../linux/patches/3.12.13/bsd-compatibility.patch | 2538 - target/linux/patches/3.12.13/defaults.patch | 46 - .../linux/patches/3.12.13/disable-netfilter.patch | 160 - .../patches/3.12.13/export-symbol-for-exmap.patch | 11 - target/linux/patches/3.12.13/gemalto.patch | 11 - target/linux/patches/3.12.13/lemote-rfkill.patch | 21 - .../patches/3.12.13/microblaze-ethernet.patch | 11 - .../linux/patches/3.12.13/microblaze-setup.patch | 12 - target/linux/patches/3.12.13/mips-lzo-fix.patch | 12 - target/linux/patches/3.12.13/mtd-rootfs.patch | 26 - target/linux/patches/3.12.13/non-static.patch | 33 - .../linux/patches/3.12.13/ppc64-missing-zlib.patch | 11 - target/linux/patches/3.12.13/raspberry.patch | 101014 ----------------- target/linux/patches/3.12.13/startup.patch | 34 - .../linux/patches/3.12.13/usb-defaults-off.patch | 20 - target/linux/patches/3.12.13/uuid.patch | 263 - .../patches/3.12.13/vga-cons-default-off.patch | 12 - target/linux/patches/3.12.13/wlan-cf.patch | 11 - target/linux/patches/3.12.13/xargs.patch | 12 - target/linux/patches/3.12.13/zlib-inflate.patch | 12 - .../linux/patches/3.12.14/bsd-compatibility.patch | 2538 + target/linux/patches/3.12.14/defaults.patch | 46 + .../linux/patches/3.12.14/disable-netfilter.patch | 160 + .../patches/3.12.14/export-symbol-for-exmap.patch | 11 + target/linux/patches/3.12.14/gemalto.patch | 11 + target/linux/patches/3.12.14/lemote-rfkill.patch | 21 + .../patches/3.12.14/microblaze-ethernet.patch | 11 + .../linux/patches/3.12.14/microblaze-setup.patch | 12 + target/linux/patches/3.12.14/mips-lzo-fix.patch | 12 + target/linux/patches/3.12.14/mtd-rootfs.patch | 26 + target/linux/patches/3.12.14/non-static.patch | 33 + .../linux/patches/3.12.14/ppc64-missing-zlib.patch | 11 + target/linux/patches/3.12.14/raspberry.patch | 101014 +++++++++++++++++ target/linux/patches/3.12.14/startup.patch | 34 + .../linux/patches/3.12.14/usb-defaults-off.patch | 20 + target/linux/patches/3.12.14/uuid.patch | 263 + .../patches/3.12.14/vga-cons-default-off.patch | 12 + target/linux/patches/3.12.14/wlan-cf.patch | 11 + target/linux/patches/3.12.14/xargs.patch | 12 + target/linux/patches/3.12.14/zlib-inflate.patch | 12 + .../linux/patches/3.13.6/bsd-compatibility.patch | 2538 - target/linux/patches/3.13.6/defaults.patch | 46 - .../linux/patches/3.13.6/disable-netfilter.patch | 160 - .../patches/3.13.6/export-symbol-for-exmap.patch | 11 - target/linux/patches/3.13.6/gemalto.patch | 11 - target/linux/patches/3.13.6/lemote-rfkill.patch | 21 - target/linux/patches/3.13.6/microblaze-axi.patch | 11 - .../patches/3.13.6/microblaze-early-printk.patch | 12 - .../linux/patches/3.13.6/microblaze-ethernet.patch | 11 - target/linux/patches/3.13.6/microblaze-setup.patch | 12 - target/linux/patches/3.13.6/mtd-rootfs.patch | 26 - target/linux/patches/3.13.6/non-static.patch | 33 - .../linux/patches/3.13.6/ppc64-missing-zlib.patch | 11 - .../patches/3.13.6/ppc64-missing_arch_random.patch | 11 - target/linux/patches/3.13.6/raspberry.patch | 101068 ------------------ target/linux/patches/3.13.6/startup.patch | 37 - target/linux/patches/3.13.6/uuid.patch | 263 - .../patches/3.13.6/vga-cons-default-off.patch | 12 - target/linux/patches/3.13.6/wlan-cf.patch | 11 - target/linux/patches/3.13.6/xargs.patch | 12 - target/linux/patches/3.13.6/zlib-inflate.patch | 12 - .../linux/patches/3.13.7/bsd-compatibility.patch | 2538 + target/linux/patches/3.13.7/defaults.patch | 46 + .../linux/patches/3.13.7/disable-netfilter.patch | 160 + .../patches/3.13.7/export-symbol-for-exmap.patch | 11 + target/linux/patches/3.13.7/gemalto.patch | 11 + target/linux/patches/3.13.7/lemote-rfkill.patch | 21 + target/linux/patches/3.13.7/microblaze-axi.patch | 11 + .../patches/3.13.7/microblaze-early-printk.patch | 12 + .../linux/patches/3.13.7/microblaze-ethernet.patch | 11 + target/linux/patches/3.13.7/microblaze-setup.patch | 12 + target/linux/patches/3.13.7/mtd-rootfs.patch | 26 + target/linux/patches/3.13.7/non-static.patch | 33 + .../linux/patches/3.13.7/ppc64-missing-zlib.patch | 11 + .../patches/3.13.7/ppc64-missing_arch_random.patch | 11 + target/linux/patches/3.13.7/raspberry.patch | 101068 ++++++++++++++++++ target/linux/patches/3.13.7/startup.patch | 37 + target/linux/patches/3.13.7/uuid.patch | 263 + .../patches/3.13.7/vga-cons-default-off.patch | 12 + target/linux/patches/3.13.7/wlan-cf.patch | 11 + target/linux/patches/3.13.7/xargs.patch | 12 + target/linux/patches/3.13.7/zlib-inflate.patch | 12 + .../linux/patches/3.4.82/bsd-compatibility.patch | 2512 - target/linux/patches/3.4.82/defaults.patch | 22 - target/linux/patches/3.4.82/gemalto.patch | 11 - target/linux/patches/3.4.82/lemote-rfkill.patch | 21 - target/linux/patches/3.4.82/mips-error.patch | 254 - .../patches/3.4.82/module-alloc-size-check.patch | 21 - target/linux/patches/3.4.82/non-static.patch | 33 - target/linux/patches/3.4.82/sparc-include.patch | 11 - target/linux/patches/3.4.82/startup.patch | 34 - target/linux/patches/3.4.82/usb-defaults-off.patch | 32 - target/linux/patches/3.4.82/uuid.patch | 263 - .../patches/3.4.82/vga-cons-default-off.patch | 12 - target/linux/patches/3.4.82/wlan-cf.patch | 11 - target/linux/patches/3.4.82/zlib-inflate.patch | 12 - .../linux/patches/3.4.84/bsd-compatibility.patch | 2512 + target/linux/patches/3.4.84/defaults.patch | 22 + target/linux/patches/3.4.84/gemalto.patch | 11 + target/linux/patches/3.4.84/lemote-rfkill.patch | 21 + target/linux/patches/3.4.84/mips-error.patch | 254 + .../patches/3.4.84/module-alloc-size-check.patch | 21 + target/linux/patches/3.4.84/non-static.patch | 33 + target/linux/patches/3.4.84/sparc-include.patch | 11 + target/linux/patches/3.4.84/startup.patch | 34 + target/linux/patches/3.4.84/usb-defaults-off.patch | 32 + target/linux/patches/3.4.84/uuid.patch | 263 + .../patches/3.4.84/vga-cons-default-off.patch | 12 + target/linux/patches/3.4.84/wlan-cf.patch | 11 + target/linux/patches/3.4.84/zlib-inflate.patch | 12 + 115 files changed, 214428 insertions(+), 214428 deletions(-) delete mode 100644 target/linux/patches/3.10.33/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.10.33/startup.patch create mode 100644 target/linux/patches/3.10.34/bsd-compatibility.patch create mode 100644 target/linux/patches/3.10.34/startup.patch delete mode 100644 target/linux/patches/3.12.13/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.12.13/defaults.patch delete mode 100644 target/linux/patches/3.12.13/disable-netfilter.patch delete mode 100644 target/linux/patches/3.12.13/export-symbol-for-exmap.patch delete mode 100644 target/linux/patches/3.12.13/gemalto.patch delete mode 100644 target/linux/patches/3.12.13/lemote-rfkill.patch delete mode 100644 target/linux/patches/3.12.13/microblaze-ethernet.patch delete mode 100644 target/linux/patches/3.12.13/microblaze-setup.patch delete mode 100644 target/linux/patches/3.12.13/mips-lzo-fix.patch delete mode 100644 target/linux/patches/3.12.13/mtd-rootfs.patch delete mode 100644 target/linux/patches/3.12.13/non-static.patch delete mode 100644 target/linux/patches/3.12.13/ppc64-missing-zlib.patch delete mode 100644 target/linux/patches/3.12.13/raspberry.patch delete mode 100644 target/linux/patches/3.12.13/startup.patch delete mode 100644 target/linux/patches/3.12.13/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.12.13/uuid.patch delete mode 100644 target/linux/patches/3.12.13/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.12.13/wlan-cf.patch delete mode 100644 target/linux/patches/3.12.13/xargs.patch delete mode 100644 target/linux/patches/3.12.13/zlib-inflate.patch create mode 100644 target/linux/patches/3.12.14/bsd-compatibility.patch create mode 100644 target/linux/patches/3.12.14/defaults.patch create mode 100644 target/linux/patches/3.12.14/disable-netfilter.patch create mode 100644 target/linux/patches/3.12.14/export-symbol-for-exmap.patch create mode 100644 target/linux/patches/3.12.14/gemalto.patch create mode 100644 target/linux/patches/3.12.14/lemote-rfkill.patch create mode 100644 target/linux/patches/3.12.14/microblaze-ethernet.patch create mode 100644 target/linux/patches/3.12.14/microblaze-setup.patch create mode 100644 target/linux/patches/3.12.14/mips-lzo-fix.patch create mode 100644 target/linux/patches/3.12.14/mtd-rootfs.patch create mode 100644 target/linux/patches/3.12.14/non-static.patch create mode 100644 target/linux/patches/3.12.14/ppc64-missing-zlib.patch create mode 100644 target/linux/patches/3.12.14/raspberry.patch create mode 100644 target/linux/patches/3.12.14/startup.patch create mode 100644 target/linux/patches/3.12.14/usb-defaults-off.patch create mode 100644 target/linux/patches/3.12.14/uuid.patch create mode 100644 target/linux/patches/3.12.14/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.12.14/wlan-cf.patch create mode 100644 target/linux/patches/3.12.14/xargs.patch create mode 100644 target/linux/patches/3.12.14/zlib-inflate.patch delete mode 100644 target/linux/patches/3.13.6/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.13.6/defaults.patch delete mode 100644 target/linux/patches/3.13.6/disable-netfilter.patch delete mode 100644 target/linux/patches/3.13.6/export-symbol-for-exmap.patch delete mode 100644 target/linux/patches/3.13.6/gemalto.patch delete mode 100644 target/linux/patches/3.13.6/lemote-rfkill.patch delete mode 100644 target/linux/patches/3.13.6/microblaze-axi.patch delete mode 100644 target/linux/patches/3.13.6/microblaze-early-printk.patch delete mode 100644 target/linux/patches/3.13.6/microblaze-ethernet.patch delete mode 100644 target/linux/patches/3.13.6/microblaze-setup.patch delete mode 100644 target/linux/patches/3.13.6/mtd-rootfs.patch delete mode 100644 target/linux/patches/3.13.6/non-static.patch delete mode 100644 target/linux/patches/3.13.6/ppc64-missing-zlib.patch delete mode 100644 target/linux/patches/3.13.6/ppc64-missing_arch_random.patch delete mode 100644 target/linux/patches/3.13.6/raspberry.patch delete mode 100644 target/linux/patches/3.13.6/startup.patch delete mode 100644 target/linux/patches/3.13.6/uuid.patch delete mode 100644 target/linux/patches/3.13.6/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.13.6/wlan-cf.patch delete mode 100644 target/linux/patches/3.13.6/xargs.patch delete mode 100644 target/linux/patches/3.13.6/zlib-inflate.patch create mode 100644 target/linux/patches/3.13.7/bsd-compatibility.patch create mode 100644 target/linux/patches/3.13.7/defaults.patch create mode 100644 target/linux/patches/3.13.7/disable-netfilter.patch create mode 100644 target/linux/patches/3.13.7/export-symbol-for-exmap.patch create mode 100644 target/linux/patches/3.13.7/gemalto.patch create mode 100644 target/linux/patches/3.13.7/lemote-rfkill.patch create mode 100644 target/linux/patches/3.13.7/microblaze-axi.patch create mode 100644 target/linux/patches/3.13.7/microblaze-early-printk.patch create mode 100644 target/linux/patches/3.13.7/microblaze-ethernet.patch create mode 100644 target/linux/patches/3.13.7/microblaze-setup.patch create mode 100644 target/linux/patches/3.13.7/mtd-rootfs.patch create mode 100644 target/linux/patches/3.13.7/non-static.patch create mode 100644 target/linux/patches/3.13.7/ppc64-missing-zlib.patch create mode 100644 target/linux/patches/3.13.7/ppc64-missing_arch_random.patch create mode 100644 target/linux/patches/3.13.7/raspberry.patch create mode 100644 target/linux/patches/3.13.7/startup.patch create mode 100644 target/linux/patches/3.13.7/uuid.patch create mode 100644 target/linux/patches/3.13.7/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.13.7/wlan-cf.patch create mode 100644 target/linux/patches/3.13.7/xargs.patch create mode 100644 target/linux/patches/3.13.7/zlib-inflate.patch delete mode 100644 target/linux/patches/3.4.82/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.4.82/defaults.patch delete mode 100644 target/linux/patches/3.4.82/gemalto.patch delete mode 100644 target/linux/patches/3.4.82/lemote-rfkill.patch delete mode 100644 target/linux/patches/3.4.82/mips-error.patch delete mode 100644 target/linux/patches/3.4.82/module-alloc-size-check.patch delete mode 100644 target/linux/patches/3.4.82/non-static.patch delete mode 100644 target/linux/patches/3.4.82/sparc-include.patch delete mode 100644 target/linux/patches/3.4.82/startup.patch delete mode 100644 target/linux/patches/3.4.82/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.4.82/uuid.patch delete mode 100644 target/linux/patches/3.4.82/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.4.82/wlan-cf.patch delete mode 100644 target/linux/patches/3.4.82/zlib-inflate.patch create mode 100644 target/linux/patches/3.4.84/bsd-compatibility.patch create mode 100644 target/linux/patches/3.4.84/defaults.patch create mode 100644 target/linux/patches/3.4.84/gemalto.patch create mode 100644 target/linux/patches/3.4.84/lemote-rfkill.patch create mode 100644 target/linux/patches/3.4.84/mips-error.patch create mode 100644 target/linux/patches/3.4.84/module-alloc-size-check.patch create mode 100644 target/linux/patches/3.4.84/non-static.patch create mode 100644 target/linux/patches/3.4.84/sparc-include.patch create mode 100644 target/linux/patches/3.4.84/startup.patch create mode 100644 target/linux/patches/3.4.84/usb-defaults-off.patch create mode 100644 target/linux/patches/3.4.84/uuid.patch create mode 100644 target/linux/patches/3.4.84/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.4.84/wlan-cf.patch create mode 100644 target/linux/patches/3.4.84/zlib-inflate.patch (limited to 'target/linux') diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index b43a566b9..d3f988845 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER config ADK_KPACKAGE_KMOD_FULL_NAT tristate "Meta package for Full NAT" - select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30 + select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7 config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_4_82 + depends on ADK_KERNEL_VERSION_3_4_84 help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by @@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT config ADK_KPACKAGE_KMOD_NF_NAT_IPV4 tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_10_30 \ + depends on ADK_KERNEL_VERSION_3_10_34 \ || ADK_KERNEL_VERSION_3_11_10 \ - || ADK_KERNEL_VERSION_3_12_13 \ - || ADK_KERNEL_VERSION_3_13_6 + || ADK_KERNEL_VERSION_3_12_14 \ + || ADK_KERNEL_VERSION_3_13_7 help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by diff --git a/target/linux/patches/3.10.33/bsd-compatibility.patch b/target/linux/patches/3.10.33/bsd-compatibility.patch deleted file mode 100644 index b954b658f..000000000 --- a/target/linux/patches/3.10.33/bsd-compatibility.patch +++ /dev/null @@ -1,2538 +0,0 @@ -diff -Nur linux-3.11.5.orig/scripts/Makefile.lib linux-3.11.5/scripts/Makefile.lib ---- linux-3.11.5.orig/scripts/Makefile.lib 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/scripts/Makefile.lib 2013-10-16 18:09:31.000000000 +0200 -@@ -281,7 +281,12 @@ - size_append = printf $(shell \ - dec_size=0; \ - for F in $1; do \ -- fsize=$$(stat -c "%s" $$F); \ -+ if stat -qs .>/dev/null 2>&1; then \ -+ statcmd='stat -f %z'; \ -+ else \ -+ statcmd='stat -c %s'; \ -+ fi; \ -+ fsize=$$($$statcmd $$F); \ - dec_size=$$(expr $$dec_size + $$fsize); \ - done; \ - printf "%08x\n" $$dec_size | \ -diff -Nur linux-3.11.5.orig/scripts/mod/mk_elfconfig.c linux-3.11.5/scripts/mod/mk_elfconfig.c ---- linux-3.11.5.orig/scripts/mod/mk_elfconfig.c 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/scripts/mod/mk_elfconfig.c 2013-10-16 18:09:31.000000000 +0200 -@@ -1,7 +1,18 @@ - #include - #include - #include --#include -+ -+#define EI_NIDENT (16) -+#define ELFMAG "\177ELF" -+ -+#define SELFMAG 4 -+#define EI_CLASS 4 -+#define ELFCLASS32 1 /* 32-bit objects */ -+#define ELFCLASS64 2 /* 64-bit objects */ -+ -+#define EI_DATA 5 /* Data encoding byte index */ -+#define ELFDATA2LSB 1 /* 2's complement, little endian */ -+#define ELFDATA2MSB 2 /* 2's complement, big endian */ - - int - main(int argc, char **argv) -diff -Nur linux-3.11.5.orig/scripts/mod/modpost.h linux-3.11.5/scripts/mod/modpost.h ---- linux-3.11.5.orig/scripts/mod/modpost.h 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/scripts/mod/modpost.h 2013-10-16 18:09:31.000000000 +0200 -@@ -7,7 +7,2453 @@ - #include - #include - #include --#include -+ -+ -+/* This file defines standard ELF types, structures, and macros. -+ Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _ELF_H -+#define _ELF_H 1 -+ -+__BEGIN_DECLS -+ -+/* Standard ELF types. */ -+ -+#include -+ -+/* Type for a 16-bit quantity. */ -+typedef uint16_t Elf32_Half; -+typedef uint16_t Elf64_Half; -+ -+/* Types for signed and unsigned 32-bit quantities. */ -+typedef uint32_t Elf32_Word; -+typedef int32_t Elf32_Sword; -+typedef uint32_t Elf64_Word; -+typedef int32_t Elf64_Sword; -+ -+/* Types for signed and unsigned 64-bit quantities. */ -+typedef uint64_t Elf32_Xword; -+typedef int64_t Elf32_Sxword; -+typedef uint64_t Elf64_Xword; -+typedef int64_t Elf64_Sxword; -+ -+/* Type of addresses. */ -+typedef uint32_t Elf32_Addr; -+typedef uint64_t Elf64_Addr; -+ -+/* Type of file offsets. */ -+typedef uint32_t Elf32_Off; -+typedef uint64_t Elf64_Off; -+ -+/* Type for section indices, which are 16-bit quantities. */ -+typedef uint16_t Elf32_Section; -+typedef uint16_t Elf64_Section; -+ -+/* Type for version symbol information. */ -+typedef Elf32_Half Elf32_Versym; -+typedef Elf64_Half Elf64_Versym; -+ -+ -+/* The ELF file header. This appears at the start of every ELF file. */ -+ -+#define EI_NIDENT (16) -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf32_Half e_type; /* Object file type */ -+ Elf32_Half e_machine; /* Architecture */ -+ Elf32_Word e_version; /* Object file version */ -+ Elf32_Addr e_entry; /* Entry point virtual address */ -+ Elf32_Off e_phoff; /* Program header table file offset */ -+ Elf32_Off e_shoff; /* Section header table file offset */ -+ Elf32_Word e_flags; /* Processor-specific flags */ -+ Elf32_Half e_ehsize; /* ELF header size in bytes */ -+ Elf32_Half e_phentsize; /* Program header table entry size */ -+ Elf32_Half e_phnum; /* Program header table entry count */ -+ Elf32_Half e_shentsize; /* Section header table entry size */ -+ Elf32_Half e_shnum; /* Section header table entry count */ -+ Elf32_Half e_shstrndx; /* Section header string table index */ -+} Elf32_Ehdr; -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf64_Half e_type; /* Object file type */ -+ Elf64_Half e_machine; /* Architecture */ -+ Elf64_Word e_version; /* Object file version */ -+ Elf64_Addr e_entry; /* Entry point virtual address */ -+ Elf64_Off e_phoff; /* Program header table file offset */ -+ Elf64_Off e_shoff; /* Section header table file offset */ -+ Elf64_Word e_flags; /* Processor-specific flags */ -+ Elf64_Half e_ehsize; /* ELF header size in bytes */ -+ Elf64_Half e_phentsize; /* Program header table entry size */ -+ Elf64_Half e_phnum; /* Program header table entry count */ -+ Elf64_Half e_shentsize; /* Section header table entry size */ -+ Elf64_Half e_shnum; /* Section header table entry count */ -+ Elf64_Half e_shstrndx; /* Section header string table index */ -+} Elf64_Ehdr; -+ -+/* Fields in the e_ident array. The EI_* macros are indices into the -+ array. The macros under each EI_* macro are the values the byte -+ may have. */ -+ -+#define EI_MAG0 0 /* File identification byte 0 index */ -+#define ELFMAG0 0x7f /* Magic number byte 0 */ -+ -+#define EI_MAG1 1 /* File identification byte 1 index */ -+#define ELFMAG1 'E' /* Magic number byte 1 */ -+ -+#define EI_MAG2 2 /* File identification byte 2 index */ -+#define ELFMAG2 'L' /* Magic number byte 2 */ -+ -+#define EI_MAG3 3 /* File identification byte 3 index */ -+#define ELFMAG3 'F' /* Magic number byte 3 */ -+ -+/* Conglomeration of the identification bytes, for easy testing as a word. */ -+#define ELFMAG "\177ELF" -+#define SELFMAG 4 -+ -+#define EI_CLASS 4 /* File class byte index */ -+#define ELFCLASSNONE 0 /* Invalid class */ -+#define ELFCLASS32 1 /* 32-bit objects */ -+#define ELFCLASS64 2 /* 64-bit objects */ -+#define ELFCLASSNUM 3 -+ -+#define EI_DATA 5 /* Data encoding byte index */ -+#define ELFDATANONE 0 /* Invalid data encoding */ -+#define ELFDATA2LSB 1 /* 2's complement, little endian */ -+#define ELFDATA2MSB 2 /* 2's complement, big endian */ -+#define ELFDATANUM 3 -+ -+#define EI_VERSION 6 /* File version byte index */ -+ /* Value must be EV_CURRENT */ -+ -+#define EI_OSABI 7 /* OS ABI identification */ -+#define ELFOSABI_NONE 0 /* UNIX System V ABI */ -+#define ELFOSABI_SYSV 0 /* Alias. */ -+#define ELFOSABI_HPUX 1 /* HP-UX */ -+#define ELFOSABI_NETBSD 2 /* NetBSD. */ -+#define ELFOSABI_LINUX 3 /* Linux. */ -+#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ -+#define ELFOSABI_AIX 7 /* IBM AIX. */ -+#define ELFOSABI_IRIX 8 /* SGI Irix. */ -+#define ELFOSABI_FREEBSD 9 /* FreeBSD. */ -+#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ -+#define ELFOSABI_MODESTO 11 /* Novell Modesto. */ -+#define ELFOSABI_OPENBSD 12 /* OpenBSD. */ -+#define ELFOSABI_ARM 97 /* ARM */ -+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ -+ -+#define EI_ABIVERSION 8 /* ABI version */ -+ -+#define EI_PAD 9 /* Byte index of padding bytes */ -+ -+/* Legal values for e_type (object file type). */ -+ -+#define ET_NONE 0 /* No file type */ -+#define ET_REL 1 /* Relocatable file */ -+#define ET_EXEC 2 /* Executable file */ -+#define ET_DYN 3 /* Shared object file */ -+#define ET_CORE 4 /* Core file */ -+#define ET_NUM 5 /* Number of defined types */ -+#define ET_LOOS 0xfe00 /* OS-specific range start */ -+#define ET_HIOS 0xfeff /* OS-specific range end */ -+#define ET_LOPROC 0xff00 /* Processor-specific range start */ -+#define ET_HIPROC 0xffff /* Processor-specific range end */ -+ -+/* Legal values for e_machine (architecture). */ -+ -+#define EM_NONE 0 /* No machine */ -+#define EM_M32 1 /* AT&T WE 32100 */ -+#define EM_SPARC 2 /* SUN SPARC */ -+#define EM_386 3 /* Intel 80386 */ -+#define EM_68K 4 /* Motorola m68k family */ -+#define EM_88K 5 /* Motorola m88k family */ -+#define EM_860 7 /* Intel 80860 */ -+#define EM_MIPS 8 /* MIPS R3000 big-endian */ -+#define EM_S370 9 /* IBM System/370 */ -+#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ -+ -+#define EM_PARISC 15 /* HPPA */ -+#define EM_VPP500 17 /* Fujitsu VPP500 */ -+#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ -+#define EM_960 19 /* Intel 80960 */ -+#define EM_PPC 20 /* PowerPC */ -+#define EM_PPC64 21 /* PowerPC 64-bit */ -+#define EM_S390 22 /* IBM S390 */ -+ -+#define EM_V800 36 /* NEC V800 series */ -+#define EM_FR20