From bd7e99163ef2cad959ae3303ffd3f85776281356 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 22 Dec 2009 00:32:07 -0500 Subject: omapl1: fix the .inc/.conf copy/paste error and inconsistency --- conf/machine/da850-omapl138-evm.conf | 2 +- conf/machine/hawkboard.conf | 2 +- conf/machine/include/omapl137.conf | 2 -- conf/machine/include/omapl137.inc | 1 + conf/machine/include/omapl138.conf | 1 - conf/machine/include/omapl138.inc | 1 + 6 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 conf/machine/include/omapl137.conf create mode 100644 conf/machine/include/omapl137.inc delete mode 100644 conf/machine/include/omapl138.conf create mode 100644 conf/machine/include/omapl138.inc (limited to 'conf/machine') 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.conf deleted file mode 100644 index 34d0e9a754..0000000000 --- a/conf/machine/include/omapl137.conf +++ /dev/null @@ -1,2 +0,0 @@ -SOC_FAMILY = "omapl137" - diff --git a/conf/machine/include/omapl137.inc b/conf/machine/include/omapl137.inc new file mode 100644 index 0000000000..cd84594f86 --- /dev/null +++ b/conf/machine/include/omapl137.inc @@ -0,0 +1 @@ +SOC_FAMILY = "omapl137" diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.conf deleted file mode 100644 index 4c222753df..0000000000 --- a/conf/machine/include/omapl138.conf +++ /dev/null @@ -1 +0,0 @@ -SOC_FAMILY = "omapl138" diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc new file mode 100644 index 0000000000..4c222753df --- /dev/null +++ b/conf/machine/include/omapl138.inc @@ -0,0 +1 @@ +SOC_FAMILY = "omapl138" -- cgit v1.2.3