summaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/Makefile4
-rw-r--r--target/arm/kernel/raspberry-pi28
2 files changed, 8 insertions, 4 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-pi2 b/target/arm/kernel/raspberry-pi2
index 6ffce8632..ed8faf4e6 100644
--- a/target/arm/kernel/raspberry-pi2
+++ b/target/arm/kernel/raspberry-pi2
@@ -2,7 +2,15 @@ CONFIG_ARM=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_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_CMDLINE_FROM_BOOTLOADER=y