simplify config.txt generation, finetune kernel config for rpi2

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

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)

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

target/linux/config/Config.in.dma

@@ -23,11 +23,11 @@ config ADK_KERNEL_BCM_VC_CMA
 config ADK_KERNEL_DMA_BCM2708
         bool
         select ADK_KERNEL_DMADEVICES
-	select ADK_KERNEL_BCM_VC_SM
-	select ADK_KERNEL_BCM_VC_CMA
 	select ADK_KERNEL_CMA
 	select ADK_KERNEL_CMA_SIZE_SEL_MBYTES
 	select ADK_KERNEL_DMA_CMA
+	select ADK_KERNEL_BCM_VC_SM
+	select ADK_KERNEL_BCM_VC_CMA
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
 	default n