summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2014-01-13 01:17:30 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-23 08:15:41 +0100
commit67221982b3c327ead2fbe6e527cfa42479caf69f (patch)
treec5652ba8d513e89c64dfd72e7dca1fea177bcade /arch/arm/mach-imx
parent3c3e99d6acaaec43b806a51dc68d2cd9c5fa441d (diff)
downloadbarebox-67221982b3c327ead2fbe6e527cfa42479caf69f.tar.gz
barebox-67221982b3c327ead2fbe6e527cfa42479caf69f.tar.xz
ARM: imx6: rename Carrier-1 to Hummingboard
Solidrun has renamed the Carrier-1 to Hummingboard. This is also the name that is used in upstream Linux, change barebox to be in line with that. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 7587e15003..de0b9ace1a 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -233,8 +233,8 @@ config MACH_NITROGEN6X
bool "BoundaryDevices Nitrogen6x"
select ARCH_IMX6
-config MACH_SOLIDRUN_CARRIER1
- bool "SolidRun CuBox-i Carrier-1"
+config MACH_SOLIDRUN_HUMMINGBOARD
+ bool "SolidRun Hummingboard"
select ARCH_IMX6
endif