From e34ffc1bf774a0a6561d7b9e0e6800e1029c0ef1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 1 May 2009 01:25:26 +0200 Subject: zaurus-2.6.inc: force creation of jffs2 images - tar.gz is (weak) assigned in bitbake.conf --- conf/machine/include/zaurus-2.6.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index d3345b469b..841b360f0d 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -22,6 +22,8 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" +IMAGE_FSTYPES += "jffs2" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " -- cgit v1.2.3 From 09187f21673a1f857c58d3d19ac00ce3d0accacc Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 May 2009 00:26:04 +0200 Subject: zaurus-2.6.inc: fix installkit creation on first build - move the task in zaurus-installer - EXTRA_IMAGEDEPENDS now on zaurus-installer --- conf/machine/include/zaurus-2.6.inc | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 841b360f0d..b0dc21f41c 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -10,8 +10,7 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -EXTRA_IMAGEDEPENDS += "zaurus-updater" -KEXECBOOT_IMAGEDEPENDS = "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" @@ -44,22 +43,4 @@ KERNEL_IMAGE_MAXSIZE = "1294336" ZAURUS_KERNEL_IMAGETYPE ?= "zImage" KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" -MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" - -zaurus_make_installkit () { - - cd ${DEPLOY_DIR_IMAGE} - rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ - mkdir installkit-${MACHINE}/ - - [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE} - - cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh - - tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/ - md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5 - rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ - -} - require conf/machine/include/kexecboot.inc -- cgit v1.2.3 From 0123e67d8568dd40be07d12f5b358c8854a3b78d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 May 2009 00:44:10 +0200 Subject: zaurus-2.6.inc: set ERASEBLOCKSIZE_spitz = "0x20000" - add a note about NAND differences between 3000 and 3100/3200 models - possibly broken for C3000 --- conf/machine/include/zaurus-2.6.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index b0dc21f41c..c6dafc19d9 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -8,6 +8,10 @@ MACHINE_KERNEL_VERSION = "2.6" ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" +# Warning! SL-C3000 seems to be "0x4000" (16m NAND) +# C3100 and C3200 have same 128MB NAND device as akita +ERASEBLOCKSIZE_spitz = "0x20000" + EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" EXTRA_IMAGEDEPENDS += "zaurus-installer" -- cgit v1.2.3 From 491b936c67225ef311a58b799c9e4280fe523fec Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 May 2009 23:55:30 +0200 Subject: zaurus-clamshell.inc: remove unused KEXECBOOT_IMAGEDEPENDS - KEXECBOOT_IMAGEDEPENDS was introduced just for Zaurus (fixed now) --- conf/machine/include/zaurus-clamshell.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 34e803e418..4fa9f75eb3 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,7 +1,6 @@ include conf/machine/include/tune-xscale.inc EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ -- cgit v1.2.3 From f1ce646bf9e343b68bc602964cb462ed64f4a3dc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 May 2009 20:07:29 +0200 Subject: linux-omap: update beagle defconfig to include TT_NEWSCHED and tweak overo PM config --- conf/machine/include/omap3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 5d6d9ffbff..2e33e33606 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r31" +MACHINE_KERNEL_PR = "r32" KERNEL_IMAGETYPE = "uImage" -- cgit v1.2.3 From 4c5af7a404c1cc17d842eb5a7093424389796d78 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 11 May 2009 13:40:19 +0200 Subject: linux-omap 2.6.29: enable networking and staging drivers in beagleboard defconfig --- conf/machine/include/omap3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 2e33e33606..9f48f750e7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r32" +MACHINE_KERNEL_PR = "r33" KERNEL_IMAGETYPE = "uImage" -- cgit v1.2.3 From 5abc720bf33bf0311a5c5b6fae294c99a2ca7623 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Thu, 14 May 2009 14:59:20 +0400 Subject: AFEB9260: add 180MHz config, split machine conf I really do this just because I need to support 2 board variants 180 MHz and default 166MHz. Each one needs different setup for at91bootstrap and (probably) u-boot. --- conf/machine/include/afeb9260.inc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 conf/machine/include/afeb9260.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/afeb9260.inc b/conf/machine/include/afeb9260.inc new file mode 100644 index 0000000000..cb3ff9bbe9 --- /dev/null +++ b/conf/machine/include/afeb9260.inc @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@Name: AFEB9260 development board http://www.oshw.ru/ + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc -- cgit v1.2.3 From fa1039ef168f11906fdac1690f3462b39e057a66 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 May 2009 12:03:53 +0200 Subject: linux-kirkwood: update to 2.6.29.2 --- 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 f58feb686c..8f995899c9 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 = "r1" +MACHINE_KERNEL_PR = "r2" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From 5537df3b31dba37a87e6cf766453ed9ce1dd5ea1 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sat, 16 May 2009 18:21:22 +0100 Subject: linux-kirkwood_2.6.29.2.bb : fix PR to new scheme --- 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 8f995899c9..fddaf63f1b 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 = "r2" +MACHINE_KERNEL_PR = "r3" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From 32a26a50e11abddf6a4f3aaff8ad09a464211b3c Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Sat, 16 May 2009 20:15:40 +0100 Subject: linux-kirkwood: Add GSPCA based webcams as modules --- 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 fddaf63f1b..3f0b8003f5 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 = "r3" +MACHINE_KERNEL_PR = "r4" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From 83cb9a11a2b04f954575bf4f2bc35d0d1743c393 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 17 May 2009 00:41:05 +0100 Subject: linux-kirkwood_2.6.29.2.bb : add CPUIDLE support so hopefully we waste less power while idle --- 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 3f0b8003f5..9e6f130c35 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 = "r4" +MACHINE_KERNEL_PR = "r5" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" -- cgit v1.2.3 From d962d391fab15d5fb7d9965b05b161da6d4d1157 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 19 May 2009 13:00:14 +0200 Subject: linux-omap 2.6.29: refresh dss2 patchset --- conf/machine/include/omap3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9f48f750e7..bb4fa7eaf0 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r33" +MACHINE_KERNEL_PR = "r34" KERNEL_IMAGETYPE = "uImage" -- cgit v1.2.3 From 104812c76e1ff7e54e6326ce28274e2e04a96494 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 22 Apr 2009 17:24:05 -0400 Subject: davinci.inc: add common DaVinci machine configuration Signed-off-by: Denys Dmytriyenko --- conf/machine/include/davinci.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 conf/machine/include/davinci.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc new file mode 100644 index 0000000000..295a9c7007 --- /dev/null +++ b/conf/machine/include/davinci.inc @@ -0,0 +1,26 @@ +require conf/machine/include/tune-arm926ejs.inc + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r0" + +TARGET_ARCH = "arm" + +KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +PREFERRED_VERSION_u-boot = "git" +UBOOT_MACHINE = "davinci_dvevm_config" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +#EXTRA_IMAGEDEPENDS += "u-boot ubl" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +#ROOT_FLASH_SIZE = "29" + +MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" -- cgit v1.2.3 From 88e86fff9620a65469d2d43afd6a8f82e505e740 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 16 Apr 2009 19:39:50 -0300 Subject: machine/geode[gl]x: use more optimization while compiling Since the code is now the same for Geode GX and Geode LX we also merged the tunning files in a single tune-geode.inc, making it easy to improve from now on. Signed-off-by: Otavio Salvador --- conf/machine/include/tune-geode.inc | 5 +++++ conf/machine/include/tune-geodegx.inc | 6 ------ conf/machine/include/tune-geodelx.inc | 9 --------- 3 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 conf/machine/include/tune-geode.inc delete mode 100644 conf/machine/include/tune-geodegx.inc delete mode 100644 conf/machine/include/tune-geodelx.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/tune-geode.inc b/conf/machine/include/tune-geode.inc new file mode 100644 index 0000000000..eda332a74e --- /dev/null +++ b/conf/machine/include/tune-geode.inc @@ -0,0 +1,5 @@ +TARGET_CC_ARCH = "-march=geode -mtune=geode" +BASE_PACKAGE_ARCH = "geode" +PACKAGE_EXTRA_ARCHS += "x86 i386 geode" + +FEED_ARCH = "geode" diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geodegx.inc deleted file mode 100644 index cae285a91c..0000000000 --- a/conf/machine/include/tune-geodegx.inc +++ /dev/null @@ -1,6 +0,0 @@ -TARGET_CC_ARCH = "-march=geode" -BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 geode" - -FEED_ARCH = "geode" - diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc deleted file mode 100644 index 63e6678947..0000000000 --- a/conf/machine/include/tune-geodelx.inc +++ /dev/null @@ -1,9 +0,0 @@ -# Geode CPU has it's own target in GCC 4.3 -# in older versions k6-2 is closest -# -TARGET_CC_ARCH = "-march=geode" -BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 geode" - -FEED_ARCH = "geode" - -- cgit v1.2.3 From bc8de04dc0375272fcd6ea50b1ca72e92711cb57 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 24 May 2009 00:06:03 +0200 Subject: zaurus-2.6.inc: reorder common include - readd collie and tosa specific bits - add MACHINE_KERNEL_PR --- conf/machine/include/zaurus-2.6.inc | 22 ++++++++++------------ conf/machine/include/zaurus-kernel.inc | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 conf/machine/include/zaurus-kernel.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index c6dafc19d9..a8c564f4da 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,10 +1,8 @@ -# Zaurus specific configuration for kernel 2.6 +# Zaurus common settings # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION = "2.6" - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" @@ -17,34 +15,34 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" PCMCIA_MANAGER ?= "pcmciautils" IMAGE_FSTYPES += "jffs2" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd mtd-utils" -# Fixme ? -######### +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -KERNEL_IMAGE_MAXSIZE = "1294336" - -ZAURUS_KERNEL_IMAGETYPE ?= "zImage" -KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" +# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup +# Fixme ? module-snd for tosa +MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" +require conf/machine/include/zaurus-kernel.inc require conf/machine/include/kexecboot.inc diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc new file mode 100644 index 0000000000..f63af74405 --- /dev/null +++ b/conf/machine/include/zaurus-kernel.inc @@ -0,0 +1,18 @@ +# Zaurus common kernel settings + +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel_collie = "linux" +PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" + +# Increase PR everytime you change something in the kernel +MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR_collie = "r8" +MACHINE_KERNEL_PR_tosa = "r4" + +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" -- cgit v1.2.3 From be8461e8b3c7e9d7c7d777816e5243ad45734233 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 24 May 2009 00:22:57 +0200 Subject: kexecboot.inc: rename as initramfs-kexecboot.in --- conf/machine/include/initramfs-kexecboot.inc | 13 +++++++++++++ conf/machine/include/kexecboot.inc | 16 ---------------- conf/machine/include/zaurus-2.6.inc | 4 ++-- 3 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 conf/machine/include/initramfs-kexecboot.inc delete mode 100644 conf/machine/include/kexecboot.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc new file mode 100644 index 0000000000..6ee1ddc3fa --- /dev/null +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -0,0 +1,13 @@ +# initramfs-kexecboot specific config options + +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" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc deleted file mode 100644 index 1835af4727..0000000000 --- a/conf/machine/include/kexecboot.inc +++ /dev/null @@ -1,16 +0,0 @@ -# kexecboot specific config options - -# NOTE: include this file after zaurus-2.6.inc for zaurus machines - -MACHINE_FEATURES_append = " kexecboot " - -IMAGE_FSTYPES += " tar.gz " -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 mtd1 for booting other kernels -DONT_CHECK_KERNELSIZE ?= "1" - -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a8c564f4da..783ea9fd32 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -23,7 +23,7 @@ PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" PCMCIA_MANAGER ?= "pcmciautils" -IMAGE_FSTYPES += "jffs2" +IMAGE_FSTYPES += "jffs2 tar.gz" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_akita = " usbhost " @@ -45,4 +45,4 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-p MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" require conf/machine/include/zaurus-kernel.inc -require conf/machine/include/kexecboot.inc +require conf/machine/include/initramfs-kexecboot.inc -- cgit v1.2.3 From a29819bbbbebdf42e94e3da20c973a1b715985f7 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 24 May 2009 00:40:45 +0200 Subject: zaurus-2.6.inc: fix bogus MACHINE_EXTRA_RDEPENDS_collie and add a placeholder for MACHINE_EXTRA_RRECOMMENDS_collie --- conf/machine/include/zaurus-2.6.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 783ea9fd32..69589a0d60 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -31,7 +31,7 @@ MACHINE_FEATURES_append_spitz = " usbhost " MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" -MACHINE_EXTRA_RDEPENDS_collie = "zaurusd mtd-utils" +MACHINE_EXTRA_RDEPENDS_collie = "" # Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules @@ -44,5 +44,8 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-p # Fixme ? module-snd for tosa MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" + require conf/machine/include/zaurus-kernel.inc require conf/machine/include/initramfs-kexecboot.inc -- cgit v1.2.3 From be6fec499ddd4de3d76a60bafbf47d94f7632d93 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 24 May 2009 14:02:56 +0200 Subject: linux-davinci: bump PR and point to include file where MACHINE_KERNEL_PR is located --- 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 295a9c7007..0f6123a359 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 = "r0" +MACHINE_KERNEL_PR = "r6" TARGET_ARCH = "arm" -- cgit v1.2.3 From 8ce0d1274b868674c997ef52b1c8753c033a8a08 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 25 May 2009 00:15:12 +0200 Subject: zaurus-kernel.inc: add a (common) PR for linux-kexecboot --- conf/machine/include/zaurus-kernel.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index f63af74405..415f8a4d68 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -11,6 +11,8 @@ MACHINE_KERNEL_PR = "r11" MACHINE_KERNEL_PR_collie = "r8" MACHINE_KERNEL_PR_tosa = "r4" +MACHINE_KERNEL_PR_pn-linux-kexecboot = "r12" + KERNEL_IMAGE_MAXSIZE = "1294336" KERNEL_IMAGE_MAXSIZE_collie = "1048576" -- cgit v1.2.3