Переглянути джерело

rpi3: update kernel + bootloader, unbreak rpi3 aarch64

Waldemar Brodkorb 7 роки тому
батько
коміт
bd2722a8ac

+ 3 - 2
package/bcm28xx-bootloader/Makefile

@@ -4,7 +4,8 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		bcm28xx-bootloader
-PKG_VERSION:=		ca9116ffd0cea06fdeb876ac7d19790bf2631d8c
+# not cloned, local src directory used
+PKG_VERSION:=		63fd4a88e70b1ea70783dd408c2df12db74605c9
 PKG_RELEASE:=		1
 PKG_DESCR:=		bootloader for bcm28xx
 PKG_SECTION:=		base/boot
@@ -92,7 +93,7 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y)
 	printf "arm_control=0x200\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-	printf "kernel_old=1\n" >> \
+	printf "enable_uart=1\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
 ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)

BIN
package/bcm28xx-bootloader/src/boot/bootcode.bin


BIN
package/bcm28xx-bootloader/src/boot/fixup.dat


BIN
package/bcm28xx-bootloader/src/boot/fixup_cd.dat


BIN
package/bcm28xx-bootloader/src/boot/fixup_db.dat


BIN
package/bcm28xx-bootloader/src/boot/fixup_x.dat


BIN
package/bcm28xx-bootloader/src/boot/start.elf


BIN
package/bcm28xx-bootloader/src/boot/start_cd.elf


BIN
package/bcm28xx-bootloader/src/boot/start_db.elf


BIN
package/bcm28xx-bootloader/src/boot/start_x.elf


+ 0 - 5
target/aarch64/Makefile

@@ -56,12 +56,7 @@ endif
 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 $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
-else
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)

+ 2 - 1
target/config/Config.in.addons

@@ -3,7 +3,8 @@
 
 choice
 prompt "Optional hardware configuration"
-depends on ADK_TARGET_OS_LINUX && ADK_TARGET_SYSTEM_RASPBERRY_PI3
+depends on ADK_TARGET_OS_LINUX && ADK_TARGET_SYSTEM_RASPBERRY_PI3 \
+	|| ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 
 config ADK_TARGET_HARDWARE_RPI3_SERIAL
 	bool "enable serial"

+ 2 - 2
target/config/Config.in.kernelversion

@@ -223,7 +223,7 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME
 config ADK_TARGET_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "8327f281c8d5083b13b3a4e6e2a36ee7c3d67913" if ADK_TARGET_BOARD_BCM28XX
+	default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "1d008423ab5fd12459f53342e4d17585ec63cfe4" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
@@ -233,7 +233,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.31" if ADK_TARGET_BOARD_BCM28XX
+	default "4.9.37" if ADK_TARGET_BOARD_BCM28XX
 	default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70

+ 3 - 0
target/config/Config.in.runtime

@@ -298,6 +298,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -354,6 +355,8 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3
+	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 	default "ttyDA1" if ADK_TARGET_SYSTEM_QEMU_METAG
 	default "ttyS2" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "ttyS2" if ADK_TARGET_SYSTEM_SOM_C6745