From 421e9b5b5905753651648c09580edad765f0071b Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Wed, 10 Dec 2014 19:56:49 +0800 Subject: [PATCH] ARM64: rockchip: add mach-rockchip Signed-off-by: Huang, Tao --- arch/arm64/Kconfig | 2 ++ arch/arm64/Makefile | 1 + arch/arm64/mach-rockchip/Kconfig | 1 + arch/arm64/mach-rockchip/Makefile | 9 +++++++++ 4 files changed, 13 insertions(+) create mode 100644 arch/arm64/mach-rockchip/Kconfig create mode 100644 arch/arm64/mach-rockchip/Makefile diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4857a6d2dbcb..2f95b7434bd3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -136,6 +136,8 @@ config ARCH_ROCKCHIP select PINCTRL_RK3368 select ARCH_REQUIRE_GPIOLIB +source "arch/arm64/mach-rockchip/Kconfig" + config ARCH_VEXPRESS bool "ARMv8 software model (Versatile Express)" select ARCH_REQUIRE_GPIOLIB diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index b1ca918f0f4f..c5090fed0679 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -43,6 +43,7 @@ TEXT_OFFSET := 0x00080000 export TEXT_OFFSET GZFLAGS core-y += arch/arm64/kernel/ arch/arm64/mm/ +core-$(CONFIG_ARCH_ROCKCHIP) += arch/arm64/mach-rockchip/ core-$(CONFIG_KVM) += arch/arm64/kvm/ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) diff --git a/arch/arm64/mach-rockchip/Kconfig b/arch/arm64/mach-rockchip/Kconfig new file mode 100644 index 000000000000..db477626ec18 --- /dev/null +++ b/arch/arm64/mach-rockchip/Kconfig @@ -0,0 +1 @@ +source "arch/arm/mach-rockchip/Kconfig.common" diff --git a/arch/arm64/mach-rockchip/Makefile b/arch/arm64/mach-rockchip/Makefile new file mode 100644 index 000000000000..c2a9526f0eeb --- /dev/null +++ b/arch/arm64/mach-rockchip/Makefile @@ -0,0 +1,9 @@ +obj-y += ../../arm/mach-rockchip/common.o +obj-y += ../../arm/mach-rockchip/cpu.o +obj-y += ../../arm/mach-rockchip/efuse.o +obj-y += ../../arm/mach-rockchip/pvtm.o +obj-y += ../../arm/mach-rockchip/rk_system_status.o +obj-$(CONFIG_PM) += ../../arm/mach-rockchip/rockchip_pm.o +obj-$(CONFIG_RK_LAST_LOG) += ../../arm/mach-rockchip/last_log.o +obj-$(CONFIG_DVFS) += ../../arm/mach-rockchip/dvfs.o +obj-$(CONFIG_BLOCK_RKNAND) += ../../arm/mach-rockchip/rknandbase.o -- 2.34.1