summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-19 19:48:01 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-19 19:48:08 +0100
commita6a94cf2e9f3019d0ee87ac3bd185a8cb850ed9c (patch)
treeb6c5c235653d411ad737a1ecab8b5cd3703c7b48
parent561fccc5e3918e0a4e7d17dc480b65c53998f525 (diff)
rpi: use uncompressed image, trailer creation otherwise seems broken
-rw-r--r--package/bcm28xx-bootloader/Makefile4
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/arm/systems/raspberry-pi3
-rw-r--r--target/arm/systems/raspberry-pi23
-rw-r--r--target/arm/systems/raspberry-pi33
-rw-r--r--target/config/Config.in.kernelversion2
6 files changed, 9 insertions, 8 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile
index 8038598a1..dca839e1f 100644
--- a/package/bcm28xx-bootloader/Makefile
+++ b/package/bcm28xx-bootloader/Makefile
@@ -81,6 +81,10 @@ ifneq ($(ADK_TARGET_HARDWARE_RPI_PROTO),)
printf "dtoverlay=rpi-proto\n" >> \
$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
+ifneq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3),)
+ printf "enable-uart=1\n" >> \
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+endif
ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)
$(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin
$(INSTALL_BIN) ./files/vcdbg \
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 527c4a4f1..7452b0022 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -138,7 +138,7 @@ endif
kernel-strip:
ifeq ($(ADK_TARGET_KERNEL_GIT_REPO_NAME),rpi)
@echo adding DT trailer to kernel $(MAKE_TRACE)
- PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --270x --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
+ PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
else
@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
endif
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
index 233dc15e8..2dd918c9d 100644
--- a/target/arm/systems/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
@@ -17,8 +17,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
select ADK_TARGET_WITH_SOUND
select ADK_PACKAGE_BCM28XX_BOOTLOADER
select ADK_TARGET_WITH_ROOT_RW
- select ADK_TARGET_KERNEL_ZIMAGE
- select ADK_TARGET_KERNEL_WITH_COMPRESSION
+ select ADK_TARGET_KERNEL_IMAGE
help
Raspberry PI
diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2
index c080347c0..76abde793 100644
--- a/target/arm/systems/raspberry-pi2
+++ b/target/arm/systems/raspberry-pi2
@@ -18,8 +18,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2
select ADK_TARGET_WITH_SOUND
select ADK_PACKAGE_BCM28XX_BOOTLOADER
select ADK_TARGET_WITH_ROOT_RW
- select ADK_TARGET_KERNEL_ZIMAGE
- select ADK_TARGET_KERNEL_WITH_COMPRESSION
+ select ADK_TARGET_KERNEL_IMAGE
help
Raspberry PI 2
diff --git a/target/arm/systems/raspberry-pi3 b/target/arm/systems/raspberry-pi3
index 858bbf720..61f4100d8 100644
--- a/target/arm/systems/raspberry-pi3
+++ b/target/arm/systems/raspberry-pi3
@@ -20,8 +20,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3
select ADK_TARGET_WITH_SDIO
select ADK_PACKAGE_BCM28XX_BOOTLOADER
select ADK_TARGET_WITH_ROOT_RW
- select ADK_TARGET_KERNEL_ZIMAGE
- select ADK_TARGET_KERNEL_WITH_COMPRESSION
+ select ADK_TARGET_KERNEL_IMAGE
help
Raspberry PI 3
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index d44ecef4a..257ca3cff 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -232,7 +232,7 @@ config ADK_TARGET_KERNEL_GIT
config ADK_TARGET_KERNEL_GIT_VER
string "kernel version"
depends on ADK_TARGET_KERNEL_VERSION_GIT
- default "4.9.14-1-v7+" if ADK_TARGET_BOARD_BCM28XX
+ default "4.9.15-1-v7+" if ADK_TARGET_BOARD_BCM28XX
default "3.14.79-1+" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default "4.4.37-1+" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70