From 5de6603a8dcec610f2f8fdbf60f44e7b4737aff5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 13 Feb 2010 10:53:22 +0100 Subject: linux-kirkwood: made utf8 the default NLS Made utf8 the default NLS (as suggested by hrw). Signed-off-by: Frans Meulenbroeks --- conf/machine/include/kirkwood.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 8507857b11..d43cb36e23 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r16" +MACHINE_KERNEL_PR = "r17" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From 45f82a941c77e9d747814fa1e337ba803475d327 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 14 Feb 2010 01:19:08 +0100 Subject: zaurus-kernels: move the kernel size check to linux-kexecboot.inc. * no need for DONT_CHECK_KERNELSIZE * clean up the affected files * check happens only if KERNEL_IMAGE_MAXSIZE is set --- conf/machine/include/initramfs-kexecboot.inc | 7 ++----- conf/machine/include/zaurus-kernel.inc | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index 6ee1ddc3fa..e59c4a2f59 100644 --- a/conf/machine/include/initramfs-kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -4,10 +4,7 @@ MACHINE_FEATURES_append = " kexecboot " EXTRA_IMAGEDEPENDS += "linux-kexecboot" -# Include kernel image in kexecboot enabled images -RDEPENDS_kernel-base = "kernel-image" - -# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels -DONT_CHECK_KERNELSIZE ?= "1" +# Include kernel in the rootfs (to be launched by kexec) +RDEPENDS_kernel-base = "kernel-image" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index 1ba4a3422d..bbbb38315c 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -4,13 +4,12 @@ MACHINE_KERNEL_VERSION = "2.6" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -# Starting with 2.6.32 linux-rp is deprecated +# Starting with 2.6.32 linux-rp is deprecated for some models #PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" -KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGE_MAXSIZE_collie = "1048576" - +# Default bootloader expects "zImage", use "uImage" for u-boot +# Note: kexecboot can boot both kind of images ZAURUS_KERNEL_IMAGETYPE ?= "zImage" KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" -- cgit v1.2.3 From ef9f23fd42c4293c3aae2d898f633251f42596ef Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 14 Feb 2010 11:33:54 +0100 Subject: initramfs-kexecboot.inc: remove RDEPENDS_kernel-base = "kernel-image" --- conf/machine/include/initramfs-kexecboot.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index e59c4a2f59..fb3cdc9aa8 100644 --- a/conf/machine/include/initramfs-kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -1,10 +1,9 @@ # initramfs-kexecboot specific config options -MACHINE_FEATURES_append = " kexecboot " - -EXTRA_IMAGEDEPENDS += "linux-kexecboot" +# If set here, each image will also build linux-kexecboot. +# Usually the machine-installer recipe already DEPENDS on it +# +# EXTRA_IMAGEDEPENDS += "linux-kexecboot" -# Include kernel in the rootfs (to be launched by kexec) -RDEPENDS_kernel-base = "kernel-image" - -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" +MACHINE_FEATURES_append = " kexecboot " +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg " -- cgit v1.2.3 From 9f028b77781f290a16fb6f1b7930f08652db60e7 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 16 Feb 2010 00:46:43 +0100 Subject: initramfs-kexecboot.inc: Remove kexecboot from MACHINE_FEATURES. * add more comments --- conf/machine/include/initramfs-kexecboot.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index fb3cdc9aa8..81cceaaf25 100644 --- a/conf/machine/include/initramfs-kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -1,9 +1,18 @@ -# initramfs-kexecboot specific config options +# Initramfs-kexecboot extra config + # If set here, each image will also build linux-kexecboot. # Usually the machine-installer recipe already DEPENDS on it # # EXTRA_IMAGEDEPENDS += "linux-kexecboot" -MACHINE_FEATURES_append = " kexecboot " + +# Force inclusion of kernel in target images +# (done by default) +# +# RDEPENDS_kernel-base = "kernel-image" + + +# Install /boot/boot.cfg in target images +# MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg " -- cgit v1.2.3 From 4dd2c2666c9192a74d1771423fca4b2633ff3d84 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 16 Feb 2010 23:42:52 +0100 Subject: initramfs-kexecboot.inc: apply sane defaults --- conf/machine/include/initramfs-kexecboot.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index 81cceaaf25..bc9cd518e2 100644 --- a/conf/machine/include/initramfs-kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -4,13 +4,13 @@ # If set here, each image will also build linux-kexecboot. # Usually the machine-installer recipe already DEPENDS on it # -# EXTRA_IMAGEDEPENDS += "linux-kexecboot" +EXTRA_IMAGEDEPENDS += "linux-kexecboot" # Force inclusion of kernel in target images # (done by default) # -# RDEPENDS_kernel-base = "kernel-image" +RDEPENDS_kernel-base = "kernel-image" # Install /boot/boot.cfg in target images -- cgit v1.2.3 From 949238317e2c0cf151ad437683f692da13a0954b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 28 Feb 2010 22:22:59 +0100 Subject: linux-kirkwood: changed openrd-client defconfig to also build ppp modules as requested on the openrd mailing list Signed-off-by: Frans Meulenbroeks --- conf/machine/include/kirkwood.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index d43cb36e23..632540345b 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r17" +MACHINE_KERNEL_PR = "r18" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From 9c022f7728478570085538f3ca033e635de06e65 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 1 Mar 2010 21:11:50 +0100 Subject: linux/linux-davinci/hawkboard added netfilter modules to defconfig added netfilter modules to hawkboard defconfig these are needed in order to build nas-server-image Signed-off-by: Frans Meulenbroeks --- conf/machine/include/davinci.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index a262059d45..f3f491c275 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r32" +MACHINE_KERNEL_PR = "r33" TARGET_ARCH = "arm" -- cgit v1.2.3 From 64a935572158eb17a44585f24d393add83b0dbcb Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 9 Mar 2010 10:07:48 -0500 Subject: linux-davinci: update to the latest staging snapshot --- conf/machine/include/davinci.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index f3f491c275..2d744e9897 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r33" +MACHINE_KERNEL_PR = "r34" TARGET_ARCH = "arm" -- cgit v1.2.3 From ba37428a7e91205ad205bcf4d19268b6fe73844e Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:18 +0000 Subject: tune-ppc440.inc: add base to extra archs Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- conf/machine/include/tune-ppc440.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc index feca186315..1c94a34e9e 100644 --- a/conf/machine/include/tune-ppc440.inc +++ b/conf/machine/include/tune-ppc440.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-mcpu=440" BASE_PACKAGE_ARCH = "ppc440" FEED_ARCH = "ppc440" -PACKAGE_EXTRA_ARCHS += "ppc440e" +PACKAGE_EXTRA_ARCHS += "${BASE_PACKAGE_ARCH} ppc440e" -- cgit v1.2.3 From 86ab2dc6608c2f4342f3a6dcad4bc175c19bda5a Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Wed, 17 Mar 2010 06:26:53 +0000 Subject: Add Freescale mpc8641_hpcn demo board A demo board from Freescale, based on the MPC8641D Freescale SOC. Acked-by: Tom Rini Signed-off-by: Tom Rini --- conf/machine/include/tune-ppce600.inc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 conf/machine/include/tune-ppce600.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/tune-ppce600.inc b/conf/machine/include/tune-ppce600.inc new file mode 100644 index 0000000000..77a7cb86b8 --- /dev/null +++ b/conf/machine/include/tune-ppce600.inc @@ -0,0 +1,4 @@ +TARGET_CC_ARCH = "-mcpu=7450" +BASE_PACKAGE_ARCH = "ppce600" +FEED_ARCH = "ppce600" +PACKAGE_EXTRA_ARCHS += "ppce600" -- cgit v1.2.3