[oe-commits] org.oe.dev merge of '85a2f16fc0d263698947f31a1f50694c14d86e70'

[oe commit]

merge of '85a2f16fc0d263698947f31a1f50694c14d86e70'
     and 'ac0792f17a9fb0d1306d68b84abb3370a80d4bce'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4d10bdeb4be1e548a65fa95504d9f2b9df3a8bc2
ViewMTN: http://monotone.openembedded.org/revision/info/4d10bdeb4be1e548a65fa95504d9f2b9df3a8bc2
Files:
1
packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-beagleboard/defconfig
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2-git/beagleboard
conf/machine/beagleboard.conf
packages/linux/linux-omap2_git.bb
packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-mtdparts.patch
packages/u-boot/u-boot_1.3.1.bb
Diffs:

#
# mt diff -r85a2f16fc0d263698947f31a1f50694c14d86e70 -r4d10bdeb4be1e548a65fa95504d9f2b9df3a8bc2
#
#
#
# rename "packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff"
#     to "packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff"
# 
# rename "packages/linux/linux-beagleboard/defconfig"
#     to "packages/linux/linux-omap2-git/beagleboard/defconfig"
# 
# add_dir "packages/linux/linux-omap2-git/beagleboard"
# 
# patch "conf/machine/beagleboard.conf"
#  from [600f5c43f12d2de1e453ff501297abf5a5cc0f64]
#    to [ed984e852b63ec950dba7f7bae3b3504a0b74fa6]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [d52fa45e838f0f38b600f28fb5ba06801961d1cb]
#    to [54e881f43e88f1a9e7f204f4b384d8156014bd07]
#
============================================================
--- conf/machine/beagleboard.conf	600f5c43f12d2de1e453ff501297abf5a5cc0f64
+++ conf/machine/beagleboard.conf	ed984e852b63ec950dba7f7bae3b3504a0b74fa6
@@ -14,9 +14,9 @@ TARGET_FPU = "hard"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 TARGET_FPU = "hard"
-include conf/machine/include/tune-arm1136jf-s.inc
+#include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-#include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/tune-cortexa8.inc
 
 
 IMAGE_FSTYPES ?= "tar.bz2"
@@ -25,7 +25,7 @@ SERIAL_CONSOLE = "115200 ttyS2"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 # No kernel recipe yet
-PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 
 KERNEL_IMAGETYPE = "uImage"
 
============================================================
--- packages/linux/linux-omap2_git.bb	d52fa45e838f0f38b600f28fb5ba06801961d1cb
+++ packages/linux/linux-omap2_git.bb	54e881f43e88f1a9e7f204f4b384d8156014bd07
@@ -1,12 +1,18 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-PV = "2.6.x+git${SRCDATE}"
-PR = "r1"
 
-COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4"
+SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27"
+PV = "2.6.24+2.6.25rc7-git${SRCREV}"
+PR = "r2"
 
+
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
            file://defconfig"
 
+SRC_URI_append_beagleboard = " file://beagle-board-patch-dirk.diff;patch=1 "
+
+COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
+
+
 S = "${WORKDIR}/git"


#
# mt diff -rac0792f17a9fb0d1306d68b84abb3370a80d4bce -r4d10bdeb4be1e548a65fa95504d9f2b9df3a8bc2
#
#
#
# add_file "packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-mtdparts.patch"
#  content [12ba74ed825293b32ed7b8b4676d5d133dd26c44]
# 
# patch "packages/u-boot/u-boot_1.3.1.bb"
#  from [146fc7fff1c04aa2f88d874a7a7ca0f258bc4f59]
#    to [33ac513192e4695c4ea43a787d866c98c2a011ef]
#
============================================================
--- packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-mtdparts.patch	12ba74ed825293b32ed7b8b4676d5d133dd26c44
+++ packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-mtdparts.patch	12ba74ed825293b32ed7b8b4676d5d133dd26c44
@@ -0,0 +1,35 @@
+diff -urN u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h u-boot-1.3.1/include/configs/MPC8313ERDB.h
+--- u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h	2007-12-06 10:21:19.000000000 +0100
++++ u-boot-1.3.1/include/configs/MPC8313ERDB.h	2008-04-11 18:37:41.000000000 +0200
+@@ -326,7 +326,7 @@
+  */
+ #ifndef CFG_RAMBOOT
+ 	#define CFG_ENV_IS_IN_FLASH	1
+-	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE + 0x40000)
++	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE + 0x60000)
+ 	#define CFG_ENV_SECT_SIZE	0x10000	/* 64K(one sector) for env */
+ 	#define CFG_ENV_SIZE		0x2000
+ 
+@@ -357,6 +357,7 @@
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_I2C
++#define CONFIG_CMD_JFFS2
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_PCI
+@@ -368,6 +369,14 @@
+ 
+ #define CONFIG_CMDLINE_EDITING 1
+ 
++/*
++ * JFFS2 partitions (mtdparts command line support)
++ */
++#define CONFIG_JFFS2_CMDLINE
++#define CONFIG_JFFS2_NAND
++#define MTDIDS_DEFAULT		"nor0=physmap-flash.0,nand0=nand0"
++#define MTDPARTS_DEFAULT	"mtdparts=physmap-flash.0:384k(uboot),64k(env)"
++
+ 
+ /*
+  * Miscellaneous configurable options
============================================================
--- packages/u-boot/u-boot_1.3.1.bb	146fc7fff1c04aa2f88d874a7a7ca0f258bc4f59
+++ packages/u-boot/u-boot_1.3.1.bb	33ac513192e4695c4ea43a787d866c98c2a011ef
@@ -2,8 +2,11 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
            file://mpc8313e-rdb-autoboot.patch;patch=1 \
+           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
            file://mpc8313e-rdb-nand.patch;patch=1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"