diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-30 06:04:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-30 06:04:09 +0200 |
commit | 9a71264445185841dee548eca87b2984fc198f1f (patch) | |
tree | 9266734c5c22a99a64100c8b93242f0e494d86d0 /target/linux | |
parent | 15ea15f2cff68851af19b0e74a7646eb0ce74002 (diff) | |
parent | 36197e445d0bde5785bb1a823b0e83c4f5b89ccb (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/config/Config.in.block | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.cpu | 21 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 10 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.network | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.pm | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.sensors | 25 | ||||
-rw-r--r-- | target/linux/config/Config.in.systems | 8 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 8 | ||||
-rw-r--r-- | target/linux/patches/2.6.39/mips-malta.patch | 135 |
11 files changed, 226 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 78e7b1bd5..8f673438d 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -129,6 +129,8 @@ config ADK_KERNEL_ATA_PIIX default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default n config ADK_KERNEL_SATA_AHCI @@ -150,6 +152,8 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI depends on ADK_TARGET_WITH_SATA + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default n help Enables support for AHCI Serial ATA. diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 64d9e9f3f..5be6dacfc 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -11,3 +11,24 @@ config ADK_KERNEL_MTRR boolean default y if ADK_TARGET_CPU_WITH_MTRR default n + +# hyper threading +config ADK_KERNEL_PM_SLEEP_SMP + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_SMP + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_X86_HT + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_USE_GENERIC_SMP_HELPERS + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 667593de9..5cbe307f0 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -3,6 +3,7 @@ config ADK_KERNEL_VT default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default n config ADK_KERNEL_VT_CONSOLE @@ -10,6 +11,7 @@ config ADK_KERNEL_VT_CONSOLE default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default n config ADK_KERNEL_FONTS @@ -71,7 +73,7 @@ config ADK_KERNEL_FB_SM7XX Framebuffer support for Lemote Yeelong. config ADK_HARDWARE_GRAPHICS_INTEL_I915 - prompt "................................ Support for Intel graphic cards (AGP/DRM/KMS)" + prompt "............................ Support for Intel graphic cards (AGP/DRM/KMS/NM10)" boolean select ADK_KERNEL_FB select ADK_KERNEL_DRM @@ -83,7 +85,7 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default n - depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 + depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_INTEL_ATOM || ADK_NATIVE_SYSTEM_INTEL_ATOM help AGP/DRM/KMS support for Intel chipset i915. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index b8566e569..65524a0d3 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -6,6 +6,8 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -15,6 +17,8 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -24,6 +28,8 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -33,6 +39,8 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -42,6 +50,8 @@ config ADK_KERNEL_INPUT_MOUSEDEV default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index d9a8cd9dc..c4df54f32 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -154,6 +154,8 @@ config ADK_KERNEL_R8169 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 + select ADK_KERNEL_MII + select ADK_KPACKAGE_KMOD_FW_LOADER default y if ADK_TARGET_SYSTEM_OVH_RPS default n help @@ -246,6 +248,8 @@ config ADK_KPACKAGE_KMOD_R8169 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 + select ADK_KERNEL_MII + select ADK_KPACKAGE_KMOD_FW_LOADER depends on !ADK_KERNEL_R8169 default n help diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 6e4267857..2ec253111 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -158,7 +158,7 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE config ADK_KPACKAGE_KMOD_IPV6 prompt "kmod-ipv6......................... IPv6 support" tristate - default n + default m help This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 5ffd8aca9..4e35a12b2 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -36,6 +36,8 @@ config ADK_HARDWARE_ACPI select ADK_KERNEL_ACPI_BUTTON select ADK_KERNEL_ACPI_FAN select ADK_KERNEL_ACPI_DOCK + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default n @@ -46,6 +48,8 @@ config ADK_KERNEL_SUSPEND prompt "Enable Suspend-to-RAM support" boolean select ADK_KERNEL_PM + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default n @@ -58,6 +62,8 @@ config ADK_KERNEL_HIBERNATION select ADK_KERNEL_PM select ADK_KERNEL_SWAP select BUSYBOX_SWAPONOFF + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default n diff --git a/target/linux/config/Config.in.sensors b/target/linux/config/Config.in.sensors new file mode 100644 index 000000000..941913bbd --- /dev/null +++ b/target/linux/config/Config.in.sensors @@ -0,0 +1,25 @@ +menu "Sensors" + +config ADK_KERNEL_HWMON + boolean + +config ADK_KPACKAGE_KMOD_CORETEMP + prompt "kmod-coretemp..................... Coretemp" + boolean + select ADK_KERNEL_I2C + select ADK_KERNEL_I2C_CHARDEV + select ADK_KERNEL_HWMON + select ADK_KERNEL_EXPERIMENTAL + default n + help + Coretemp module + +config ADK_KPACKAGE_KMOD_IT87 + prompt "kmod-it87......................... it87" + boolean + default n + help + Module for IT87 smbus chipsets + +endmenu + diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 8750ac281..369727277 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -1,3 +1,10 @@ +# page size +config ADK_KERNEL_PAGE_SIZE_4KB + boolean + +config ADK_KERNEL_PAGE_SIZE_16KB + boolean + # mips systems config ADK_KERNEL_ATHEROS_AR231X boolean @@ -37,6 +44,7 @@ config ADK_KERNEL_ARCH_AT91SAM9G20 config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean +# endianesss and ABI config ADK_KERNEL_AEABI boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index f16ef7dab..057fa1ffc 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -35,6 +35,8 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_FOXBOARD_LX @@ -78,6 +80,8 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help @@ -101,6 +105,8 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default n help The Open Host Controller Interface (OHCI) is a standard for accessing @@ -152,6 +158,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG diff --git a/target/linux/patches/2.6.39/mips-malta.patch b/target/linux/patches/2.6.39/mips-malta.patch new file mode 100644 index 000000000..cc8789dca --- /dev/null +++ b/target/linux/patches/2.6.39/mips-malta.patch @@ -0,0 +1,135 @@ +http://lkml.indiana.edu/hypermail/linux/kernel/1105.3/02199.html + +diff -Nur linux-2.6.39.orig/arch/mips/include/asm/smp-ops.h linux-2.6.39/arch/mips/include/asm/smp-ops.h +--- linux-2.6.39.orig/arch/mips/include/asm/smp-ops.h 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/arch/mips/include/asm/smp-ops.h 2011-08-29 04:39:03.360480881 +0200 +@@ -56,8 +56,43 @@ + + #endif /* !CONFIG_SMP */ + +-extern struct plat_smp_ops up_smp_ops; +-extern struct plat_smp_ops cmp_smp_ops; +-extern struct plat_smp_ops vsmp_smp_ops; ++static inline int register_up_smp_ops(void) ++{ ++#ifdef CONFIG_SMP_UP ++ extern struct plat_smp_ops up_smp_ops; ++ ++ register_smp_ops(&up_smp_ops); ++ ++ return 0; ++#else ++ return -ENODEV; ++#endif ++} ++ ++static inline int register_cmp_smp_ops(void) ++{ ++#ifdef CONFIG_MIPS_CMP ++ extern struct plat_smp_ops cmp_smp_ops; ++ ++ register_smp_ops(&cmp_smp_ops); ++ ++ return 0; ++#else ++ return -ENODEV; ++#endif ++} ++ ++static inline int register_vsmp_smp_ops(void) ++{ ++#ifdef CONFIG_MIPS_MT_SMP ++ extern struct plat_smp_ops vsmp_smp_ops; ++ ++ register_smp_ops(&vsmp_smp_ops); ++ ++ return 0; ++#else ++ return -ENODEV; ++#endif ++} + + #endif /* __ASM_SMP_OPS_H */ +diff -Nur linux-2.6.39.orig/arch/mips/mipssim/sim_setup.c linux-2.6.39/arch/mips/mipssim/sim_setup.c +--- linux-2.6.39.orig/arch/mips/mipssim/sim_setup.c 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/arch/mips/mipssim/sim_setup.c 2011-08-29 04:39:03.390480572 +0200 +@@ -59,18 +59,17 @@ + + prom_meminit(); + +-#ifdef CONFIG_MIPS_MT_SMP +- if (cpu_has_mipsmt) +- register_smp_ops(&vsmp_smp_ops); +- else +- register_smp_ops(&up_smp_ops); +-#endif ++ if (cpu_has_mipsmt) { ++ if (!register_vsmp_smp_ops()) ++ return; ++ + #ifdef CONFIG_MIPS_MT_SMTC +- if (cpu_has_mipsmt) + register_smp_ops(&ssmtc_smp_ops); +- else +- register_smp_ops(&up_smp_ops); ++ return; + #endif ++ } ++ ++ register_up_smp_ops(); + } + + static void __init serial_init(void) +diff -Nur linux-2.6.39.orig/arch/mips/mti-malta/malta-init.c linux-2.6.39/arch/mips/mti-malta/malta-init.c +--- linux-2.6.39.orig/arch/mips/mti-malta/malta-init.c 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/arch/mips/mti-malta/malta-init.c 2011-08-29 04:39:03.700480601 +0200 +@@ -29,6 +29,7 @@ + #include <asm/system.h> + #include <asm/cacheflush.h> + #include <asm/traps.h> ++#include <asm/smp-ops.h> + + #include <asm/gcmpregs.h> + #include <asm/mips-boards/prom.h> +@@ -358,15 +359,14 @@ + #ifdef CONFIG_SERIAL_8250_CONSOLE + console_config(); + #endif +-#ifdef CONFIG_MIPS_CMP + /* Early detection of CMP support */ + if (gcmp_probe(GCMP_BASE_ADDR, GCMP_ADDRSPACE_SZ)) +- register_smp_ops(&cmp_smp_ops); +- else +-#endif +-#ifdef CONFIG_MIPS_MT_SMP +- register_smp_ops(&vsmp_smp_ops); +-#endif ++ if (!register_cmp_smp_ops()) ++ return; ++ ++ if (!register_vsmp_smp_ops()) ++ return; ++ + #ifdef CONFIG_MIPS_MT_SMTC + register_smp_ops(&msmtc_smp_ops); + #endif +diff -Nur linux-2.6.39.orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c linux-2.6.39/arch/mips/pmc-sierra/msp71xx/msp_setup.c +--- linux-2.6.39.orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/arch/mips/pmc-sierra/msp71xx/msp_setup.c 2011-08-29 04:39:03.790480302 +0200 +@@ -228,13 +228,11 @@ + */ + msp_serial_setup(); + +-#ifdef CONFIG_MIPS_MT_SMP +- register_smp_ops(&vsmp_smp_ops); +-#endif +- ++ if (register_vsmp_smp_ops()) { + #ifdef CONFIG_MIPS_MT_SMTC +- register_smp_ops(&msp_smtc_smp_ops); ++ register_smp_ops(&msp_smtc_smp_ops); + #endif ++ } + + #ifdef CONFIG_PMCTWILED + /* |