summaryrefslogtreecommitdiff
path: root/recipes/linux
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-2.6.24/hipox/defconfig5
-rw-r--r--recipes/linux/linux-omap-2.6.29/arch-has-holes.diff2
-rw-r--r--recipes/linux/linux-omap-2.6.29/beagleboard/defconfig2
-rw-r--r--recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff2
4 files changed, 6 insertions, 5 deletions
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 62c6d16f6b..a1482fbf4b 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24.4
-# Wed Jul 29 12:54:46 2009
+# Mon Aug 24 09:09:25 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -48,7 +48,8 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_FAIR_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
diff --git a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
+
+static int __init meminfo_cmp(const void *_a, const void *_b) {
+ const struct membank *a = _a, *b = _b;
-+ long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++ long cmp = bank_pfn_start(a) - bank_pfn_start(b);
+ return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
+
void __init bootmem_init(void)
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index 7da8bb9f2b..c9f8e9962b 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y
# CONFIG_OMAP_MUX is not set
CONFIG_OMAP_MCBSP=y
# CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_IOMMU=y
+CONFIG_OMAP_IOMMU=m
# CONFIG_OMAP_MPU_TIMER is not set
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_32K_TIMER_HZ=128
diff --git a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
+
+static int __init meminfo_cmp(const void *_a, const void *_b) {
+ const struct membank *a = _a, *b = _b;
-+ long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++ long cmp = bank_pfn_start(a) - bank_pfn_start(b);
+ return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
+
void __init bootmem_init(void)