* [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory
@ 2017-01-25 9:31 Marcin Niestroj
2017-01-26 2:59 ` Tom Rini
2017-01-27 9:48 ` Stefano Babic
0 siblings, 2 replies; 3+ messages in thread
From: Marcin Niestroj @ 2017-01-25 9:31 UTC (permalink / raw)
To: u-boot
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>
---
arch/arm/Kconfig | 2 --
arch/arm/Makefile | 1 -
arch/arm/cpu/armv7/mx6/Kconfig | 9 ++++++++-
arch/arm/cpu/armv7/mx6/Makefile | 1 +
arch/arm/{mach-litesom => cpu/armv7/mx6}/litesom.c | 0
.../include/mach => include/asm/arch-mx6}/litesom.h | 4 ++--
arch/arm/mach-litesom/Kconfig | 6 ------
arch/arm/mach-litesom/Makefile | 6 ------
board/grinn/liteboard/board.c | 2 +-
9 files changed, 12 insertions(+), 19 deletions(-)
rename arch/arm/{mach-litesom => cpu/armv7/mx6}/litesom.c (100%)
rename arch/arm/{mach-litesom/include/mach => include/asm/arch-mx6}/litesom.h (68%)
delete mode 100644 arch/arm/mach-litesom/Kconfig
delete mode 100644 arch/arm/mach-litesom/Makefile
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 30f0925308..b96a86ef85 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -989,8 +989,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 4b8bf80c40..9c6834b332 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 b8dc5c8df6..1ee96cc125 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
@@ -244,7 +251,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 8af191d660..024f7031ad 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
similarity index 100%
rename from arch/arm/mach-litesom/litesom.c
rename to 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
similarity index 68%
rename from arch/arm/mach-litesom/include/mach/litesom.h
rename to arch/arm/include/asm/arch-mx6/litesom.h
index 6833949ae8..656b96aca9 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 9b7f36d7ba..0000000000
--- 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 b15eb64793..0000000000
--- 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
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 13dd0a63db..2d184c8125 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -9,6 +9,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h>
+#include <asm/arch/litesom.h>
#include <asm/arch/mx6ul_pins.h>
#include <asm/arch/mx6-pins.h>
#include <asm/arch/sys_proto.h>
@@ -20,7 +21,6 @@
#include <fsl_esdhc.h>
#include <linux/sizes.h>
#include <linux/fb.h>
-#include <mach/litesom.h>
#include <miiphy.h>
#include <mmc.h>
#include <netdev.h>
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory
2017-01-25 9:31 [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory Marcin Niestroj
@ 2017-01-26 2:59 ` Tom Rini
2017-01-27 9:48 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2017-01-26 2:59 UTC (permalink / raw)
To: u-boot
On Wed, Jan 25, 2017 at 10:31:48AM +0100, Marcin Niestroj wrote:
> 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>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170125/7817ee18/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory
2017-01-25 9:31 [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory Marcin Niestroj
2017-01-26 2:59 ` Tom Rini
@ 2017-01-27 9:48 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2017-01-27 9:48 UTC (permalink / raw)
To: u-boot
On 25/01/2017 10:31, Marcin Niestroj wrote:
> 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>
> ---
> arch/arm/Kconfig | 2 --
> arch/arm/Makefile | 1 -
> arch/arm/cpu/armv7/mx6/Kconfig | 9 ++++++++-
> arch/arm/cpu/armv7/mx6/Makefile | 1 +
> arch/arm/{mach-litesom => cpu/armv7/mx6}/litesom.c | 0
> .../include/mach => include/asm/arch-mx6}/litesom.h | 4 ++--
> arch/arm/mach-litesom/Kconfig | 6 ------
> arch/arm/mach-litesom/Makefile | 6 ------
> board/grinn/liteboard/board.c | 2 +-
> 9 files changed, 12 insertions(+), 19 deletions(-)
> rename arch/arm/{mach-litesom => cpu/armv7/mx6}/litesom.c (100%)
> rename arch/arm/{mach-litesom/include/mach => include/asm/arch-mx6}/litesom.h (68%)
> delete mode 100644 arch/arm/mach-litesom/Kconfig
> delete mode 100644 arch/arm/mach-litesom/Makefile
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 30f0925308..b96a86ef85 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -989,8 +989,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 4b8bf80c40..9c6834b332 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 b8dc5c8df6..1ee96cc125 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
> @@ -244,7 +251,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 8af191d660..024f7031ad 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
> similarity index 100%
> rename from arch/arm/mach-litesom/litesom.c
> rename to 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
> similarity index 68%
> rename from arch/arm/mach-litesom/include/mach/litesom.h
> rename to arch/arm/include/asm/arch-mx6/litesom.h
> index 6833949ae8..656b96aca9 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 9b7f36d7ba..0000000000
> --- 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 b15eb64793..0000000000
> --- 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
> diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
> index 13dd0a63db..2d184c8125 100644
> --- a/board/grinn/liteboard/board.c
> +++ b/board/grinn/liteboard/board.c
> @@ -9,6 +9,7 @@
> #include <asm/arch/iomux.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/crm_regs.h>
> +#include <asm/arch/litesom.h>
> #include <asm/arch/mx6ul_pins.h>
> #include <asm/arch/mx6-pins.h>
> #include <asm/arch/sys_proto.h>
> @@ -20,7 +21,6 @@
> #include <fsl_esdhc.h>
> #include <linux/sizes.h>
> #include <linux/fb.h>
> -#include <mach/litesom.h>
> #include <miiphy.h>
> #include <mmc.h>
> #include <netdev.h>
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-27 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-25 9:31 [U-Boot] [PATCH] ARM: imx6ul: Move liteSOM source to SoC directory Marcin Niestroj
2017-01-26 2:59 ` Tom Rini
2017-01-27 9:48 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.