Browse Source

arm: Introduce arch/arm/mach-omap2 for OMAP2 derivative platforms

This moves what was in arch/arm/cpu/armv7/omap-common in to
arch/arm/mach-omap2 and moves
arch/arm/cpu/armv7/{am33xx,omap3,omap4,omap5} in to arch/arm/mach-omap2
as subdirectories.  All refernces to the former locations are updated to
the current locations.  For the logic to decide what our outputs are,
consolidate the tests into a single config.mk rather than including 4.

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 7 years ago
parent
commit
983e37007d
100 changed files with 52 additions and 99 deletions
  1. 2 3
      arch/arm/Kconfig
  2. 1 0
      arch/arm/Makefile
  3. 0 5
      arch/arm/cpu/armv7/Makefile
  4. 0 15
      arch/arm/cpu/armv7/omap3/config.mk
  5. 0 15
      arch/arm/cpu/armv7/omap4/config.mk
  6. 0 22
      arch/arm/cpu/armv7/omap5/config.mk
  7. 4 4
      arch/arm/mach-omap2/Kconfig
  8. 6 1
      arch/arm/mach-omap2/Makefile
  9. 0 0
      arch/arm/mach-omap2/abb.c
  10. 0 0
      arch/arm/mach-omap2/am33xx/Kconfig
  11. 0 0
      arch/arm/mach-omap2/am33xx/Makefile
  12. 0 0
      arch/arm/mach-omap2/am33xx/board.c
  13. 0 0
      arch/arm/mach-omap2/am33xx/clk_synthesizer.c
  14. 0 0
      arch/arm/mach-omap2/am33xx/clock.c
  15. 0 0
      arch/arm/mach-omap2/am33xx/clock_am33xx.c
  16. 0 0
      arch/arm/mach-omap2/am33xx/clock_am43xx.c
  17. 0 0
      arch/arm/mach-omap2/am33xx/clock_ti814x.c
  18. 0 0
      arch/arm/mach-omap2/am33xx/clock_ti816x.c
  19. 0 0
      arch/arm/mach-omap2/am33xx/ddr.c
  20. 0 0
      arch/arm/mach-omap2/am33xx/emif4.c
  21. 0 0
      arch/arm/mach-omap2/am33xx/mux.c
  22. 0 0
      arch/arm/mach-omap2/am33xx/sys_info.c
  23. 0 0
      arch/arm/mach-omap2/am33xx/u-boot-spl.lds
  24. 0 0
      arch/arm/mach-omap2/boot-common.c
  25. 0 0
      arch/arm/mach-omap2/clocks-common.c
  26. 12 7
      arch/arm/mach-omap2/config.mk
  27. 0 0
      arch/arm/mach-omap2/config_secure.mk
  28. 0 0
      arch/arm/mach-omap2/emif-common.c
  29. 0 0
      arch/arm/mach-omap2/hwinit-common.c
  30. 0 0
      arch/arm/mach-omap2/lowlevel_init.S
  31. 0 0
      arch/arm/mach-omap2/mem-common.c
  32. 0 0
      arch/arm/mach-omap2/omap-cache.c
  33. 0 0
      arch/arm/mach-omap2/omap3/Kconfig
  34. 0 0
      arch/arm/mach-omap2/omap3/Makefile
  35. 0 0
      arch/arm/mach-omap2/omap3/am35x_musb.c
  36. 0 0
      arch/arm/mach-omap2/omap3/board.c
  37. 0 0
      arch/arm/mach-omap2/omap3/boot.c
  38. 0 0
      arch/arm/mach-omap2/omap3/clock.c
  39. 0 0
      arch/arm/mach-omap2/omap3/emac.c
  40. 0 0
      arch/arm/mach-omap2/omap3/emif4.c
  41. 0 0
      arch/arm/mach-omap2/omap3/lowlevel_init.S
  42. 0 0
      arch/arm/mach-omap2/omap3/sdrc.c
  43. 0 0
      arch/arm/mach-omap2/omap3/spl_id_nand.c
  44. 0 0
      arch/arm/mach-omap2/omap3/sys_info.c
  45. 0 0
      arch/arm/mach-omap2/omap4/Kconfig
  46. 0 0
      arch/arm/mach-omap2/omap4/Makefile
  47. 0 0
      arch/arm/mach-omap2/omap4/boot.c
  48. 0 0
      arch/arm/mach-omap2/omap4/emif.c
  49. 0 0
      arch/arm/mach-omap2/omap4/hw_data.c
  50. 0 0
      arch/arm/mach-omap2/omap4/hwinit.c
  51. 0 0
      arch/arm/mach-omap2/omap4/prcm-regs.c
  52. 0 0
      arch/arm/mach-omap2/omap4/sdram_elpida.c
  53. 0 0
      arch/arm/mach-omap2/omap5/Kconfig
  54. 0 0
      arch/arm/mach-omap2/omap5/Makefile
  55. 0 0
      arch/arm/mach-omap2/omap5/abb.c
  56. 0 0
      arch/arm/mach-omap2/omap5/boot.c
  57. 0 0
      arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
  58. 0 0
      arch/arm/mach-omap2/omap5/emif.c
  59. 0 0
      arch/arm/mach-omap2/omap5/fdt.c
  60. 0 0
      arch/arm/mach-omap2/omap5/hw_data.c
  61. 0 0
      arch/arm/mach-omap2/omap5/hwinit.c
  62. 0 0
      arch/arm/mach-omap2/omap5/prcm-regs.c
  63. 0 0
      arch/arm/mach-omap2/omap5/sdram.c
  64. 0 0
      arch/arm/mach-omap2/omap5/sec-fxns.c
  65. 0 0
      arch/arm/mach-omap2/pipe3-phy.c
  66. 0 0
      arch/arm/mach-omap2/pipe3-phy.h
  67. 0 0
      arch/arm/mach-omap2/reset.c
  68. 0 0
      arch/arm/mach-omap2/sata.c
  69. 0 0
      arch/arm/mach-omap2/sec-common.c
  70. 0 0
      arch/arm/mach-omap2/timer.c
  71. 0 0
      arch/arm/mach-omap2/u-boot-spl.lds
  72. 0 0
      arch/arm/mach-omap2/utils.c
  73. 0 0
      arch/arm/mach-omap2/vc.c
  74. 1 1
      include/configs/am335x_evm.h
  75. 1 1
      include/configs/am335x_igep0033.h
  76. 1 1
      include/configs/am335x_shc.h
  77. 1 1
      include/configs/am335x_sl50.h
  78. 1 1
      include/configs/am3517_crane.h
  79. 1 1
      include/configs/am3517_evm.h
  80. 1 1
      include/configs/am43xx_evm.h
  81. 1 1
      include/configs/baltos.h
  82. 1 1
      include/configs/bav335x.h
  83. 1 1
      include/configs/bur_am335x_common.h
  84. 1 1
      include/configs/cm_t335.h
  85. 1 1
      include/configs/cm_t35.h
  86. 1 1
      include/configs/cm_t43.h
  87. 1 1
      include/configs/imx6_spl.h
  88. 1 1
      include/configs/kc1.h
  89. 1 1
      include/configs/mcx.h
  90. 1 1
      include/configs/omap3_evm.h
  91. 1 1
      include/configs/pcm051.h
  92. 1 1
      include/configs/pengwyn.h
  93. 1 1
      include/configs/pepper.h
  94. 1 1
      include/configs/siemens-am33x-common.h
  95. 1 1
      include/configs/sniper.h
  96. 1 1
      include/configs/tam3517-common.h
  97. 1 1
      include/configs/tao3530.h
  98. 1 1
      include/configs/ti814x_evm.h
  99. 1 1
      include/configs/ti816x_evm.h
  100. 1 1
      include/configs/ti_omap3_common.h

+ 2 - 3
arch/arm/Kconfig

@@ -544,8 +544,7 @@ config ARCH_SOCFPGA
 
 config TARGET_CM_T43
 	bool "Support cm_t43"
-	select CPU_V7
-	select SUPPORT_SPL
+	select ARCH_OMAP2
 
 config ARCH_SUNXI
 	bool "Support sunxi (Allwinner) SoCs"
@@ -891,7 +890,7 @@ source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
-source "arch/arm/cpu/armv7/omap-common/Kconfig"
+source "arch/arm/mach-omap2/Kconfig"
 
 source "arch/arm/cpu/armv8/fsl-layerscape/Kconfig"
 

+ 1 - 0
arch/arm/Makefile

@@ -63,6 +63,7 @@ machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
 # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
 machine-$(CONFIG_ORION5X)		+= orion5x
+machine-$(CONFIG_ARCH_OMAP2)		+= omap2
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
 machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon

+ 0 - 5
arch/arm/cpu/armv7/Makefile

@@ -23,14 +23,12 @@ obj-$(CONFIG_ARMV7_PSCI)	+= psci.o psci-common.o
 
 obj-$(CONFIG_IPROC) += iproc-common/
 obj-$(CONFIG_KONA) += kona-common/
-obj-$(CONFIG_OMAP_COMMON) += omap-common/
 obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o
 
 ifneq (,$(filter s5pc1xx exynos,$(SOC)))
 obj-y += s5p-common/
 endif
 
-obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
 obj-$(if $(filter bcm235xx,$(SOC)),y) += bcm235xx/
 obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
 obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
@@ -39,9 +37,6 @@ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
 obj-$(if $(filter mx5,$(SOC)),y) += mx5/
 obj-$(CONFIG_MX6) += mx6/
 obj-$(CONFIG_MX7) += mx7/
-obj-$(CONFIG_OMAP34XX) += omap3/
-obj-$(CONFIG_OMAP44XX) += omap4/
-obj-$(CONFIG_OMAP54XX) += omap5/
 obj-$(CONFIG_RMOBILE) += rmobile/
 obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/

+ 0 - 15
arch/arm/cpu/armv7/omap3/config.mk

@@ -1,15 +0,0 @@
-#
-# Copyright 2011 Linaro Limited
-#
-# (C) Copyright 2010
-# Texas Instruments, <www.ti.com>
-#
-# Aneesh V <aneesh@ti.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-ifdef CONFIG_SPL_BUILD
-ALL-y	+= MLO
-else
-ALL-y	+= u-boot.img
-endif

+ 0 - 15
arch/arm/cpu/armv7/omap4/config.mk

@@ -1,15 +0,0 @@
-#
-# Copyright 2011 Linaro Limited
-#
-# (C) Copyright 2010
-# Texas Instruments, <www.ti.com>
-#
-# Aneesh V <aneesh@ti.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-ifdef CONFIG_SPL_BUILD
-ALL-y	+= MLO
-else
-ALL-y	+= u-boot.img
-endif

+ 0 - 22
arch/arm/cpu/armv7/omap5/config.mk

@@ -1,22 +0,0 @@
-#
-# Copyright 2011 Linaro Limited
-#
-# Aneesh V <annesh@ti.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-include  $(srctree)/$(CPUDIR)/omap-common/config_secure.mk
-
-ifdef CONFIG_SPL_BUILD
-ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
-ALL-y	+= u-boot-spl_HS_MLO u-boot-spl_HS_X-LOADER
-else
-ALL-y	+= MLO
-endif
-else
-ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
-ALL-$(CONFIG_SPL_LOAD_FIT) += u-boot_HS.img
-endif
-ALL-y	+= u-boot.img
-endif

+ 4 - 4
arch/arm/cpu/armv7/omap-common/Kconfig → arch/arm/mach-omap2/Kconfig

@@ -8,10 +8,10 @@ config TI_SECURE_DEVICE
 	  authenticated) and the code. See the doc/README.ti-secure
 	  file for further details.
 
-source "arch/arm/cpu/armv7/omap3/Kconfig"
+source "arch/arm/mach-omap2/omap3/Kconfig"
 
-source "arch/arm/cpu/armv7/omap4/Kconfig"
+source "arch/arm/mach-omap2/omap4/Kconfig"
 
-source "arch/arm/cpu/armv7/omap5/Kconfig"
+source "arch/arm/mach-omap2/omap5/Kconfig"
 
-source "arch/arm/cpu/armv7/am33xx/Kconfig"
+source "arch/arm/mach-omap2/am33xx/Kconfig"

+ 6 - 1
arch/arm/cpu/armv7/omap-common/Makefile → arch/arm/mach-omap2/Makefile

@@ -5,7 +5,12 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	:= reset.o
+obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
+obj-$(CONFIG_OMAP34XX) += omap3/
+obj-$(CONFIG_OMAP44XX) += omap4/
+obj-$(CONFIG_OMAP54XX) += omap5/
+
+obj-y	+= reset.o
 ifeq ($(CONFIG_TIMER),)
 obj-y	+= timer.o
 else

+ 0 - 0
arch/arm/cpu/armv7/omap-common/abb.c → arch/arm/mach-omap2/abb.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/Kconfig → arch/arm/mach-omap2/am33xx/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/am33xx/Makefile → arch/arm/mach-omap2/am33xx/Makefile


+ 0 - 0
arch/arm/cpu/armv7/am33xx/board.c → arch/arm/mach-omap2/am33xx/board.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clk_synthesizer.c → arch/arm/mach-omap2/am33xx/clk_synthesizer.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clock.c → arch/arm/mach-omap2/am33xx/clock.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clock_am33xx.c → arch/arm/mach-omap2/am33xx/clock_am33xx.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clock_am43xx.c → arch/arm/mach-omap2/am33xx/clock_am43xx.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clock_ti814x.c → arch/arm/mach-omap2/am33xx/clock_ti814x.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/clock_ti816x.c → arch/arm/mach-omap2/am33xx/clock_ti816x.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/ddr.c → arch/arm/mach-omap2/am33xx/ddr.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/emif4.c → arch/arm/mach-omap2/am33xx/emif4.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/mux.c → arch/arm/mach-omap2/am33xx/mux.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/sys_info.c → arch/arm/mach-omap2/am33xx/sys_info.c


+ 0 - 0
arch/arm/cpu/armv7/am33xx/u-boot-spl.lds → arch/arm/mach-omap2/am33xx/u-boot-spl.lds


+ 0 - 0
arch/arm/cpu/armv7/omap-common/boot-common.c → arch/arm/mach-omap2/boot-common.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/clocks-common.c → arch/arm/mach-omap2/clocks-common.c


+ 12 - 7
arch/arm/cpu/armv7/am33xx/config.mk → arch/arm/mach-omap2/config.mk

@@ -1,13 +1,12 @@
 #
 # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
+# SPDX-License-Identifier:      GPL-2.0+
 
-include  $(srctree)/$(CPUDIR)/omap-common/config_secure.mk
+include  $(srctree)/arch/arm/mach-omap2/config_secure.mk
 
 ifdef CONFIG_SPL_BUILD
-ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
+ifeq ($(CONFIG_AM33XX)$(CONFIG_TI_SECURE_DEVICE),yy)
 #
 # For booting from SPI use
 # u-boot-spl_HS_SPI_X-LOADER to program flash
@@ -30,19 +29,25 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 #
 # Refer to README.ti-secure for more info
 #
-ALL-y	+= u-boot-spl_HS_ISSW
+ALL-y += u-boot-spl_HS_ISSW
 ALL-y += u-boot-spl_HS_SPI_X-LOADER
 ALL-y += u-boot-spl_HS_X-LOADER
 ALL-y += u-boot-spl_HS_MLO
 ALL-y += u-boot-spl_HS_2ND
 else
-ALL-y	+= MLO
+ifeq ($(CONFIG_OMAP54XX)$(CONFIG_TI_SECURE_DEVICE),yy)
+ALL-y += u-boot-spl_HS_MLO u-boot-spl_HS_X-LOADER
+else
+ALL-y += MLO
+ifeq ($(CONFIG_AM33XX),y)
 ALL-y += MLO.byteswap
 endif
+endif
+endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER
 ALL-$(CONFIG_SPL_LOAD_FIT) += u-boot_HS.img
 endif
-ALL-y	+= u-boot.img
+ALL-y += u-boot.img
 endif

+ 0 - 0
arch/arm/cpu/armv7/omap-common/config_secure.mk → arch/arm/mach-omap2/config_secure.mk


+ 0 - 0
arch/arm/cpu/armv7/omap-common/emif-common.c → arch/arm/mach-omap2/emif-common.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/hwinit-common.c → arch/arm/mach-omap2/hwinit-common.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/lowlevel_init.S → arch/arm/mach-omap2/lowlevel_init.S


+ 0 - 0
arch/arm/cpu/armv7/omap-common/mem-common.c → arch/arm/mach-omap2/mem-common.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/omap-cache.c → arch/arm/mach-omap2/omap-cache.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/Kconfig → arch/arm/mach-omap2/omap3/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/omap3/Makefile → arch/arm/mach-omap2/omap3/Makefile


+ 0 - 0
arch/arm/cpu/armv7/omap3/am35x_musb.c → arch/arm/mach-omap2/omap3/am35x_musb.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/board.c → arch/arm/mach-omap2/omap3/board.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/boot.c → arch/arm/mach-omap2/omap3/boot.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/clock.c → arch/arm/mach-omap2/omap3/clock.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/emac.c → arch/arm/mach-omap2/omap3/emac.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/emif4.c → arch/arm/mach-omap2/omap3/emif4.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/lowlevel_init.S → arch/arm/mach-omap2/omap3/lowlevel_init.S


+ 0 - 0
arch/arm/cpu/armv7/omap3/sdrc.c → arch/arm/mach-omap2/omap3/sdrc.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/spl_id_nand.c → arch/arm/mach-omap2/omap3/spl_id_nand.c


+ 0 - 0
arch/arm/cpu/armv7/omap3/sys_info.c → arch/arm/mach-omap2/omap3/sys_info.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/Kconfig → arch/arm/mach-omap2/omap4/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/omap4/Makefile → arch/arm/mach-omap2/omap4/Makefile


+ 0 - 0
arch/arm/cpu/armv7/omap4/boot.c → arch/arm/mach-omap2/omap4/boot.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/emif.c → arch/arm/mach-omap2/omap4/emif.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/hw_data.c → arch/arm/mach-omap2/omap4/hw_data.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/hwinit.c → arch/arm/mach-omap2/omap4/hwinit.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/prcm-regs.c → arch/arm/mach-omap2/omap4/prcm-regs.c


+ 0 - 0
arch/arm/cpu/armv7/omap4/sdram_elpida.c → arch/arm/mach-omap2/omap4/sdram_elpida.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/Kconfig → arch/arm/mach-omap2/omap5/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/omap5/Makefile → arch/arm/mach-omap2/omap5/Makefile


+ 0 - 0
arch/arm/cpu/armv7/omap5/abb.c → arch/arm/mach-omap2/omap5/abb.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/boot.c → arch/arm/mach-omap2/omap5/boot.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/dra7xx_iodelay.c → arch/arm/mach-omap2/omap5/dra7xx_iodelay.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/emif.c → arch/arm/mach-omap2/omap5/emif.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/fdt.c → arch/arm/mach-omap2/omap5/fdt.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/hw_data.c → arch/arm/mach-omap2/omap5/hw_data.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/hwinit.c → arch/arm/mach-omap2/omap5/hwinit.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/prcm-regs.c → arch/arm/mach-omap2/omap5/prcm-regs.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/sdram.c → arch/arm/mach-omap2/omap5/sdram.c


+ 0 - 0
arch/arm/cpu/armv7/omap5/sec-fxns.c → arch/arm/mach-omap2/omap5/sec-fxns.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/pipe3-phy.c → arch/arm/mach-omap2/pipe3-phy.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/pipe3-phy.h → arch/arm/mach-omap2/pipe3-phy.h


+ 0 - 0
arch/arm/cpu/armv7/omap-common/reset.c → arch/arm/mach-omap2/reset.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/sata.c → arch/arm/mach-omap2/sata.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/sec-common.c → arch/arm/mach-omap2/sec-common.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/timer.c → arch/arm/mach-omap2/timer.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/u-boot-spl.lds → arch/arm/mach-omap2/u-boot-spl.lds


+ 0 - 0
arch/arm/cpu/armv7/omap-common/utils.c → arch/arm/mach-omap2/utils.c


+ 0 - 0
arch/arm/cpu/armv7/omap-common/vc.c → arch/arm/mach-omap2/vc.c


+ 1 - 1
include/configs/am335x_evm.h

@@ -213,7 +213,7 @@
 
 /* USB gadget RNDIS */
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 #endif
 
 #ifdef CONFIG_NAND

+ 1 - 1
include/configs/am335x_igep0033.h

@@ -123,7 +123,7 @@
 #undef CONFIG_USE_IRQ
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \

+ 1 - 1
include/configs/am335x_shc.h

@@ -280,7 +280,7 @@
 
 /* SPL */
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1

+ 1 - 1
include/configs/am335x_sl50.h

@@ -86,7 +86,7 @@
 #define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1

+ 1 - 1
include/configs/am3517_crane.h

@@ -281,7 +281,7 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT

+ 1 - 1
include/configs/am3517_evm.h

@@ -341,6 +341,6 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 #endif /* __CONFIG_H */

+ 1 - 1
include/configs/am43xx_evm.h

@@ -82,7 +82,7 @@
 #define FAT_ENV_FILE			"uboot.env"
 #define CONFIG_FAT_WRITE
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* SPL USB Support */
 

+ 1 - 1
include/configs/baltos.h

@@ -224,7 +224,7 @@
 /* General network SPL, both CPSW and USB gadget RNDIS */
 #define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL"*/
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC

+ 1 - 1
include/configs/bav335x.h

@@ -357,7 +357,7 @@ DEFAULT_LINUX_BOOT_ENV \
 
 /* USB gadget RNDIS */
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 #endif
 
 #ifdef CONFIG_NAND

+ 1 - 1
include/configs/bur_am335x_common.h

@@ -113,6 +113,6 @@
 
 /* General parts of the framework, required. */
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #endif	/* ! __BUR_AM335X_COMMON_H__ */

+ 1 - 1
include/configs/cm_t335.h

@@ -104,7 +104,7 @@
 #define CONFIG_SYS_I2C_EEPROM_BUS	0
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 /* Network. */
 #define CONFIG_PHY_GIGE

+ 1 - 1
include/configs/cm_t35.h

@@ -300,7 +300,7 @@
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
 #define CONFIG_SPL_OMAP3_ID_NAND
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE

+ 1 - 1
include/configs/cm_t43.h

@@ -103,7 +103,7 @@
 #define CONFIG_ENV_OFFSET		(768 * 1024)
 #define CONFIG_ENV_SPI_MAX_HZ           48000000
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT

+ 1 - 1
include/configs/imx6_spl.h

@@ -25,7 +25,7 @@
  *    or 64KB
  */
 #define CONFIG_SYS_THUMB_BUILD
-#define CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT	"arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SPL_TEXT_BASE		0x00908000
 #define CONFIG_SPL_MAX_SIZE		0x10000
 #define CONFIG_SPL_STACK		0x0091FFB8

+ 1 - 1
include/configs/kc1.h

@@ -126,7 +126,7 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	(1024 * 1024)
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION	2

+ 1 - 1
include/configs/mcx.h

@@ -316,7 +316,7 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 #define CONFIG_SPL_TEXT_BASE		0x40200000 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE		(54 * 1024)	/* 8 KB for stack */

+ 1 - 1
include/configs/omap3_evm.h

@@ -340,7 +340,7 @@
 
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_OMAP3_ID_NAND
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM

+ 1 - 1
include/configs/pcm051.h

@@ -120,7 +120,7 @@
 /* CPU */
 #define CONFIG_ENV_IS_NOWHERE
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #ifdef CONFIG_SPI_BOOT
 #define CONFIG_SPL_SPI_LOAD

+ 1 - 1
include/configs/pengwyn.h

@@ -207,6 +207,6 @@
 
 /* CPSW support */
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #endif	/* ! __CONFIG_PENGWYN_H */

+ 1 - 1
include/configs/pepper.h

@@ -90,6 +90,6 @@
 #define CONFIG_PHY_RESET_DELAY 1000
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #endif /* __CONFIG_PEPPER_H */

+ 1 - 1
include/configs/siemens-am33x-common.h

@@ -136,7 +136,7 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_AM33XX_BCH

+ 1 - 1
include/configs/sniper.h

@@ -134,7 +134,7 @@
 #define CONFIG_SYS_SPL_MALLOC_SIZE	(1024 * 1024)
 #define CONFIG_SPL_STACK		LOW_LEVEL_SRAM_STACK
 
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION	2

+ 1 - 1
include/configs/tam3517-common.h

@@ -198,7 +198,7 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 #define CONFIG_SPL_TEXT_BASE		0x40200000 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE		(SRAM_SCRATCH_SPACE_ADDR - \

+ 1 - 1
include/configs/tao3530.h

@@ -284,7 +284,7 @@
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
 #define CONFIG_SPL_OMAP3_ID_NAND
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE

+ 1 - 1
include/configs/ti814x_evm.h

@@ -166,7 +166,7 @@
 
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 
 #define CONFIG_SPL_BOARD_INIT
 

+ 1 - 1
include/configs/ti816x_evm.h

@@ -130,7 +130,7 @@
 
 #define CONFIG_SYS_SPI_U_BOOT_OFFS  0x20000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE  0x40000
-#define CONFIG_SPL_LDSCRIPT     "$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT     "arch/arm/mach-omap2/u-boot-spl.lds"
 
 #define CONFIG_SPL_BOARD_INIT
 

+ 1 - 1
include/configs/ti_omap3_common.h

@@ -68,7 +68,7 @@
 
 /* SPL */
 #define CONFIG_SPL_TEXT_BASE		0x40200800
-#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 					 (64 << 20))
 

Some files were not shown because too many files changed in this diff