Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 14 insertions, 19 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 479ab738e..0e7441090 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -99,19 +99,15 @@ endif
 kernel-strip:
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-ifeq ($(ADK_KERNEL_BCM2708_DT),y)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	-rm $(BUILD_DIR)/$(TARGET_KERNEL)
 	$(ADK_TOPDIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 endif
-endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
-ifeq ($(ADK_KERNEL_BCM2709_DT),y)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	-rm $(BUILD_DIR)/$(TARGET_KERNEL)
 	$(ADK_TOPDIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 endif
-endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 0399d9bcc..d3f74f8af 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -10,6 +10,7 @@ CONFIG_MACH_BCM2708=y
 CONFIG_BCM2708_VCMEM=y
 CONFIG_BCM2708_DMAER=y
 CONFIG_BCM2708_VCHIQ=y
+CONFIG_BCM2708_DT=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
diff --git a/target/arm/kernel/raspberry-pi2 b/target/arm/kernel/raspberry-pi2
index 767a675c3..67eb76e87 100644
--- a/target/arm/kernel/raspberry-pi2
+++ b/target/arm/kernel/raspberry-pi2
@@ -1,9 +1,17 @@
 CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_PHYS_OFFSET=0
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_BCM2709=y
 CONFIG_MACH_BCM2709=y
+CONFIG_BCM2709_DT=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_FIQ=y
+CONFIG_BCM2708_VCMEM=y
+CONFIG_BCM2708_NOL2CACHE=y
+CONFIG_BCM2708_VCHIQ=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_KUSER_HELPERS=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index 1d5224aac..4a85f50a3 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -35,6 +35,8 @@ config ADK_KERNEL_VERSION_3_12_38
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	select ADK_KERNEL_VERSION_3_12
 
 config ADK_KERNEL_VERSION_3_10_71
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index c3038289d..144fb2d2d 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -23,11 +23,11 @@ config ADK_KERNEL_BCM_VC_CMA
 config ADK_KERNEL_DMA_BCM2708
         bool
         select ADK_KERNEL_DMADEVICES
-	select ADK_KERNEL_BCM_VC_SM
-	select ADK_KERNEL_BCM_VC_CMA
 	select ADK_KERNEL_CMA
 	select ADK_KERNEL_CMA_SIZE_SEL_MBYTES
 	select ADK_KERNEL_DMA_CMA
+	select ADK_KERNEL_BCM_VC_SM
+	select ADK_KERNEL_BCM_VC_CMA
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 95904d9af..296dba2fc 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -227,18 +227,6 @@ config ADK_KERNEL_HIGHMEM
 	help
 	  Enable high memory support.
 
-config ADK_KERNEL_BCM2708_DT
-	bool
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on ADK_KERNEL_VERSION_3_18
-	default y
-
-config ADK_KERNEL_BCM2709_DT
-	bool
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on ADK_KERNEL_VERSION_3_18
-	default y
-
 config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
 	# does not boot in qemu-microblaze