summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-12-22 00:32:07 -0500
committerDenys Dmytriyenko <denis@denix.org>2009-12-22 00:32:07 -0500
commitbd7e99163ef2cad959ae3303ffd3f85776281356 (patch)
treee91d709d3736e845df9545a1d7cc988cc819557d /conf/machine
parentac038cb468a3997cd440aacd53e05bcc672a8c63 (diff)
omapl1: fix the .inc/.conf copy/paste error and inconsistency
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/da850-omapl138-evm.conf2
-rw-r--r--conf/machine/hawkboard.conf2
-rw-r--r--conf/machine/include/omapl137.inc (renamed from conf/machine/include/omapl137.conf)1
-rw-r--r--conf/machine/include/omapl138.inc (renamed from conf/machine/include/omapl138.conf)0
4 files changed, 2 insertions, 3 deletions
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index aaf7583e5d..b61c00ca27 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.conf
+require conf/machine/include/omapl138.inc
UBOOT_MACHINE = "da850_omapl138_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
index ccf571ef9f..ae53a53377 100644
--- a/conf/machine/hawkboard.conf
+++ b/conf/machine/hawkboard.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI Hawkboard
require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.conf
+require conf/machine/include/omapl138.inc
UBOOT_MACHINE = "da850_omapl138_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/include/omapl137.conf b/conf/machine/include/omapl137.inc
index 34d0e9a754..cd84594f86 100644
--- a/conf/machine/include/omapl137.conf
+++ b/conf/machine/include/omapl137.inc
@@ -1,2 +1 @@
SOC_FAMILY = "omapl137"
-
diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.inc
index 4c222753df..4c222753df 100644
--- a/conf/machine/include/omapl138.conf
+++ b/conf/machine/include/omapl138.inc