diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-04 14:11:16 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-05 10:29:53 -0500 |
| commit | d4408fa754351bfab44e7657d0d7473d820218bd (patch) | |
| tree | 08a544b2cc123955ad6158090a5cea709a933747 /target | |
| parent | 095dce1161da25a0dc31ec92f350be725c9bcdb6 (diff) | |
always enable device tree for raspberry pi{,2}. enable only 3.18 kernel
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/arm/kernel/raspberry-pi2 | 5 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.choice | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 12 |
4 files changed, 5 insertions, 15 deletions
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..6ffce8632 100644 --- a/target/arm/kernel/raspberry-pi2 +++ b/target/arm/kernel/raspberry-pi2 @@ -1,9 +1,8 @@ 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_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=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.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 |