summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig16
-rw-r--r--arch/arm/Makefile4
-rw-r--r--arch/arm/configs/pcm037_defconfig (renamed from arch/arm/configs/phycore_imx31_defconfig)6
-rw-r--r--arch/arm/configs/pcm038_defconfig (renamed from arch/arm/configs/phyCORE-pcm038_defconfig)4
-rw-r--r--arch/arm/configs/scb9328_defconfig2
-rw-r--r--arch/ppc/Makefile2
-rw-r--r--arch/ppc/configs/pcm030_defconfig (renamed from arch/ppc/configs/phycore_mpc5200b_tiny_defconfig)0
7 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b232276b3e..74eaa3bcd9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -8,7 +8,7 @@ config ARCH_TEXT_BASE
default 0x81f00000 if MACH_NXDB500
default 0x21e00000 if MACH_ECO920
default 0xa0000000 if MACH_PCM038
- default 0x87f00000 if MACH_IMX31
+ default 0x87f00000 if MACH_PCM037
#
#
#
@@ -19,10 +19,10 @@ config BOARDINFO
default "Hilscher Netx nxdb500" if MACH_NXDB500
config BOARDINFO
- default "Phytec Phycore MX27" if MACH_PCM038
+ default "Phytec phyCORE-i.MX27" if MACH_PCM038
config BOARDINFO
- default "Phytec Phycore i.MX31" if MACH_IMX31
+ default "Phytec phyCORE-i.MX31" if MACH_PCM037
config BOARD_LINKER_SCRIPT
bool
@@ -91,11 +91,11 @@ config MACH_SCB9328
Say Y here if you are using the Synertronixx scb9328 board
config MACH_PCM038
- bool "Phytec pcm038"
+ bool "phyCORE-i.MX27"
select HAS_CFI
select ARCH_IMX27
help
- Say Y here if you are using the Phytec Phycore pcm038 equipped
+ Say Y here if you are using Phytec's phyCORE-i.MX27 (pcm038) equipped
with a Freescale i.MX27 Processor
config MACH_ECO920
@@ -114,11 +114,11 @@ config MACH_NXDB500
help
Say Y here if you are using the Hilscher Netx nxdb500 board
-config MACH_IMX31
- bool "Phytec i.MX31"
+config MACH_PCM037
+ bool "phyCORE-i.MX31"
select ARCH_IMX31
help
- Say Y here if your are using Phytec's pcm-mx31 equipped
+ Say Y here if your are using Phytec's phyCORE-i.MX31 (pcm037) equipped
with a Freescale i.MX31 Processor
endchoice
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 27e4432537..a1a4630a61 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -10,9 +10,9 @@ machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200
board-$(CONFIG_MACH_MX1ADS) := mx1ads
board-$(CONFIG_MACH_ECO920) := eco920
board-$(CONFIG_MACH_SCB9328) := scb9328
-board-$(CONFIG_MACH_PCM038) := phycore_pcm038
+board-$(CONFIG_MACH_PCM038) := pcm038
board-$(CONFIG_MACH_NXDB500) := netx
-board-$(CONFIG_MACH_IMX31) := phycore_imx31
+board-$(CONFIG_MACH_PCM037) := pcm037
# FIXME "cpu-y" never used on ARM!
cpu-$(CONFIG_ARM920T) := arm920t
cpu-$(CONFIG_ARM926EJS) := arm926ejs
diff --git a/arch/arm/configs/phycore_imx31_defconfig b/arch/arm/configs/pcm037_defconfig
index 150e27db7c..29651d9918 100644
--- a/arch/arm/configs/phycore_imx31_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
@@ -4,7 +4,7 @@
# Thu Oct 18 19:32:40 2007
#
CONFIG_ARCH_TEXT_BASE=0x87f00000
-CONFIG_BOARDINFO="Phytec Phycore i.MX31"
+CONFIG_BOARDINFO="Phytec phyCORE-i.MX31"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
@@ -15,7 +15,7 @@ CONFIG_ARCH_IMX31=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
-CONFIG_MACH_IMX31=y
+CONFIG_MACH_PCM037=y
#
# Arm specific settings
@@ -49,7 +49,7 @@ CONFIG_TIMESTAMP=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/phycore_imx31/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm037/env"
#
# Debugging
diff --git a/arch/arm/configs/phyCORE-pcm038_defconfig b/arch/arm/configs/pcm038_defconfig
index 347dbc9832..f9d2e95d5a 100644
--- a/arch/arm/configs/phyCORE-pcm038_defconfig
+++ b/arch/arm/configs/pcm038_defconfig
@@ -4,7 +4,7 @@
# Thu Nov 8 16:52:09 2007
#
CONFIG_ARCH_TEXT_BASE=0xa0000000
-CONFIG_BOARDINFO="Phytec Phycore MX27"
+CONFIG_BOARDINFO="Phytec phyCORE-i.MX27"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
@@ -16,7 +16,7 @@ CONFIG_ARCH_IMX27=y
CONFIG_MACH_PCM038=y
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_IMX31 is not set
+# CONFIG_MACH_PCM037 is not set
#
# Arm specific settings
diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig
index ce329d3126..d674acb839 100644
--- a/arch/arm/configs/scb9328_defconfig
+++ b/arch/arm/configs/scb9328_defconfig
@@ -16,7 +16,7 @@ CONFIG_MACH_SCB9328=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_IMX31 is not set
+# CONFIG_MACH_PCM037 is not set
#
# Arm specific settings
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 3645a288df..ff528f2dbb 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -9,7 +9,7 @@ endif
machine-$(CONFIG_ARCH_MPC5200) := mpc5200
-board-$(CONFIG_MACH_PHYCORE_MPC5200B_TINY) := phycore_mpc5200b_tiny
+board-$(CONFIG_MACH_PHYCORE_MPC5200B_TINY) := pcm030
cpu-$(CONFIG_ARCH_MPC5200) := mpc5xxx
TEXT_BASE = $(CONFIG_TEXT_BASE)
diff --git a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig b/arch/ppc/configs/pcm030_defconfig
index cd04e16f30..cd04e16f30 100644
--- a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig
+++ b/arch/ppc/configs/pcm030_defconfig