From a4f0089c5bf7d37257b244fb08de5e756498c6cd Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 14 Jan 2006 06:10:54 +0000 Subject: slugos: move to ixp4xx-kernel, change nslu2 to more generic ixp4xx in conf - rather than build nslu2-kernel or nas100d-kernel slugos-image now builds ixp4xx-kernel, the generic kernel. ixp4xx is now used as the normal MACHINE override, even though MACHINE itself is still set to nslu2 or nas100d (or ixp4xx). --- packages/linux/ixp4xx-kernel.inc | 2 +- packages/linux/ixp4xx-kernel_2.6.15.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 233d2a655c..452c8c956b 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -196,7 +196,7 @@ CMDLINE_KERNEL_OPTIONS ?= "${MACH_KERNEL_OPTIONS}" # CMDLINE_ROOT: machine specific boot options - should not be set on a # generic kernel! -CMDLINE_ROOT ?= "init=/linuxrc" +CMDLINE_ROOT ?= "" # CMDLINE_DEBUG: debug options such as noirqdebug, defaults to empty # override in local.conf etc diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 4a7cd96d37..8af2fde408 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r4.${PR_CONFIG}" +PR = "r5.${PR_CONFIG}" include ixp4xx-kernel.inc -- cgit v1.2.3 From 834e0aaa9e5048ca1872a7022ddb639fa15a2f18 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 14 Jan 2006 08:26:35 +0000 Subject: ixp4xx-kernel: correct config for Loft in 2.6.15 --- packages/linux/ixp4xx-kernel/2.6.15/defconfig | 9 +++++---- packages/linux/ixp4xx-kernel_2.6.15.bb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index c05034de19..1643ab8b43 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Thu Jan 12 17:44:50 2006 +# Fri Jan 13 23:40:57 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -112,12 +112,13 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # IXP4xx Platforms # CONFIG_MACH_NSLU2=y -# CONFIG_ARCH_AVILA is not set +CONFIG_ARCH_AVILA=y CONFIG_MACH_LOFT=y # CONFIG_ARCH_ADI_COYOTE is not set -# CONFIG_ARCH_IXDP425 is not set +CONFIG_ARCH_IXDP425=y # CONFIG_MACH_IXDPG425 is not set # CONFIG_MACH_IXDP465 is not set +CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y CONFIG_ARCH_IXDP4XX=y @@ -1362,7 +1363,7 @@ CONFIG_RTC_INTF_DEV=y # RTC drivers # CONFIG_RTC_DRV_X1205=y -# CONFIG_RTC_DRV_DS1672 is not set +CONFIG_RTC_DRV_DS1672=y # CONFIG_RTC_DRV_TEST is not set # diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 8af2fde408..6da130772c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "0" +PR_CONFIG = "1" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches -- cgit v1.2.3 From 8997e3c9f0a49d0455a557c44857b0f96b9ec714 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 14 Jan 2006 16:33:04 +0000 Subject: linux-openzaurus: added check for DISTRO_TYPE - type = "debug" kernels will give debug output - type = "release" will be quiet --- packages/linux/linux-openzaurus.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 7b7a6e72f2..2fc6f58007 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -25,7 +25,8 @@ CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" -CMDLINE_OTHER = "dyntick=enable debug" +CMDLINE_OTHER = "dyntick=enable" +CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' ############################################################## # Configure memory/ramdisk split for collie @@ -37,7 +38,7 @@ CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" -CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER}" +CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" ############################################################### # Enable or disable ELPP via local.conf - default is "no" -- cgit v1.2.3