Browse Source

rpi: use uncompressed image, trailer creation otherwise seems broken

Waldemar Brodkorb 7 years ago
parent
commit
a6a94cf2e9

+ 4 - 0
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 \

+ 1 - 1
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

+ 1 - 2
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
 

+ 1 - 2
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
 

+ 1 - 2
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
 

+ 1 - 1
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