diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-06 16:11:11 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-06 16:11:11 +0200 |
commit | c2586b3ee4f5bb508374513bd28573ca1b49c404 (patch) | |
tree | fdbdcfd1497811a402607e869749fe3ec886209f /target/arm | |
parent | 82a266c21bdd3fd746fc862654abd131f74c2f51 (diff) | |
parent | 1554c2ef3adde4cc08d1bec75ea65a0bd3688239 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm')
-rw-r--r-- | target/arm/Makefile | 4 | ||||
-rw-r--r-- | target/arm/kernel/raspberry-pi | 1 | ||||
-rw-r--r-- | target/arm/kernel/raspberry-pi2 | 10 |
3 files changed, 10 insertions, 5 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 |