diff options
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 15 | ||||
| -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 |
5 files changed, 9 insertions, 26 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index d966ade15..f4e99a7d9 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -66,23 +66,20 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRRY_PI),y) printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -endif -ifeq ($(ADK_KERNEL_BCM2709_DT),y) - printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \ + printf "device_tree=bcm2708-rpi-b.dtb\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_KERNEL_BCM2708_DT),y) - printf "device_tree=bcm2708-rpi-b.dtb\n" >> \ +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y) + printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifneq ($(ADK_KERNEL_BCM2708_DT)$(ADK_KERNEL_BCM2709_DT),) printf "device_tree_address=0x100\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "kernel_address=0x8000\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "disable_commandline_tags=2\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "dtparam=i2s=on,spi=on,i2c_arm=on,i2c_vc=on\n" >> \ + printf "dtparam=i2s=on,spi=on\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP),) printf "dtoverlay=hifiberry-amp\n" >> \ @@ -108,10 +105,6 @@ ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),) printf "dtoverlay=rpi-proto\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -else - printf "device_tree=\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -endif ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin $(INSTALL_BIN) $(WRKBUILD)/hardfp/opt/vc/bin/vcdbg \ 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 |