diff options
| author | Marcin Niestroj <m.niestroj@grinn-global.com> | 2017-01-25 10:31:48 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-01-27 10:48:07 +0100 |
| commit | d4b1b52737ddd3f7404dc3c56262098e3abbf6d4 (patch) | |
| tree | e20aa6924de8aab62a4ae58bfc3715eb86454734 /arch | |
| parent | 5f8c4d44192f1e24973cc67528d7f860aedf9e69 (diff) | |
| download | u-boot-imx-d4b1b52737ddd3f7404dc3c56262098e3abbf6d4.zip u-boot-imx-d4b1b52737ddd3f7404dc3c56262098e3abbf6d4.tar.gz u-boot-imx-d4b1b52737ddd3f7404dc3c56262098e3abbf6d4.tar.bz2 | |
ARM: imx6ul: Move liteSOM source to SoC directory
Moving arch/arm/mach-litesom/ to arch/arm/cpu/armv7/mx6/ was requested
in [1] during discussion of chiliSOM support patches.
[1] http://lists.denx.de/pipermail/u-boot/2017-January/279137.html
Suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/litesom.c (renamed from arch/arm/mach-litesom/litesom.c) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/litesom.h (renamed from arch/arm/mach-litesom/include/mach/litesom.h) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-litesom/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-litesom/Makefile | 6 |
8 files changed, 11 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c04adfb..6e86c6c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1025,8 +1025,6 @@ source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-kirkwood/Kconfig" -source "arch/arm/mach-litesom/Kconfig" - source "arch/arm/mach-mvebu/Kconfig" source "arch/arm/cpu/armv7/ls102xa/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4b8bf80..9c6834b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -58,7 +58,6 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood -machine-$(CONFIG_LITESOM) += litesom machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MVEBU) += mvebu # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 3b04091..995a910 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -35,6 +35,13 @@ config MX6UL select ROM_UNIFIED_SECTIONS bool +config MX6UL_LITESOM + bool + select MX6UL + select DM + select DM_THERMAL + select SUPPORT_SPL + config MX6ULL bool select MX6UL @@ -248,7 +255,7 @@ config TARGET_PICO_IMX6UL config TARGET_LITEBOARD bool "Grinn liteBoard (i.MX6UL)" select BOARD_LATE_INIT - select LITESOM + select MX6UL_LITESOM config TARGET_PLATINUM_PICON bool "platinum-picon" diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile index 8af191d..024f703 100644 --- a/arch/arm/cpu/armv7/mx6/Makefile +++ b/arch/arm/cpu/armv7/mx6/Makefile @@ -10,3 +10,4 @@ obj-y := soc.o clock.o obj-$(CONFIG_SPL_BUILD) += ddr.o obj-$(CONFIG_MP) += mp.o +obj-$(CONFIG_MX6UL_LITESOM) += litesom.o diff --git a/arch/arm/mach-litesom/litesom.c b/arch/arm/cpu/armv7/mx6/litesom.c index ac2eccf..ac2eccf 100644 --- a/arch/arm/mach-litesom/litesom.c +++ b/arch/arm/cpu/armv7/mx6/litesom.c diff --git a/arch/arm/mach-litesom/include/mach/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h index 6833949..656b96a 100644 --- a/arch/arm/mach-litesom/include/mach/litesom.h +++ b/arch/arm/include/asm/arch-mx6/litesom.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __ARCH_ARM_MACH_LITESOM_SOM_H__ -#define __ARCH_ARM_MACH_LITESOM_SOM_H__ +#ifndef __ARCH_ARM_MX6UL_LITESOM_H__ +#define __ARCH_ARM_MX6UL_LITESOM_H__ int litesom_mmc_init(bd_t *bis); diff --git a/arch/arm/mach-litesom/Kconfig b/arch/arm/mach-litesom/Kconfig deleted file mode 100644 index 9b7f36d..0000000 --- a/arch/arm/mach-litesom/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -config LITESOM - bool - select MX6UL - select DM - select DM_THERMAL - select SUPPORT_SPL diff --git a/arch/arm/mach-litesom/Makefile b/arch/arm/mach-litesom/Makefile deleted file mode 100644 index b15eb64..0000000 --- a/arch/arm/mach-litesom/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# (C) Copyright 2016 Grinn -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := litesom.o |