add basic support for raspberry pi2

Introduce new board symbols for embedded systems, which use
the similar board as basis. As for example raspberry pi and
raspberry pi2.

And some more updates:
Update binutils to 2.25, set gcc 4.9.2 as default.
Update glibc to 2.21, set as default.
Update gdb to 7.8.2.
Update kodi to latest release.

39 files changed, 96 insertions, 99 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 179e26fd7..c6463e0ac 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -158,11 +158,11 @@ config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ
 	default n
 
 config ADK_KERNEL_SND_BCM2835
-	bool "Raspberry PI onboard soundcard"
+	bool "BCM2835 onboard soundcard"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_I2S
@@ -175,41 +175,46 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_REGMAP_MMIO
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 	default n
 
+config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP
+	tristate "Hifiberry AMP"
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_BOARD_BCM28XX
+
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	tristate "Hifiberry DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	tristate "Hifiberry DIGI"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
 	tristate "RPI-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
 	tristate "IQAudio-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO
 	tristate "Rpi-Proto"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8731
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
 	depends on ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_IMX_SOC
-	bool "Solidrun SoC sound chip"
+	bool "IMX6 SoC sound chip"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 0f74cabff..a72a95012 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -199,12 +199,12 @@ config ADK_KERNEL_PATA_PLATFORM
 	default n
 
 config ADK_KERNEL_PATA_PCMCIA
+	tristate
 	select ADK_KERNEL_PCCARD
 	select ADK_KERNEL_PCMCIA
-	tristate
 
 config ADK_KERNEL_PATA_IMX
-	tristate "eSATA driver for Solidrun IMX6"
+	tristate "eSATA driver for IMX6 boards"
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -219,7 +219,7 @@ config ADK_KERNEL_PATA_IMX
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  eSATA driver for solidrun imx6
+	  eSATA driver for IMX6 boards.
 
 config ADK_KERNEL_PATA_CMD64X
 	tristate "CMD64x PATA driver"
@@ -299,7 +299,7 @@ config ADK_KERNEL_MMC_AT91
 	default n
 
 config ADK_KERNEL_MMC_SDHCI_BCM2708
-	bool "SD card support for Raspberry PI"
+	bool "SD card support for BCM2835 boards"
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -311,12 +311,12 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 	select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	select ADK_KERNEL_MMC_BCM2835
 	select ADK_KERNEL_MMC_BCM2835_DMA
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
-	bool "SD card support for Solidrun IMX6"
+	bool "SD card support for IMX6 boards"
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
 	select ADK_KERNEL_SCSI_MULTI_LUN
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 1f158a27c..fa4ead68d 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -1,21 +1,21 @@
 config ADK_KERNEL_MTRR
-	boolean
+	bool
 	default y if ADK_TARGET_CPU_WITH_MTRR
 	default n
 	
 # hyper threading
 config ADK_KERNEL_PM_SLEEP_SMP
-	boolean
+	bool
 	default y if ADK_TARGET_CPU_WITH_HT
 	default n
 
 config ADK_KERNEL_X86_HT
-	boolean
+	bool
 	default y if ADK_TARGET_CPU_WITH_HT
 	default n
 
 config ADK_KERNEL_USE_GENERIC_SMP_HELPERS
-	boolean
+	bool
 	default y if ADK_TARGET_CPU_WITH_HT
 	default n
 
@@ -23,32 +23,25 @@ menu "CPU frequency support"
 depends on ADK_TARGET_WITH_CPU_FREQ
 
 config ADK_KERNEL_CPU_FREQ
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_CPU_FREQ_GOV_USERSPACE
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_ARM_IMX6_CPUFREQ
-	prompt "CPU frequency support for Solidrun IMX6"
-	boolean
+	bool "CPU frequency support for IMX6 boards"
 	select ADK_KERNEL_CPU_FREQ
 	select ADK_KERNEL_REGULATOR
 	select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
@@ -59,11 +52,10 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ
 	default n
 
 config ADK_KERNEL_ARM_BCM2835_CPUFREQ
-	prompt "CPU frequency support for raspberry-pi"
-	boolean
+	bool "CPU frequency support for BCM2835 boards"
 	select ADK_KERNEL_CPU_FREQ
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 choice
@@ -71,23 +63,23 @@ prompt "Governor"
 depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ || ADK_KERNEL_ARM_IMX6_CPUFREQ
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_ONDEMAND
-	boolean "ondemand"
+	bool "ondemand"
 	select ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
-	boolean "performance"
+	bool "performance"
 	select ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_POWERSAVE
-	boolean "powersave"
+	bool "powersave"
 	select ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
-	boolean "conservative"
+	bool "conservative"
 	select ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_USERSPACE
-	boolean "userspace"
+	bool "userspace"
 	select ADK_KERNEL_CPU_FREQ_GOV_USERSPACE
 	
 endchoice
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index ce5a86f1e..a152b59d7 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -1,15 +1,15 @@
 config ADK_KERNEL_DMADEVICES
-	boolean
+	bool
 
 config ADK_KERNEL_DMA_BCM2708
-        boolean
+        bool
         select ADK_KERNEL_DMADEVICES
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_IMX_SDMA
-	boolean
+	bool
 	select ADK_KERNEL_DMADEVICES
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FIRMWARE_IN_KERNEL
@@ -19,7 +19,7 @@ config ADK_KERNEL_IMX_SDMA
 	default n
 
 config ADK_KERNEL_CMA
-	boolean
+	bool
 
 config ADK_KERNEL_CMA_SIZE_MBYTES
 	int
@@ -27,4 +27,4 @@ config ADK_KERNEL_CMA_SIZE_MBYTES
 
 config ADK_KERNEL_DMA_CMA
 	select ADK_KERNEL_CMA
-	boolean
+	bool
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 22f2d36c3..14daf5184 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -80,8 +80,8 @@ config ADK_KERNEL_USB_NET_SMSC95XX
 	tristate "SMSC95XX USB ethernet driver"
 	select ADK_KERNEL_USB_NET_DRIVERS
 	select ADK_KERNEL_USB_USBNET
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
 	  USB SMSC95XX ethernet driver
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index e9c3ba9d2..5bf161bf6 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -145,7 +145,7 @@ config ADK_KERNEL_VFAT_FS
 	tristate
 	select ADK_KERNEL_NLS_CODEPAGE_850
 	select ADK_KERNEL_NLS_ISO8859_1
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
 	  This option provides support for normal Windows file systems with
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index c4ce4b2c1..03f7ea5b0 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -1,27 +1,27 @@
 config ADK_KERNEL_RESET_GPIO
-	boolean
+	bool
 
 config ADK_KERNEL_GPIOLIB
-	boolean
+	bool
 
 config ADK_KERNEL_GPIO_SYSFS
-	boolean
+	bool
 
 config ADK_KERNEL_GPIO_GENERIC
-	boolean
+	bool
 
 config ADK_KERNEL_BCM2708_GPIO
-	boolean
+	bool
 	select ADK_KERNEL_GPIOLIB
 	select ADK_KERNEL_GPIO_SYSFS
 	select ADK_KERNEL_GPIO_GENERIC
 	select ADK_KERNEL_RESET_CONTROLLER
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_GPIO_MXC
-	boolean
+	bool
 	select ADK_KERNEL_GPIOLIB
 	select ADK_KERNEL_GPIO_SYSFS
 	select ADK_KERNEL_GPIO_GENERIC
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 7964a951b..68d3039e6 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -289,16 +289,16 @@ config ADK_KERNEL_FB_SM7XX
 	 Framebuffer support for Lemote Yeelong.
 
 config ADK_KERNEL_FB_BCM2708
-	prompt "Framebuffer support for Raspberry PI"
+	prompt "Framebuffer support for BCM2835 boards"
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FONT_8x16
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_BOARD_BCM28XX
  	default n
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
  	help
-	 Framebuffer support for Raspberry PI.
+	 Framebuffer support for BCM2835 boards.
 
 config ADK_HARDWARE_GRAPHICS_INTEL_I915
 	prompt "Support for Intel graphic cards (AGP/DRM/KMS)"
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index feb06eaea..b1ee8b6ae 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -2,26 +2,24 @@ menu "I2C driver support"
 depends on ADK_TARGET_WITH_I2C
 
 config ADK_KERNEL_I2C
- 	boolean
+ 	bool
 
 config ADK_KERNEL_I2C_CHARDEV
  	tristate
 
 config ADK_KERNEL_I2C_BCM2708
-	prompt "I2C driver for Raspberry PI"
-	tristate
+	tristate "I2C driver for BCM2835 boards"
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_REGMAP_I2C
 	select ADK_KERNEL_I2C_CHARDEV
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
-	  I2C driver for Raspberry PI.
+	  I2C driver for BCM2835 boards.
 
 config ADK_KERNEL_I2C_IMX
-	prompt "I2C driver for Solidrun IMX6"
-	tristate
+	tristate "I2C driver for IMX6 boards"
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_REGMAP_I2C
 	select ADK_KERNEL_I2C_CHARDEV
@@ -29,11 +27,10 @@ config ADK_KERNEL_I2C_IMX
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  I2C driver for Solidrun IMX6.
+	  I2C driver for IMX6 boards.
 	
 config ADK_KERNEL_SCX200_ACB
-	prompt "I2C driver for Geode"
-	tristate
+	tristate "I2C driver for Geode"
 	depends on ADK_CPU_GEODE
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 6cd70c8c4..c636de8fa 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -125,7 +125,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	bool "Keyboard support (AT)"
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -136,7 +136,7 @@ config ADK_KERNEL_MOUSE_PS2
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index af6147df7..9d25986de 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -127,6 +127,7 @@ config ADK_KERNEL_CPU_LITTLE_ENDIAN
 choice
 prompt "Kernel Compression"
 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+default ADK_KERNEL_COMP_GZIP if ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_COMP_XZ
 	bool "use XZ compression"
@@ -190,13 +191,16 @@ config ADK_KERNEL_HIGHMEM
 
 config ADK_KERNEL_PREEMPT
 	bool "Enable preemptive kernel"
-	default n
 
 config ADK_KERNEL_BCM2708_DT
 	bool "Enable Devicetree support"
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KERNEL_VERSION_3_18
-	default n
+
+config ADK_KERNEL_BCM2709_DT
+	bool "Enable Devicetree support"
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index dda7a71d7..18de386da 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -22,7 +22,6 @@ config ADK_KERNEL_EXTRA_FIRMWARE
 
 config ADK_KERNEL_FW_LOADER_USER_HELPER
 	bool
-	default n
 
 config ADK_KERNEL_KEYS
 	bool
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 06781c0ce..c90c402ff 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -33,14 +33,14 @@ config ADK_KERNEL_SPI_PXA2XX
 	select ADK_KERNEL_SPI
 
 config ADK_KERNEL_SPI_BCM2708
-	tristate "SPI driver for Raspberry PI"
+	tristate "SPI driver for BCM2835 boards"
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_BCM2708_SPIDEV
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_SPI_IMX
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 0577d277b..d4e3b7a8b 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -78,7 +78,7 @@ config ADK_KERNEL_USB_EHCI_HCD
 	select ADK_KERNEL_USB_EHCI_TT_NEWSCHED
 	select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	depends on ADK_KERNEL_USB
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -111,7 +111,7 @@ config ADK_KERNEL_USB_UHCI_HCD
 	tristate "Support for UHCI controllers"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
@@ -128,7 +128,7 @@ config ADK_KERNEL_USB_UHCI_HCD
 config ADK_KERNEL_USB_OHCI_HCD
 	tristate "Support for OHCI controllers"
 	depends on ADK_KERNEL_USB
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -148,8 +148,8 @@ config ADK_KERNEL_USB_OHCI_HCD
 config ADK_KERNEL_USB_DWCOTG
 	bool "Support for DWCOTG controller"
 	select ADK_KERNEL_USB
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
 	  The Synopsis DWC controller is a dual-role
@@ -175,7 +175,7 @@ config ADK_KERNEL_USB_ISP116X_HCD
 	tristate "Support for ISP116X"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
 	  option if your board has this chip. If unsure, say N.
@@ -186,7 +186,7 @@ config ADK_KERNEL_USB_SL811_HCD
 	tristate "Support for SL811HS"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
 	  The SL811HS is a single-port USB controller that supports either
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 1516ad63e..9f1673a53 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -16,22 +16,22 @@ config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
 menu "Watchdog driver support"
 
 config ADK_KERNEL_BCM2708_WDT
-	bool "BCM2708 Hardware Watchdog"
+	bool "Hardware Watchdog for BCM2835 boards"
 	select ADK_KERNEL_WATCHDOG
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_BOARD_BCM28XX
+	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	help
-	  Watchdog driver for Raspberry Pi.
+	  Watchdog driver for BCM2835 boards.
 
 config ADK_KERNEL_IMX2_WDT
-	bool "IMX6 Hardware Watchdog"
+	bool "Hardware Watchdog for IMX6 boards"
 	select ADK_KERNEL_WATCHDOG
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  Watchdog driver for Cubox-i and Hummingboard.
+	  Watchdog driver for IMX6 boards.
 
 config ADK_KERNEL_SCx200_WDT
 	bool "Natsemi Hardware Watchdog" 
@@ -41,7 +41,7 @@ config ADK_KERNEL_SCx200_WDT
 	default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default n
 	help
-	  Natsemi Watchdog (scx200)
+	  Natsemi Watchdog (scx200).
 
 config ADK_KERNEL_AT91SAM9X_WATCHDOG
 	bool "AT91SAM9X Hardware Watchdog" 
diff --git a/target/linux/patches/3.18.5/bsd-compatibility.patch b/target/linux/patches/3.18.6/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.18.5/bsd-compatibility.patch
+++ b/target/linux/patches/3.18.6/bsd-compatibility.patch
diff --git a/target/linux/patches/3.18.5/cleankernel.patch b/target/linux/patches/3.18.6/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.18.5/cleankernel.patch
+++ b/target/linux/patches/3.18.6/cleankernel.patch
diff --git a/target/linux/patches/3.18.5/cris-header.patch b/target/linux/patches/3.18.6/cris-header.patch
index 3db07e530..3db07e530 100644
--- a/target/linux/patches/3.18.5/cris-header.patch
+++ b/target/linux/patches/3.18.6/cris-header.patch
diff --git a/target/linux/patches/3.18.5/defaults.patch b/target/linux/patches/3.18.6/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.18.5/defaults.patch
+++ b/target/linux/patches/3.18.6/defaults.patch
diff --git a/target/linux/patches/3.18.5/export-symbol-for-exmap.patch b/target/linux/patches/3.18.6/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.18.5/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.18.6/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.18.5/gemalto.patch b/target/linux/patches/3.18.6/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.18.5/gemalto.patch
+++ b/target/linux/patches/3.18.6/gemalto.patch
diff --git a/target/linux/patches/3.18.5/initramfs-nosizelimit.patch b/target/linux/patches/3.18.6/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.18.5/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.18.6/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.18.5/lemote-rfkill.patch b/target/linux/patches/3.18.6/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.18.5/lemote-rfkill.patch
+++ b/target/linux/patches/3.18.6/lemote-rfkill.patch
diff --git a/target/linux/patches/3.18.5/microblaze-axi.patch b/target/linux/patches/3.18.6/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.18.5/microblaze-axi.patch
+++ b/target/linux/patches/3.18.6/microblaze-axi.patch
diff --git a/target/linux/patches/3.18.5/microblaze-ethernet.patch b/target/linux/patches/3.18.6/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.18.5/microblaze-ethernet.patch
+++ b/target/linux/patches/3.18.6/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.18.5/mkpiggy.patch b/target/linux/patches/3.18.6/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/target/linux/patches/3.18.5/mkpiggy.patch
+++ b/target/linux/patches/3.18.6/mkpiggy.patch
diff --git a/target/linux/patches/3.18.5/mtd-rootfs.patch b/target/linux/patches/3.18.6/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.18.5/mtd-rootfs.patch
+++ b/target/linux/patches/3.18.6/mtd-rootfs.patch
diff --git a/target/linux/patches/3.18.5/nfsv3-tcp.patch b/target/linux/patches/3.18.6/nfsv3-tcp.patch
index d5e07e1c2..d5e07e1c2 100644
--- a/target/linux/patches/3.18.5/nfsv3-tcp.patch
+++ b/target/linux/patches/3.18.6/nfsv3-tcp.patch
diff --git a/target/linux/patches/3.18.5/non-static.patch b/target/linux/patches/3.18.6/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.18.5/non-static.patch
+++ b/target/linux/patches/3.18.6/non-static.patch
diff --git a/target/linux/patches/3.18.5/patch-fblogo b/target/linux/patches/3.18.6/patch-fblogo
index f1fad64c1..f1fad64c1 100644
--- a/target/linux/patches/3.18.5/patch-fblogo
+++ b/target/linux/patches/3.18.6/patch-fblogo
diff --git a/target/linux/patches/3.18.5/patch-yaffs2 b/target/linux/patches/3.18.6/patch-yaffs2
index bb244c7ca..bb244c7ca 100644
--- a/target/linux/patches/3.18.5/patch-yaffs2
+++ b/target/linux/patches/3.18.6/patch-yaffs2
diff --git a/target/linux/patches/3.18.5/ppc64-missing-zlib.patch b/target/linux/patches/3.18.6/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.18.5/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.18.6/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.18.5/regmap-bool.patch b/target/linux/patches/3.18.6/regmap-bool.patch
index 5c0ff5e2c..5c0ff5e2c 100644
--- a/target/linux/patches/3.18.5/regmap-bool.patch
+++ b/target/linux/patches/3.18.6/regmap-bool.patch
diff --git a/target/linux/patches/3.18.5/relocs.patch b/target/linux/patches/3.18.6/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/target/linux/patches/3.18.5/relocs.patch
+++ b/target/linux/patches/3.18.6/relocs.patch
diff --git a/target/linux/patches/3.18.5/sgidefs.patch b/target/linux/patches/3.18.6/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.18.5/sgidefs.patch
+++ b/target/linux/patches/3.18.6/sgidefs.patch
diff --git a/target/linux/patches/3.18.5/sortext.patch b/target/linux/patches/3.18.6/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.18.5/sortext.patch
+++ b/target/linux/patches/3.18.6/sortext.patch
diff --git a/target/linux/patches/3.18.5/startup.patch b/target/linux/patches/3.18.6/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.18.5/startup.patch
+++ b/target/linux/patches/3.18.6/startup.patch
diff --git a/target/linux/patches/3.18.5/wlan-cf.patch b/target/linux/patches/3.18.6/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.18.5/wlan-cf.patch
+++ b/target/linux/patches/3.18.6/wlan-cf.patch
diff --git a/target/linux/patches/3.18.5/xargs.patch b/target/linux/patches/3.18.6/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.18.5/xargs.patch
+++ b/target/linux/patches/3.18.6/xargs.patch