sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Lucas Stach 2014-01-13 01:17:30 +01:00 committed by Sascha Hauer
parent 3c3e99d6ac
commit 67221982b3
11 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/Makefile
View File

@ -79,7 +79,7 @@ obj-$(CONFIG_MACH_SAMA5D3XEK) += sama5d3xek/
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_CARRIER1) += solidrun-carrier-1/
obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += solidrun-hummingboard/
obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/
obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/
obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/

3
arch/arm/boards/solidrun-carrier-1/Makefile
View File

@ -1,3 +0,0 @@
obj-y += board.o flash-header-solidrun-carrier-1.dcd.o
extra-y += flash-header-solidrun-carrier-1.dcd.S flash-header-solidrun-carrier-1.dcd
lwl-y += lowlevel.o

3
arch/arm/boards/solidrun-hummingboard/Makefile Normal file
View File

@ -0,0 +1,3 @@
obj-y += board.o flash-header-solidrun-hummingboard.dcd.o
extra-y += flash-header-solidrun-hummingboard.dcd.S flash-header-solidrun-hummingboard.dcd
lwl-y += lowlevel.o

14
arch/arm/boards/solidrun-carrier-1/board.c → arch/arm/boards/solidrun-hummingboard/board.c
View File

@ -60,9 +60,9 @@ static int ar8035_phy_fixup(struct phy_device *dev)
return 0;
}
static int carrier1_device_init(void)
static int hummingboard_device_init(void)
{
if (!of_machine_is_compatible("solidrun,cubox-i-carrier-1"))
if (!of_machine_is_compatible("solidrun,hummingboard"))
return 0;
phy_register_fixup_for_uid(0x004dd072, 0xffffffef, ar8035_phy_fixup);
@ -73,17 +73,17 @@ static int carrier1_device_init(void)
return 0;
}
device_initcall(carrier1_device_init);
device_initcall(hummingboard_device_init);
static int carrier1_lwl_init(void)
static int hummingboard_lwl_init(void)
{
if (!of_machine_is_compatible("solidrun,cubox-i-carrier-1"))
if (!of_machine_is_compatible("solidrun,hummingboard"))
return 0;
barebox_set_hostname("carrier-1");
barebox_set_hostname("hummingboard");
imx6_init_lowlevel();
return 0;
}
postcore_initcall(carrier1_lwl_init);
postcore_initcall(hummingboard_lwl_init);

0
arch/arm/boards/solidrun-carrier-1/flash-header-solidrun-carrier-1.imxcfg → arch/arm/boards/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg
View File

6
arch/arm/boards/solidrun-carrier-1/lowlevel.c → arch/arm/boards/solidrun-hummingboard/lowlevel.c
View File

@ -3,9 +3,9 @@
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
extern char __dtb_imx6dl_cubox_i_carrier_1_start[];
extern char __dtb_imx6dl_hummingboard_start[];
ENTRY_FUNCTION(start_imx6dl_cubox_i_carrier_1, r0, r1, r2)
ENTRY_FUNCTION(start_imx6dl_hummingboard, r0, r1, r2)
{
uint32_t fdt;
@ -13,6 +13,6 @@ ENTRY_FUNCTION(start_imx6dl_cubox_i_carrier_1, r0, r1, r2)
arm_cpu_lowlevel_init();
fdt = (uint32_t)__dtb_imx6dl_cubox_i_carrier_1_start - get_runtime_offset();
fdt = (uint32_t)__dtb_imx6dl_hummingboard_start - get_runtime_offset();
barebox_arm_entry(0x10000000, SZ_512M, fdt);
}

4
arch/arm/dts/Makefile
View File

@ -16,7 +16,7 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6dl-mba6x.dtb \
imx6q-mba6x.dtb \
imx6q-phytec-pbab01.dtb \
imx6dl-cubox-i-carrier-1.dtb \
imx6dl-hummingboard.dtb \
imx6q-nitrogen6x.dtb \
imx6dl-nitrogen6x.dtb
dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox.dtb
@ -45,7 +45,7 @@ pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.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_CARRIER1) += imx6dl-cubox-i-carrier-1.dtb.o
pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o
pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o

28
arch/arm/dts/imx6dl-cubox-i-carrier-1.dts → arch/arm/dts/imx6dl-hummingboard.dts
View File

@ -11,8 +11,8 @@
#include "imx6qdl-microsom-ar8035.dtsi"
/ {
model = "SolidRun Cubox-i DL/Solo Carrier-1 Board";
compatible = "solidrun,cubox-i-carrier-1", "fsl,imx6dl";
model = "SolidRun HummingBoard DL/Solo";
compatible = "solidrun,hummingboard", "fsl,imx6dl";
chosen {
linux,stdout-path = &uart1;
@ -31,13 +31,13 @@
compatible = "gpio-ir-receiver";
gpios = <&gpio1 2 1>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_carrier1_gpio1_2>;
pinctrl-0 = <&pinctrl_hummingboard_gpio1_2>;
};
codec: spdif-transmitter {
compatible = "linux,spdif-dit";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_carrier1_spdif>;
pinctrl-0 = <&pinctrl_hummingboard_spdif>;
};
sound-spdif {
@ -51,7 +51,7 @@
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
pinctrl-0 = <&pinctrl_hummingboard_i2c1>;
/*
* Not fitted on Carrier-1 board... yet
@ -65,18 +65,22 @@
};
&iomuxc {
carrier1 {
pinctrl_carrier1_gpio1_2: carrier1-gpio1_2 {
hummingboard {
pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
fsl,pins = <
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
>;
};
pinctrl_carrier1_spdif: carrier1-spdif {
pinctrl_hummingboard_i2c1: hummingboard-i2c1 {
fsl,pins = <MX6QDL_I2C1_PINGRP1>;
};
pinctrl_hummingboard_spdif: hummingboard-spdif {
fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;
};
pinctrl_carrier1_usdhc2: carrier1-usdhc2 {
pinctrl_hummingboard_usdhc2: hummingboard-usdhc2 {
fsl,pins = <
MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
@ -87,10 +91,6 @@
MX6QDL_PAD_GPIO_4__SD2_CD_B 0x1f071
>;
};
pinctrl_i2c1: i2c1grp {
fsl,pins = <MX6QDL_I2C1_PINGRP1>;
};
};
};
@ -100,7 +100,7 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_carrier1_usdhc2>;
pinctrl-0 = <&pinctrl_hummingboard_usdhc2>;
vmmc-supply = <&reg_3p3v>;
fsl,cd-controller;
status = "okay";

21
arch/arm/dts/imx6qdl-microsom.dtsi
View File

@ -7,17 +7,21 @@
/ {
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: 3p3v {
reg_3p3v: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usb_h1_vbus: usb_h1_vbus {
reg_usb_h1_vbus: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -25,8 +29,9 @@
enable-active-high;
};
reg_usb_otg_vbus: usb_otg_vbus {
reg_usb_otg_vbus: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -51,6 +56,10 @@
>;
};
pinctrl_microsom_uart1: microsom-uart1 {
fsl,pins = <MX6QDL_UART1_PINGRP1>;
};
pinctrl_microsom_usbotg: microsom-usbotg {
/*
* Similar to pinctrl_usbotg_2, but we want it
@ -58,16 +67,12 @@
*/
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
};
pinctrl_uart1: uart1grp {
fsl,pins = <MX6QDL_UART1_PINGRP1>;
};
};
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
pinctrl-0 = <&pinctrl_microsom_uart1>;
status = "okay";
};

4
arch/arm/mach-imx/Kconfig
View File

@ -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

8
images/Makefile.imx
View File

@ -89,10 +89,10 @@ CFG_start_imx6dl_sabrelite.pblx.imximg = $(board)/freescale-mx6-sabrelite/flash-
FILE_barebox-freescale-imx6dl-sabrelite.img = start_imx6dl_sabrelite.pblx.imximg
image-$(CONFIG_MACH_SABRELITE) += barebox-freescale-imx6dl-sabrelite.img
pblx-$(CONFIG_MACH_SOLIDRUN_CARRIER1) += start_imx6dl_cubox_i_carrier_1
CFG_start_imx6dl_cubox_i_carrier_1.pblx.imximg = $(board)/solidrun-carrier-1/flash-header-solidrun-carrier-1.imxcfg
FILE_barebox-cubox-i-carrier-1.img = start_imx6dl_cubox_i_carrier_1.pblx.imximg
image-$(CONFIG_MACH_SOLIDRUN_CARRIER1) += barebox-cubox-i-carrier-1.img
pblx-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += start_imx6dl_hummingboard
CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-hummingboard/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
pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6q_nitrogen6x_1g
CFG_start_imx6q_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6x-1g.imxcfg