merge of '1cdc12c3862be0a347484d50284adc22bea0c4b4'

     and 'dd686600ef516db9cad8d6454476424eb47cf9b5'

8 files changed, 85 insertions, 1 deletions

diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc
new file mode 100644
index 0000000000..4d7ea7ef87
--- /dev/null
+++ b/conf/machine/include/tune-ppce300c2.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=e300c2"
+PACKAGE_ARCH = "ppce300c2"
+
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
new file mode 100644
index 0000000000..0335cb6249
--- /dev/null
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Freescale MPC8323E-RDB
+#@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
+
+TARGET_ARCH = "powerpc"
+TARGET_FPU = "soft"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "MPC8323ERDB_config"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e300c2 core
+require conf/machine/include/tune-ppce300c2.inc
+
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 6568049113..b00ae95253 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -16,6 +16,8 @@ DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native "
 DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native "
 DEPENDS_append_fic-gta01      = " u-boot-mkimage-openmoko-native "
 DEPENDS_append_fic-gta02      = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_mpc8313e-rdb   = " u-boot "
+DEPENDS_append_mpc8323e-rdb   = " u-boot "
 
 
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index d73c51c971..e042c7248b 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -4,8 +4,9 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_cm-x270 = "1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
+DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   file://binutils-buildid-arm.patch;patch=1 \
diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb
index 8217898664..55f56d841f 100644
--- a/packages/uboot/u-boot_git.bb
+++ b/packages/uboot/u-boot_git.bb
@@ -2,6 +2,7 @@ require u-boot.inc
 PR="r1"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
+DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
 SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 "
diff --git a/packages/uclibc/uclibc-0.9.29/mpc8313e-rdb/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/mpc8313e-rdb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/mpc8313e-rdb/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/uClibc.machine b/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/uClibc.machine
new file mode 100644
index 0000000000..620676918b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/mpc8323e-rdb/uClibc.machine
@@ -0,0 +1,54 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:25:50 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="to be mangled by uclibc bitbake"
+HAVE_DOT_CONFIG=y
+