diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/board.c | 52 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand | 7 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname | 1 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/lowlevel.c | 69 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phyflex-imx6/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3 | 6 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount | 14 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default | 1 | ||||
-rw-r--r-- | arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname | 1 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/Makefile (renamed from arch/arm/boards/phytec-phycard-imx6/Makefile) | 2 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/board.c (renamed from arch/arm/boards/phytec-phyflex-imx6/board.c) | 69 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand (renamed from arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/nand) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 (renamed from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount (renamed from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/init/automount) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default (renamed from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg (renamed from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg (renamed from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg (renamed from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h (renamed from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3.h) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg (renamed from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/lowlevel.c (renamed from arch/arm/boards/phytec-phyflex-imx6/lowlevel.c) | 16 | ||||
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/dts/Makefile | 8 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 11 |
32 files changed, 61 insertions, 205 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 2229817dba..1536c6bac1 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -79,13 +79,12 @@ obj-$(CONFIG_MACH_PANDA) += panda/ obj-$(CONFIG_MACH_PCA100) += phytec-phycard-imx27/ obj-$(CONFIG_MACH_PCAAL1) += phytec-phycard-omap3/ obj-$(CONFIG_MACH_PCAAXL2) += phytec-phycard-omap4/ -obj-$(CONFIG_MACH_PCAAXL3) += phytec-phycard-imx6/ obj-$(CONFIG_MACH_PCM037) += phytec-phycore-imx31/ obj-$(CONFIG_MACH_PCM038) += phytec-phycore-imx27/ obj-$(CONFIG_MACH_PCM043) += phytec-phycore-imx35/ obj-$(CONFIG_MACH_PCM049) += phytec-phycore-omap4460/ obj-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += phytec-som-am335x/ -obj-$(CONFIG_MACH_PHYTEC_PFLA02) += phytec-phyflex-imx6/ +obj-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += phytec-som-imx6/ obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/ obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += plathome-openblocks-a6/ obj-$(CONFIG_MACH_PM9261) += pm9261/ diff --git a/arch/arm/boards/phytec-phycard-imx6/board.c b/arch/arm/boards/phytec-phycard-imx6/board.c deleted file mode 100644 index 84224b34cd..0000000000 --- a/arch/arm/boards/phytec-phycard-imx6/board.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2014 Christian Hemp, Phytec Messtechnik GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation. - * - */ - -#include <envfs.h> -#include <environment.h> -#include <bootsource.h> -#include <common.h> -#include <gpio.h> -#include <init.h> -#include <of.h> - -#include <mach/bbu.h> -#include <mach/imx6.h> - -static int phytec_pcaaxl3_init(void) -{ - if (!of_machine_is_compatible("phytec,imx6q-pcaaxl3")) - return 0; - - switch (bootsource_get()) { - case BOOTSOURCE_MMC: - of_device_enable_path("/chosen/environment-sd3"); - break; - default: - case BOOTSOURCE_NAND: - of_device_enable_path("/chosen/environment-nand"); - break; - } - - imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT); - - defaultenv_append_directory(defaultenv_phycard_imx6); - - return 0; -} -device_initcall(phytec_pcaaxl3_init); diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand b/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand deleted file mode 100644 index 3f3a9aa2fc..0000000000 --- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -global.bootm.image="/dev/nand0.kernel.bb" -global.bootm.oftree="/dev/nand0.oftree.bb" -bootargs-ip -global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw" - diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname b/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname deleted file mode 100644 index 47b16cc8cc..0000000000 --- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname +++ /dev/null @@ -1 +0,0 @@ -phyCARD-i.MX6 diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c deleted file mode 100644 index 09ab6452ba..0000000000 --- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2014 Christian Hemp <c.hemp@phytec.de> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ -#include <debug_ll.h> -#include <common.h> -#include <linux/sizes.h> -#include <io.h> -#include <asm/barebox-arm-head.h> -#include <asm/barebox-arm.h> -#include <asm/sections.h> -#include <asm/cache.h> -#include <asm/mmu.h> -#include <mach/imx6.h> - -static inline void setup_uart(void) -{ - void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR); - - writel(0x4, iomuxbase + 0x01f8); - - imx6_ungate_all_peripherals(); - imx6_uart_setup_ll(); - - putc_ll('>'); -} - -extern char __dtb_imx6q_phytec_pbaa03_start[]; - -static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size) -{ - void *fdt; - - imx6_cpu_lowlevel_init(); - - arm_setup_stack(0x00920000 - 8); - - if (IS_ENABLED(CONFIG_DEBUG_LL)) - setup_uart(); - - fdt = __dtb_imx6q_phytec_pbaa03_start - get_runtime_offset(); - - barebox_arm_entry(0x10000000, size, fdt); -} - -ENTRY_FUNCTION(start_phytec_pbaa03_1gib, r0, r1, r2) -{ - start_imx6q_phytec_pbaa03_common(SZ_1G); -} - -ENTRY_FUNCTION(start_phytec_pbaa03_1gib_1bank, r0, r1, r2) -{ - start_imx6q_phytec_pbaa03_common(SZ_1G); -} - -ENTRY_FUNCTION(start_phytec_pbaa03_2gib, r0, r1, r2) -{ - start_imx6q_phytec_pbaa03_common(SZ_2G); -} diff --git a/arch/arm/boards/phytec-phyflex-imx6/Makefile b/arch/arm/boards/phytec-phyflex-imx6/Makefile deleted file mode 100644 index 11e1c7dc38..0000000000 --- a/arch/arm/boards/phytec-phyflex-imx6/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += board.o -lwl-y += lowlevel.o -bbenv-y += defaultenv-phyflex-imx6 diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3 deleted file mode 100644 index fd35fe0c74..0000000000 --- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -global.bootm.image="/mnt/mmc/linuximage" -global.bootm.oftree="/mnt/mmc/oftree" -bootargs-ip -global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait rw" diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount deleted file mode 100644 index 49d99bd78d..0000000000 --- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - -# automount tftp server based on $eth0.serverip - -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' - -mkdir -p /mnt/mmc -automount -d /mnt/mmc 'mmc2.probe=1 && [ -e /dev/mmc2.0 ] && mount /dev/mmc2.0 /mnt/mmc' diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default deleted file mode 100644 index 026a25cc7e..0000000000 --- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default +++ /dev/null @@ -1 +0,0 @@ -nand diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname deleted file mode 100644 index 192f6b4ae8..0000000000 --- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname +++ /dev/null @@ -1 +0,0 @@ -phyFLEX-i.MX6 diff --git a/arch/arm/boards/phytec-phycard-imx6/Makefile b/arch/arm/boards/phytec-som-imx6/Makefile index de67f04dde..7e385c2131 100644 --- a/arch/arm/boards/phytec-phycard-imx6/Makefile +++ b/arch/arm/boards/phytec-som-imx6/Makefile @@ -1,3 +1,3 @@ obj-y += board.o lwl-y += lowlevel.o -bbenv-y += defaultenv-phycard-imx6 +bbenv-y += defaultenv-physom-imx6 diff --git a/arch/arm/boards/phytec-phyflex-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index d3100c88b3..2afe685919 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -1,5 +1,7 @@ /* * Copyright (C) 2013 Sascha Hauer, Pengutronix + * Copyright (C) 2015 PHYTEC Messtechnik GmbH, + * Author: Stefan Christ <s.christ@phytec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -16,7 +18,7 @@ * Foundation. * */ -#define pr_fmt(fmt) "phyFLEX-i.MX6: " fmt +#define pr_fmt(fmt) "phySOM-i.MX6: " fmt #include <malloc.h> #include <envfs.h> @@ -83,24 +85,34 @@ static unsigned int get_module_rev(void) return 16 - val; } -static int phytec_pfla02_init(void) +static int physom_imx6_devices_init(void) { int ret; - char *environment_path, *envdev; + char *environment_path, *default_environment_path; + char *envdev, *default_envdev; - if (!of_machine_is_compatible("phytec,imx6q-pfla02") && - !of_machine_is_compatible("phytec,imx6dl-pfla02") && - !of_machine_is_compatible("phytec,imx6s-pfla02")) - return 0; + if (of_machine_is_compatible("phytec,imx6q-pfla02") + || of_machine_is_compatible("phytec,imx6dl-pfla02") + || of_machine_is_compatible("phytec,imx6s-pfla02")) { - phyflex_err006282_workaround(); + phyflex_err006282_workaround(); - imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT); + pfla02_module_revision = get_module_rev(); + globalvar_add_simple_int("board.revision", &pfla02_module_revision, "%u"); + pr_info("Module Revision: %u\n", pfla02_module_revision); + + barebox_set_hostname("phyFLEX-i.MX6"); + default_environment_path = "/chosen/environment-spinor"; + default_envdev = "SPI NOR flash"; + + } else if (of_machine_is_compatible("phytec,imx6q-pcaaxl3")) { - pfla02_module_revision = get_module_rev(); - globalvar_add_simple_int("board.revision", &pfla02_module_revision, "%u"); + barebox_set_hostname("phyCARD-i.MX6"); + default_environment_path = "/chosen/environment-nand"; + default_envdev = "NAND flash"; - pr_info("Module Revision: %u\n", pfla02_module_revision); + } else + return 0; switch (bootsource_get()) { case BOOTSOURCE_MMC: @@ -112,35 +124,30 @@ static int phytec_pfla02_init(void) environment_path = asprintf("/chosen/environment-nand"); envdev = "NAND flash"; break; - default: case BOOTSOURCE_SPI: environment_path = asprintf("/chosen/environment-spinor"); envdev = "SPI NOR flash"; break; + default: + environment_path = asprintf(default_environment_path); + envdev = default_envdev; + break; } - ret = of_device_enable_path(environment_path); - if (ret < 0) - pr_warn("Failed to enable environment partition '%s' (%d)\n", - environment_path, ret); - - free(environment_path); + if (environment_path) { + ret = of_device_enable_path(environment_path); + if (ret < 0) + pr_warn("Failed to enable environment partition '%s' (%d)\n", + environment_path, ret); + free(environment_path); + } pr_notice("Using environment in %s\n", envdev); - return 0; -} -device_initcall(phytec_pfla02_init); - -static int phytec_pbab0x_init(void) -{ - if (!of_machine_is_compatible("phytec,imx6x-pbab01") && - !of_machine_is_compatible("phytec,imx6dl-pbab05") && - !of_machine_is_compatible("phytec,imx6q-pbab02")) - return 0; + imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT); - defaultenv_append_directory(defaultenv_phyflex_imx6); + defaultenv_append_directory(defaultenv_physom_imx6); return 0; } -device_initcall(phytec_pbab0x_init); +device_initcall(physom_imx6_devices_init); diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/nand b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand index 79dc03c34a..79dc03c34a 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/nand +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 index fd35fe0c74..fd35fe0c74 100644 --- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3 +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount index 49d99bd78d..49d99bd78d 100644 --- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/init/automount +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default index 026a25cc7e..026a25cc7e 100644 --- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg index 62a24ed0df..62a24ed0df 100644 --- a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg index bab726d147..bab726d147 100644 --- a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg index 512f6cbd47..512f6cbd47 100644 --- a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h index a03b8dc0fa..a03b8dc0fa 100644 --- a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3.h +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg index 75dc982432..75dc982432 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg index 1f1fbe542c..1f1fbe542c 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg index aa01c056be..aa01c056be 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg index c8d33cfacc..c8d33cfacc 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h index 93291e9836..93291e9836 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg index e76867004a..e76867004a 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h index 337488bdf0..337488bdf0 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg index 6a46cd958f..6a46cd958f 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c index 82c0244631..a3d375eba0 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c @@ -1,5 +1,7 @@ /* * Copyright (C) 2013 Sascha Hauer <s.hauer@pengutronix.de> + * Copyright (C) 2015 PHYTEC Messtechnik GmbH, + * Author: Stefan Christ <s.christ@phytec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -38,10 +40,10 @@ static inline void setup_uart(void) #define SZ_4G 0xEFFFFFF8 -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0); -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0); -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0); -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0); +BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0); +BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0); +BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0); +BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0); static void __noreturn start_imx6_phytec_common(uint32_t size, bool do_early_uart_config, @@ -65,12 +67,16 @@ static void __noreturn start_imx6_phytec_common(uint32_t size, { \ extern char __dtb_##fdt_name##_start[]; \ \ - IMD_USED(phyflex_mx6_memsize_##memory_size); \ + IMD_USED(physom_mx6_memsize_##memory_size); \ \ start_imx6_phytec_common(memory_size, do_early_uart_config, \ __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_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true); PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true); PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true); diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 0f3812595d..a8b25b8e01 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -6,8 +6,7 @@ CONFIG_MACH_FREESCALE_MX51_PDK=y CONFIG_MACH_FREESCALE_MX53_LOCO=y CONFIG_MACH_TQMA53=y CONFIG_MACH_FREESCALE_MX53_VMX53=y -CONFIG_MACH_PCAAXL3=y -CONFIG_MACH_PHYTEC_PFLA02=y +CONFIG_MACH_PHYTEC_SOM_IMX6=y CONFIG_MACH_DFI_FS700_M60=y CONFIG_MACH_GUF_SANTARO=y CONFIG_MACH_REALQ7=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 59c9be7c5d..832ce8f542 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -31,7 +31,6 @@ pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dt pbl-dtb-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o pbl-dtb-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o pbl-dtb-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o -pbl-dtb-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o pbl-dtb-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am335x-phytec-phyflex-som-mlo.dtb.o \ am335x-phytec-phyflex-som-no-spi.dtb.o am335x-phytec-phyflex-som-no-eeprom.dtb.o \ @@ -39,7 +38,12 @@ pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am33 am335x-phytec-phycore-som.dtb.o am335x-phytec-phycore-som-no-spi.dtb.o am335x-phytec-phycore-som-mlo.dtb.o \ am335x-phytec-phycore-som-no-eeprom.dtb.o am335x-phytec-phycore-som-no-spi-no-eeprom.dtb.o \ am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o -pbl-dtb-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o imx6q-phytec-phyboard-alcor.dtb.o imx6dl-phytec-phyboard-subra.dtb.o +pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \ + imx6s-phytec-pbab01.dtb.o \ + imx6dl-phytec-pbab01.dtb.o \ + imx6q-phytec-pbab01.dtb.o \ + imx6q-phytec-phyboard-alcor.dtb.o \ + imx6dl-phytec-phyboard-subra.dtb.o pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o pbl-dtb-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0a7b517b4c..aeb58d0fb4 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -34,11 +34,10 @@ config ARCH_TEXT_BASE default 0x4fc00000 if MACH_REALQ7 default 0x4fc00000 if MACH_GK802 default 0x2fc00000 if MACH_TQMA6X - default 0x4fc00000 if MACH_PHYTEC_PFLA02 default 0x4fc00000 if MACH_DFI_FS700_M60 default 0x4fc00000 if MACH_UDOO default 0x4fc00000 if MACH_VARISCITE_MX6 - default 0x4fc00000 if MACH_PCAAXL3 + default 0x4fc00000 if MACH_PHYTEC_SOM_IMX6 config ARCH_IMX_INTERNAL_BOOT bool "support internal boot mode" @@ -268,14 +267,10 @@ config MACH_FREESCALE_MX53_VMX53 Say Y here if you are using the Voipac Technologies X53-DMM-668 module equipped with a Freescale i.MX53 Processor -config MACH_PCAAXL3 - bool "Phytec phyCARD-i.MX6 Quad" +config MACH_PHYTEC_SOM_IMX6 + bool "Phytec phyCARD-i.MX6 and phyFLEX-i.MX6" select ARCH_IMX6 -config MACH_PHYTEC_PFLA02 - bool "Phytec phyFLEX-i.MX6" - select ARCH_IMX6 - config MACH_DFI_FS700_M60 bool "DFI i.MX6 FS700 M60 Q7 Board" select ARCH_IMX6 |