diff options
| author | Stefan Riedmueller <s.riedmueller@phytec.de> | 2019-12-11 11:59:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-12 08:22:44 +0100 |
| commit | 207e33d4e037c51dcdbf83a79565b96a3a1b4da0 (patch) | |
| tree | cd2122d80f955a11cc56471628770d6f01344f12 /arch | |
| parent | 56788fcbde4d53983dcc2e063646fbb41ff2c8b4 (diff) | |
| download | barebox-207e33d4e037c51dcdbf83a79565b96a3a1b4da0.tar.gz barebox-207e33d4e037c51dcdbf83a79565b96a3a1b4da0.tar.xz | |
ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard
Use the simpler name phycard instead of the article number pcaaxl3
for device tree file names and image names of the phyCARD-i.MX 6.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/lowlevel.c | 6 | ||||
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/dts/imx6q-phytec-phycard.dts (renamed from arch/arm/dts/imx6q-phytec-pbaa03.dts) | 6 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi (renamed from arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi) | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c index 2de84169c6..900aa19c19 100644 --- a/arch/arm/boards/phytec-som-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c @@ -90,9 +90,9 @@ static void __noreturn start_imx6_phytec_common(uint32_t size, __dtb_##fdt_name##_start); \ } -PHYTEC_ENTRY(start_phytec_pbaa03_1gib, imx6q_phytec_pbaa03, SZ_1G, true); -PHYTEC_ENTRY(start_phytec_pbaa03_1gib_1bank, imx6q_phytec_pbaa03, SZ_1G, true); -PHYTEC_ENTRY(start_phytec_pbaa03_2gib, imx6q_phytec_pbaa03, SZ_2G, true); +PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib, imx6q_phytec_phycard, SZ_1G, true); +PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib_1bank, imx6q_phytec_phycard, SZ_1G, true); +PHYTEC_ENTRY(start_phytec_phycard_imx6q_2gib, imx6q_phytec_phycard, SZ_2G, true); PHYTEC_ENTRY(start_phytec_pbab01_512mb_1bank, imx6q_phytec_pbab01, SZ_512M, true); PHYTEC_ENTRY(start_phytec_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true); diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 5c9a311c5f..e8dca0b851 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -52,7 +52,7 @@ lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am33 am335x-phytec-phycore-som-nand-no-eeprom.dtb.o am335x-phytec-phycore-som-nand-no-spi-no-eeprom.dtb.o \ am335x-phytec-phycore-som-emmc.dtb.o \ am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o -lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \ +lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-phycard.dtb.o \ imx6s-phytec-pbab01.dtb.o \ imx6dl-phytec-pbab01.dtb.o \ imx6q-phytec-pbab01.dtb.o \ diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-phycard.dts index 8034f90804..09106f7d4d 100644 --- a/arch/arm/dts/imx6q-phytec-pbaa03.dts +++ b/arch/arm/dts/imx6q-phytec-phycard.dts @@ -5,10 +5,14 @@ */ /dts-v1/; + #ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY #include CONFIG_BOOTM_FITIMAGE_PUBKEY #endif -#include "imx6q-phytec-pcaaxl3.dtsi" + +#include <arm/imx6q.dtsi> +#include "imx6q.dtsi" +#include "imx6qdl-phytec-phycard-som.dtsi" / { model = "PHYTEC phyCARD-i.MX6 Quad"; diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi index 0dbd5419ba..6d963f1910 100644 --- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi @@ -4,13 +4,7 @@ * Author: Christian Hemp <c.hemp@phytec.de> */ -#include <arm/imx6q.dtsi> -#include "imx6q.dtsi" - / { - model = "PHYTEC phyCARD-i.MX6 Quad"; - compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q"; - chosen { environment-nand { compatible = "barebox,environment"; |