From d4408fa754351bfab44e7657d0d7473d820218bd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 4 Apr 2015 14:11:16 -0500 Subject: always enable device tree for raspberry pi{,2}. enable only 3.18 kernel --- package/bcm28xx-bootloader/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'package/bcm28xx-bootloader/Makefile') 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 \ -- cgit v1.2.3 From 73da8f82c3fe878e40d2f4cc364cd1f210dbba21 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 4 Apr 2015 14:47:53 -0500 Subject: simplify config.txt generation, finetune kernel config for rpi2 --- package/bcm28xx-bootloader/Makefile | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'package/bcm28xx-bootloader/Makefile') diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index f4e99a7d9..258855bce 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -66,21 +66,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRRY_PI),y) printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "device_tree=bcm2708-rpi-b.dtb\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y) - printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif - 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\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP),) printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -- cgit v1.2.3