diff options
-rw-r--r-- | arch/arm/Kconfig | 15 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/socfpga/config.mk | 11 | ||||
-rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 27 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/Makefile (renamed from arch/arm/cpu/armv7/socfpga/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/clock_manager.c (renamed from arch/arm/cpu/armv7/socfpga/clock_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/fpga_manager.c (renamed from arch/arm/cpu/armv7/socfpga/fpga_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/freeze_controller.c (renamed from arch/arm/cpu/armv7/socfpga/freeze_controller.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/clock_manager.h (renamed from arch/arm/include/asm/arch-socfpga/clock_manager.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/dwmmc.h (renamed from arch/arm/include/asm/arch-socfpga/dwmmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/fpga_manager.h (renamed from arch/arm/include/asm/arch-socfpga/fpga_manager.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/freeze_controller.h (renamed from arch/arm/include/asm/arch-socfpga/freeze_controller.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/gpio.h (renamed from arch/arm/include/asm/arch-socfpga/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/nic301.h (renamed from arch/arm/include/asm/arch-socfpga/nic301.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/reset_manager.h (renamed from arch/arm/include/asm/arch-socfpga/reset_manager.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/scan_manager.h (renamed from arch/arm/include/asm/arch-socfpga/scan_manager.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/scu.h (renamed from arch/arm/include/asm/arch-socfpga/scu.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/sdram.h (renamed from arch/arm/include/asm/arch-socfpga/sdram.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h (renamed from arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/system_manager.h (renamed from arch/arm/include/asm/arch-socfpga/system_manager.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/timer.h (renamed from arch/arm/include/asm/arch-socfpga/timer.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/misc.c (renamed from arch/arm/cpu/armv7/socfpga/misc.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/reset_manager.c (renamed from arch/arm/cpu/armv7/socfpga/reset_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/scan_manager.c (renamed from arch/arm/cpu/armv7/socfpga/scan_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/spl.c (renamed from arch/arm/cpu/armv7/socfpga/spl.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/system_manager.c (renamed from arch/arm/cpu/armv7/socfpga/system_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/timer.c (renamed from arch/arm/cpu/armv7/socfpga/timer.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/u-boot-spl.lds (renamed from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds) | 0 | ||||
-rw-r--r-- | board/altera/socfpga/Kconfig | 31 | ||||
-rw-r--r-- | board/altera/socfpga/iocsr_config.c | 2 | ||||
-rw-r--r-- | configs/socfpga_arria5_defconfig | 1 | ||||
-rw-r--r-- | configs/socfpga_cyclone5_defconfig | 1 | ||||
-rw-r--r-- | configs/socfpga_socrates_defconfig | 1 | ||||
-rw-r--r-- | doc/git-mailrc | 1 | ||||
-rw-r--r-- | include/configs/socfpga_common.h | 4 |
37 files changed, 40 insertions, 60 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49bcad1..cee3126 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -619,16 +619,8 @@ config TARGET_CM_FX6 select DM_SERIAL select DM_GPIO -config TARGET_SOCFPGA_ARRIA5 - bool "Support socfpga_arria5" - select CPU_V7 - select SUPPORT_SPL - select DM - select DM_SPI_FLASH - select DM_SPI - -config TARGET_SOCFPGA_CYCLONE5 - bool "Support socfpga_cyclone5" +config ARCH_SOCFPGA + bool "Altera SOCFPGA family" select CPU_V7 select SUPPORT_SPL select DM @@ -841,6 +833,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig" source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" +source "arch/arm/mach-socfpga/Kconfig" + source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-uniphier/Kconfig" @@ -863,7 +857,6 @@ source "board/Marvell/aspenite/Kconfig" source "board/Marvell/db-88f6820-gp/Kconfig" source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/gplugd/Kconfig" -source "board/altera/socfpga/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8ff94a3..6f30098 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index d335845..e66c61e 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -12,7 +12,7 @@ obj-y += cache_v7.o obj-y += cpu.o cp15.o obj-y += syslib.o -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_SOCFPGA),) +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_ARCH_SOCFPGA),) ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y) obj-y += lowlevel_init.o endif @@ -50,7 +50,6 @@ obj-$(CONFIG_OMAP44XX) += omap4/ obj-$(CONFIG_OMAP54XX) += omap5/ obj-$(CONFIG_RMOBILE) += rmobile/ obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ -obj-$(CONFIG_SOCFPGA) += socfpga/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_U8500) += u8500/ diff --git a/arch/arm/cpu/armv7/socfpga/config.mk b/arch/arm/cpu/armv7/socfpga/config.mk deleted file mode 100644 index 2a99c72..0000000 --- a/arch/arm/cpu/armv7/socfpga/config.mk +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# -ifndef CONFIG_SPL_BUILD -ALL-y += u-boot.img -endif - -# Added for handoff support -PLATFORM_RELFLAGS += -Iboard/$(VENDOR)/$(BOARD) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 15d60b9..6a01759 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -49,7 +49,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-zc770-xm013.dtb dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb -dtb-$(CONFIG_SOCFPGA) += \ +dtb-$(CONFIG_ARCH_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_socrates.dtb diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig new file mode 100644 index 0000000..204efca --- /dev/null +++ b/arch/arm/mach-socfpga/Kconfig @@ -0,0 +1,27 @@ +if ARCH_SOCFPGA + +choice + prompt "Altera SOCFPGA board select" + +config TARGET_SOCFPGA_ARRIA5 + bool "Altera SOCFPGA Arria V" + +config TARGET_SOCFPGA_CYCLONE5 + bool "Altera SOCFPGA Cyclone V" + +endchoice + +config SYS_BOARD + default "socfpga" + +config SYS_VENDOR + default "altera" + +config SYS_SOC + default "socfpga" + +config SYS_CONFIG_NAME + default "socfpga_arria5" if TARGET_SOCFPGA_ARRIA5 + default "socfpga_cyclone5" if TARGET_SOCFPGA_CYCLONE5 + +endif diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 7524ef9..7524ef9 100644 --- a/arch/arm/cpu/armv7/socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile diff --git a/arch/arm/cpu/armv7/socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index fa3b93a..fa3b93a 100644 --- a/arch/arm/cpu/armv7/socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/fpga_manager.c b/arch/arm/mach-socfpga/fpga_manager.c index 43fd2fe..43fd2fe 100644 --- a/arch/arm/cpu/armv7/socfpga/fpga_manager.c +++ b/arch/arm/mach-socfpga/fpga_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c index 0be643c..0be643c 100644 --- a/arch/arm/cpu/armv7/socfpga/freeze_controller.c +++ b/arch/arm/mach-socfpga/freeze_controller.c diff --git a/arch/arm/include/asm/arch-socfpga/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h index 5449726..5449726 100644 --- a/arch/arm/include/asm/arch-socfpga/clock_manager.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h diff --git a/arch/arm/include/asm/arch-socfpga/dwmmc.h b/arch/arm/mach-socfpga/include/mach/dwmmc.h index 945eb64..945eb64 100644 --- a/arch/arm/include/asm/arch-socfpga/dwmmc.h +++ b/arch/arm/mach-socfpga/include/mach/dwmmc.h diff --git a/arch/arm/include/asm/arch-socfpga/fpga_manager.h b/arch/arm/mach-socfpga/include/mach/fpga_manager.h index a077e22..a077e22 100644 --- a/arch/arm/include/asm/arch-socfpga/fpga_manager.h +++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h diff --git a/arch/arm/include/asm/arch-socfpga/freeze_controller.h b/arch/arm/mach-socfpga/include/mach/freeze_controller.h index f19ad87..f19ad87 100644 --- a/arch/arm/include/asm/arch-socfpga/freeze_controller.h +++ b/arch/arm/mach-socfpga/include/mach/freeze_controller.h diff --git a/arch/arm/include/asm/arch-socfpga/gpio.h b/arch/arm/mach-socfpga/include/mach/gpio.h index 6c61f18..6c61f18 100644 --- a/arch/arm/include/asm/arch-socfpga/gpio.h +++ b/arch/arm/mach-socfpga/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-socfpga/nic301.h b/arch/arm/mach-socfpga/include/mach/nic301.h index 3c8ab31..3c8ab31 100644 --- a/arch/arm/include/asm/arch-socfpga/nic301.h +++ b/arch/arm/mach-socfpga/include/mach/nic301.h diff --git a/arch/arm/include/asm/arch-socfpga/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h index d63a285..d63a285 100644 --- a/arch/arm/include/asm/arch-socfpga/reset_manager.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h diff --git a/arch/arm/include/asm/arch-socfpga/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h index 1155fd3..1155fd3 100644 --- a/arch/arm/include/asm/arch-socfpga/scan_manager.h +++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h diff --git a/arch/arm/include/asm/arch-socfpga/scu.h b/arch/arm/mach-socfpga/include/mach/scu.h index 7a5b074..7a5b074 100644 --- a/arch/arm/include/asm/arch-socfpga/scu.h +++ b/arch/arm/mach-socfpga/include/mach/scu.h diff --git a/arch/arm/include/asm/arch-socfpga/sdram.h b/arch/arm/mach-socfpga/include/mach/sdram.h index 4f6489d..4f6489d 100644 --- a/arch/arm/include/asm/arch-socfpga/sdram.h +++ b/arch/arm/mach-socfpga/include/mach/sdram.h diff --git a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h b/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h index 6534283..6534283 100644 --- a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h +++ b/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h diff --git a/arch/arm/include/asm/arch-socfpga/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h index 51d9815..51d9815 100644 --- a/arch/arm/include/asm/arch-socfpga/system_manager.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager.h diff --git a/arch/arm/include/asm/arch-socfpga/timer.h b/arch/arm/mach-socfpga/include/mach/timer.h index ee6969b..ee6969b 100644 --- a/arch/arm/include/asm/arch-socfpga/timer.h +++ b/arch/arm/mach-socfpga/include/mach/timer.h diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 0f8b4d0..0f8b4d0 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c diff --git a/arch/arm/cpu/armv7/socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c index 45b352b..45b352b 100644 --- a/arch/arm/cpu/armv7/socfpga/reset_manager.c +++ b/arch/arm/mach-socfpga/reset_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c index a820b1b..a820b1b 100644 --- a/arch/arm/cpu/armv7/socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index f994658..f994658 100644 --- a/arch/arm/cpu/armv7/socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c diff --git a/arch/arm/cpu/armv7/socfpga/system_manager.c b/arch/arm/mach-socfpga/system_manager.c index 8126e0d..8126e0d 100644 --- a/arch/arm/cpu/armv7/socfpga/system_manager.c +++ b/arch/arm/mach-socfpga/system_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/mach-socfpga/timer.c index 253cde3..253cde3 100644 --- a/arch/arm/cpu/armv7/socfpga/timer.c +++ b/arch/arm/mach-socfpga/timer.c diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/mach-socfpga/u-boot-spl.lds index 569fa41..569fa41 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/mach-socfpga/u-boot-spl.lds diff --git a/board/altera/socfpga/Kconfig b/board/altera/socfpga/Kconfig deleted file mode 100644 index cbed8d6..0000000 --- a/board/altera/socfpga/Kconfig +++ /dev/null @@ -1,31 +0,0 @@ -if TARGET_SOCFPGA_CYCLONE5 - -config SYS_BOARD - default "socfpga" - -config SYS_VENDOR - default "altera" - -config SYS_SOC - default "socfpga" - -config SYS_CONFIG_NAME - default "socfpga_cyclone5" - -endif - -if TARGET_SOCFPGA_ARRIA5 - -config SYS_BOARD - default "socfpga" - -config SYS_VENDOR - default "altera" - -config SYS_SOC - default "socfpga" - -config SYS_CONFIG_NAME - default "socfpga_arria5" - -endif diff --git a/board/altera/socfpga/iocsr_config.c b/board/altera/socfpga/iocsr_config.c index c79aa6d..3b202b5 100644 --- a/board/altera/socfpga/iocsr_config.c +++ b/board/altera/socfpga/iocsr_config.c @@ -6,7 +6,7 @@ /* This file is generated by Preloader Generator */ -#include <iocsr_config.h> +#include "iocsr_config.h" #ifdef CONFIG_TARGET_SOCFPGA_CYCLONE5 const unsigned long iocsr_scan_chain0_table[(( diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 52032e5..d658a50 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y CONFIG_TARGET_SOCFPGA_ARRIA5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 6c982ab..a67b0c1 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index c81ab0f..1aa3ee5 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" diff --git a/doc/git-mailrc b/doc/git-mailrc index 174109f..ddc4513 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -64,6 +64,7 @@ alias rmobile uboot, iwamatsu alias s3c samsung alias s5pc samsung alias samsung uboot, prom +alias socfpga uboot, marex, Dinh Nguyen <dinguyen@opensource.altera.com> alias sunxi uboot, ijc, jwrdegoede alias tegra uboot, sjg, Tom Warren <twarren@nvidia.com>, Stephen Warren <swarren@nvidia.com> alias tegra2 tegra diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 41bb52b..e742acf 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_THUMB_BUILD -#define CONFIG_SOCFPGA - /* * High level configuration */ @@ -298,7 +296,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_CRC32_VERIFY /* Linker script for SPL */ -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/socfpga/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-socfpga/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT |