From f3127d1c1f64aa7f748ce4e30d7c8a6314ce83a4 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Tue, 24 Jun 2014 08:33:15 +0200 Subject: [PATCH] arm: imx6: rename hummingboard directory to microsom The rule in barebox is to name the directories after the modules. As hummingboard is just one of the carriers for the MicroSOM module, name the directory accordingly. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/boards/Makefile | 2 +- .../{solidrun-hummingboard => solidrun-microsom}/Makefile | 0 .../{solidrun-hummingboard => solidrun-microsom}/board.c | 0 .../flash-header-solidrun-hummingboard.imxcfg | 0 .../{solidrun-hummingboard => solidrun-microsom}/lowlevel.c | 0 arch/arm/configs/imx_v7_defconfig | 2 +- arch/arm/dts/Makefile | 2 +- arch/arm/mach-imx/Kconfig | 4 ++-- images/Makefile.imx | 6 +++--- 9 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/boards/{solidrun-hummingboard => solidrun-microsom}/Makefile (100%) rename arch/arm/boards/{solidrun-hummingboard => solidrun-microsom}/board.c (100%) rename arch/arm/boards/{solidrun-hummingboard => solidrun-microsom}/flash-header-solidrun-hummingboard.imxcfg (100%) rename arch/arm/boards/{solidrun-hummingboard => solidrun-microsom}/lowlevel.c (100%) diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 4eccc9293..b8bfb8433 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_SAMA5D3_XPLAINED) += sama5d3_xplained/ obj-$(CONFIG_MACH_SCB9328) += scb9328/ obj-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += ebv-socrates/ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/ -obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += solidrun-hummingboard/ +obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/ obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/ diff --git a/arch/arm/boards/solidrun-hummingboard/Makefile b/arch/arm/boards/solidrun-microsom/Makefile similarity index 100% rename from arch/arm/boards/solidrun-hummingboard/Makefile rename to arch/arm/boards/solidrun-microsom/Makefile diff --git a/arch/arm/boards/solidrun-hummingboard/board.c b/arch/arm/boards/solidrun-microsom/board.c similarity index 100% rename from arch/arm/boards/solidrun-hummingboard/board.c rename to arch/arm/boards/solidrun-microsom/board.c diff --git a/arch/arm/boards/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg b/arch/arm/boards/solidrun-microsom/flash-header-solidrun-hummingboard.imxcfg similarity index 100% rename from arch/arm/boards/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg rename to arch/arm/boards/solidrun-microsom/flash-header-solidrun-hummingboard.imxcfg diff --git a/arch/arm/boards/solidrun-hummingboard/lowlevel.c b/arch/arm/boards/solidrun-microsom/lowlevel.c similarity index 100% rename from arch/arm/boards/solidrun-hummingboard/lowlevel.c rename to arch/arm/boards/solidrun-microsom/lowlevel.c diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 0c32d7d97..315d7e931 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -15,7 +15,7 @@ CONFIG_MACH_TQMA6X=y CONFIG_MACH_SABRELITE=y CONFIG_MACH_SABRESD=y CONFIG_MACH_NITROGEN6X=y -CONFIG_MACH_SOLIDRUN_HUMMINGBOARD=y +CONFIG_MACH_SOLIDRUN_MICROSOM=y CONFIG_MACH_EMBEST_RIOTBOARD=y CONFIG_MACH_UDOO=y CONFIG_MACH_VARISCITE_MX6=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 6bbb4dcbe..a9bb20e06 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -69,7 +69,7 @@ pbl-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o pbl-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o -pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o +pbl-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += imx6dl-hummingboard.dtb.o pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o pbl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index e1b4e3119..2d99f3eec 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -269,8 +269,8 @@ config MACH_NITROGEN6X bool "BoundaryDevices Nitrogen6x" select ARCH_IMX6 -config MACH_SOLIDRUN_HUMMINGBOARD - bool "SolidRun Hummingboard" +config MACH_SOLIDRUN_MICROSOM + bool "SolidRun MicroSOM based devices" select ARCH_IMX6 config MACH_EMBEST_RIOTBOARD diff --git a/images/Makefile.imx b/images/Makefile.imx index 633fdfac0..1d0edd2fd 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -150,10 +150,10 @@ CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-heade FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblx.imximg image-$(CONFIG_MACH_SABRESD) += barebox-freescale-imx6q-sabresd.img -pblx-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += start_imx6dl_hummingboard -CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg +pblx-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += start_imx6dl_hummingboard +CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-microsom/flash-header-solidrun-hummingboard.imxcfg FILE_barebox-solidrun-imx6dl-hummingboard.img = start_imx6dl_hummingboard.pblx.imximg -image-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += barebox-solidrun-imx6dl-hummingboard.img +image-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += barebox-solidrun-imx6dl-hummingboard.img pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6q_nitrogen6x_1g CFG_start_imx6q_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6x-1g.imxcfg