summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-09-20 01:50:38 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-09-20 01:50:38 -0400
commita96730454f6f8d86519317ad0798b2f96dfcdd45 (patch)
treeb3b5c4025db41bae3f9bd9162bf176373524d989 /conf/machine
parentaa0d1e870c41d3375866c8180c720cd0fc27ffcd (diff)
linux-davinci: add DA850/OMAPL138, update other DaVinci machines
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/da830-omapl137-evm.conf2
-rw-r--r--conf/machine/da850-omapl138-evm.conf13
-rw-r--r--conf/machine/include/davinci.inc2
3 files changed, 15 insertions, 2 deletions
diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf
index c891f7a903..4df4d63cca 100644
--- a/conf/machine/da830-omapl137-evm.conf
+++ b/conf/machine/da830-omapl137-evm.conf
@@ -4,7 +4,7 @@
require conf/machine/include/davinci.inc
-UBOOT_MACHINE = "da830_omapl137_config"
+UBOOT_MACHINE = "da830_omapl137_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
UBOOT_LOADADDRESS = "0xc0008000"
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
new file mode 100644
index 0000000000..bbcb45002e
--- /dev/null
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: DA850 CPUs on a DA850/OMAPL138 EVM board
+#@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "da850_omapl138_evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+MACHINE_FEATURES = "kernel26 serial ethernet"
+
+SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 32211a07a5..206afd46f2 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 = "r9"
+MACHINE_KERNEL_PR = "r10"
TARGET_ARCH = "arm"