summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Volpe <shanevolpe@gmail.com>2008-07-21 11:05:51 +0000
committerShane Volpe <shanevolpe@gmail.com>2008-07-21 11:05:51 +0000
commitbacf7fec4317a33c54f60e59032b4dc4f9e264d0 (patch)
tree8e5385e102e8979e861ab5fe9619ca7858c36fcd
parent8a70396a87b461003d0a0bdd1f43ed77d1dad196 (diff)
parent7c3ab51907d9e974a12bf43e73c7d7070101da3f (diff)
merge of '1111600f6f0e98778deec94f838de80fd1db927b'
and '5f9ae2c9fe265c14ea195bf732ef1ce81060197a'
-rw-r--r--conf/machine/at91-l9260.conf24
-rw-r--r--packages/linux/linux_2.6.25.bb7
2 files changed, 30 insertions, 1 deletions
diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf
new file mode 100644
index 0000000000..16d0705a24
--- /dev/null
+++ b/conf/machine/at91-l9260.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Olimex eval board for the AT91SAM9260
+#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.25"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+# 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
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index e228860a49..dc9a35e3bb 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -1,6 +1,6 @@
require linux.inc
-PR = "r2"
+PR = "r3"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
@@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_sequoia = "1"
DEFAULT_PREFERENCE_cm-x270 = "1"
DEFAULT_PREFERENCE_alix = "1"
DEFAULT_PREFERENCE_at32stk1000 = "1"
+DEFAULT_PREFERENCE_at91-l9260 = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
file://defconfig"
@@ -32,6 +33,10 @@ SRC_URI_append_at32stk1000 = " \
http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1 \
"
+SRC_URI_append_at91-l9260 = " \
+ http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \
+"
+
CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
FILES_kernel-image_cm-x270 = ""