Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 08:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: imx6ul: Move liteSOM source to SoC directory

Browse source 
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>
This commit is contained in:
Marcin Niestroj 2017-01-25 10:31:48 +01:00 committed by Stefano Babic
parent 5f8c4d4419
commit d4b1b52737
9 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/Kconfig
View file

@ -1025,8 +1025,6 @@ source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/mach-kirkwood/Kconfig"
source "arch/arm/mach-litesom/Kconfig"
source "arch/arm/mach-mvebu/Kconfig" source "arch/arm/mach-mvebu/Kconfig"
source "arch/arm/cpu/armv7/ls102xa/Kconfig" source "arch/arm/cpu/armv7/ls102xa/Kconfig"

1
arch/arm/Makefile
View file

@ -58,7 +58,6 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank
machine-$(CONFIG_ARCH_KEYSTONE) += keystone machine-$(CONFIG_ARCH_KEYSTONE) += keystone
# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
machine-$(CONFIG_KIRKWOOD) += kirkwood machine-$(CONFIG_KIRKWOOD) += kirkwood
machine-$(CONFIG_LITESOM) += litesom
machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MVEBU) += mvebu
# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA

9
arch/arm/cpu/armv7/mx6/Kconfig
View file

@ -35,6 +35,13 @@ config MX6UL
select ROM_UNIFIED_SECTIONS select ROM_UNIFIED_SECTIONS
bool bool
config MX6UL_LITESOM
bool
select MX6UL
select DM
select DM_THERMAL
select SUPPORT_SPL
config MX6ULL config MX6ULL
bool bool
select MX6UL select MX6UL
@ -248,7 +255,7 @@ config TARGET_PICO_IMX6UL
config TARGET_LITEBOARD config TARGET_LITEBOARD
bool "Grinn liteBoard (i.MX6UL)" bool "Grinn liteBoard (i.MX6UL)"
select BOARD_LATE_INIT select BOARD_LATE_INIT
select LITESOM select MX6UL_LITESOM
config TARGET_PLATINUM_PICON config TARGET_PLATINUM_PICON
bool "platinum-picon" bool "platinum-picon"

1
arch/arm/cpu/armv7/mx6/Makefile
View file

@ -10,3 +10,4 @@
obj-y := soc.o clock.o obj-y := soc.o clock.o
obj-$(CONFIG_SPL_BUILD) += ddr.o obj-$(CONFIG_SPL_BUILD) += ddr.o
obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_MP) += mp.o
obj-$(CONFIG_MX6UL_LITESOM) += litesom.o

0
arch/arm/mach-litesom/litesom.c → arch/arm/cpu/armv7/mx6/litesom.c
View file

4
arch/arm/mach-litesom/include/mach/litesom.h → arch/arm/include/asm/arch-mx6/litesom.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef __ARCH_ARM_MACH_LITESOM_SOM_H__ #ifndef __ARCH_ARM_MX6UL_LITESOM_H__
#define __ARCH_ARM_MACH_LITESOM_SOM_H__ #define __ARCH_ARM_MX6UL_LITESOM_H__
int litesom_mmc_init(bd_t *bis); int litesom_mmc_init(bd_t *bis);

6
arch/arm/mach-litesom/Kconfig
View file

@ -1,6 +0,0 @@
config LITESOM
bool
select MX6UL
select DM
select DM_THERMAL
select SUPPORT_SPL

6
arch/arm/mach-litesom/Makefile
View file

@ -1,6 +0,0 @@
# (C) Copyright 2016 Grinn
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := litesom.o

2
board/grinn/liteboard/board.c
View file

@ -9,6 +9,7 @@
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/litesom.h>
#include <asm/arch/mx6ul_pins.h> #include <asm/arch/mx6ul_pins.h>
#include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
@ -20,7 +21,6 @@
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <mach/litesom.h>
#include <miiphy.h> #include <miiphy.h>
#include <mmc.h> #include <mmc.h>
#include <netdev.h> #include <netdev.h>