diff options
| -rw-r--r-- | package/bcm2835-bootloader/Makefile | 6 | ||||
| -rwxr-xr-x | scripts/install.sh | 5 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 | ||||
| -rw-r--r-- | target/linux/patches/3.18.5/regmap-bool.patch | 27 |
4 files changed, 37 insertions, 2 deletions
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile index c78b7e811..4095e1151 100644 --- a/package/bcm2835-bootloader/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm2835-bootloader PKG_VERSION:= 9b068fe44503f564579a25fd849df4ec784f9d4d -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= bootloader for raspberry pi PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware @@ -55,6 +55,10 @@ ifeq ($(ADK_KERNEL_BCM2708_DT),y) $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt printf "disable_commandline_tags=2\n" >> \ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt +ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),) + printf "device_tree_overlay=rpi-proto\n" >> \ + $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt +endif endif include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/scripts/install.sh b/scripts/install.sh index 5957c6959..a80c8965d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -547,6 +547,11 @@ case $target { [[ -e "$x" ]] && cp "$fwdir"/*.dtb "$B/" break done + mkdir "$B/"overlay + for x in "$B/"*-overlay.dtb; do + [[ -e "$x" ]] && mv "$B/"*-overlay.dtb "$B/"overlay + break + done umount_fs "$B" ;; (solidrun-imx6) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index f69e561d4..009ea1eb0 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -141,7 +141,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_SPEED prompt "serial console speed" string default "9600" if ADK_TARGET_SYSTEM_FON_FON2100 - default "9600" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "115200" diff --git a/target/linux/patches/3.18.5/regmap-bool.patch b/target/linux/patches/3.18.5/regmap-bool.patch new file mode 100644 index 000000000..5c0ff5e2c --- /dev/null +++ b/target/linux/patches/3.18.5/regmap-bool.patch @@ -0,0 +1,27 @@ +diff -Nur linux-3.18.5.orig/drivers/base/regmap/Kconfig linux-3.18.5/drivers/base/regmap/Kconfig +--- linux-3.18.5.orig/drivers/base/regmap/Kconfig 2015-01-30 02:41:03.000000000 +0100 ++++ linux-3.18.5/drivers/base/regmap/Kconfig 2015-02-02 11:53:27.854106073 +0100 +@@ -10,19 +10,19 @@ + bool + + config REGMAP_I2C +- tristate ++ bool + depends on I2C + + config REGMAP_SPI +- tristate ++ bool + depends on SPI + + config REGMAP_SPMI +- tristate ++ bool + depends on SPMI + + config REGMAP_MMIO +- tristate ++ bool + + config REGMAP_IRQ + bool |